Merging upstream version 20240916 (Closes: #1079257).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

29 files changed, 18 insertions, 4 deletions

diff --git a/extensions/46/hibernate-status.mk b/extensions/47/hibernate-status.mk
index b97a0d6..b97a0d6 100644
--- a/extensions/46/hibernate-status.mk
+++ b/extensions/47/hibernate-status.mk
diff --git a/extensions/46/hibernate-status/.editorconfig b/extensions/47/hibernate-status/.editorconfig
index bf58f2f..bf58f2f 100644
--- a/extensions/46/hibernate-status/.editorconfig
+++ b/extensions/47/hibernate-status/.editorconfig
diff --git a/extensions/46/hibernate-status/.github/workflows/release.yaml b/extensions/47/hibernate-status/.github/workflows/release.yaml
index 80138f9..80138f9 100644
--- a/extensions/46/hibernate-status/.github/workflows/release.yaml
+++ b/extensions/47/hibernate-status/.github/workflows/release.yaml
diff --git a/extensions/46/hibernate-status/.gitignore b/extensions/47/hibernate-status/.gitignore
index 68270f9..68270f9 100644
--- a/extensions/46/hibernate-status/.gitignore
+++ b/extensions/47/hibernate-status/.gitignore
diff --git a/extensions/46/hibernate-status/.prettierrc b/extensions/47/hibernate-status/.prettierrc
index 8da2b4c..8da2b4c 100644
--- a/extensions/46/hibernate-status/.prettierrc
+++ b/extensions/47/hibernate-status/.prettierrc
diff --git a/extensions/46/hibernate-status/LICENSE b/extensions/47/hibernate-status/LICENSE
index d6a9326..d6a9326 100644
--- a/extensions/46/hibernate-status/LICENSE
+++ b/extensions/47/hibernate-status/LICENSE
diff --git a/extensions/46/hibernate-status/Makefile b/extensions/47/hibernate-status/Makefile
index f74ed54..f74ed54 100644
--- a/extensions/46/hibernate-status/Makefile
+++ b/extensions/47/hibernate-status/Makefile
diff --git a/extensions/46/hibernate-status/README.md b/extensions/47/hibernate-status/README.md
index f356bd7..f356bd7 100644
--- a/extensions/46/hibernate-status/README.md
+++ b/extensions/47/hibernate-status/README.md
diff --git a/extensions/46/hibernate-status/buildforupload.sh b/extensions/47/hibernate-status/buildforupload.sh
index d2c705c..d2c705c 100755
--- a/extensions/46/hibernate-status/buildforupload.sh
+++ b/extensions/47/hibernate-status/buildforupload.sh
diff --git a/extensions/46/hibernate-status/extension.js b/extensions/47/hibernate-status/extension.js
index d0c7708..b0a26c7 100644
--- a/extensions/46/hibernate-status/extension.js
+++ b/extensions/47/hibernate-status/extension.js
@@ -219,6 +219,22 @@ export default class HibernateButtonExtension extends Extension {
 
     _updateDefaults() {
         console.log("Update defaults");
+        let menuItems = this.systemMenu._systemItem.menu._getMenuItems()
+        for (let menuItem of menuItems) {
+            console.log(menuItem.label.get_text())
+            if ( menuItem.label.get_text() === _('Suspend') ) {
+                console.log(`Show suspend button: ${this._setting.get_boolean('show-suspend')}`)
+                menuItem.visible = this._setting.get_boolean('show-suspend');
+            }
+            if ( menuItem.label.get_text() === _('Restart…') ) {
+                console.log(`Show restart button: ${this._setting.get_boolean('show-restart')}`)
+                menuItem.visible = this._setting.get_boolean('show-restart');
+            }
+            if ( menuItem.label.get_text() === _('Power Off…') ) {
+                console.log(`Show shutdown button: ${this._setting.get_boolean('show-shutdown')}`)
+                menuItem.visible = this._setting.get_boolean('show-shutdown');
+            }
+        }
     }
 
     _onHibernateClicked() {
@@ -571,3 +587,4 @@ var ConfirmDialog = GObject.registerClass(
 );
 
 const _DIALOG_ICON_SIZE = 32;
+
diff --git a/extensions/46/hibernate-status/locale/bg/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/bg/LC_MESSAGES/hibernate-status-button.po
index 689fee9..689fee9 100644
--- a/extensions/46/hibernate-status/locale/bg/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/bg/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po
index 32e541d..32e541d 100644
--- a/extensions/46/hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po
index 3fdb8c2..3fdb8c2 100644
--- a/extensions/46/hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po
index 92c14bc..92c14bc 100644
--- a/extensions/46/hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po
index e4edef0..e4edef0 100644
--- a/extensions/46/hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po
index 9dca80d..9dca80d 100644
--- a/extensions/46/hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/hu/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/hu/LC_MESSAGES/hibernate-status-button.po
index 70da5aa..70da5aa 100644
--- a/extensions/46/hibernate-status/locale/hu/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/hu/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po
index a41e5ac..a41e5ac 100644
--- a/extensions/46/hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
index 3146d8a..3146d8a 100644
--- a/extensions/46/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po
index 25debf8..25debf8 100644
--- a/extensions/46/hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po
index 57b735c..57b735c 100644
--- a/extensions/46/hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po
index 143129c..143129c 100644
--- a/extensions/46/hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po
index 326481a..326481a 100644
--- a/extensions/46/hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
index c55e2c6..c55e2c6 100644
--- a/extensions/46/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po
index 68c6b8c..68c6b8c 100644
--- a/extensions/46/hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po b/extensions/47/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
index d6a6ebe..d6a6ebe 100644
--- a/extensions/46/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
+++ b/extensions/47/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
diff --git a/extensions/46/hibernate-status/metadata.json b/extensions/47/hibernate-status/metadata.json
index 581fb2c..db14afb 100644
--- a/extensions/46/hibernate-status/metadata.json
+++ b/extensions/47/hibernate-status/metadata.json
@@ -3,7 +3,7 @@
     "name": "Hibernate Status Button",
     "url": "https://github.com/arelange/gnome-shell-extension-hibernate-status",
     "description": "Adds a Hibernate button in Status menu. Using Alt modifier, you can also select Hybrid Sleep instead.",
-    "shell-version": ["45", "46"],
+    "shell-version": ["45", "46", "47"],
     "gettext-domain": "hibernate-status-button",
     "settings-schema": "org.gnome.shell.extensions.hibernate-status-button"
 }
diff --git a/extensions/46/hibernate-status/prefs.js b/extensions/47/hibernate-status/prefs.js
index 1407a6b..3a04ca6 100644
--- a/extensions/46/hibernate-status/prefs.js
+++ b/extensions/47/hibernate-status/prefs.js
@@ -101,7 +101,6 @@ export default class Prefs extends ExtensionPreferences {
 
         const suspend_row = new Adw.SwitchRow({
             title: __('Suspend'),
-            subtitle: __('Not implemented yet'),
         });
         modes_group.add(suspend_row);
         const hibernate_row = new Adw.SwitchRow({
@@ -118,12 +117,10 @@ export default class Prefs extends ExtensionPreferences {
         modes_group.add(suspend_then_hibernate_row);
         const restart_row = new Adw.SwitchRow({
             title: __('Restart...'),
-            subtitle: __('Not implemented yet'),
         });
         modes_group.add(restart_row);
         const shutdown_row = new Adw.SwitchRow({
             title: __('Shutdown...'),
-            subtitle: __('Not implemented yet'),
         });
         modes_group.add(shutdown_row);
 
diff --git a/extensions/46/hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml b/extensions/47/hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml
index 242d9cc..242d9cc 100644
--- a/extensions/46/hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml
+++ b/extensions/47/hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml