Merge branch 'release/version-34'

BigE · May 7, 2022 · d55eae5 · d55eae5
2 parents 4612839 + 6d7372d
commit d55eae5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/[email protected]/daemon/profile.js b/[email protected]/daemon/profile.js
@@ -64,6 +64,10 @@ class DeskChangerProfile extends GObject.Object {
         return Boolean(this._profile);
     }
 
+    get profile() {
+        return this._profile;
+    }
+
     get preview() {
         if (!this.loaded) {
             return null;

diff --git a/[email protected]/daemon/server.js b/[email protected]/daemon/server.js
@@ -89,9 +89,9 @@ class Server extends Gio.Application {
     }
 
     loadprofile(profile=null) {
-        let _profile = this._profile.loaded;
+        let _profile = this._profile.profile;
 
-        if (_profile) {
+        if (this._profile.loaded) {
             this._profile.unload(this._background.get_string('picture-uri'));
         }
 
@@ -352,6 +352,7 @@ class Server extends Gio.Application {
     _set_wallpaper(uri) {
         deskchanger.debug(`setting wallpaper to ${uri}`);
         this._background.set_string('picture-uri', uri);
+        this._background.set_string('picture-uri-dark', uri);
         this.emit_signal('Changed', new GLib.Variant('(s)', [uri]));
     }
 }

diff --git a/[email protected]/metadata.json b/[email protected]/metadata.json
@@ -8,9 +8,10 @@
     "3.36",
     "3.38",
     "40",
-    "41"
+    "41",
+    "42"
   ],
   "url": "https://github.com/BigE/desk-changer/",
   "uuid": "[email protected]",
-  "version": "3333"
+  "version": "34"
 }
diff --git a/[email protected]/ui/panelMenu.js b/[email protected]/ui/panelMenu.js
@@ -53,7 +53,7 @@ class DeskChangerPanelMenuIcon extends St.Bin {
         });
         this._icon = null;
         this._preview = null;
-        this.update_child();
+        this.update_child(this._daemon.Preview);
 
         this._preview_id = deskchanger.settings.connect('changed::icon-preview', (settings, key) => {
             this.update_child(this._daemon.Preview);