moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2024-11-10 11:05:07 -05:00
Code Issues Releases Wiki Activity

fix shutdown so ctypes libs are close cleanly + cleaning

Browse Source
This commit is contained in:
foudfou 2012-08-04 15:22:10 +02:00
parent a9cc299259
commit 6f95421a2f
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/FiretrayHandler.jsm
View File

@ -110,6 +110,7 @@ firetray.Handler = {
}, },
shutdown: function() { shutdown: function() {
F.LOG("Disabling Handler");
firetray.PrefListener.unregister(); firetray.PrefListener.unregister();
if (this.inMailApp) if (this.inMailApp)

2
src/modules/FiretrayInstantMessaging.jsm
View File

@ -33,7 +33,7 @@ firetray.InstantMessaging = {
if (!this.initialized) return; if (!this.initialized) return;
F.LOG("Disabling InstantMessaging"); F.LOG("Disabling InstantMessaging");
Services.obs.removeAllObservers(firetray.InstantMessaging); firetray.Utils.removeAllObservers(firetray.InstantMessaging);
this.initialized = false; this.initialized = false;
}, },

3
src/modules/FiretrayMessaging.jsm
View File

@ -54,11 +54,12 @@ firetray.Messaging = {
F.LOG("Disabling Messaging"); F.LOG("Disabling Messaging");
firetray.InstantMessaging.shutdown(); firetray.InstantMessaging.shutdown();
F.LOG("HI THERE");
MailServices.mailSession.RemoveFolderListener(this.mailSessionListener); MailServices.mailSession.RemoveFolderListener(this.mailSessionListener);
firetray.Handler.setIconImageDefault(); firetray.Handler.setIconImageDefault();
Services.obs.removeAllObservers(firetray.Messaging); firetray.Utils.removeAllObservers(firetray.Messaging);
this.initialized = false; this.initialized = false;
}, },

2
src/modules/linux/FiretrayGtkIcons.jsm
View File

@ -20,6 +20,8 @@ firetray.GtkIcons = {
init: function() { init: function() {
try { try {
if (this.initialized) return true;
this.loadDefaultTheme(); this.loadDefaultTheme();
this.initialized = true; this.initialized = true;
return true; return true;

1
src/modules/linux/FiretrayPopupMenu.jsm
View File

@ -60,6 +60,7 @@ firetray.PopupMenu = {
}, },
shutdown: function() { shutdown: function() {
F.LOG("Disabling PopupMenu");
firetray.Utils.tryCloseLibs([gobject, gtk]); firetray.Utils.tryCloseLibs([gobject, gtk]);
this.initialized = false; this.initialized = false;
}, },

7
src/modules/linux/FiretrayStatusIcon.jsm
View File

@ -39,14 +39,12 @@ firetray.StatusIcon = {
this.FILENAME_BLANK = firetray.Utils.chromeToPath( this.FILENAME_BLANK = firetray.Utils.chromeToPath(
"chrome://firetray/skin/blank-icon.png"); "chrome://firetray/skin/blank-icon.png");
this.defineIconNames();
Cu.import("resource://firetray/linux/FiretrayGtkIcons.jsm"); Cu.import("resource://firetray/linux/FiretrayGtkIcons.jsm");
firetray.GtkIcons.init(); firetray.GtkIcons.init();
this.defineIconNames();
this.loadThemedIcons(); this.loadThemedIcons();
this.trayIcon = gtk.gtk_status_icon_new();
this.trayIcon = gtk.gtk_status_icon_new();
firetray.Handler.setIconImageDefault(); firetray.Handler.setIconImageDefault();
firetray.Handler.setIconTooltipDefault(); firetray.Handler.setIconTooltipDefault();
@ -61,6 +59,7 @@ firetray.StatusIcon = {
}, },
shutdown: function() { shutdown: function() {
F.LOG("Disabling StatusIcon");
firetray.PopupMenu.shutdown(); firetray.PopupMenu.shutdown();
firetray.GtkIcons.shutdown(); firetray.GtkIcons.shutdown();
firetray.Utils.tryCloseLibs([cairo, gobject, gdk, gio, gtk, pango, pangocairo]); firetray.Utils.tryCloseLibs([cairo, gobject, gdk, gio, gtk, pango, pangocairo]);