[Pkg-mozext-commits] [firetray] 262/399: Merge branch 'native-handle'

[David Prévot]

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

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit 3c572aa5fc98bf5693bccdcb6cf691a593678b50
Merge: 4fb215c 2fe1c2b
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat Jul 28 15:19:04 2012 +0200

    Merge branch 'native-handle'

 src/chrome.manifest                      |    1 +
 src/lib/linux/Makefile                   |   43 +++++++++++++++++++++
 src/lib/linux/firetray.c                 |   16 ++++++++
 src/lib/linux/firetray.h                 |    3 ++
 src/modules/FiretrayHandler.jsm          |   22 +++++++----
 src/modules/ctypes/libfiretray.jsm       |   60 ++++++++++++++++++++++++++++++
 src/modules/ctypes/linux/gdk.jsm         |    1 +
 src/modules/ctypes/linux/gtk.jsm         |    1 +
 src/modules/linux/FiretrayStatusIcon.jsm |    3 +-
 src/modules/linux/FiretrayWindow.jsm     |   55 +++++++++++++++++++++------
 testing/xtypes.c                         |    1 +
 11 files changed, 185 insertions(+), 21 deletions(-)


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