From 233037a709c7843cc63e49b90da961da04bed545 Mon Sep 17 00:00:00 2001
From: Brent Hull <bhull2010@live.com>
Date: Sat, 17 Nov 2012 20:09:06 -0500
Subject: Don't set the toolbar type in the ui file so user's choice will be
 applied automatically (no need to load the preference from MateConf)

---
 baobab/data/baobab-main-window.ui | 1 -
 1 file changed, 1 deletion(-)

(limited to 'baobab/data/baobab-main-window.ui')

diff --git a/baobab/data/baobab-main-window.ui b/baobab/data/baobab-main-window.ui
index 55f6215c..85298f4a 100644
--- a/baobab/data/baobab-main-window.ui
+++ b/baobab/data/baobab-main-window.ui
@@ -220,7 +220,6 @@
           <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
             <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-            <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
             <property name="tooltips">True</property>
             <property name="show_arrow">False</property>
             <child>
-- 
cgit v1.2.1


From 507090e64e66315d6dad960791489a477dced017 Mon Sep 17 00:00:00 2001
From: Brent Hull <bhull2010@live.com>
Date: Sat, 17 Nov 2012 22:13:08 -0500
Subject: Port disk-usage-analyzer to Gsettings (based on GNOME patch)

---
 baobab/data/baobab-main-window.ui | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'baobab/data/baobab-main-window.ui')

diff --git a/baobab/data/baobab-main-window.ui b/baobab/data/baobab-main-window.ui
index 85298f4a..e544c430 100644
--- a/baobab/data/baobab-main-window.ui
+++ b/baobab/data/baobab-main-window.ui
@@ -62,10 +62,10 @@
           <accelerator key="R" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
-          <object class="GtkAction" id="esci1">
+          <object class="GtkAction" id="menuquit">
             <property name="stock_id">gtk-quit</property>
-            <property name="name">esci1</property>
-            <signal handler="on_esci1_activate" last_modification_time="Tue, 05 Jul 2005 08:47:26 GMT" name="activate"/>
+            <property name="name">menuquit</property>
+            <signal handler="on_quit_activate" last_modification_time="Tue, 05 Jul 2005 08:47:26 GMT" name="activate"/>
           </object>
         </child>
         <child>
@@ -106,7 +106,6 @@
             <property name="active">True</property>
             <property name="name">view_tb</property>
             <property name="label" translatable="yes">_Toolbar</property>
-            <signal handler="on_view_tb_activate" last_modification_time="Wed, 19 Apr 2006 12:10:25 GMT" name="activate"/>
           </object>
         </child>
         <child>
@@ -114,7 +113,6 @@
             <property name="active">True</property>
             <property name="name">view_sb</property>
             <property name="label" translatable="yes">St_atusbar</property>
-            <signal handler="on_view_sb_activate" last_modification_time="Wed, 19 Apr 2006 12:45:08 GMT" name="activate"/>
           </object>
         </child>
         <child>
@@ -160,7 +158,7 @@
           <menuitem action="menustop"/>
           <menuitem action="menurescan"/>
           <separator/>
-          <menuitem action="esci1"/>
+          <menuitem action="menuquit"/>
         </menu>
         <menu action="edit1">
           <menuitem action="expand_all"/>
@@ -197,7 +195,6 @@
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
     <property name="focus_on_map">True</property>
     <property name="urgency_hint">False</property>
-    <signal handler="on_esci1_activate" last_modification_time="Sun, 31 Jul 2005 16:47:41 GMT" name="destroy"/>
     <signal handler="on_delete_activate" last_modification_time="Sun, 31 Jul 2005 16:53:49 GMT" name="delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -233,8 +230,7 @@
                 <property name="visible_vertical">True</property>
                 <property name="is_important">True</property>
                 <accessibility>
-		
-	      </accessibility>
+                </accessibility>
                 <signal handler="on_tbscanhome_clicked" last_modification_time="Wed, 23 Aug 2006 12:30:03 GMT" name="clicked"/>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="a11y-tbscanhome1">
-- 
cgit v1.2.1