From e8c24d29f7e029ccb1f271db4298785f8daa6436 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sat, 10 Nov 2007 22:06:43 +0000 Subject: 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 --- src/bookmarks/ephy-bookmark-properties.c | 7 ++++--- src/bookmarks/ephy-topic-action.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/bookmarks') 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 +#include #include #include #include @@ -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 -- cgit v1.2.3