[gnome-maps] MainWindow: Don't use libgd widgets

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 9a41b7d0de25253c7795c62e5cc2258d8dbd2d06
Author: Yosef Or Boczko <yoseforb gmail com>
Date:   Wed Aug 7 17:03:41 2013 +0300

    MainWindow: Don't use libgd widgets
    
    * Gd*Button -> GtkButton
    * GdTaggedEntry -> GtkSearchEntry
    * GdHeaderBar -> GtkHeaderBar
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705594

 configure.ac       |    2 --
 src/main-window.ui |   48 +++++++++++++++++++-----------------------------
 src/mainWindow.js  |    1 -
 3 files changed, 19 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aa1c906..ad2db6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,6 @@ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
 LIBGD_INIT([
-  header-bar
-  tagged-entry
   gir
 ])
 
diff --git a/src/main-window.ui b/src/main-window.ui
index 1d9e4ec..2199800 100644
--- a/src/main-window.ui
+++ b/src/main-window.ui
@@ -21,62 +21,52 @@
     <property name="window_position">center</property>
     <property name="title" translatable="yes">Maps</property>
     <child type="titlebar">
-      <object class="GdHeaderBar" id="header-bar">
+      <object class="GtkHeaderBar" id="header-bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="show_close_button">True</property>
         <child type="title">
-          <object class="GdTaggedEntry" id="search-entry">
+          <object class="GtkSearchEntry" id="search-entry">
             <property name="visible">True</property>
             <property name="width_request">500</property>
           </object>
         </child>
         <child>
-          <object class="GdHeaderSimpleButton" id="goto-user-location-button">
+          <object class="GtkButton" id="goto-user-location-button">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="symbolic-icon-name">find-location-symbolic</property>
+            <property name="valign">center</property>
             <property name="action_name">win.goto-user-location</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="track-user-button-image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">find-location-symbolic</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="pack_type">start</property>
           </packing>
         </child>
         <child>
-          <object class="GdHeaderMenuButton" id="layer-menu-button">
+          <object class="GtkMenuButton" id="layer-menu-button">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="symbolic-icon-name">emblem-system-symbolic</property>
+            <property name="valign">center</property>
             <property name="menu-model">map-type-menu</property>
             <property name="action_name">win.map-type-menu</property>
-          </object>
-          <packing>
-            <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>
-            <property name="action_name">win.close</property>
             <style>
               <class name="image-button"/>
             </style>
             <child>
-              <object class="GtkImage" id="close-image">
+              <object class="GtkImage" id="layer-menu-button-image">
                 <property name="visible">True</property>
                 <property name="icon_size">1</property>
-                <property name="icon_name">window-close-symbolic</property>
+                <property name="icon_name">emblem-system-symbolic</property>
               </object>
             </child>
           </object>
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 213cde4..4990cda 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -24,7 +24,6 @@
 const Gdk = imports.gi.Gdk;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
-const Gd = imports.gi.Gd;
 const Champlain = imports.gi.Champlain;
 
 const Lang = imports.lang;