[Pkg-mozext-commits] [firetray] 48/84: Merge branch 'winnt'

[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 9d08b8203f42f7511ab116c13a326c20142d4214
Merge: 3b80f4b f1c5c02
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat Apr 12 15:35:19 2014 +0200

    Merge branch 'winnt'

 src/Makefile                                 |    6 +-
 src/chrome/content/options.js                |  309 ++++---
 src/chrome/content/options.xul               |   44 +-
 src/chrome/content/overlay.js                |  107 ++-
 src/chrome/content/overlay.xul               |    2 +-
 src/chrome/locale/en-US/options.dtd          |    8 +-
 src/chrome/locale/es-AR/options.dtd          |    8 +-
 src/chrome/locale/fr/options.dtd             |   10 +-
 src/chrome/locale/it/options.dtd             |    8 +-
 src/chrome/locale/nl/options.dtd             |    8 +-
 src/chrome/locale/sk-SK/options.dtd          |    8 +-
 src/chrome/locale/zh-TW/options.dtd          |    8 +-
 src/chrome/skin/winnt/application-exit.bmp   |  Bin 0 -> 2358 bytes
 src/chrome/skin/winnt/blank-icon.bmp         |  Bin 0 -> 3126 bytes
 src/chrome/skin/winnt/document-new.bmp       |  Bin 0 -> 2358 bytes
 src/chrome/skin/winnt/gtk-apply.bmp          |  Bin 0 -> 1654 bytes
 src/chrome/skin/winnt/gtk-edit.bmp           |  Bin 0 -> 2358 bytes
 src/chrome/skin/winnt/gtk-preferences.bmp    |  Bin 0 -> 2358 bytes
 src/chrome/skin/winnt/mail-unread.ico        |  Bin 0 -> 2086 bytes
 src/defaults/preferences/prefs.js            |    6 +-
 src/install.rdf                              |   13 +-
 src/modules/FiretrayHandler.jsm              |  131 ++-
 src/modules/FiretrayMessaging.jsm            |   30 +-
 src/modules/FiretrayWindow.jsm               |   43 +
 src/modules/commons.js                       |   82 +-
 src/modules/ctypes/ctypes-utils.jsm          |   19 +-
 src/modules/ctypes/ctypesMap.jsm             |    4 +
 src/modules/ctypes/linux/gtk.jsm             |    1 +
 src/modules/ctypes/winnt/gdi32.jsm           |  182 ++++
 src/modules/ctypes/winnt/kernel32.jsm        |   49 ++
 src/modules/ctypes/winnt/shell32.jsm         |   96 +++
 src/modules/ctypes/winnt/user32.jsm          |  380 +++++++++
 src/modules/ctypes/winnt/win32.jsm           |  210 +++++
 src/modules/{ => linux}/FiretrayChat.jsm     |    6 +-
 src/modules/linux/FiretrayChatStatusIcon.jsm |    1 -
 src/modules/linux/FiretrayPopupMenu.jsm      |    6 +-
 src/modules/linux/FiretrayStatusIcon.jsm     |   23 +-
 src/modules/linux/FiretrayWindow.jsm         | 1148 ++++++++++++--------------
 src/modules/logging.jsm                      |   74 +-
 src/modules/winnt/FiretrayPopupMenu.jsm      |  160 ++++
 src/modules/winnt/FiretrayStatusIcon.jsm     |  467 +++++++++++
 src/modules/winnt/FiretrayWin32.jsm          |   61 ++
 src/modules/winnt/FiretrayWindow.jsm         |  294 +++++++
 testing/xtypes.c                             |    1 +
 44 files changed, 3069 insertions(+), 944 deletions(-)

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