Merge lp:~chrisccoulson/messagingmenu-extension/me-fixes into lp:messagingmenu-extension

[Chris Coulson]

Here are some changes I've been working on :-)

[Mike Conley (mconley)]

+ let folderURL = LibIndicate.IndicatorGetProperty(indicator,
FOLDER_URL_KEY).readString();
+ LOG("Received click event on indicator for folder " + folderURL);
+
+ let mmie = MessagingMenu.mIndicators[folderURL];
+ if (!mmie) {
+ WARN("No indicator for folder " + folderURL);
+ return;

I assume that "mmie" stands for something like "Messaging Menu Indicator
Entry". Still, I think "indicatorEntry" would suffice, and is clearer.

+// Small helper class which takes a directory containting messaging menu
+// launcher entries and tells the listener whether one of them is ours
+function LauncherEntryFinder(aDir, aDesktopFile, aListener, aMethod) {
+ LOG("Searching for launcher entry for " + aDesktopFile + " in " +
aDir.path);

Typo: "containting" -> "containing"

+ cleanup: function MM_cleanup() {
+ // We're being uninstalled or disabled. If we created a launcher
+ // entry in the messaging menu, make sure we clean it up
+ let userLauncherEntryDir = Services.dirsvc.get("Home",
Ci.nsILocalFile);
+ userLauncherEntryDir.appendRelativePath(USER_LAUNCHER_ENTRIES);
+ new LauncherEntryFinder(userLauncherEntryDir, this.desktopFile, this,
+ "removeLauncherEntry");
+ },

What if a launcher entry exists, but we didn't put it there?

+
+ //this.buildIndicators();
+

Please remove.

+ // Now see if there are any pending indicators to be shown
+ // Show the one which has been waiting the longest
+ let pendingIndicator = null;
+ for (let url in this.mIndicators) {

Oh, I quite like this idea. Good work. :)

I like it! Once the above is addressed, I think this is fine to merge.

[lp:~chrisccoulson/messagingmenu-extension/me-fixes]

58. By Chris Coulson on 2011-06-24

Rename mmie => indicatorEntry
Fix a typo
Delete some dead code

[Chris Coulson (chrisccoulson)]

Thanks for reviewing. I've pushed an update with most of those comments addressed, and I removed 2 dead functions that I'd added as well.
>
> + cleanup: function MM_cleanup() {
> + // We're being uninstalled or disabled. If we created a launcher
> + // entry in the messaging menu, make sure we clean it up
> + let userLauncherEntryDir = Services.dirsvc.get("Home",
> Ci.nsILocalFile);
> + userLauncherEntryDir.appendRelativePath(USER_LAUNCHER_ENTRIES);
> + new LauncherEntryFinder(userLauncherEntryDir, this.desktopFile, this,
> + "removeLauncherEntry");
> + },
>
> What if a launcher entry exists, but we didn't put it there?
>

Yeah, I guess this is a problem, but I think it is an edge case. In general, we don't offer any particular guarantees about application data stored in the profile (eg, we could save a pref so we know we created the file, but there's no guarantees the user hasn't modified it since we created it)

[lp:~chrisccoulson/messagingmenu-extension/me-fixes]

59. By Chris Coulson on 2011-06-24

Only clean up the local launcher entry if we created it (just based on a simple mtime check)

[Chris Coulson (chrisccoulson)]

I've fixed the remaining issue as well now

[Mike Conley (mconley)]

Hey Chris - looks good to me, thanks!

review: Approve

=== modified file 'config_build.sh'
--- config_build.sh	2011-06-07 15:01:14 +0000
+++ config_build.sh	2011-06-24 11:05:55 +0000
@@ -3,10 +3,10 @@
 # Build config for the build script, build.sh. Look there for more info.
 
 APP_NAME=messagingmenu
-CHROME_PROVIDERS="content"
+CHROME_PROVIDERS="content locale"
 CLEAN_UP=1
 ROOT_FILES=
-ROOT_DIRS="modules locale defaults"
+ROOT_DIRS="modules"
 BEFORE_BUILD=
 BEFORE_PACK=
 AFTER_BUILD=

=== removed directory 'defaults'
=== removed directory 'defaults/preferences'
=== removed file 'defaults/preferences/defaults.js'
--- defaults/preferences/defaults.js	2011-03-29 17:55:47 +0000
+++ defaults/preferences/defaults.js	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-pref("extensions.messagingmenu.showIndication", true);
-pref("extensions.messagingmenu.includeMail", true);
-pref("extensions.messagingmenu.includeNewsgroups", true);
-pref("extensions.messagingmenu.includeRSS", true);

=== modified file 'install.rdf'
--- install.rdf	2011-06-06 19:04:21 +0000
+++ install.rdf	2011-06-24 11:05:55 +0000
@@ -5,7 +5,6 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>[e-mail]</em:id>
 		<em:version>0.6</em:version>
-		<em:unpack>true</em:unpack>
                 <em:optionsURL>chrome://messagingmenu/content/options.xul</em:optionsURL>
 	
 		<em:targetApplication>

=== modified file 'locale/en-US/messagingmenu.properties'
--- locale/en-US/messagingmenu.properties	2011-02-26 19:33:18 +0000
+++ locale/en-US/messagingmenu.properties	2011-06-24 11:05:55 +0000
@@ -1,2 +1,2 @@
-compose_new_message=Compose New Message
+composeNewMessage=Compose New Message
 contacts=Contacts

=== modified file 'modules/LibDbusmenu.jsm'
--- modules/LibDbusmenu.jsm	2011-06-06 14:58:22 +0000
+++ modules/LibDbusmenu.jsm	2011-06-24 11:05:55 +0000
@@ -101,6 +101,20 @@
   return dbusmenu_menuitem_property_set;
 });
 
