From 30078bc8c9dcd0376091471ed484f05acc554b21 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Sat, 15 Oct 2011 16:03:09 +0200
Subject: [PATCH] gtk-tools: port to gtk3

---
 Makefile.am                       |    4 ++--
 configure.ac                      |    2 +-
 src/gnome-ask-password-agent.vala |    1 -
 src/systemadm.vala                |    4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dabe32a..a652ea5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1438,7 +1438,7 @@ systemadm_CFLAGS = \
 
 systemadm_VALAFLAGS = \
 	--pkg=posix \
-	--pkg=gtk+-2.0 \
+	--pkg=gtk+-3.0 \
 	-g
 
 systemadm_LDADD = \
@@ -1458,7 +1458,7 @@ systemd_gnome_ask_password_agent_CFLAGS = \
 
 systemd_gnome_ask_password_agent_VALAFLAGS = \
 	--pkg=posix \
-	--pkg=gtk+-2.0 \
+	--pkg=gtk+-3.0 \
 	--pkg=linux \
 	--pkg=gio-unix-2.0 \
 	--pkg=libnotify
diff --git a/configure.ac b/configure.ac
index 0ec6f69..01e7571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,7 +327,7 @@ AM_CONDITIONAL(ENABLE_LOCALED, [test "$have_localed" = "yes"])
 have_gtk=no
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
 if test "x$enable_gtk" != "xno"; then
-        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 ],
+        PKG_CHECK_MODULES(GTK, [ gtk+-3.0 glib-2.0 > 2.26 gio-unix-2.0 ],
                 [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
         AC_SUBST(GTK_CFLAGS)
         AC_SUBST(GTK_LIBS)
diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
index c31c07e..a6b0407 100644
--- a/src/gnome-ask-password-agent.vala
+++ b/src/gnome-ask-password-agent.vala
@@ -32,7 +32,6 @@ public class PasswordDialog : Dialog {
 
         public PasswordDialog(string message, string icon) {
                 set_title("System Password");
-                set_has_separator(false);
                 set_border_width(8);
                 set_default_response(ResponseType.OK);
                 set_icon_name(icon);
diff --git a/src/systemadm.vala b/src/systemadm.vala
index d45ec64..4c3b750 100644
--- a/src/systemadm.vala
+++ b/src/systemadm.vala
@@ -98,7 +98,7 @@ public class MainWindow : Window {
         private RightLabel job_state_label;
         private RightLabel job_type_label;
 
-        private ComboBox unit_type_combo_box;
+        private ComboBoxText unit_type_combo_box;
 
         public MainWindow() throws IOError {
                 title = user ? "systemd User Service Manager" : "systemd System Manager";
@@ -118,7 +118,7 @@ public class MainWindow : Window {
                 notebook.append_page(job_vbox, new Label("Jobs"));
                 job_vbox.set_border_width(12);
 
-                unit_type_combo_box = new ComboBox.text();
+                unit_type_combo_box = new ComboBoxText();
                 Box type_hbox = new HBox(false, 6);
                 type_hbox.pack_start(unit_type_combo_box, false, false, 0);
                 unit_vbox.pack_start(type_hbox, false, false, 0);
-- 
1.7.7.213.g8b0e1.dirty