From ef7678f94c05d5c23d224a36b63fb98aa963c12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
Date: Sun, 24 Nov 2024 22:47:25 +0100
Subject: [PATCH 1/2] Update command for Extensions app

The old command was removed from GNOME 47:
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3456
---
 appIcons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appIcons.js b/appIcons.js
index c24e133..27dbd50 100644
--- a/appIcons.js
+++ b/appIcons.js
@@ -1818,7 +1818,7 @@ export const MyShowAppsIconMenu = class extends PopupMenu.PopupMenu {
 
         this._appendItem({
             title: _('Extensions'),
-            cmd: ['gnome-shell-extension-prefs']
+            cmd: ['gnome-extensions-app']
         });
 
         this._appendItem({

From a6653f6f8b33eb5965b6ff178de1cc78e724cc4c Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Sun, 1 Dec 2024 09:58:12 -0500
Subject: [PATCH 2/2] Only enable ubuntu dock if dtp disabled it

---
 extension.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/extension.js b/extension.js
index 5e6ea6d..06187b4 100644
--- a/extension.js
+++ b/extension.js
@@ -33,6 +33,7 @@ const UBUNTU_DOCK_UUID = 'ubuntu-dock@ubuntu.com';
 let panelManager;
 let extensionChangedHandler;
 let startupCompleteHandler;
+let disabledUbuntuDock;
 let extensionSystem = Main.extensionManager;
 
 export let DTP_EXTENSION = null;
@@ -80,7 +81,11 @@ export default class DashToPanelExtension extends Extension {
 
         if (!reset) {
             extensionSystem.disconnect(extensionChangedHandler);
-            extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
+
+            if (disabledUbuntuDock) {
+                disabledUbuntuDock = false;
+                extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
+            }
 
             delete global.dashToPanel;
 
@@ -97,7 +102,12 @@ export default class DashToPanelExtension extends Extension {
 }
 
 function _enable(extension) {
-    extensionSystem.disableExtension(UBUNTU_DOCK_UUID);
+    let enabled = global.settings.get_strv('enabled-extensions');
+
+    if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0) {
+        disabledUbuntuDock = true;
+        extensionSystem.disableExtension(UBUNTU_DOCK_UUID);
+    }
 
     if (panelManager)
         return panelManager.toggleDash(); // already initialized but ubuntu dock restored the original dash on disable