+XPCOMUtils.defineLazyGetter(this, "dbusmenu_menuitem_property_set_bool", function() {
+  var dbusmenu_menuitem_property_set_bool =
+    libdbusmenu.declare("dbusmenu_menuitem_property_set_bool",
+                        ctypes.default_abi,
+                        LibGObject.gboolean,
+                        DbusmenuMenuitem.ptr,
+                        LibGObject.gchar.ptr,
+                        LibGObject.gboolean);
+  if (!dbusmenu_menuitem_property_set_bool)
+    throw "dbusmenu_menuitem_property_set is unavailable";
+
+  return dbusmenu_menuitem_property_set_bool;
+});
+
 XPCOMUtils.defineLazyGetter(this, "dbusmenu_menuitem_child_append", function() {
   var dbusmenu_menuitem_child_append =
     libdbusmenu.declare("dbusmenu_menuitem_child_append",
@@ -134,6 +148,7 @@
   ServerNew: dbusmenu_server_new,
   MenuitemNew: dbusmenu_menuitem_new,
   MenuitemPropertySet: dbusmenu_menuitem_property_set,
+  MenuitemPropertySetBool: dbusmenu_menuitem_property_set_bool,
   MenuitemChildAppend: dbusmenu_menuitem_child_append,
   ServerSetRoot: dbusmenu_server_set_root
 };

=== modified file 'modules/LibIndicate.jsm'
--- modules/LibIndicate.jsm	2011-06-06 19:04:21 +0000
+++ modules/LibIndicate.jsm	2011-06-24 11:05:55 +0000
@@ -190,6 +190,18 @@
   return indicate_indicator_hide;
 });
 
+XPCOMUtils.defineLazyGetter(this, "indicate_indicator_is_visible", function() {
+  var indicate_indicator_is_visible =
+    libindicate.declare("indicate_indicator_is_visible",
+                        ctypes.default_abi,
+                        LibGObject.gboolean,
+                        Indicator.ptr)
+  if (!indicate_indicator_is_visible)
+    throw "indicate_indicator_is_visible is unavailable";
+
+  return indicate_indicator_is_visible;
+});
+
 var LibIndicate = {
   Indicator: Indicator,
   IndicateServer: IndicateServer,
@@ -213,5 +225,6 @@
   IndicatorSetProperty: indicate_indicator_set_property,
   IndicatorGetProperty: indicate_indicator_get_property,
   IndicatorShow: indicate_indicator_show,
-  IndicatorHide: indicate_indicator_hide
+  IndicatorHide: indicate_indicator_hide,
+  IndicatorIsVisible: indicate_indicator_is_visible
 };

=== modified file 'modules/MessagingMenu.jsm'
--- modules/MessagingMenu.jsm	2011-06-07 15:02:53 +0000
+++ modules/MessagingMenu.jsm	2011-06-24 11:05:55 +0000
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  *    Mike Conley <[e-mail]>
+ *    Chris Coulson <[e-mail]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -45,7 +46,11 @@
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+Cu.import("resource://gre/modules/AddonManager.jsm");
 Cu.import("resource:///modules/mailServices.js");
+Cu.import("resource:///modules/iteratorUtils.jsm");
 Cu.import("resource://messagingmenu/LibGObject.jsm");
 Cu.import("resource://messagingmenu/LibDbusmenu.jsm");
 Cu.import("resource://messagingmenu/LibIndicate.jsm");
@@ -53,17 +58,37 @@
 // I need the GdkWindow lib to do focus hacking
 Cu.import("resource://messagingmenu/LibGdkWindow.jsm");
 
+["LOG", "WARN", "ERROR"].forEach(function(aName) {
+  this.__defineGetter__(aName, function() {
+    Components.utils.import("resource://gre/modules/AddonLogging.jsm");
+
+    LogManager.getLogger("messagingmenu", this);
+    return this[aName];
+  });
+}, this);
+
 const FLDR_UNINTERESTING = Ci.nsMsgFolderFlags.Trash
-                           & Ci.nsMsgFolderFlags.Junk
-                           & Ci.nsMsgFolderFlags.SentMail
-                           & Ci.nsMsgFolderFlags.Drafts
-                           & Ci.nsMsgFolderFlags.Templates
-                           & Ci.nsMsgFolderFlags.Queue;
+                           | Ci.nsMsgFolderFlags.Junk
+                           | Ci.nsMsgFolderFlags.SentMail
+                           | Ci.nsMsgFolderFlags.Drafts
+                           | Ci.nsMsgFolderFlags.Templates
+                           | Ci.nsMsgFolderFlags.Queue;
 
