[gnome-utils] Compile gnome-dictionary against Gtk3

[Paolo Borelli <pborelli src gnome org>]

commit 37b9785815cdf984dddb3808fc56bec3a5ee9116
Author: Paolo Borelli <pborelli gnome org>
Date:   Wed Oct 20 19:58:59 2010 +0200

    Compile gnome-dictionary against Gtk3

 gnome-dictionary/libgdict/Makefile.am      |    4 ++--
 gnome-dictionary/libgdict/gdict-defbox.c   |   24 ++++++++++++------------
 gnome-dictionary/src/Makefile.am           |    6 +++---
 gnome-dictionary/src/gdict-pref-dialog.c   |    3 +--
 gnome-dictionary/src/gdict-sidebar.c       |    8 ++++----
 gnome-dictionary/src/gdict-source-dialog.c |    2 --
 gnome-dictionary/src/gdict-window.c        |    1 -
 7 files changed, 22 insertions(+), 26 deletions(-)
---
diff --git a/gnome-dictionary/libgdict/Makefile.am b/gnome-dictionary/libgdict/Makefile.am
index a1b8627..100cf46 100644
--- a/gnome-dictionary/libgdict/Makefile.am
+++ b/gnome-dictionary/libgdict/Makefile.am
@@ -60,13 +60,13 @@ libgdict_1_0_la_SOURCES = \
 
 libgdict_1_0_la_CPPFLAGS = \
 	$(GLIB_CFLAGS)		\
-	$(GTK2_CFLAGS)		\
+	$(GTK_CFLAGS)		\
 	$(GDICT_DEBUG_CFLAGS)	\
 	$(MAINTAINER_CFLAGS)
 
 libgdict_1_0_la_LIBADD = \
 	$(GLIB_LIBS)		\
-	$(GTK2_LIBS)
+	$(GTK_LIBS)
 
 libgdict_1_0_la_LDFLAGS  = \
 	-version-info $(LIBGDICT_LT_VERSION)	\
diff --git a/gnome-dictionary/libgdict/gdict-defbox.c b/gnome-dictionary/libgdict/gdict-defbox.c
index 2dee3cc..80415f4 100644
--- a/gnome-dictionary/libgdict/gdict-defbox.c
+++ b/gnome-dictionary/libgdict/gdict-defbox.c
@@ -1888,21 +1888,21 @@ gdict_defbox_class_init (GdictDefboxClass *klass)
   
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_f, GDK_CONTROL_MASK,
-  			        "show-find",
-  			        0);
+			        GDK_KEY_f, GDK_CONTROL_MASK,
+			        "show-find",
+			        0);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_g, GDK_CONTROL_MASK,
-  			        "find-next",
-  			        0);
+			        GDK_KEY_g, GDK_CONTROL_MASK,
+			        "find-next",
+			        0);
   gtk_binding_entry_add_signal (binding_set,
-  				GDK_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
-  				"find-previous",
-  				0);
+				GDK_KEY_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+				"find-previous",
+				0);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_Escape, 0,
-  			        "hide-find",
-  			        0);
+			        GDK_KEY_Escape, 0,
+			        "hide-find",
+			        0);
 
   g_type_class_add_private (klass, sizeof (GdictDefboxPrivate));
 }
diff --git a/gnome-dictionary/src/Makefile.am b/gnome-dictionary/src/Makefile.am
index cf0312e..04cafbe 100644
--- a/gnome-dictionary/src/Makefile.am
+++ b/gnome-dictionary/src/Makefile.am
@@ -41,7 +41,7 @@ gnome_dictionary_CFLAGS = \
 	-I$(top_srcdir)/gnome-dictionary	\
 	$(GLIB_CFLAGS)				\
 	$(GIO_CFLAGS)				\
-	$(GTK2_CFLAGS)				\
+	$(GTK_CFLAGS)				\
 	$(GCONF_CFLAGS)				\
 	$(NULL)
 
