cleaning code for #45

phocean · Jan 15, 2017 · 7cd6989 · 7cd6989
1 parent 53dd963
commit 7cd6989
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 30 deletions.
diff --git a/extension.js b/extension.js
@@ -67,6 +67,13 @@ function disable() {
 
 function onTrayIconAdded(o, icon, role, delay=1000) {
 
+    // loop through the array and hide the extension if extension X is enabled and corresponding application is running
+    let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
+    for (let i = 0; i < blacklist.length; i++) {
+        if (ExtensionUtils.extensions[blacklist[i+1]] !== undefined && ExtensionUtils.extensions[blacklist[i+1]].state === 1 && wmClass === blacklist[i])
+            return;
+    }
+
     let iconContainer = new St.Button({child: icon, visible: false});
 
     icon.connect("destroy", function() {
@@ -78,35 +85,15 @@ function onTrayIconAdded(o, icon, role, delay=1000) {
         icon.click(event);
     });
 
-    //iconsBoxLayout.insert_child_at_index(iconContainer, 0);
-
-
-    // display icon
-    let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
-    for (let i = 0; i < blacklist.length; i++) {
-        // loop through the array and hide the extension if extension X is enabled and corresponding application is running
-        if (ExtensionUtils.extensions[blacklist[i+1]] !== undefined && ExtensionUtils.extensions[blacklist[i+1]].state === 1 && wmClass === blacklist[i]) {
-        //if (wmClass === "Skype") {
-            return;
-            // GLib.timeout_add(GLib.PRIORITY_DEFAULT, delay, Lang.bind(this, function(){
-            // iconContainer.visible = false;
-            // iconsContainer.actor.visible = false;
-            // return GLib.SOURCE_REMOVE;
-            // }));            
-        }
-        else {
-            GLib.timeout_add(GLib.PRIORITY_DEFAULT, delay, Lang.bind(this, function(){
-            iconContainer.visible = true;
-            iconsContainer.actor.visible = true;
-            return GLib.SOURCE_REMOVE;
-            }));
-            iconsBoxLayout.insert_child_at_index(iconContainer, 0);
-            setIcon(icon);
-            icons.push(icon);
-        }
-    }
-
-
+    GLib.timeout_add(GLib.PRIORITY_DEFAULT, delay, Lang.bind(this, function(){
+        iconContainer.visible = true;
+        iconsContainer.actor.visible = true;
+        return GLib.SOURCE_REMOVE;
+    }));
+
+    iconsBoxLayout.insert_child_at_index(iconContainer, 0);
+    setIcon(icon);
+    icons.push(icon);
 
 }
 

diff --git a/metadata.json b/metadata.json
@@ -13,5 +13,5 @@
   "settings-schema": "org.gnome.shell.extensions.topicons",
   "url": "https://github.com/phocean/TopIcons-plus",
   "uuid": "[email protected]",
-  "version": 17
+  "version": 19
 }