Add GTK_DISABLE_DEPRECATED back in DEPRECATION_FLAGS. Move the last

calls to gtk_entry_set_editable, gtk_menu_item_remove_submenu, and
gtk_tool_item_set_tooltip to the appropriate replacements in Gtk 2.12.

svn path=/trunk/; revision=7659

4 files changed, 10 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index 91b5cb647..a00159655 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,7 @@ GECKO_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
 if test "x$enable_maintainer_mode" = "xyes"; then
 	AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
 	enable_debug=yes
-# -DGTK_DISABLE_DEPRECATED 
-        DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
+	DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 	GECKO_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $GECKO_WARN_CXXFLAGS"
 fi
 
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 7b18fe2f1..3dc7e1bb6 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -40,6 +40,7 @@
 
 
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkstock.h>
@@ -548,7 +549,7 @@ ephy_bookmark_properties_constructor (GType type,
 	gtk_widget_show (table);
 
 	entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (entry), !lockdown);
+	gtk_editable_set_editable (GTK_EDITABLE (entry), !lockdown);
 	tmp = ephy_node_get_property_string (properties->priv->bookmark,
 					     EPHY_NODE_BMK_PROP_TITLE);
 	gtk_entry_set_text (GTK_ENTRY (entry), tmp);
@@ -565,7 +566,7 @@ ephy_bookmark_properties_constructor (GType type,
 	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (entry), !lockdown);
+	gtk_editable_set_editable (GTK_EDITABLE (entry), !lockdown);
 	tmp = ephy_node_get_property_string (properties->priv->bookmark,
 					     EPHY_NODE_BMK_PROP_LOCATION);
 	gtk_entry_set_text (GTK_ENTRY (entry), tmp);
@@ -581,7 +582,7 @@ ephy_bookmark_properties_constructor (GType type,
 	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	entry = ephy_topics_entry_new (priv->bookmarks, priv->bookmark);
-	gtk_entry_set_editable (GTK_ENTRY (entry), !lockdown);
+	gtk_editable_set_editable (GTK_EDITABLE (entry), !lockdown);
 	priv->entry = entry;
 	gtk_widget_show (entry);
 	label = gtk_label_new_with_mnemonic(_("T_opics:"));
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 315d42d34..ad5eb9eef 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -273,7 +273,7 @@ menu_destroy_cb (GtkWidget *menuitem,
 {
 	/* Save the submenu from similar destruction,
 	 * because it doesn't rightly belong to this menuitem. */
-	gtk_menu_item_remove_submenu (GTK_MENU_ITEM (menuitem));
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), NULL);
 }
 
 static void
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index 7ab4d9018..85b6e31a7 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -469,9 +469,8 @@ ephy_find_toolbar_init (EphyFindToolbar *toolbar)
 	arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
 	priv->prev = gtk_tool_button_new (arrow, _("Find Previous"));
 	gtk_tool_item_set_is_important (priv->prev, TRUE);
-	gtk_tool_item_set_tooltip (priv->prev, gtoolbar->tooltips,
-				   _("Find previous occurrence of the search string"),
-				   NULL);
+	gtk_tool_item_set_tooltip_text (priv->prev,
+					_("Find previous occurrence of the search string"));
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->prev, -1);
 	gtk_widget_show_all (GTK_WIDGET (priv->prev));
 
@@ -479,9 +478,8 @@ ephy_find_toolbar_init (EphyFindToolbar *toolbar)
 	arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
 	priv->next = gtk_tool_button_new (arrow, _("Find Next"));
 	gtk_tool_item_set_is_important (priv->next, TRUE);
-	gtk_tool_item_set_tooltip (priv->next, gtoolbar->tooltips,
-				   _("Find next occurrence of the search string"),
-				   NULL);
+	gtk_tool_item_set_tooltip_text (priv->next,
+					_("Find next occurrence of the search string"));
 	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), priv->next, -1);
 	gtk_widget_show_all (GTK_WIDGET (priv->next));