Merge pull request linuxmint#4063 from collinss/applet-multi-instance…

…-fix Fix regression in multi-instance applets
tanderson-google · Apr 18, 2015 · 8b67304 · 8b67304
2 parents b1a6bce + 5d45efc
commit 8b67304
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/files/usr/lib/cinnamon-settings/bin/XletSettings.py b/files/usr/lib/cinnamon-settings/bin/XletSettings.py
@@ -100,7 +100,7 @@ def get_meta_data_for_applet(self, path):
     def get_settings_for_applet(self, path):
         if "max-instances" in self.applet_meta:
             try:
-                self.multi_instance = int(self.applet_meta["max-instances"]) > 1
+                self.multi_instance = int(self.applet_meta["max-instances"]) != 1
             except:
                 if "infinite" in self.applet_meta["max-instances"]:
                     self.multi_instance = True

diff --git a/js/ui/settings.js b/js/ui/settings.js
@@ -783,7 +783,7 @@ AppletSettings.prototype = {
     },
 
     _get_is_multi_instance_xlet: function(uuid) {
-        return Extension.get_max_instances(uuid) > 1;
+        return Extension.get_max_instances(uuid) != 1;
     },
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -783,7 +783,7 @@ AppletSettings.prototype = { @@
         },
         _get_is_multi_instance_xlet: function(uuid) {
-            return Extension.get_max_instances(uuid) > 1;
+            return Extension.get_max_instances(uuid) != 1;
         },
     };
@@ Expand Down @@