[Pkg-mozext-commits] [firetray] 256/399: 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 e0f60f29819c894f2969d340e2f79a423922dd79
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Jun 13 22:24:07 2012 +0200

    cleaning
---
 src/modules/FiretrayHandler.jsm          |   22 ++++++++++++++--------
 src/modules/linux/FiretrayStatusIcon.jsm |    3 ++-
 src/modules/linux/FiretrayWindow.jsm     |    8 ++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index e339c38..98511aa 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -8,8 +8,6 @@ const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/ctypes.jsm");
-Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
-Cu.import("resource://firetray/ctypes/linux/gtk.jsm");
 Cu.import("resource://firetray/commons.js");
 Cu.import("resource://firetray/PrefListener.jsm");
 Cu.import("resource://firetray/VersionChange.jsm");
@@ -35,10 +33,6 @@ firetray.Handler = {
   FILENAME_NEWMAIL: null,
 
   initialized: false,
-  appId:      (function(){return Services.appinfo.ID;})(),
-  appName:    (function(){return Services.appinfo.name;})(),
-  runtimeABI: (function(){return Services.appinfo.XPCOMABI;})(),
-  runtimeOS:  (function(){return Services.appinfo.OS;})(), // "WINNT", "Linux", "Darwin"
   inMailApp: false,
   inBrowserApp: false,
   appStarted: false,
@@ -46,6 +40,19 @@ firetray.Handler = {
   windowsCount: 0,
   visibleWindowsCount: 0,
 
+  appId:      (function(){return Services.appinfo.ID;})(),
+  appName:    (function(){return Services.appinfo.name;})(),
+  runtimeABI: (function(){return Services.appinfo.XPCOMABI;})(),
+  runtimeOS:  (function(){return Services.appinfo.OS;})(), // "WINNT", "Linux", "Darwin"
+  addonRootDir: (function(){
+    let uri = Services.io.newURI(Components.stack.filename, null, null);
+    if (uri instanceof Ci.nsIFileURL) {
+      F.LOG("_directory="+uri.file.parent.parent.path);
+      return uri.file.parent.parent;
+    }
+    throw new Error("not resolved");
+  })(),
+
   init: function() {            // does creates icon
     firetray.PrefListener.register(false);
 
@@ -121,8 +128,7 @@ firetray.Handler = {
       firetray.Messaging.shutdown();
     firetray.StatusIcon.shutdown();
     firetray.Window.shutdown();
-
-    firetray.Utils.tryCloseLibs([gobject, glib, gtk]);
+    // watchout order and sufficiency of lib closings (tryCloseLibs())
 
     Services.obs.removeObserver(this, this.getAppStartupTopic(this.appId), false);
     Services.obs.removeObserver(this, "xpcom-will-shutdown", false);
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index 5824f83..84b0710 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -69,7 +69,8 @@ firetray.StatusIcon = {
   },
 
   shutdown: function() {
-    firetray.Utils.tryCloseLibs([cairo, gobject, gdk, gtk, pango, pangocairo]);
+    firetray.PopupMenu.shutdown();
+    firetray.Utils.tryCloseLibs([cairo, gobject, gdk, gio, gtk, pango, pangocairo]);
     this.initialized = false;
   },
 
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 3313461..12973e2 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -61,7 +61,7 @@ firetray.Window = {
   },
 
   shutdown: function() {
-    firetray.Utils.tryCloseLibs([gobject, gdk, gtk, libc, x11]);
+    firetray.Utils.tryCloseLibs([gobject, gdk, gtk, libc, x11, glib]);
     this.initialized = false;
   },
 
@@ -97,9 +97,9 @@ firetray.Window = {
       gobject.g_list_foreach(widgets, findGtkWindowByTitleCb, userData);
       gobject.g_list_free(widgets);
 
-      if (userData.contents.outWindow.isNull()) {
+      if (userData.contents.outWindow.isNull())
         throw new Error("Window not found!");
-      }
+
       F.LOG("found window: "+userData.contents.outWindow);
     } catch (x) {
       F.ERROR(x);
@@ -154,7 +154,7 @@ firetray.Window = {
     return null;
   },
 
-  /** consider using getXIDFromChromeWindow() if you only need the XID */
+  /* consider using getXIDFromChromeWindow() if you only need the XID */
   getWindowsFromChromeWindow: function(win) {
     let gtkWin = firetray.Window.getGtkWindowHandle(win);
     let gdkWin = firetray.Window.getGdkWindowFromGtkWindow(gtkWin);

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