[Pkg-mozext-commits] [firetray] 270/399: fix shutdown so ctypes libs are close cleanly + cleaning

[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 6f95421a2f9205de99c86e31d85ea8a150245c46
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat Aug 4 15:22:10 2012 +0200

    fix shutdown so ctypes libs are close cleanly + cleaning
---
 src/modules/FiretrayHandler.jsm          |    1 +
 src/modules/FiretrayInstantMessaging.jsm |    2 +-
 src/modules/FiretrayMessaging.jsm        |    3 ++-
 src/modules/linux/FiretrayGtkIcons.jsm   |    2 ++
 src/modules/linux/FiretrayPopupMenu.jsm  |    1 +
 src/modules/linux/FiretrayStatusIcon.jsm |    7 +++----
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 63bfcfc..5e83931 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -110,6 +110,7 @@ firetray.Handler = {
   },
 
   shutdown: function() {
+    F.LOG("Disabling Handler");
     firetray.PrefListener.unregister();
 
     if (this.inMailApp)
diff --git a/src/modules/FiretrayInstantMessaging.jsm b/src/modules/FiretrayInstantMessaging.jsm
index a4d78ad..c485850 100644
--- a/src/modules/FiretrayInstantMessaging.jsm
+++ b/src/modules/FiretrayInstantMessaging.jsm
@@ -33,7 +33,7 @@ firetray.InstantMessaging = {
     if (!this.initialized) return;
     F.LOG("Disabling InstantMessaging");
 
-    Services.obs.removeAllObservers(firetray.InstantMessaging);
+    firetray.Utils.removeAllObservers(firetray.InstantMessaging);
 
     this.initialized = false;
   },
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index b908253..6ffda93 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -54,11 +54,12 @@ firetray.Messaging = {
     F.LOG("Disabling Messaging");
 
     firetray.InstantMessaging.shutdown();
+    F.LOG("HI THERE");
 
     MailServices.mailSession.RemoveFolderListener(this.mailSessionListener);
     firetray.Handler.setIconImageDefault();
 
-    Services.obs.removeAllObservers(firetray.Messaging);
+    firetray.Utils.removeAllObservers(firetray.Messaging);
 
     this.initialized = false;
   },
diff --git a/src/modules/linux/FiretrayGtkIcons.jsm b/src/modules/linux/FiretrayGtkIcons.jsm
index 5979f2a..e7ab9ee 100644
--- a/src/modules/linux/FiretrayGtkIcons.jsm
+++ b/src/modules/linux/FiretrayGtkIcons.jsm
@@ -20,6 +20,8 @@ firetray.GtkIcons = {
 
   init: function() {
     try {
+      if (this.initialized) return true;
+
       this.loadDefaultTheme();
       this.initialized = true;
       return true;
diff --git a/src/modules/linux/FiretrayPopupMenu.jsm b/src/modules/linux/FiretrayPopupMenu.jsm
index 4e23c9b..f2a483a 100644
--- a/src/modules/linux/FiretrayPopupMenu.jsm
+++ b/src/modules/linux/FiretrayPopupMenu.jsm
@@ -60,6 +60,7 @@ firetray.PopupMenu = {
   },
 
   shutdown: function() {
+    F.LOG("Disabling PopupMenu");
     firetray.Utils.tryCloseLibs([gobject, gtk]);
     this.initialized = false;
   },
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index 24727e6..4a7d9db 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -39,14 +39,12 @@ firetray.StatusIcon = {
     this.FILENAME_BLANK = firetray.Utils.chromeToPath(
       "chrome://firetray/skin/blank-icon.png");
 
-    this.defineIconNames();
-
     Cu.import("resource://firetray/linux/FiretrayGtkIcons.jsm");
     firetray.GtkIcons.init();
-
+    this.defineIconNames();
     this.loadThemedIcons();
-    this.trayIcon = gtk.gtk_status_icon_new();
 
+    this.trayIcon = gtk.gtk_status_icon_new();
     firetray.Handler.setIconImageDefault();
     firetray.Handler.setIconTooltipDefault();
 
@@ -61,6 +59,7 @@ firetray.StatusIcon = {
   },
 
   shutdown: function() {
+    F.LOG("Disabling StatusIcon");
     firetray.PopupMenu.shutdown();
     firetray.GtkIcons.shutdown();
     firetray.Utils.tryCloseLibs([cairo, gobject, gdk, gio, gtk, pango, pangocairo]);

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