@@ -50,7 +50,7 @@ gnome_dictionary_LDADD = \
 	$(top_builddir)/gnome-dictionary/libgdict/libgdict-1.0.la \
 	$(GLIB_LIBS)		\
 	$(GIO_LIBS)		\
-	$(GTK2_LIBS)		\
+	$(GTK_LIBS)		\
 	$(GCONF_LIBS)		\
 	$(NULL)
 
@@ -80,7 +80,7 @@ gnome_dictionary_applet_CFLAGS = \
 	-I$(top_srcdir)/gnome-dictionary	\
 	$(GLIB_CFLAGS)				\
 	$(GIO_CFLAG)				\
-	$(GTK2_CFLAGS)				\
+	$(GTK_CFLAGS)				\
 	$(GCONF_CFLAG)				\
 	$(APPLET_CFLAGS) \
 	$(NULL)
diff --git a/gnome-dictionary/src/gdict-pref-dialog.c b/gnome-dictionary/src/gdict-pref-dialog.c
index e6a165e..75cd5d8 100644
--- a/gnome-dictionary/src/gdict-pref-dialog.c
+++ b/gnome-dictionary/src/gdict-pref-dialog.c
@@ -615,8 +615,7 @@ gdict_pref_dialog_init (GdictPrefDialog *dialog)
     
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
   gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
-  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-  
+
   /* add buttons */
   gtk_dialog_add_button (GTK_DIALOG (dialog),
   			 "gtk-help",
diff --git a/gnome-dictionary/src/gdict-sidebar.c b/gnome-dictionary/src/gdict-sidebar.c
index 76b65d2..52f66f1 100644
--- a/gnome-dictionary/src/gdict-sidebar.c
+++ b/gnome-dictionary/src/gdict-sidebar.c
@@ -200,10 +200,10 @@ gdict_sidebar_select_key_press_cb (GtkWidget   *widget,
 {
   GdictSidebar *sidebar = GDICT_SIDEBAR (user_data);
 
-  if (event->keyval == GDK_space ||
-      event->keyval == GDK_KP_Space ||
-      event->keyval == GDK_Return ||
-      event->keyval == GDK_KP_Enter)
+  if (event->keyval == GDK_KEY_space ||
+      event->keyval == GDK_KEY_KP_Space ||
+      event->keyval == GDK_KEY_Return ||
+      event->keyval == GDK_KEY_KP_Enter)
     {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
       gtk_menu_popup (GTK_MENU (sidebar->priv->menu),
diff --git a/gnome-dictionary/src/gdict-source-dialog.c b/gnome-dictionary/src/gdict-source-dialog.c
index 794bf5a..7aae710 100644
--- a/gnome-dictionary/src/gdict-source-dialog.c
+++ b/gnome-dictionary/src/gdict-source-dialog.c
@@ -718,8 +718,6 @@ gdict_source_dialog_init (GdictSourceDialog *dialog)
 {
   gtk_widget_set_size_request (GTK_WIDGET (dialog), 400, 300);
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-  
-  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 
   dialog->transport = GDICT_SOURCE_TRANSPORT_INVALID;
 
diff --git a/gnome-dictionary/src/gdict-window.c b/gnome-dictionary/src/gdict-window.c
index 8febb9c..ce3a1f9 100644
--- a/gnome-dictionary/src/gdict-window.c
+++ b/gnome-dictionary/src/gdict-window.c
@@ -1879,7 +1879,6 @@ gdict_window_constructor (GType                  type,
   gtk_widget_show (window->defbox_frame);
 
   window->status = gtk_statusbar_new ();
-  gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->status), TRUE);
   gtk_box_pack_end (GTK_BOX (window->main_box), window->status, FALSE, FALSE, 0);
   statusbar_visible = gconf_client_get_bool (window->gconf_client,
 		  			     GDICT_GCONF_STATUSBAR_VISIBLE_KEY,