Merge lp:~debfx/messagingmenu-extension/lp817598 into lp:messagingmenu-extension

[Felix Geyer]

Make the messaging menu work when libunity isn't installed.

=== modified file 'modules/LibUnity.jsm'
--- modules/LibUnity.jsm	2011-09-06 13:54:17 +0000
+++ modules/LibUnity.jsm	2011-09-07 18:01:23 +0000
@@ -54,12 +54,11 @@
   try {
     libunity = ctypes.open("libunity.so.5");
   } catch(e) {
-    libunity = ctypes.open("libunity.so.4");
+    try {
+      libunity = ctypes.open("libunity.so.4");
+    } catch(e) {}
   }
 
-  if (!libunity)
-    throw "libunity is unavailable";
-
   return libunity;
 });
 
@@ -240,6 +239,9 @@
   },
 
   isAvailable: function LUP_isAvailable() {
+    if (!libunity)
+      return false;
+
     var ret = false;
     try {
       var inspector = unity_inspector_get_default();
 
=== modified file 'modules/MessagingMenu.jsm'
--- modules/MessagingMenu.jsm	2011-09-05 17:48:06 +0000
+++ modules/MessagingMenu.jsm	2011-09-07 18:01:23 +0000
@@ -685,10 +685,12 @@
   set badgeCount(aCount) {
     LOG("Setting total new count to " + aCount.toString());
     this._badgeCount = aCount;
-    if (aCount > 0) {
-      LibUnity.setCount(aCount);
-    } else {
-      LibUnity.setCount(null);
+    if (LibUnity.isAvailable()) {
+      if (aCount > 0) {
+        LibUnity.setCount(aCount);
+      } else {
+        LibUnity.setCount(null);
+      }
     }
   },