Merge branch 'release/version-33'

BigE · Nov 10, 2021 · 4612839 · 4612839
2 parents adc0f73 + 77035a5
commit 4612839
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -29,4 +29,4 @@ update-translation: all
 
 zipfile: all
 	cd ./$(UUID)/; \
-	zip -r ../$(UUID)-$(VERSION).zip . -x 'resources/ui/*' -x 'resources/icons/*' -x 'resources/*.xml' -x 'resources/*.in'
+	zip -r ../$(UUID)-$(VERSION).zip . -x 'resources/ui/*' -x 'resources/icons/*' -x 'resources/*.xml' -x 'resources/*.in' -x '*.gitkeep'
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ without reloading the daemon.
 The requirements are for the most recent version of the plugin. Previous
 versions support older versions of gnome-shell.
 
-* gnome-shell 3.30 or higher
+* gnome-shell 3.32 or higher
 * gjs 1.54 or higher
 
 ## Install

diff --git a/[email protected]/daemon/profile.js b/[email protected]/daemon/profile.js
@@ -247,6 +247,11 @@ class DeskChangerProfile extends GObject.Object {
             deskchanger.settings.disconnect(this._profiles_changed_id);
         }
 
+        this._monitors.forEach((monitor) => {
+            monitor.cancel();
+            deskchanger.debug(`destroyed directory monitor`);
+        });
+
         this._history.clear();
         this._queue.clear();
         this._sequence = 0;
@@ -266,8 +271,20 @@ class DeskChangerProfile extends GObject.Object {
      * @param {string} other_file If applicable, the changed directory
      * @param {Gio.FileMonitorEvent} event_type Event type flag
      */
-    _directory_changed(file, other_file, event_type) {
-        deskchanger.debug(`detected change of "${event_type}" for ${file}`);
+    _directory_changed(_monitor, file, other_file, event_type) {
+        deskchanger.debug(`detected change of "${event_type}" for ${file.get_uri()}`);
+        if (event_type === Gio.FileMonitorEvent.CREATED) {
+            // TODO: make the recursive check against the parent
+            this._load_uri(this._profile, file.get_uri(), false);
+        } else if (event_type === Gio.FileMonitorEvent.DELETED) {
+            let uri = file.get_uri(),
+                index = this._wallpapers.indexOf(uri);
+
+            if (index >= 0) {
+                this._wallpapers.splice(index);
+                deskchanger.debug(`removed ${uri} from profile ${this._profile}`);
+            }
+        }
     }
 
     /**

diff --git a/[email protected]/daemon/server.js b/[email protected]/daemon/server.js
@@ -256,10 +256,6 @@ class Server extends Gio.Application {
 
         // Keep us open and running... we are a daemon
         this.hold();
-
-        if (deskchanger.settings.auto_start) {
-            this.start();
-        }
     }
 
     _create_timer() {

diff --git a/[email protected]/metadata.json b/[email protected]/metadata.json
@@ -4,13 +4,13 @@
   "name": "Desk Changer",
   "settings-schema": "org.gnome.shell.extensions.desk-changer",
   "shell-version": [
-    "3.32",
     "3.34",
     "3.36",
     "3.38",
-    "40"
+    "40",
+    "41"
   ],
   "url": "https://github.com/BigE/desk-changer/",
   "uuid": "[email protected]",
-  "version": "32"
+  "version": "3333"
 }