[baobab] Use new close button in GtkHeaderBar

[Stefano Facchini <sfacchini src gnome org>]

commit 0d1e40ea14c22f4e83561ce5efd821b81322b5c6
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Mon Aug 5 17:19:27 2013 +0200

    Use new close button in GtkHeaderBar

 src/baobab-main-window.ui |   35 ++++-------------------------------
 src/baobab-window.vala    |    5 -----
 2 files changed, 4 insertions(+), 36 deletions(-)
---
diff --git a/src/baobab-main-window.ui b/src/baobab-main-window.ui
index 3fc6b17..37c5c75 100644
--- a/src/baobab-main-window.ui
+++ b/src/baobab-main-window.ui
@@ -50,6 +50,10 @@
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="show_close_button">True</property>
+        <style>
+          <class name="titlebar"/>
+        </style>
         <child>
           <object class="GtkButton" id="back_button">
             <property name="valign">center</property>
@@ -109,37 +113,6 @@
             <property name="pack_type">end</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkSeparator" id="close_button_separator">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="valign">fill</property>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="close_button">
-            <property name="visible">True</property>
-            <property name="valign">center</property>
-            <property name="relief">none</property>
-            <signal name="clicked" handler="close_button_clicked" swapped="no"/>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage" id="close_image">
-                <property name="visible">True</property>
-                <property name="icon_size">1</property>
-                <property name="icon_name">window-close-symbolic</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-          </packing>
-        </child>
       </object>
     </child>
     <child>
diff --git a/src/baobab-window.vala b/src/baobab-window.vala
index 8f5396e..3162e74 100644
--- a/src/baobab-window.vala
+++ b/src/baobab-window.vala
@@ -119,11 +119,6 @@ namespace Baobab {
             {"text/uri-list", 0, DndTargets.URI_LIST}
         };
 
-        [GtkCallback]
-        private void close_button_clicked(Gtk.Button button) {
-            close ();
-        }
-
         public Window (Application app) {
             Object (application: app);