Merge lp:~chrisccoulson/messagingmenu-extension/libunity5 into lp:messagingmenu-extension

[Chris Coulson]

Adds support for the libunity5 ABI, fixes a warning and fixes bug 826447

=== modified file 'modules/LibUnity.jsm'
--- modules/LibUnity.jsm	2011-07-08 19:25:23 +0000
+++ modules/LibUnity.jsm	2011-09-05 17:51:24 +0000
@@ -49,7 +49,13 @@
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "libunity", function() {
-  var libunity = ctypes.open("libunity.so.4");
+  var libunity;
+  try {
+    libunity = ctypes.open("libunity.so.5");
+  } catch(e) {
+    libunity = ctypes.open("libunity.so.4");
+  }
+
   if (!libunity)
     throw "libunity is unavailable";
 

=== modified file 'modules/MessagingMenu.jsm'
--- modules/MessagingMenu.jsm	2011-08-08 14:44:29 +0000
+++ modules/MessagingMenu.jsm	2011-09-05 17:51:24 +0000
@@ -225,7 +225,7 @@
 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");
+    LOG(aDir.path + " does not exist or is not a directory");
     aListener[aMethod](aDir, null);
     return;
   }
@@ -1066,11 +1066,12 @@
    * on an Indicator that was clicked.
    */
   OnItemAdded: function MM_OnItemAdded(parentItem, item) {
-    let header = item.QueryInterface(Ci.nsIMsgDBHdr);
-    let self = this;
-    MMIndicatorMessageCheck(header, function(aShouldRequestAtt) {
-      self.doIndication(header, aShouldRequestAtt);
-    });
+    if (item instanceof Ci.nsIMsgDBHdr) {
+      let self = this;
+      MMIndicatorMessageCheck(item, function(aShouldRequestAtt) {
+        self.doIndication(item, aShouldRequestAtt);
+      });
+    }
   },
 
   OnItemPropertyFlagChanged: function MM_OnItemPropertyFlagChanged(item,
@@ -1079,8 +1080,9 @@
                                                                    newFlag) {
     if((oldFlag & Ci.nsMsgMessageFlags.New)
         && !(newFlag & Ci.nsMsgMessageFlags.New)) {
-      let header = item.QueryInterface(Ci.nsIMsgDBHdr);
-      this.stopIndication(header);
+      if (item instanceof Ci.nsIMsgDBHdr) {
+        this.stopIndication(item);
+      }
     }
   },