-const DATE_IN_SECONDS_KEY = "date-in-seconds";
-const MESSAGE_URL_KEY = "message-url";
-const SHELL_EXECUTABLES = ["thunderbird.sh", "thunderbird"];
-const USER_SHARE_APPLICATIONS = "/usr/share/applications/"
+const FOLDER_URL_KEY                    = "url";
+const SHELL_EXECUTABLES                 = ["thunderbird", "thunderbird-bin"];
+const USER_SHARE_APPLICATIONS           = "/usr/share/applications/";
+const SYSTEM_LAUNCHER_ENTRIES           = "/usr/share/indicators/messages/applications/";
+const USER_LAUNCHER_ENTRIES             = ".config/indicators/messages/applications/";
+const USER_BLACKLIST_ENTRIES            = ".config/indicators/messages/applications-blacklist/";
+const MAX_INDICATORS                    = 6;
+const ADDON_ID                          = "[e-mail]";
+const PREF_ROOT                         = "extensions.messagingmenu.";
+const PREF_INCLUDE_NEWSGROUPS           = "includeNewsgroups";
+const PREF_INCLUDE_RSS                  = "includeRSS";
+const PREF_ENABLED                      = "enabled";
+const PREF_USER_LAUNCHER_PATH           = "userLauncherPath";
+const PREF_USER_LAUNCHER_MTIME          = "userLauncherMTime";
+const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
 
 var open3PaneCallback;
 var contactsCallback;
@@ -90,23 +115,37 @@
 }
 
 var openAndFocusAddressBook = function MM_openAndFocusAddressBook(aInstance, aTimestamp, aUserData) {
+  LOG("Opening addressbook");
   injectTimestamp(aTimestamp);
   MessagingMenu.tbProc.run(false, ['-addressbook'], 1);
 }
 
 var openAndFocusComposer = function MM_openAndFocusComposer(aInstance, aTimestamp, aUserData) {
+  LOG("Opening composer");
   injectTimestamp(aTimestamp);
   MessagingMenu.tbProc.run(false, ['-compose'], 1);
 }
 
 var onClickIndicator = function MM_onClickIndicator(aInstance, aTimestamp, aUserData) {
   let indicator = LibIndicate.IndicatorPtrCast(aInstance);
+  let folderURL = LibIndicate.IndicatorGetProperty(indicator, FOLDER_URL_KEY).readString();
+  LOG("Received click event on indicator for folder " + folderURL);
+
+  let indicatorEntry = MessagingMenu.mIndicators[folderURL];
+  if (!indicatorEntry) {
+    WARN("No indicator for folder " + folderURL);
+    return;
+  }
+
   // Hide the indicator
-  MessagingMenu.hideIndicator(indicator);
-  let url = LibIndicate.IndicatorGetProperty(indicator, MESSAGE_URL_KEY);
-  var msg = MessagingMenu.messenger.msgHdrFromURI(url.readString());
-  if(!msg)
+  MessagingMenu.hideIndicator(indicatorEntry);
+
+  var msg = MessagingMenu.messenger.msgHdrFromURI(indicatorEntry.messageURL);
+  if(!msg) {
+    WARN("Invalid message URI " + indicatorEntry.messageURL);
     return;
+  }
+
   // Focus 3pane
   openAndFocus3Pane(aInstance, aTimestamp, aUserData);
   gWindow.document.getElementById("tabmail").switchToTab(0);
@@ -114,9 +153,237 @@
   gWindow.gFolderDisplay.selectMessage(msg);
 }
 
