[gitg] Use GtkButton subclasses instead of GdHeaderButton ones

[Ignacio Casal Quinteiro <icq src gnome org>]

commit ed3927a45188ba568aa43c2262dd086e0e93ca29
Author: Jose Manuel Pintor Freire <jmpintorfreire gmail com>
Date:   Tue May 28 14:24:34 2013 +0200

    Use GtkButton subclasses instead of GdHeaderButton ones
    
    Signed-off-by: Ignacio Casal Quinteiro <icq gnome org>

 gitg/gitg-window.vala            |    6 ++--
 gitg/resources/ui/gitg-window.ui |   42 ++++++++++++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 9 deletions(-)
---
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 9c7c3be..e15b5ce 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -39,7 +39,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable, Gtk.
        private MenuModel d_dash_model;
        private MenuModel d_views_model;
 
-       private Gd.HeaderSimpleButton d_button_dash;
+       private Gtk.Button d_button_dash;
        private Gd.StackSwitcher d_commit_view_switcher;
 
        private Gd.TaggedEntry d_search_entry;
@@ -419,7 +419,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable, Gtk.
                // Extract widgets from the builder
                d_header_bar = builder.get_object("header-bar") as Gtk.HeaderBar;
 
-               d_button_dash = builder.get_object("button_dash") as Gd.HeaderSimpleButton;
+               d_button_dash = builder.get_object("button_dash") as Gtk.Button;
                d_button_dash.clicked.connect((b) => {
                        repository = null;
                });
@@ -466,7 +466,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable, Gtk.
                d_dash_model = Resource.load_object<MenuModel>("ui/gitg-menus.ui", menuname + "-dash");
                d_views_model = Resource.load_object<MenuModel>("ui/gitg-menus.ui", menuname + "-views");
 
-               var search_button = builder.get_object("search-button") as Gd.HeaderToggleButton;
+               var search_button = builder.get_object("search-button") as Gtk.ToggleButton;
                var revealer = builder.get_object("search-revealer") as Gd.Revealer;
                d_search_entry = builder.get_object("search-entry") as Gd.TaggedEntry;
 
diff --git a/gitg/resources/ui/gitg-window.ui b/gitg/resources/ui/gitg-window.ui
index cd41eac..b5fd3a2 100644
--- a/gitg/resources/ui/gitg-window.ui
+++ b/gitg/resources/ui/gitg-window.ui
@@ -14,21 +14,41 @@
         <property name="can_focus">False</property>
         <property name="vexpand">False</property>
         <child>
-          <object class="GdHeaderSimpleButton" id="button_dash">
+          <object class="GtkButton" id="button_dash">
             <property name="visible">False</property>
+            <property name="valign">center</property>
             <property name="can_focus">False</property>
-            <property name="symbolic_icon_name">go-previous-symbolic</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="dash_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">go-previous-symbolic</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="pack_type">start</property>
           </packing>
         </child>
         <child>
-          <object class="GdHeaderToggleButton" id="search-button">
+          <object class="GtkToggleButton" id="search-button">
             <property name="visible">True</property>
+            <property name="valign">center</property>
             <property name="can_focus">False</property>
-            <property name="symbolic_icon_name">edit-find-symbolic</property>
             <property name="action_name">win.search</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="search_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">edit-find-symbolic</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="pack_type">end</property>
@@ -43,11 +63,21 @@
           </packing>
         </child>
         <child>
-          <object class="GdHeaderMenuButton" id="gear-menubutton">
+          <object class="GtkMenuButton" id="gear-menubutton">
             <property name="visible">True</property>
+            <property name="valign">center</property>
             <property name="can_focus">False</property>
-            <property name="symbolic_icon_name">emblem-system-symbolic</property>
             <property name="action_name">win.gear-menu</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="gear_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">emblem-system-symbolic</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="pack_type">end</property>