[gitg] Use header bar

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 6ee2438d5719c1188a5cc2f72263f64ade4a0a32
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Feb 20 10:37:13 2013 +0100

    Use header bar

 configure.ac                     |    1 +
 gitg/gitg-window.vala            |    3 +-
 gitg/resources/ui/gitg-window.ui |   58 ++++---------------------------------
 libgd                            |    2 +-
 libgitg/gitg-commit.vala         |    2 +-
 5 files changed, 12 insertions(+), 54 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a9c886e..60be120 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,6 +281,7 @@ AM_CONDITIONAL(ENABLE_PYTHON, test x"$enable_python" = "xyes")
 
 dnl libgd
 LIBGD_INIT([
+       header-bar
        tagged-entry
        stack
        revealer
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 70f8a5d..b526bb8 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -76,7 +76,8 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable, Gtk.
                var model = Resource.load_object<MenuModel>("ui/gitg-menus.ui", "win-menu");
                d_config.menu_model = model;
 
-               var search_button = builder.get_object("search-button");
+               var header_bar = builder.get_object("header-bar") as Gd.HeaderBar;
+               var search_button = builder.get_object("search-button") as Gd.HeaderToggleButton;
                var revealer = builder.get_object("search-revealer") as Gd.Revealer;
                search_button.bind_property("active", revealer, "reveal-child");
                var 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 0577d96..aaf80d0 100644
--- a/gitg/resources/ui/gitg-window.ui
+++ b/gitg/resources/ui/gitg-window.ui
@@ -3,12 +3,6 @@
   <!-- interface-requires gtk+ 3.3 -->
   <!-- interface-requires gitg 0.0 -->
   <!-- interface-requires gd 1.0 -->
-  <object class="GtkImage" id="image_config">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixel_size">16</property>
-    <property name="icon_name">emblem-system-symbolic</property>
-  </object>
   <object class="GitgWindow" id="window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">gitg</property>
@@ -20,65 +14,27 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkToolbar" id="toolbar1">
+          <object class="GdHeaderBar" id="header-bar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="toolbar_style">icons</property>
-            <style>
-              <class name="horizontal"/>
-              <class name="menubar"/>
-            </style>
             <child>
-              <object class="GtkToolItem" id="toolbutton1">
+              <object class="GdHeaderMenuButton" id="button_config">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkAlignment" id="search-button-alignment">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="xscale">0</property>
-                    <child>
-                      <object class="GtkToggleButton" id="search-button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <child>
-                          <object class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="icon_size">1</property>
-                            <property name="icon_name">edit-find-symbolic</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="symbolic_icon_name">emblem-system-symbolic</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="homogeneous">True</property>
+                <property name="pack_type">end</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolItem" id="toolbutton2">
+              <object class="GdHeaderToggleButton" id="search-button">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkMenuButton" id="button_config">
-                    <property name="use_action_appearance">False</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">6</property>
-                    <property name="image">image_config</property>
-                  </object>
-                </child>
+                <property name="symbolic_icon_name">edit-find-symbolic</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
+                <property name="pack_type">end</property>
               </packing>
             </child>
           </object>
diff --git a/libgd b/libgd
index 1223ead..8d25ea8 160000
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit 1223eade34911247d480f1ff3324b7c5cdc52191
+Subproject commit 8d25ea89357cc04fc4bc7c5e9f686bed0f17cad5
diff --git a/libgitg/gitg-commit.vala b/libgitg/gitg-commit.vala
index f81e3bb..569d315 100644
--- a/libgitg/gitg-commit.vala
+++ b/libgitg/gitg-commit.vala
@@ -89,7 +89,7 @@ public class Commit : Ggit.Commit
        {
                owned get
                {
-                       return get_subject().replace(" ", "-").replace("/", "-");;
+                       return get_subject().replace(" ", "-").replace("/", "-");
                }
        }