+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;
+}
+
+// Helper class to wrap a nsIPrefBranch and allow the caller
+// to specify default values to be used where the pref doesn't exist
+function Prefs(aBranch) {
+  this.branch = aBranch;
+}
+
+Prefs.prototype = {
+  getBoolPref: function P_getBoolPref(aName, aDefaultValue) {
+    try {
+      return this.branch.getBoolPref(aName);
+    } catch(e) {
+      return aDefaultValue;
+    }
+  },
+
+  setCharPref: function P_setCharPref(aName, aValue) {
+    this.branch.setCharPref(aName, aValue);
+  },
+
+  getCharPref: function P_getCharPref(aName, aDefaultValue) {
+    try {
+      return this.branch.getCharPref(aName);
+    } catch(e) {
+      return aDefaultValue;
+    }
+  },
+
+  setIntPrefAsChar: function P_setIntPrefAsChar(aName, aValue) {
+    this.setCharPref(aName, aValue.toString());
+  },
+
+  getIntPrefFromChar: function P_getIntPrefFromChar(aName, aDefaultValue) {
+    return parseInt(this.getCharPref(aName, aDefaultValue.toString()));
+  },
+
+  clearUserPref: function P_clearUserPref(aName) {
+    this.branch.clearUserPref(aName);
+  },
+
+  addObserver: function P_addObserver(aDomain, aObserver, aHoldWeak) {
+    this.branch.QueryInterface(Ci.nsIPrefBranch2)
+      .addObserver(aDomain, aObserver, aHoldWeak);
+  },
+
+  removeObserver: function P_removeObserver(aDomain, aObserver) {
+    this.branch.QueryInterface(Ci.nsIPrefBranch2)
+      .removeObserver(aDomain, aObserver);
+  }
+};
+
+// Small helper class which takes a directory containing messaging menu
+// launcher entries and tells the listener whether one of them is ours
+function LauncherEntryFinder(aDir, aDesktopFile, aListener, aMethod) {
+  LOG("Searching for launcher entry for " + aDesktopFile + " in " + aDir.path);
+  if (!aDir.exists() || !aDir.isDirectory()) {
+    WARN(aDir.path + " does not exist or is not a directory");
+    aListener[method](aDir, null);
+  }
+
+  this.listener = aListener;
+  this.desktopFile = aDesktopFile;
+  this.entries = aDir.directoryEntries;
+  this.method = aMethod;
+  this.dir = aDir;
+
+  this.processNextEntry();
+}
+
+LauncherEntryFinder.prototype = {
+  processNextEntry: function MMEF_processNextEntry() {
+    if (this.entries.hasMoreElements()) {
+      var entry = this.entries.getNext().QueryInterface(Ci.nsIFile);
+      if (!entry.isFile()) {
+        this.processNextEntry();
+      }
+      var self = this;
+      NetUtil.asyncFetch(entry, function(inputStream, status) {
+        let data = NetUtil.readInputStreamToString(inputStream, inputStream.available());
+        if (data.replace(/\n$/,"") == self.desktopFile) {
+          LOG("Found launcher entry " + entry.path);
+          self.listener[self.method](self.dir, entry);
+        } else {
+          self.processNextEntry();
+        }
+      });
+    } else {
+      LOG("No launcher entry found");
+      this.listener[this.method](this.dir, null);
+    }
+  }
+};
+
+function MMIndicatorEntry (aFolder) {
+  LOG("Creating indicator for folder " + aFolder.folderURL);
+  this.folder = aFolder;
+  this.indicator = LibIndicate.IndicatorNew();
+  if (hasMultipleAccounts()) {
+    this.label = aFolder.prettiestName +
+                 " (" + aFolder.server.prettyName + ")";
+  } else {
+    this.label = aFolder.prettiestName;
+  }
+  this.unreadCount = 0;
+  this.dateInSeconds = 0;
+  this.cancelAttention();
+  this.hide();
+
+  LibGObject.g_signal_connect(this.indicator, "user-display",
+                              clickIndicatorCallback, null);
+
+  LibIndicate.IndicatorSetProperty(this.indicator,
+                                   FOLDER_URL_KEY,
+                                   aFolder.folderURL);
+
+  Services.prefs.addObserver("mail.accountmanager.accounts",
+                             this, false);
+}
+
+MMIndicatorEntry.prototype = {
+  get indicator() {
+    if (this._indicator) {
+      return this._indicator;
+    }
+
+    throw "No IndicateIndicator. Have we been destroyed?";
+  },
+
+  set indicator(aIndicator) {
+    this._indicator = aIndicator;
+  },
+
+  getAttention: function MMIE_getAttention() {
+    LOG("Requesting attention for folder " + this.folder.folderURL);
+    LibIndicate.IndicatorSetProperty(this.indicator,
+                                     LibIndicate.INDICATOR_MESSAGES_PROP_ATTENTION,
+                                     "true");
+    this._attention = true;
+  },
+
+  cancelAttention: function MMIE_cancelAttention() {
+    LOG("Cancelling attention for folder " + this.folder.folderURL);
+    LibIndicate.IndicatorSetProperty(this.indicator,
+                                     LibIndicate.INDICATOR_MESSAGES_PROP_ATTENTION,
+                                     "false");
+    this._attention = false;
+  },
+
+  hasAttention: function MMIE_hasAttention() {
+    return this._attention;
+  },
+
+  set label(aName) {
+    LOG("Setting label for folder " + this.folder.folderURL + " to " + aName);
+    LibIndicate.IndicatorSetProperty(this.indicator,
+                                     LibIndicate.INDICATOR_MESSAGES_PROP_NAME,
+                                     aName);
+  },
+
+  set unreadCount(aCount) {
+    LOG("Setting unread count for folder " + this.folder.folderURL +
+        " to " + aCount.toString());
+    LibIndicate.IndicatorSetProperty(this.indicator,
+                                     LibIndicate.INDICATOR_MESSAGES_PROP_COUNT,
+                                     aCount.toString());
+    this._unreadCount = aCount;
+  },
+
+  get unreadCount() {
+    return this._unreadCount;
+  },
+
+  show: function MMIE_show() {
+    LOG("Showing indicator for folder " + this.folder.folderURL);
+    LibIndicate.IndicatorShow(this.indicator);
+  },
+
+  hide: function MMIE_hide() {
+    LOG("Hiding indicator for folder " + this.folder.folderURL);
+    LibIndicate.IndicatorHide(this.indicator);
+  },
+
+  get visible() {
+    return LibIndicate.IndicatorIsVisible(this.indicator) != 0;
+  },
+
+  destroy: function MMIE_destroy() {
+    LOG("Destroying indicator for folder " + this.folder.folderURL);
+    LibGObject.g_object_unref(this.indicator);
+    this.indicator = null;
+
+    Services.prefs.removeObserver("mail.accountmanager.accounts",
+                                  this);
+  },
+
+  observe: function MMIE_observe(subject, topic, data) {
+    // An account was added or removed. Note that this observer fires
+    // before nsIMsgAccountManager is up-to-date, so we add the next
+    // bit to the event loop
+    LOG("Account settings updated. Updating label for folder " +
+        this.folder.folderURL);
+    var self = this;
+    gWindow.setTimeout(function() {
+      if (hasMultipleAccounts()) {
+        self.label = self.folder.prettiestName +
+                     " (" + self.folder.server.prettyName + ")";
+      } else {
+        self.label = self.folder.prettiestName;
+      }
+    }, 0);
+  }
+};
+
 var MessagingMenu = {
   initialized: false,
+  enabled: false,
   mIndicators: {},
+  visibleIndicators: 0,
 
   get messenger() {
     if (this._messenger)
@@ -163,10 +430,32 @@
   get prefs() {
     if (this._prefs)
       return this._prefs;
-    this._prefs = Services.prefs.getBranch("extensions.messagingmenu.");
+    this._prefs = new Prefs(Services.prefs.getBranch(PREF_ROOT));
     return this._prefs;
   },
 
+  get shortcutVisibility() {
+    if (this._shortcutVisibility == null) {
+      this._shortcutVisibility = false;
+    }
+
+    return this._shortcutVisibility ? 1 : 0;
+  },
+
+  set shortcutVisibility(aVis) {
+    this._shortcutVisibility = aVis;
+
+    if (this.contactsMi) {
+      LibDbusmenu.MenuitemPropertySetBool(this.contactsMi, "visible",
+                                          this.shortcutVisibility);
+    }
+
+    if (this.composeMi) {
+      LibDbusmenu.MenuitemPropertySetBool(this.composeMi, "visible",
+                                          this.shortcutVisibility);
+    }
+  },
+
   get indicateServer() {
     if (this._indicateServer)
       return this._indicateServer;
@@ -181,24 +470,35 @@
     LibGObject.g_signal_connect(indicateServer, "server-display",
         open3PaneCallback, null);
 
+    let bundle = Services.strings.createBundle(
+                  "chrome://messagingmenu/locale/messagingmenu.properties");
+
     let server = LibDbusmenu.ServerNew("/messaging/commands");
     let root = LibDbusmenu.MenuitemNew();
-    let mi = LibDbusmenu.MenuitemNew();
-    LibDbusmenu.MenuitemPropertySet(mi, "label", "Contacts");
+    this.contactsMi = LibDbusmenu.MenuitemNew();
+    LibDbusmenu.MenuitemPropertySet(this.contactsMi, "label",
+                                    bundle.GetStringFromName("contacts"));
+    LibDbusmenu.MenuitemPropertySetBool(this.contactsMi, "visible",
+                                        this.shortcutVisibility);
     contactsCallback = LibGObject.GCallbackFunction(openAndFocusAddressBook);
 
-    LibGObject.g_signal_connect(mi, LibDbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, 
+    LibGObject.g_signal_connect(this.contactsMi,
+                                LibDbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, 
                                 contactsCallback, null);
-    LibDbusmenu.MenuitemChildAppend(root, mi);
+    LibDbusmenu.MenuitemChildAppend(root, this.contactsMi);
 
-    mi = LibDbusmenu.MenuitemNew();
-    LibDbusmenu.MenuitemPropertySet(mi, "label", "Compose a New Message");
+    this.composeMi = LibDbusmenu.MenuitemNew();
+    LibDbusmenu.MenuitemPropertySet(this.composeMi, "label",
+                                    bundle.GetStringFromName("composeNewMessage"));
+    LibDbusmenu.MenuitemPropertySetBool(this.composeMi, "visible",
+                                        this.shortcutVisibility);
     composerCallback = LibGObject.GCallbackFunction(openAndFocusComposer);
 
-    LibGObject.g_signal_connect(mi, LibDbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, 
+    LibGObject.g_signal_connect(this.composeMi,
+                                LibDbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED, 
                                 composerCallback, null);
 
-    LibDbusmenu.MenuitemChildAppend(root, mi);
+    LibDbusmenu.MenuitemChildAppend(root, this.composeMi);
     LibDbusmenu.ServerSetRoot(server, root);
     LibIndicate.ServerSetMenu(indicateServer, server); 
     LibIndicate.ServerShow(indicateServer);
@@ -209,36 +509,173 @@
     return this._indicateServer;
   },
 
+  sysLauncherFindResult: function MM_sysLauncherFindResult(aDir, aFound) {
+    if (!aFound) {
+      // There is no system-provided static launcher entry for us in the
+      // messaging menu. Show the "Compose" and "Contacts" items, and then
+      // add a static launcher entry if there isn't one already
+      this.shortcutVisibility = true;
+
+      let userLauncherEntriesDir = Services.dirsvc.get("Home", Ci.nsILocalFile);
+      userLauncherEntriesDir.appendRelativePath(USER_LAUNCHER_ENTRIES);
+      new LauncherEntryFinder(userLauncherEntriesDir, this.desktopFile, this,
+                              "createLauncherEntryIfNoneExists");
+    } 
+  },
+
+  createLauncherEntryIfNoneExists: function MM_createLauncherEntryIfNoneExists(
+                                            aDir, aFound) {
+    if (!aFound) {
+      let entry = aDir;
+      entry.append(Services.appinfo.name.toLowerCase());
+      let ostream = FileUtils.openSafeFileOutputStream(entry,
+                                                       FileUtils.MODE_WRONLY |
+                                                       FileUtils.MODE_CREATE |
+                                                       FileUtils.MODE_TRUNCATE);
+      let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                      .createInstance(Ci.nsIScriptableUnicodeConverter);
+      converter.charset = "UTF-8";
+      let istream = converter.convertToInputStream(this.desktopFile);
+      var self = this;
+      NetUtil.asyncCopy(istream, ostream, function() {
+        self.prefs.setCharPref(PREF_USER_LAUNCHER_PATH, entry.path);
+        self.prefs.setIntPrefAsChar(PREF_USER_LAUNCHER_MTIME,
+                                    entry.lastModifiedTime);
+      });
+    }
+  },
+
   init: function MM_init(aWindow) {
     if (this.initialized)
       return;
 
+    LOG("Initializing MessagingMenu");
+
     gWindow = aWindow;
 
+    // Check if we have a static launcher entry in the messaging menu. If we
+    // don't, then we should add one and also display "Contacts" and "Compose"
+    // menu items. If there is one, then it was probably added by the Thunderbird
+    // package. We don't need to create one or show the extra menu items in that case
+    let sysLauncherEntriesDir = Cc["@mozilla.org/file/local;1"]
+                                .createInstance(Ci.nsILocalFile);
+    sysLauncherEntriesDir.initWithPath(SYSTEM_LAUNCHER_ENTRIES);
+    new LauncherEntryFinder(sysLauncherEntriesDir, this.desktopFile, this,
+                            "sysLauncherFindResult");
+
+    AddonManager.addAddonListener(this);
+    this.prefs.addObserver("", this, false);
+    Services.obs.addObserver(this, "xpcom-will-shutdown", false);
+
+    if (this.prefs.getBoolPref(PREF_ENABLED, true)) {
+      this.enable();
+    } else {
+      this.disableAndHide();
+    }
+
+    this.initialized = true;
+  },
+
+  removeLauncherEntry: function MM_removeLauncherEntry(aDir, aFound) {
+    if (aFound) {
+      LOG("Removing launcher entry " + aFound.path);
+      aFound.remove(false);
+    }
+  },
+
+  enable: function MM_enable() {
+    if (this.enabled) {
+      WARN("Trying to enable more than once");
+      return;
+    }
+
+    LOG("Enabling messaging indicator");
+
     if (!this.indicateServer) {
       Cu.reportError("Could not construct the Messaging Menu server.");
       return;
     }
 
+    let userBlacklistDir = Services.dirsvc.get("Home", Ci.nsILocalFile);
+    userBlacklistDir.appendRelativePath(USER_BLACKLIST_ENTRIES);
+    new LauncherEntryFinder(userBlacklistDir, this.desktopFile, this,
+                            "removeLauncherEntry");
+
     let notificationFlags = Ci.nsIFolderListener.added
                             | Ci.nsIFolderListener.propertyFlagChanged;
     MailServices.mailSession.AddFolderListener(this, notificationFlags);
 
-    Services.obs.addObserver(this, "xpcom-will-shutdown", false);
-    this.initialized = true;
-  },
-
-  shutdown: function MM_shutdown() {
+    this.enabled = true;
+  },
+
+  disableAndHide: function MM_disableAndHide() {
+    LOG("Hiding messaging indicator");
+    let userBlacklistDir = Services.dirsvc.get("Home", Ci.nsILocalFile);
+    userBlacklistDir.appendRelativePath(USER_BLACKLIST_ENTRIES);
+    new LauncherEntryFinder(userBlacklistDir, this.desktopFile, this,
+                            "createLauncherEntryIfNoneExists");
+
+    this.disable();
+  },
+
+  cleanup: function MM_cleanup() {
+    // We're being uninstalled or disabled. If we created a launcher
+    // entry in the messaging menu, make sure we clean it up
+    let userLauncherEntry = this.prefs.getCharPref(PREF_USER_LAUNCHER_PATH,
+                                                   null);
+    let userLauncherEntryMTime =
+      this.prefs.getIntPrefFromChar(PREF_USER_LAUNCHER_MTIME, 0);
+    this.prefs.clearUserPref(PREF_USER_LAUNCHER_PATH);
+    this.prefs.clearUserPref(PREF_USER_LAUNCHER_MTIME);
+    if (userLauncherEntry) {
+      let userLauncherEntryFile = Cc["@mozilla.org/file/local;1"]
+                                  .createInstance(Ci.nsILocalFile);
+      userLauncherEntryFile.initWithPath(userLauncherEntry);
+      if (userLauncherEntryFile.exists() &&
+          userLauncherEntryFile.isFile() &&
+          userLauncherEntryFile.lastModifiedTime == userLauncherEntryMTime) {
+        LOG("Removing launcher entry at " + userLauncherEntry);
+        userLauncherEntryFile.remove(false);
+      }
+    }
+  },
+
+  disable: function MM_disable() {
+    if (!this.enabled)
+      return;
+
+    LOG("Disabling messaging indicator");
+
+    MailServices.mailSession.RemoveFolderListener(this);
+
     // Remove references for any leftover indicators
-    for each (key in this.mIndicators)
-      LibGObject.g_object_unref(this.mIndicators[key]);
-
+    for (let key in this.mIndicators)
+      this.mIndicators[key].destroy();
     this.mIndicators = {};
+    this.visibleIndicators = 0;
 
     if (this._indicateServer)
       LibGObject.g_object_unref(this._indicateServer);
-
     this._indicateServer = null;
+
+    this.enabled = false;
+  },
+
+  shutdown: function MM_shutdown() {
+    if (!this.initialized) {
+      WARN("Calling shutdown before we are initialized");
+      return;
+    }
+
+    LOG("Shutting down");
+
+    this.disable();
+
+    AddonManager.removeAddonListener(this);
+    Services.prefs.removeObserver(this, "xpcom-will-shutdown");
+    this.prefs.removeObserver("", this);
+
+    this.initialized = false;
   },
 
   /* Given a particular message header, determines whether or not
@@ -247,111 +684,95 @@
    * @param header An nsIMsgDBHdr for a message.
    */
   worthIndication: function MM_worthIndication(header) {
+    var folder = header.folder;
+    LOG("Checking if message " + header.folder.getUriForMsg(header) +
+        " in " + folder.folderURL + " is worth indicating");
+
     // Filter out the new messages that don't count...like junk.
     var junkScore = header.getStringProperty("junkscore");
-
     if ((junkScore != "") && (junkScore != "0")) {
       // We're junk.  Not worth indicating.
+      LOG("Rejecting message with junkscore = " + junkScore);
       return false;
     }
 
-    var folder = header.folder;
-
-    if (this.prefs.getBoolPref("includeMail")) {
-      if (folder.flags & Ci.nsMsgFolderFlags.Inbox) {
-        return true;
-      }
-    }
-
     if (folder.flags & FLDR_UNINTERESTING) {
-      return false;
-    }
-
+      LOG("Rejecting message with flags = " + folder.flags.toString());
+      return false;
+    }
+
+    if (header.isRead) {
+      // The item has already been read
+      LOG("Rejecting message which has already been read");
+      return false;
+    }
+
+    if (folder.flags & Ci.nsMsgFolderFlags.Mail) {
+      LOG("Accepting mail message");
+      return true;
+    }
 
     // Are we checking news groups?
-    if (this.prefs.getBoolPref("includeNewsgroups")) {
+    if (this.prefs.getBoolPref(PREF_INCLUDE_NEWSGROUPS, true)) {
       if (folder.flags & Ci.nsMsgFolderFlags.Newsgroup) {
+        LOG("Accepting newsgroup message");
         return true;
       }
     }
 
-    if (this.prefs.getBoolPref("includeRSS")) {
+    if (this.prefs.getBoolPref(PREF_INCLUDE_RSS, true)) {
       if (folder.server.type == "rss") {
+        LOG("Accepting message from RSS feed");
         return true;
       }
     }
 
+    LOG("Rejecting message with flags = " + folder.flags.toString());
     return false;
   },
 
-  /* Sends a request to Indicate to uMessagingMenuService.
+  /* Given a message header, displays an indicator for it's folder
+   * and requests attention
    *
    * @param aItemHeader A nsIMsgDBHdr for the message that we're
    *        trying to show in the Messaging Menu.
    */
-  sendIndication: function MM_sendIndication(aItemHeader) {
-    var itemFolder = aItemHeader.folder;
-    // TODO:  We want to only display the root folder's name if it disambiguates common
-    // subfolder names.
-    itemFolder.updateSummaryTotals(true);
-    let label = itemFolder.prettiestName + " (" 
-      + itemFolder.rootFolder.prettiestName + ")";
-    let count = itemFolder.getNumUnread(true);
-    let folderUrl = itemFolder.folderURL;
-    let messageUrl = itemFolder.getUriForMsg(aItemHeader);
-
-    this.doIndication(folderUrl, label, messageUrl, count,
-                      aItemHeader.dateInSeconds);
-  },
-
-  doIndication: function MM_doIndication(aFolderURL, aFolderName, 
-                                         aMessageURL, count,
-                                         aDateInSeconds) {
-
-    var indicator;
-    if (!this.mIndicators[aFolderURL]) {
-      indicator = LibIndicate.IndicatorNew();
-      LibIndicate.IndicatorSetProperty(indicator,
-                                       LibIndicate.INDICATOR_MESSAGES_PROP_NAME, aFolderName);
-      LibIndicate.IndicatorSetProperty(indicator, DATE_IN_SECONDS_KEY, "0")
-      LibIndicate.IndicatorSetProperty(indicator,
-                                       LibIndicate.INDICATOR_MESSAGES_PROP_ATTENTION, "false");
-
-      LibGObject.g_signal_connect(indicator, "user-display",
-                                  clickIndicatorCallback, null);
-      this.mIndicators[aFolderURL] = indicator;
-    } else {
-      indicator = this.mIndicators[aFolderURL];
-    }
-
-    let curDateInSeconds = LibIndicate.IndicatorGetProperty(indicator, DATE_IN_SECONDS_KEY);
-    curDateInSeconds = curDateInSeconds.readString();
-    let gettingAttention = LibIndicate
-                           .IndicatorGetProperty(indicator,
-                                                 LibIndicate.INDICATOR_MESSAGES_PROP_ATTENTION);
-    gettingAttention = gettingAttention.readString();
-
-    if (gettingAttention != "true" || (curDateInSeconds > aDateInSeconds)) {
-      LibIndicate.IndicatorSetProperty(indicator,
-                                       MESSAGE_URL_KEY,
-                                       aMessageURL);
-      LibIndicate.IndicatorSetProperty(indicator,
-                                       DATE_IN_SECONDS_KEY,
-                                       aDateInSeconds.toString());
-    }
-
-    LibIndicate.IndicatorSetProperty(indicator,
-                                     LibIndicate.INDICATOR_MESSAGES_PROP_COUNT, count.toString());
-
-    LibIndicate.IndicatorSetProperty(indicator,
-                                     LibIndicate.INDICATOR_MESSAGES_PROP_ATTENTION, "true");
-
-    LibIndicate.IndicatorShow(indicator);
-  },
-
-  stopIndication: function MM_stopIndication(aItemHeader) {
+  doIndication: function MM_doIndication(aItemHeader) {
     let itemFolder = aItemHeader.folder;
     let folderURL = itemFolder.folderURL;
+    LOG("Doing indication for folder " + folderURL);
+    if (!this.mIndicators[folderURL]) {
+      // Create an indicator for this folder if one doesn't already exist
+      this.mIndicators[folderURL] = new MMIndicatorEntry(itemFolder);
+    }
+
+    let indicator = this.mIndicators[folderURL];
+    indicator.unreadCount += 1;
+
+    LOG("Current indicator dateInSeconds = " + indicator.dateInSeconds.toString());
+    LOG("Message item dateInSeconds = " + aItemHeader.dateInSeconds.toString());
+    if (indicator.hasAttention()) {
+      LOG("Indicator for folder already has attention");
+    }
+
+    if (!indicator.hasAttention() || (indicator.dateInSeconds > aItemHeader.dateInSeconds)) {
+      indicator.messageURL = itemFolder.getUriForMsg(aItemHeader);
+      indicator.dateInSeconds = aItemHeader.dateInSeconds;
+    }
+
+    indicator.getAttention();
+
+    // Don't show more than MAX_INDICATORS indicators
+    if (!indicator.visible && (this.visibleIndicators < MAX_INDICATORS)) {
+      this.visibleIndicators++;
+      indicator.show();
+      LOG("There are now " + this.visibleIndicators.toString() + " visible indicators");
+    }
+  },
+
+  stopIndication: function MM_stopIndication(aItemHeader) {
+    let folderURL = aItemHeader.folder.folderURL;
+    LOG("Stopping indication for folder " + folderURL);
      
     if (!this.mIndicators[folderURL])
       return;
@@ -359,10 +780,41 @@
     this.hideIndicator(this.mIndicators[folderURL]);
   },
 
-  hideIndicator: function MM_hideIndicator(indicator) {
-    LibIndicate.IndicatorHide(indicator);
-    LibIndicate.IndicatorSetProperty(indicator,
-                                     LibIndicate.INDICATOR_MESSAGES_PROP_ATTENTION, "false");
+  hideIndicator: function MM_hideIndicator(aIndicator) {
+    if (aIndicator.visible) {
+      aIndicator.hide();
+      if (this.visibleIndicators > 0) {
+        this.visibleIndicators--;
+        LOG("There are now " + this.visibleIndicators.toString() + " visible indicators");
+      } else {
+        ERROR("Invalid MessagingMenu.visibleIndicators count: "
+              + this.visibleIndicators.toString());
+      }
+    }
+    aIndicator.cancelAttention();
+    aIndicator.unreadCount = 0;
+
+    if (this.visibleIndicators >= MAX_INDICATORS) {
+      return;
+    }
+
+    // Now see if there are any pending indicators to be shown
+    // Show the one which has been waiting the longest
+    let pendingIndicator = null;
+    for (let url in this.mIndicators) {
+      let indicator = this.mIndicators[url];
+      if (indicator.hasAttention() && !indicator.visible &&
+          (!pendingIndicator ||
+          (indicator.dateInSeconds < pendingIndicator.dateInSeconds))) {
+        pendingIndicator = indicator;
+      }
+    }
+
+    if (pendingIndicator) {
+      pendingIndicator.show();
+      this.visibleIndicators++;
+      LOG("There are now " + this.visibleIndicators.toString() + " visible indicators");
+    }
   },
 
   /* Observes when items are added to folders, and when
@@ -370,25 +822,60 @@
    * sent by uMessagingMenuService for opening messages based
    * on an Indicator that was clicked.
    */
-   OnItemAdded: function MM_OnItemAdded(parentItem, item) {
-     let header = item.QueryInterface(Ci.nsIMsgDBHdr);
-     if(this.worthIndication(header)) {
-       this.sendIndication(header);
-     }
-   },
-
-   OnItemPropertyFlagChanged: function MM_OnItemPropertyFlagChanged(item, property, oldFlag, newFlag) {
-     if((oldFlag & Ci.nsMsgMessageFlags.New)
-         && !(newFlag & Ci.nsMsgMessageFlags.New)) {
-       let header = item.QueryInterface(Ci.nsIMsgDBHdr);
-       this.stopIndication(header);
-     }
-   },
-
-   observe: function(aSubject, aTopic, aData) {
-     if (aTopic == "xpcom-will-shutdown") {
-       this.shutdown();
-     }
-   }
+  OnItemAdded: function MM_OnItemAdded(parentItem, item) {
+    let header = item.QueryInterface(Ci.nsIMsgDBHdr);
+    if(this.worthIndication(header)) {
+      this.doIndication(header);
+    }
+  },
+
+  OnItemPropertyFlagChanged: function MM_OnItemPropertyFlagChanged(item, property, oldFlag, newFlag) {
+    if((oldFlag & Ci.nsMsgMessageFlags.New)
+        && !(newFlag & Ci.nsMsgMessageFlags.New)) {
+      let header = item.QueryInterface(Ci.nsIMsgDBHdr);
+      this.stopIndication(header);
+    }
+  },
+
+  observe: function(aSubject, aTopic, aData) {
+    if (aTopic == "xpcom-will-shutdown") {
+      LOG("Got shutdown notification");
+      this.shutdown();
+    } else if (aTopic == NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) {
+      LOG("Got prefchange notification for " + aData);
+      if (aData == PREF_ENABLED) {
+        let prefs = new Prefs(aSubject.QueryInterface(Ci.nsIPrefBranch));
+        let enabled = prefs.getBoolPref(aData, true);
+        if (enabled) {
+          this.enable();
+        } else {
+          this.disableAndHide();
+        }
+      }
+    } else {
+      WARN("Observer notification not intended for us: " + aTopic);
+    }
+  },
+
+  onUninstalling: function(aAddon, aNeedsRestart) {
+    if (aAddon.id == ADDON_ID) {
+      LOG("Addon is being uninstalled");
+      this.cleanup();
+    }
+  },
+
+  onDisabling: function(aAddon, aNeedsRestart) {
+    if (aAddon.id == ADDON_ID) {
+      LOG("Addon is being disabled");
+      this.disableAndHide();
+    }
+  },
+
+  onEnabling: function(aAddon, aNeedsRestart) {
+    if (aAddon.id == ADDON_ID) {
+      LOG("Addon is being enabled");
+      this.enable();
+    }
+  }
 }