[Pkg-mozext-commits] [firetray] 34/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 7ee2fddddd2bb5645eded98ec9628caf36ae5de7
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Sep 7 17:55:11 2011 +0200

    cleaning
---
 src/modules/MoztHandler.jsm   |   13 ++++++-------
 src/modules/MoztMessaging.jsm |   30 ++++--------------------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/src/modules/MoztHandler.jsm b/src/modules/MoztHandler.jsm
index 6cfbdeb..1c9a28c 100644
--- a/src/modules/MoztHandler.jsm
+++ b/src/modules/MoztHandler.jsm
@@ -37,6 +37,10 @@ var mozt_menuItemQuitActivateCb;
 // (https://developer.mozilla.org/en/XUL_School/JavaScript_Object_Management)
 mozt.Handler = {
   initialized: false,
+  strings: null,
+  tryIcon: null,
+  menu: null,
+
   _windowsHidden: false,
   _handledDOMWindows: [],
   _inMailApp: false,
@@ -175,9 +179,6 @@ mozt.Handler = {
     }
   },
 
-  /**
-   * @param strings l10n Strings passed from the XUL overlay
-   */
   init: function() {            // creates icon
 
     // initialize l10n
@@ -235,10 +236,8 @@ mozt.Handler = {
       LibGObject.g_signal_connect(this.trayIcon, "popup-menu",
                                   mozt_popupMenuCb, this.menu);
 
-      // set tooltip.
-      // GTK bug:
-      // (firefox-bin:5302): Gdk-CRITICAL **: IA__gdk_window_get_root_coords: assertion `GDK_IS_WINDOW (window)' failed
-      // (thunderbird-bin:5380): Gdk-CRITICAL **: IA__gdk_window_get_root_coords: assertion `GDK_IS_WINDOW (window)' failed
+      // set tooltip. bugs on hover:
+      // Gdk-CRITICAL **: IA__gdk_window_get_root_coords: assertion `GDK_IS_WINDOW (window)' failed
       LibGtkStatusIcon.gtk_status_icon_set_tooltip_text(this.trayIcon,
                                                         mozApp);
 
diff --git a/src/modules/MoztMessaging.jsm b/src/modules/MoztMessaging.jsm
index 799d232..6318126 100644
--- a/src/modules/MoztMessaging.jsm
+++ b/src/modules/MoztMessaging.jsm
@@ -39,9 +39,6 @@ mozt.Messaging = {
     let mailSessionNotificationFlags = Ci.nsIFolderListener.intPropertyChanged;
     MailServices.mailSession.AddFolderListener(that.mailSessionListener,
                                                mailSessionNotificationFlags);
-    // doesn't seem like we also needed a
-    // MailServices.mfn.addListener(that.notificationServiceListener,
-    // msgFolderNotificationFlags);
 
     this.enabled = true;
   },
@@ -66,14 +63,10 @@ mozt.Messaging = {
     OnItemIntPropertyChanged: function(folder, property, oldValue, newValue) {
       LOG("OnItemIntPropertyChanged fired with property: "+property);
 
-      switch (property.toString())  {
-      case "TotalUnreadMessages":
-        if (!(folder.flags & FLDR_UNINTERESTING)) {
-          LOG("Unread msgs for folder "+folder.prettyName+" was "+oldValue+" became "+newValue);
-          mozt.Messaging.updateUnreadMsgCount();
-        }
-        break;
-      default:
+      if (property.toString() === "TotalUnreadMessages" &&
+          !(folder.flags & FLDR_UNINTERESTING)) {
+        LOG("Unread msgs for folder "+folder.prettyName+" was "+oldValue+" became "+newValue);
+        mozt.Messaging.updateUnreadMsgCount();
       }
     }
   },
@@ -108,18 +101,3 @@ mozt.Messaging = {
   }
 
 };
-
-
-function hasMultipleAccounts() {
-  let count = 0;
-  // We don't want to just call Count() on the account nsISupportsArray, as we
-  // want to filter out accounts with "none" as the incoming server type
-  // (eg, for Local Folders)
-  for (let account in fixIterator(MailServices.accounts.accounts, Ci.nsIMsgAccount)) {
-    if (account.incomingServer.type != "none") {
-      count++
-    }
-  }
-
-  return count > 1;
-}

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