From d851bd76872978f5f12ff92db3fef3e3e19f72e1 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Thu, 23 Jan 2025 13:32:44 -0500
Subject: [PATCH 1/2] Remove superfluous property

---
 ui/BoxWindowPreviewOptions.ui |  4 ++--
 ui/SettingsFineTune.ui        | 10 +++++-----
 ui/SettingsPosition.ui        | 10 +++++-----
 ui/SettingsStyle.ui           | 12 ++++++------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ui/BoxWindowPreviewOptions.ui b/ui/BoxWindowPreviewOptions.ui
index 87cecff..2f3a1ef 100644
--- a/ui/BoxWindowPreviewOptions.ui
+++ b/ui/BoxWindowPreviewOptions.ui
@@ -322,7 +322,7 @@
                     <property name="receives_default">False</property>
                     <property name="valign">center</property>
                     <property name="active">True</property>
-                    <signal name="toggled" handler="preview_title_position_bottom_button_toggled_cb" swapped="no"/>
+                    <signal name="toggled" handler="preview_title_position_bottom_button_toggled_cb"/>
                   </object>
                 </child>
                 <child>
@@ -331,7 +331,7 @@
                     <property name="receives_default">False</property>
                     <property name="valign">center</property>
                     <property name="group">preview_title_position_bottom_button</property>
-                    <signal name="toggled" handler="preview_title_position_top_button_toggled_cb" swapped="no"/>
+                    <signal name="toggled" handler="preview_title_position_top_button_toggled_cb"/>
                   </object>
                 </child>
               </object>
diff --git a/ui/SettingsFineTune.ui b/ui/SettingsFineTune.ui
index c9def52..e15fbdd 100644
--- a/ui/SettingsFineTune.ui
+++ b/ui/SettingsFineTune.ui
@@ -58,7 +58,7 @@
                   <property name="digits">0</property>
                   <property name="value_pos">right</property>
                   <property name="draw_value">True</property>
-                  <signal name="value-changed" handler="tray_size_scale_value_changed_cb" swapped="no"/>
+                  <signal name="value-changed" handler="tray_size_scale_value_changed_cb"/>
                 </object>
               </child>
             </object>
@@ -76,7 +76,7 @@
                   <property name="digits">0</property>
                   <property name="value_pos">right</property>
                   <property name="draw_value">True</property>
-                  <signal name="value-changed" handler="leftbox_size_scale_value_changed_cb" swapped="no"/>
+                  <signal name="value-changed" handler="leftbox_size_scale_value_changed_cb"/>
                 </object>
               </child>
             </object>
@@ -102,7 +102,7 @@
                   <property name="digits">0</property>
                   <property name="value_pos">right</property>
                   <property name="draw_value">True</property>
-                  <signal name="value-changed" handler="tray_padding_scale_value_changed_cb" swapped="no"/>
+                  <signal name="value-changed" handler="tray_padding_scale_value_changed_cb"/>
                 </object>
               </child>
             </object>
@@ -120,7 +120,7 @@
                   <property name="digits">0</property>
                   <property name="value_pos">right</property>
                   <property name="draw_value">True</property>
-                  <signal name="value-changed" handler="statusicon_padding_scale_value_changed_cb" swapped="no"/>
+                  <signal name="value-changed" handler="statusicon_padding_scale_value_changed_cb"/>
                 </object>
               </child>
             </object>
@@ -138,7 +138,7 @@
                   <property name="digits">0</property>
                   <property name="value_pos">right</property>
                   <property name="draw_value">True</property>
-                  <signal name="value-changed" handler="leftbox_padding_scale_value_changed_cb" swapped="no"/>
+                  <signal name="value-changed" handler="leftbox_padding_scale_value_changed_cb"/>
                 </object>
               </child>
             </object>
diff --git a/ui/SettingsPosition.ui b/ui/SettingsPosition.ui
index 8130f7f..c084ad4 100644
--- a/ui/SettingsPosition.ui
+++ b/ui/SettingsPosition.ui
@@ -131,7 +131,7 @@
                   <property name="receives_default">False</property>
                   <property name="valign">center</property>
                   <property name="active">True</property>
-                  <signal name="clicked" handler="position_bottom_button_clicked_cb" swapped="no"/>
+                  <signal name="clicked" handler="position_bottom_button_clicked_cb"/>
                 </object>
               </child>
               <child>
@@ -140,7 +140,7 @@
                   <property name="receives_default">False</property>
                   <property name="valign">center</property>
                   <property name="group">position_bottom_button</property>
-                  <signal name="clicked" handler="position_top_button_clicked_cb" swapped="no"/>
+                  <signal name="clicked" handler="position_top_button_clicked_cb"/>
                 </object>
               </child>
               <child>
@@ -149,7 +149,7 @@
                   <property name="receives_default">False</property>
                   <property name="valign">center</property>
                   <property name="group">position_bottom_button</property>
-                  <signal name="clicked" handler="position_left_button_clicked_cb" swapped="no"/>
+                  <signal name="clicked" handler="position_left_button_clicked_cb"/>
                 </object>
               </child>
               <child>
