[Pkg-mozext-commits] [firetray] 09/22: Merge branch 'appind'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firetray.

commit e4318ed5d969842af6f25cdbc5888c640a593ad8
Merge: 9b8ab13 389e6ce
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Tue Dec 23 13:25:21 2014 +0100

    Merge branch 'appind'

 src/chrome/content/options.js                      |  80 +++--
 src/chrome/content/options.xul                     |  10 +
 src/chrome/content/overlay.js                      |   4 +-
 src/chrome/locale/de-DE/options.dtd                |   4 +
 src/chrome/locale/de-DE/overlay.properties         |   2 +
 src/chrome/locale/en-US/options.dtd                |   4 +
 src/chrome/locale/en-US/overlay.properties         |   2 +
 src/chrome/locale/es-AR/options.dtd                |   4 +
 src/chrome/locale/es-AR/overlay.properties         |   2 +
 src/chrome/locale/fr/options.dtd                   |   4 +
 src/chrome/locale/fr/overlay.properties            |   2 +
 src/chrome/locale/hr-HR/options.dtd                |   4 +
 src/chrome/locale/hr-HR/overlay.properties         |   2 +
 src/chrome/locale/it/options.dtd                   |   4 +
 src/chrome/locale/it/overlay.properties            |   2 +
 src/chrome/locale/nl/options.dtd                   |   4 +
 src/chrome/locale/nl/overlay.properties            |   2 +
 src/chrome/locale/pl-PL/options.dtd                |   4 +
 src/chrome/locale/pl-PL/overlay.properties         |   2 +
 src/chrome/locale/ru-RU/options.dtd                |   4 +
 src/chrome/locale/ru-RU/overlay.properties         |   2 +
 src/chrome/locale/sk-SK/options.dtd                |   4 +
 src/chrome/locale/sk-SK/overlay.properties         |   2 +
 src/chrome/locale/uk-UA/options.dtd                |   4 +
 src/chrome/locale/uk-UA/overlay.properties         |   2 +
 src/chrome/locale/zh-TW/options.dtd                |   4 +
 src/chrome/locale/zh-TW/overlay.properties         |   2 +
 src/chrome/skin/overlay.css                        |   4 +-
 src/defaults/preferences/prefs.js                  |   1 +
 src/modules/FiretrayHandler.jsm                    |  39 +--
 src/modules/commons.js                             |  27 +-
 src/modules/ctypes/ctypes-utils.jsm                |  14 +-
 src/modules/ctypes/linux/appindicator.jsm          |  58 ++++
 src/modules/ctypes/linux/gio.jsm                   |  20 ++
 src/modules/ctypes/linux/glib.jsm                  |   8 +-
 src/modules/ctypes/linux/gobject.jsm               |   4 +
 src/modules/ctypes/linux/gtk.jsm                   |   2 +
 src/modules/linux/FiretrayAppIndicator.jsm         | 157 ++++++++++
 src/modules/linux/FiretrayChatStatusIcon.jsm       |   8 +-
 src/modules/linux/FiretrayGtkIcons.jsm             |   5 +-
 ...rayStatusIcon.jsm => FiretrayGtkStatusIcon.jsm} | 207 ++++++-------
 src/modules/linux/FiretrayPopupMenu.jsm            |  93 ++++--
 src/modules/linux/FiretrayStatusIcon.jsm           | 329 +++++----------------
 src/modules/linux/FiretrayWindow.jsm               |   1 +
 src/modules/winnt/FiretrayStatusIcon.jsm           |  10 +-
 45 files changed, 673 insertions(+), 480 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git