[Pkg-mozext-commits] [firetray] 18/22: Merge tag 'upstream/0.5.4+dfsg'

[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 df32cb8eca3728e43ca4d3e60c2b41139675014d
Merge: 477974c 11f8fa1
Author: David Prévot <david at tilapin.org>
Date:   Wed Dec 31 11:52:01 2014 -0400

    Merge tag 'upstream/0.5.4+dfsg'
    
    Upstream version 0.5.4+dfsg
    
    # gpg: Signature faite le mer. 31 déc. 2014 11:51:56 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 README.md                                          |   6 +-
 src/Makefile                                       |   2 +-
 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                |  13 +-
 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                  |   3 +
 src/install.rdf                                    |   8 +-
 src/modules/FiretrayHandler.jsm                    |  75 +++--
 src/modules/commons.js                             |  39 +--
 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                   |   3 +
 src/modules/ctypes/winnt/win32.jsm                 |   1 +
 src/modules/linux/FiretrayAppIndicator.jsm         | 157 ++++++++++
 src/modules/linux/FiretrayChatStatusIcon.jsm       |   8 +-
 src/modules/linux/FiretrayGtkIcons.jsm             |  22 +-
 ...rayStatusIcon.jsm => FiretrayGtkStatusIcon.jsm} | 207 ++++++-------
 src/modules/linux/FiretrayPopupMenu.jsm            |  94 ++++--
 src/modules/linux/FiretrayStatusIcon.jsm           | 334 +++++----------------
 src/modules/linux/FiretrayWindow.jsm               |   1 +
 src/modules/log4moz.js                             |   4 +-
 src/modules/logging.jsm                            |  26 +-
 src/modules/winnt/FiretrayStatusIcon.jsm           |  10 +-
 51 files changed, 764 insertions(+), 519 deletions(-)

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