SpiceSpy and xsession: Increase stability (#7937)

claudiux · web-flow · commit feb20b082785 · 2025-11-01T02:54:36.000+01:00
diff --git a/SpiceSpy@claudiux/files/SpiceSpy@claudiux/CHANGELOG.md b/SpiceSpy@claudiux/files/SpiceSpy@claudiux/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v5.5.2~20251101
+  * Increase stability.
+
 ### v5.5.1~20250925
   * Updated README.
   * Minor changes in menu about new commits.
diff --git a/SpiceSpy@claudiux/files/SpiceSpy@claudiux/applet.js b/SpiceSpy@claudiux/files/SpiceSpy@claudiux/applet.js
@@ -656,8 +656,12 @@ class SpiceSpy extends Applet.TextIconApplet {
       this.update_issues();
       this.update_comments();
 
-      this.settings.setValue("spices_to_spy", this.spices_to_spy);
-      this.settings.setValue("old_spices_to_spy", this.old_spices_to_spy);
+      let spices_to_spy = this.spices_to_spy;
+      this.settings.setValue("spices_to_spy", spices_to_spy);
+      let old_spices_to_spy = this.old_spices_to_spy;
+      this.settings.setValue("old_spices_to_spy", old_spices_to_spy);
+      spices_to_spy = null;
+      old_spices_to_spy = null;
     }
     this.fistTime = false;
     this.set_applet_tooltip(this.metadata.name);
@@ -988,10 +992,12 @@ class SpiceSpy extends Applet.TextIconApplet {
   } // End of on_applet_added_to_panel
 
   on_applet_clicked() {
-    this.settings.setValue("spices_to_spy", this.spices_to_spy);
+    let spices_to_spy = this.spices_to_spy;
+    this.settings.setValue("spices_to_spy", spices_to_spy);
     if (!this.menu || (this.menu && !this.menu.isOpen))
       this.make_menu();
     if (this.menu) this.menu.toggle();
+    spices_to_spy = null;
   } // End of on_applet_clicked
 
   on_applet_removed_from_panel() {
diff --git a/SpiceSpy@claudiux/files/SpiceSpy@claudiux/metadata.json b/SpiceSpy@claudiux/files/SpiceSpy@claudiux/metadata.json
@@ -2,7 +2,7 @@
   "uuid": "SpiceSpy@claudiux",
   "name": "SpiceSpy",
   "description": "Notifies you when there's a change to your favorite Spices on the website.",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "max-instances": 1,
   "author": "claudiux"
 }
diff --git a/xsession@claudiux/files/xsession@claudiux/CHANGELOG.md b/xsession@claudiux/files/xsession@claudiux/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v5.1.2~20251101
+  * Increase stability.
+
 ### v5.1.1~20251031
   * Avoids paint() errors.
 
diff --git a/xsession@claudiux/files/xsession@claudiux/applet.js b/xsession@claudiux/files/xsession@claudiux/applet.js
@@ -119,18 +119,12 @@ class ReloadAllMenuItem extends PopupMenu.PopupBaseMenuItem {
     let icon_file = Gio.file_new_for_path(icon_path);
     let icon, gicon;
 
-    //~ let icon = new St.Icon({ icon_name: type+"-symbolic", icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size });
-
     gicon = Gio.icon_new_for_string(icon_path);
-    //~ icon = new St.Icon({ gicon: gicon, icon_type: St.IconType.FULLCOLOR, icon_size: this.parent.icon_size });
-    //~ icon = new St.Icon({ gicon: gicon, icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size, });
-    //~ icon = new St.Icon({ gicon: gicon, icon_type: St.IconType.SYMBOLIC, });
     icon = new St.Icon();
     icon.set_icon_size(this.parent.icon_size);
     icon.set_icon_type(St.IconType.SYMBOLIC);
     icon.set_gicon(gicon);
 
-    //~ let icon = new St.Icon({ icon_name: ICONS_DIR + "/" + type+"-symbolic", icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size });
     try {
       icon_box.add_actor(icon);
     } catch(e) {
@@ -157,40 +151,29 @@ class LGSMenuItem extends PopupMenu.PopupBaseMenuItem {
         let label = new St.Label({ style: "spacing: .25em;" , x_align: St.Align.START, x_expand: true, text: uuid, reactive: true, track_hover: true });
 
         let icon_box = new St.BoxLayout({ style: "spacing: .25em;" , x_align: St.Align.START, x_expand: false, reactive: true, track_hover: true });
-        let icon_path = HOME_DIR+"/.cache/cinnamon/spices/"+type.slice(0,-1)+"/"+uuid+".png";
-        let icon_file = Gio.file_new_for_path(icon_path);
+        let icon_path, icon_file;
         let icon, gicon;
 
+        icon_path = SPICES_DIR + "/" + type + "/" + uuid + "/icon.png";
+        icon_file = Gio.file_new_for_path(icon_path);
         if (icon_file.query_exists(null)) {
             gicon = Gio.icon_new_for_string(icon_path);
             icon = new St.Icon({ gicon: gicon, icon_type: St.IconType.FULLCOLOR, icon_size: this.parent.icon_size });
-            //~ icon = new St.Icon({ gicon: gicon, icon_type: St.IconType.FULLCOLOR, });
         } else {
-            icon_path = SPICES_DIR + "/" + type + "/" + uuid + "/icon.png";
-            icon_file = Gio.file_new_for_path(icon_path);
-            if (icon_file.query_exists(null)) {
-                gicon = Gio.icon_new_for_string(icon_path);
-                icon = new St.Icon({ gicon: gicon, icon_type: St.IconType.FULLCOLOR, icon_size: this.parent.icon_size });
-                //~ icon = new St.Icon({ gicon: gicon, icon_type: St.IconType.FULLCOLOR, });
-            } else {
-                let metadataJson_path = SPICES_DIR + "/" + type + "/" + uuid + "/metadata.json";
-                let metadataJson_file = Gio.file_new_for_path(metadataJson_path);
-                if (metadataJson_file.query_exists(null)) {
-                    let [success, array_chars] = GLib.file_get_contents(metadataJson_path);
-                    let contents = to_string(array_chars);
-                    let metadata = JSON.parse(contents);
-                    if (metadata["icon"]) {
-                        icon = new St.Icon({ icon_name: metadata["icon"], icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size });
-                        //~ icon = new St.Icon({ icon_name: metadata["icon"], icon_type: St.IconType.SYMBOLIC, });
-                    } else {
-                        icon = new St.Icon({ icon_name: type+"-symbolic", icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size });
-                        //~ icon = new St.Icon({ icon_name: type+"-symbolic", icon_type: St.IconType.SYMBOLIC, });
-                    }
-                    GLib.free(array_chars);
+            let metadataJson_path = SPICES_DIR + "/" + type + "/" + uuid + "/metadata.json";
+            let metadataJson_file = Gio.file_new_for_path(metadataJson_path);
+            if (metadataJson_file.query_exists(null)) {
+                let [success, array_chars] = GLib.file_get_contents(metadataJson_path);
+                let contents = to_string(array_chars);
+                let metadata = JSON.parse(contents);
+                if (metadata["icon"]) {
+                    icon = new St.Icon({ icon_name: metadata["icon"], icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size });
                 } else {
                     icon = new St.Icon({ icon_name: type+"-symbolic", icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size });
-                    //~ icon = new St.Icon({ icon_name: type+"-symbolic", icon_type: St.IconType.SYMBOLIC, });
                 }
+                GLib.free(array_chars);
+            } else {
+                icon = new St.Icon({ icon_name: type+"-symbolic", icon_type: St.IconType.SYMBOLIC, icon_size: this.parent.icon_size });
             }
         }
 
@@ -387,7 +370,6 @@ class LGS extends Applet.IconApplet {
         sectionReload.addMenuItem(subMenuReloadApplets);
 
         if (this.show_reload_all) {
-          //~ let itemReloadAllApplets = new PopupMenu.PopupMenuItem(_("RELOAD ALL"), {style_class: "menu-selected-app-title"}); // make it bold.
           let itemReloadAllApplets = new ReloadAllMenuItem(this, "applets", {});
           itemReloadAllApplets.connect(
             "activate",
@@ -414,7 +396,6 @@ class LGS extends Applet.IconApplet {
         sectionReload.addMenuItem(subMenuReloadDesklets);
 
         if (this.show_reload_all) {
-          //~ let itemReloadAllDesklets = new PopupMenu.PopupMenuItem(_("RELOAD ALL"), {style_class: "menu-selected-app-title"}); // make it bold.
           let itemReloadAllDesklets = new ReloadAllMenuItem(this, "desklets", {});
           itemReloadAllDesklets.connect(
             "activate",
diff --git a/xsession@claudiux/files/xsession@claudiux/metadata.json b/xsession@claudiux/files/xsession@claudiux/metadata.json
@@ -3,7 +3,7 @@
   "name": "Xsession",
   "max-instances": "1",
   "hide-configuration": false,
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "Restart, access source code and configure your Spices (Applets, Desklets, Extensions). View the contents of your .xsession-errors file in real time. Restart Cinnamon.",
   "author": "claudiux"
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"uuid": "SpiceSpy@claudiux",`
`3`	`3`	`"name": "SpiceSpy",`
`4`	`4`	`"description": "Notifies you when there's a change to your favorite Spices on the website.",`
`5`		`- "version": "5.5.1",`
	`5`	`+ "version": "5.5.2",`
`6`	`6`	`"max-instances": 1,`
`7`	`7`	`"author": "claudiux"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"name": "Xsession",`
`4`	`4`	`"max-instances": "1",`
`5`	`5`	`"hide-configuration": false,`
`6`		`- "version": "5.1.1",`
	`6`	`+ "version": "5.1.2",`
`7`	`7`	`"description": "Restart, access source code and configure your Spices (Applets, Desklets, Extensions). View the contents of your .xsession-errors file in real time. Restart Cinnamon.",`
`8`	`8`	`"author": "claudiux"`
`9`	`9`	`}`