Merge lp:~elementary-apps/switchboard/fix-gtk-deprecations into lp:~elementary-pantheon/switchboard/switchboard

[Danielle Foré]

fix deprecated gtk widgets and methods. Requires gtk >= 3.6

This branch fixes the following deprecations:

Granite search entry -> Gtk.SearchEntry
Gtk.VBox -> Gtk.Box
Stock icons -> named icons

[lp:~elementary-apps/switchboard/fix-gtk-deprecations]

405. By Raphael Isemann on 2013-09-25

fixed codestyle

406. By Cody Garver on 2013-09-26

Require GTK >= 3.6

[David Gomes (davidgomes)]

pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 gtk+-3.0>=3.6 unity)

I think we need that too, no?

[Cody Garver (codygarver)]

no

[lp:~elementary-apps/switchboard/fix-gtk-deprecations]

407. By Raphael Isemann on 2013-09-26

another codestyle-fix

[Rico Tzschichholz (ricotz)]

> pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 gtk+-3.0>=3.6 unity)
>
> I think we need that too, no?

+1

Does adding the version to the vala-macro even work?

[lp:~elementary-apps/switchboard/fix-gtk-deprecations]

408. By Cody Garver on 2013-09-26

Properly require GTK >= 3.6

[Cody Garver (codygarver)]

Fixed GTK requirement

[David Gomes (davidgomes)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-06-16 23:14:21 +0000
+++ CMakeLists.txt	2013-09-26 11:17:15 +0000
@@ -61,7 +61,7 @@
 #
 
 find_package(PkgConfig)
-pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 unity)
+pkg_check_modules(DEPS REQUIRED granite gio-2.0 gee-1.0 gtk+-3.0>=3.6 unity)
 add_definitions(${DEPS_CFLAGS})
 link_directories(${DEPS_LIBRARY_DIRS})
 find_package(Vala REQUIRED)
@@ -78,6 +78,7 @@
     granite
     gee-1.0
     gio-2.0
+    gtk+-3.0
     unity
 CUSTOM_VAPIS
     vapi/config.vapi

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2013-06-15 00:38:19 +0000
+++ src/Switchboard.vala	2013-09-26 11:17:15 +0000
@@ -43,7 +43,7 @@
         // Chrome widgets
         Gtk.ProgressBar progress_bar;
         Gtk.Label progress_label;
-        Granite.Widgets.SearchBar search_box;
+        Gtk.SearchEntry search_box;
         Gtk.Toolbar toolbar;
         Gtk.ToolButton navigation_button;
         // Public so we can hide it after show_all()
@@ -244,7 +244,7 @@
                     // ensure the button is sensitive; it might be the first plug loaded
                     if (!@extern) {
                         navigation_button.set_sensitive(true);
-                        navigation_button.stock_id = Gtk.Stock.HOME;
+                        navigation_button.set_icon_name ("go-home");
                         current_plug["title"] = title;
                         current_plug["executable"] = executable;
                         switch_to_socket ();
@@ -253,7 +253,7 @@
                 } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
             } else {
                 navigation_button.set_sensitive(true);
-                navigation_button.stock_id = Gtk.Stock.HOME;
+                navigation_button.set_icon_name ("go-home");
             }
             
             if (@extern) {
@@ -268,13 +268,14 @@
 
         // Handles clicking the navigation button
         void handle_navigation_button_clicked () {
-            if (navigation_button.stock_id == Gtk.Stock.HOME) {
+            string icon_name = navigation_button.get_icon_name ();
+            if (icon_name == "go-home") {
                 switch_to_icons();
-                navigation_button.stock_id = Gtk.Stock.GO_BACK;
+                navigation_button.set_icon_name ("go-previous");
             }
             else {
                 load_plug (current_plug["title"], current_plug["executable"], current_plug["extern"] == "1");
-                navigation_button.stock_id = Gtk.Stock.HOME;
+                navigation_button.set_icon_name ("go-home");
             }
         }
 
@@ -482,7 +483,7 @@
             rspace.set_expand(true);
 
             // Progressbar
-            var progress_vbox = new Gtk.VBox (true, 0);
+            var progress_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
             progress_label = new Gtk.Label ("");
             progress_label.set_use_markup(true);
             progress_bar = new Gtk.ProgressBar ();
@@ -493,8 +494,8 @@
             progress_toolitem.set_expand(true);
 
             // Searchbar
-            search_box = new Granite.Widgets.SearchBar (_("Search Settings"));
-            search_box.primary_icon_stock = "gtk-find";
+            search_box = new Gtk.SearchEntry ();
+            search_box.set_placeholder_text (_("Search Settings"));
             search_box.activate.connect(() => search_box_activated());
             search_box.changed.connect(() => {
                 category_view.filter_plugs(search_box.get_text (), this);
@@ -515,7 +516,8 @@
             });
 
             // Nav button
-            navigation_button = new Gtk.ToolButton.from_stock(Gtk.Stock.GO_BACK);
+            navigation_button = new Gtk.ToolButton (null, null);
+            navigation_button.set_icon_name ("go-previous");
             navigation_button.clicked.connect (handle_navigation_button_clicked);
             navigation_button.set_sensitive(false);