@@ -158,7 +158,7 @@
                   <property name="receives_default">False</property>
                   <property name="valign">center</property>
                   <property name="group">position_bottom_button</property>
-                  <signal name="clicked" handler="position_right_button_clicked_cb" swapped="no"/>
+                  <signal name="clicked" handler="position_right_button_clicked_cb"/>
                 </object>
               </child>
             </object>
@@ -176,7 +176,7 @@
                   <property name="digits">0</property>
                   <property name="value_pos">right</property>
                   <property name="draw_value">True</property>
-                  <signal name="value-changed" handler="panel_size_scale_value_changed_cb" swapped="no"/>
+                  <signal name="value-changed" handler="panel_size_scale_value_changed_cb"/>
                 </object>
               </child>
             </object>
diff --git a/ui/SettingsStyle.ui b/ui/SettingsStyle.ui
index abe5c34..3267bcf 100644
--- a/ui/SettingsStyle.ui
+++ b/ui/SettingsStyle.ui
@@ -55,7 +55,7 @@
                 <property name="digits">0</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <signal name="value-changed" handler="appicon_margin_scale_value_changed_cb" swapped="no"/>
+                <signal name="value-changed" handler="appicon_margin_scale_value_changed_cb"/>
               </object>
             </child>
           </object>
@@ -73,7 +73,7 @@
                 <property name="digits">0</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <signal name="value-changed" handler="appicon_padding_scale_value_changed_cb" swapped="no"/>
+                <signal name="value-changed" handler="appicon_padding_scale_value_changed_cb"/>
               </object>
             </child>
           </object>
@@ -133,7 +133,7 @@
               <object class="GtkToggleButton" id="dots_bottom_button">
                 <property name="label" translatable="yes">Bottom</property>
                 <property name="valign">center</property>
-                <signal name="toggled" handler="dots_bottom_button_toggled_cb" swapped="no"/>
+                <signal name="toggled" handler="dots_bottom_button_toggled_cb"/>
               </object>
             </child>
             <child>
@@ -141,7 +141,7 @@
                 <property name="label" translatable="yes">Top</property>
                 <property name="valign">center</property>
                 <property name="group">dots_bottom_button</property>
-                <signal name="toggled" handler="dots_top_button_toggled_cb" swapped="no"/>
+                <signal name="toggled" handler="dots_top_button_toggled_cb"/>
               </object>
             </child>
             <child>
@@ -149,7 +149,7 @@
                 <property name="label" translatable="yes">Left</property>
                 <property name="valign">center</property>
                 <property name="group">dots_bottom_button</property>
-                <signal name="toggled" handler="dots_left_button_toggled_cb" swapped="no"/>
+                <signal name="toggled" handler="dots_left_button_toggled_cb"/>
               </object>
             </child>
             <child>
@@ -157,7 +157,7 @@
                 <property name="label" translatable="yes">Right</property>
                 <property name="valign">center</property>
                 <property name="group">dots_bottom_button</property>
-                <signal name="toggled" handler="dots_right_button_toggled_cb" swapped="no"/>
+                <signal name="toggled" handler="dots_right_button_toggled_cb"/>
               </object>
             </child>
           </object>

From 4d61b95c83e09bbb5c68c07786f5675f62321fa9 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Sun, 26 Jan 2025 14:03:53 -0500
Subject: [PATCH 2/2] Stop re-enabling ubuntu dock

---
 extension.js    | 13 ++-----------
 panelManager.js |  4 ----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/extension.js b/extension.js
index 06187b4..412eb95 100644
--- a/extension.js
+++ b/extension.js
@@ -33,7 +33,6 @@ 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;
@@ -81,12 +80,6 @@ export default class DashToPanelExtension extends Extension {
 
         if (!reset) {
             extensionSystem.disconnect(extensionChangedHandler);
-
-            if (disabledUbuntuDock) {
-                disabledUbuntuDock = false;
-                extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
-            }
-
             delete global.dashToPanel;
 
             AppIcons.resetRecentlyClickedApp();
@@ -104,13 +97,11 @@ export default class DashToPanelExtension extends Extension {
 function _enable(extension) {
     let enabled = global.settings.get_strv('enabled-extensions');
 
-    if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0) {
-        disabledUbuntuDock = true;
+    if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0)
         extensionSystem.disableExtension(UBUNTU_DOCK_UUID);
-    }
 
     if (panelManager)
-        return panelManager.toggleDash(); // already initialized but ubuntu dock restored the original dash on disable
+        return
 
     SETTINGS = extension.getSettings('org.gnome.shell.extensions.dash-to-panel');
     DESKTOPSETTINGS = new Gio.Settings({schema_id: 'org.gnome.desktop.interface'});
diff --git a/panelManager.js b/panelManager.js
index 43e93b4..9073739 100755
--- a/panelManager.js
+++ b/panelManager.js
@@ -296,10 +296,6 @@ export const PanelManager = class {
         this._desktopIconsUsableArea = null;
     }
 
-    toggleDash() {
-        this.overview.toggleDash();
-    }
-
     _setDesktopIconsMargins() {
         this._desktopIconsUsableArea?.resetMargins();
         this.allPanels.forEach(p => {