[gnome-utils] Compile logview against Gtk3

[Paolo Borelli <pborelli src gnome org>]

commit 27d4974b613ae7c99feb7c0c10e2e0ccf5ddb4f4
Author: Paolo Borelli <pborelli gnome org>
Date:   Wed Oct 20 19:39:30 2010 +0200

    Compile logview against Gtk3

 logview/Makefile.am       |    4 ++--
 logview/logview-findbar.c |    2 +-
 logview/logview-window.c  |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/logview/Makefile.am b/logview/Makefile.am
index dc9720e..956f84e 100644
--- a/logview/Makefile.am
+++ b/logview/Makefile.am
@@ -44,7 +44,7 @@ gnome_system_log_CFLAGS =	\
 	$(GLIB_CFLAGS)		\
 	$(GTHREAD_CFLAGS)	\
 	$(GIO_CFLAGS)		\
-	$(GTK2_CFLAGS)		\
+	$(GTK_CFLAGS)		\
 	$(GCONF_CFLAGS)		\
 	$(NULL)
 
@@ -52,7 +52,7 @@ gnome_system_log_LDADD =	\
 	$(GLIB_LIBS)		\
 	$(GIO_LIBS)		\
 	$(GTHREAD_LIBS)		\
-	$(GTK2_LIBS)		\
+	$(GTK_LIBS)		\
 	$(GCONF_LIBS)		\
 	$(Z_LIBS)		\
 	-lm
diff --git a/logview/logview-findbar.c b/logview/logview-findbar.c
index bdbda89..3deb829 100644
--- a/logview/logview-findbar.c
+++ b/logview/logview-findbar.c
@@ -120,7 +120,7 @@ entry_key_press_event_cb (GtkWidget *entry,
 {
   LogviewFindbar *findbar = user_data;
 
-  if (event->keyval == GDK_Escape) {
+  if (event->keyval == GDK_KEY_Escape) {
     g_signal_emit (findbar, signals[CLOSE], 0);
     return TRUE;
   }
diff --git a/logview/logview-window.c b/logview/logview-window.c
index 3fe8d04..00f5bf0 100644
--- a/logview/logview-window.c
+++ b/logview/logview-window.c
@@ -1116,9 +1116,9 @@ static const struct {
   GdkModifierType modifier;
   const gchar *action;
 } extra_keybindings [] = {
-  { GDK_KP_Add,      GDK_CONTROL_MASK, "ViewZoomIn" },
-  { GDK_KP_Subtract, GDK_CONTROL_MASK, "ViewZoomOut" },
-  { GDK_KP_0,        GDK_CONTROL_MASK, "ViewZoom100" }
+  { GDK_KEY_KP_Add,      GDK_CONTROL_MASK, "ViewZoomIn" },
+  { GDK_KEY_KP_Subtract, GDK_CONTROL_MASK, "ViewZoomOut" },
+  { GDK_KEY_KP_0,        GDK_CONTROL_MASK, "ViewZoom100" }
 };
 
 static gboolean
@@ -1375,7 +1375,7 @@ logview_window_init (LogviewWindow *logview)
   /* version selector */
   priv->version_bar = gtk_hbox_new (FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (priv->version_bar), 3);
-  priv->version_selector = gtk_combo_box_new_text ();
+  priv->version_selector = gtk_combo_box_text_new ();
   g_signal_connect (priv->version_selector, "changed",
                     G_CALLBACK (logview_version_selector_changed), logview);
   w = gtk_label_new (_("Version: "));