[baobab/wip/gtkmaster: 1/2] Port to GtkStack

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 26d570f591c30504021ee8dd5540dd486c6c6ff4
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jun 2 11:34:21 2013 +0200

    Port to GtkStack

 configure.ac              |    3 +--
 src/baobab-main-window.ui |    4 ++--
 src/baobab-window.vala    |   12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8ac2fc3..f8db6ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 YELP_HELP_INIT
 
 PKG_CHECK_MODULES(BAOBAB, [
-    gtk+-3.0 >= 3.8.0
+    gtk+-3.0 >= 3.9.0
     gio-2.0 >= 2.30.0
 ])
 
@@ -53,7 +53,6 @@ LT_INIT([disable-static])
 LIBGD_INIT([
     static
     header-bar
-    stack
     vapi
 ])
 
diff --git a/src/baobab-main-window.ui b/src/baobab-main-window.ui
index 00e17b2..9db64df 100644
--- a/src/baobab-main-window.ui
+++ b/src/baobab-main-window.ui
@@ -130,7 +130,7 @@
       </object>
     </child>
     <child>
-      <object class="GdStack" id="main-stack">
+      <object class="GtkStack" id="main-stack">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
@@ -278,7 +278,7 @@
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <child>
-                  <object class="GdStack" id="chart-stack">
+                  <object class="GtkStack" id="chart-stack">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <child>
diff --git a/src/baobab-window.vala b/src/baobab-window.vala
index d403288..406c866 100644
--- a/src/baobab-window.vala
+++ b/src/baobab-window.vala
@@ -26,7 +26,7 @@ namespace Baobab {
         Settings ui_settings;
         Gd.HeaderBar header_bar;
         Gd.HeaderBar result_header_bar;
-        Gd.Stack main_stack;
+        Gtk.Stack main_stack;
         Gtk.Widget home_page;
         Gtk.Widget result_page;
         Gtk.InfoBar infobar;
@@ -35,7 +35,7 @@ namespace Baobab {
         Gtk.ScrolledWindow location_scroll;
         LocationList location_list;
         Gtk.TreeView treeview;
-        Gd.Stack chart_stack;
+        Gtk.Stack chart_stack;
         Chart rings_chart;
         Chart treemap_chart;
         Gtk.Spinner spinner;
@@ -103,7 +103,7 @@ namespace Baobab {
             }
 
             // Cache some objects from the builder.
-            main_stack = builder.get_object ("main-stack") as Gd.Stack;
+            main_stack = builder.get_object ("main-stack") as Gtk.Stack;
             home_page = builder.get_object ("home-page") as Gtk.Widget;
             result_page = builder.get_object ("result-page") as Gtk.Widget;
             header_bar = builder.get_object ("header-bar") as Gd.HeaderBar;
@@ -114,7 +114,7 @@ namespace Baobab {
             location_scroll = builder.get_object ("location-scrolled-window") as Gtk.ScrolledWindow;
             location_list = builder.get_object ("location-list") as LocationList;
             treeview = builder.get_object ("treeview") as Gtk.TreeView;
-            chart_stack = builder.get_object ("chart-stack") as Gd.Stack;
+            chart_stack = builder.get_object ("chart-stack") as Gtk.Stack;
             rings_chart = builder.get_object ("rings-chart") as Chart;
             treemap_chart = builder.get_object ("treemap-chart") as Chart;
             spinner = builder.get_object ("spinner") as Gtk.Spinner;
@@ -502,12 +502,12 @@ namespace Baobab {
             if (child == home_page) {
                 var action = lookup_action ("reload") as SimpleAction;
                 action.set_enabled (false);
-                main_stack.transition_type = Gd.StackTransitionType.SLIDE_RIGHT;
+                main_stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT;
             } else {
                 var action = lookup_action ("reload") as SimpleAction;
                 action.set_enabled (true);
                 result_header_bar.set_title (active_location.name);
-                main_stack.transition_type = Gd.StackTransitionType.SLIDE_LEFT;
+                main_stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT;
             }
 
             main_stack.visible_child = child;