[Pkg-mozext-commits] [firetray] 01/11: Fix GtkIcons import. (#175)

[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 a6277724b030fb30228b1014a44f8a57fc4eab6e
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Mon Apr 6 18:13:04 2015 +0200

    Fix GtkIcons import. (#175)
---
 src/modules/linux/FiretrayChatStatusIcon.jsm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index 17646d4..b9a6a6a 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -14,6 +14,7 @@ Cu.import("resource://firetray/ctypes/linux/gdk.jsm");
 Cu.import("resource://firetray/ctypes/linux/gio.jsm");
 Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
 Cu.import("resource://firetray/ctypes/linux/gtk.jsm");
+Cu.import("resource://firetray/linux/FiretrayGtkIcons.jsm");
 Cu.import("resource://firetray/linux/FiretrayWindow.jsm");
 Cu.import("resource://firetray/commons.js");
 firetray.Handler.subscribeLibsForClosing([gdk, gio, gobject, gtk]);
@@ -51,9 +52,9 @@ firetray.ChatStatusIcon = {
 
   init: function() {
     if (!firetray.Handler.appHasChat) throw "ChatStatusIcon for chat app only";
-    firetray.GtkIcons.init();
 
     this.trayIcon = gtk.gtk_status_icon_new();
+    firetray.GtkIcons.init();
     this.loadThemedIcons();
     this.setIconImage(this.themedIconNameCurrent || FIRETRAY_IM_STATUS_OFFLINE); // updated in Chat anyway
     this.setIconTooltipDefault();
@@ -66,6 +67,7 @@ firetray.ChatStatusIcon = {
   shutdown: function() {
     this.destroyTimers();
     this.destroyIcons();
+    firetray.GtkIcons.shutdown();
     this.initialized = false;
   },
 

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