From 9bb91ca8751cdb13be829569e88979bd4d0ed44c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 15 Apr 2020 20:27:15 +0200
Subject: [PATCH] dbusServices/extensions: Stop using GtkToolbar

Toolbars have been removed from GTK4, so just use a regular GtkBox
for the error details bottom bar.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1495>
---
 .../extensions/css/application.css            |  6 +-
 .../extensions/ui/extension-prefs-dialog.ui   | 73 +++++++------------
 2 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/js/dbusServices/extensions/css/application.css b/js/dbusServices/extensions/css/application.css
index 06914ea3c..1acbf36c8 100644
--- a/js/dbusServices/extensions/css/application.css
+++ b/js/dbusServices/extensions/css/application.css
@@ -1,2 +1,6 @@
 .expander-frame > * { border-top-width: 0; }
-.expander-toolbar { border: 0 solid @borders; border-top-width: 1px; }
+.expander-toolbar {
+  border: 0 solid @borders;
+  border-top-width: 1px;
+  padding: 3px;
+}
diff --git a/js/dbusServices/extensions/ui/extension-prefs-dialog.ui b/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
index e7895bba6..020bc4462 100644
--- a/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
+++ b/js/dbusServices/extensions/ui/extension-prefs-dialog.ui
@@ -117,65 +117,46 @@
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkToolbar">
+                                      <object class="GtkBox">
                                         <property name="visible">True</property>
                                         <style>
                                           <class name="expander-toolbar"/>
                                         </style>
                                         <child>
-                                          <object class="GtkToolItem">
+                                          <object class="GtkButton">
                                             <property name="visible">True</property>
+                                            <property name="can-focus">True</property>
+                                            <property name="receives-default">True</property>
+                                            <property name="action-name">win.copy-error</property>
+                                            <style>
+                                              <class name="flat"/>
+                                              <class name="image-button"/>
+                                            </style>
                                             <child>
-                                              <object class="GtkButton">
+                                              <object class="GtkImage">
                                                 <property name="visible">True</property>
-                                                <property name="can-focus">True</property>
-                                                <property name="receives-default">True</property>
-                                                <property name="action-name">win.copy-error</property>
-                                                <style>
-                                                  <class name="flat"/>
-                                                  <class name="image-button"/>
-                                                </style>
-                                                <child>
-                                                  <object class="GtkImage">
-                                                    <property name="visible">True</property>
-                                                    <property name="icon-name">edit-copy-symbolic</property>
-                                                  </object>
-                                                </child>
+                                                <property name="icon-name">edit-copy-symbolic</property>
                                               </object>
                                             </child>
                                           </object>
                                         </child>
                                         <child>
-                                          <object class="GtkSeparatorToolItem">
-                                            <property name="visible">True</property>
-                                            <property name="draw">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkToolItem">
-                                            <property name="visible">True</property>
-                                            <child>
-                                              <object class="GtkButton" id="homeButton">
-                                                <property name="visible"
-                                                          bind-source="homeButton"
-                                                          bind-property="sensitive"
-                                                          bind-flags="sync-create"/>
-                                                <property name="hexpand">True</property>
-                                                <property name="halign">end</property>
-                                                <property name="label" translatable="yes">Homepage</property>
-                                                <property name="tooltip-text" translatable="yes">Visit extension homepage</property>
-                                                <property name="can-focus">True</property>
-                                                <property name="receives-default">True</property>
-                                                <property name="no-show-all">True</property>
-                                                <property name="action-name">win.show-url</property>
-                                                <style>
-                                                  <class name="flat"/>
-                                                </style>
-                                              </object>
-                                            </child>
+                                          <object class="GtkButton" id="homeButton">
+                                            <property name="visible"
+                                                      bind-source="homeButton"
+                                                      bind-property="sensitive"
+                                                      bind-flags="sync-create"/>
+                                            <property name="hexpand">True</property>
+                                            <property name="halign">end</property>
+                                            <property name="label" translatable="yes">Homepage</property>
+                                            <property name="tooltip-text" translatable="yes">Visit extension homepage</property>
+                                            <property name="can-focus">True</property>
+                                            <property name="receives-default">True</property>
+                                            <property name="no-show-all">True</property>
+                                            <property name="action-name">win.show-url</property>
+                                            <style>
+                                              <class name="flat"/>
+                                            </style>
                                           </object>
                                         </child>
                                       </object>