Fix usage of deprecated GTK+ symbols (bug 572756)

* src/glade-window.c, gladeui/glade-editor-property.c,
plugins/gtk+/glade-accels.c, plugins/gtk+/glade-cell-renderer-button.c,
plugins/gtk+/glade-gtk.c:
Replace use of deprecated GTK+ functions (Sam Thursfield - bug 572756).

5 files changed, 17 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 33fd9d02..eb0f1f3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
 	gladeui/glade-utils.c, plugins/gtk+/glade-gtk.c: Replaced symbols with new glib 
 	variants (Sam Thursfield - bug 572756)
 
+	* src/glade-window.c, gladeui/glade-editor-property.c,
+	plugins/gtk+/glade-accels.c, plugins/gtk+/glade-cell-renderer-button.c, 
+	plugins/gtk+/glade-gtk.c:
+	Replace use of deprecated GTK+ functions (Sam Thursfield - bug 572756).
+
 2009-06-18  James Liggett <jrliggett@cox.net>
 	
 	* gladeui/glade-widget.c: Make sure that the project view is not 
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index f49ab416..98901918 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -1152,7 +1152,7 @@ glade_eprop_flags_create_input (GladeEditorProperty *eprop)
 	widget = glade_eprop_flags_create_treeview (eprop);
 
 	eprop_flags->entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (eprop_flags->entry), FALSE);
+	gtk_editable_set_editable (GTK_EDITABLE (eprop_flags->entry), FALSE);
 
 	gtk_box_pack_start (GTK_BOX (vbox), eprop_flags->entry, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
@@ -1266,7 +1266,7 @@ glade_eprop_color_create_input (GladeEditorProperty *eprop)
 	hbox = gtk_hbox_new (FALSE, 0);
 
 	eprop_color->entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (eprop_color->entry), FALSE);
+	gtk_editable_set_editable (GTK_EDITABLE (eprop_color->entry), FALSE);
 	gtk_widget_show (eprop_color->entry);
 	gtk_box_pack_start (GTK_BOX (hbox), eprop_color->entry, TRUE, TRUE, 0);
 
@@ -2104,9 +2104,9 @@ glade_eprop_text_create_input (GladeEditorProperty *eprop)
 		/* Dont allow custom items where an actual GTK+ stock item is expected
 		 * (i.e. real items come with labels) */
 		if (klass->stock)	
-			gtk_entry_set_editable (GTK_ENTRY (GTK_BIN (combo)->child), FALSE);
+			gtk_editable_set_editable (GTK_EDITABLE (GTK_BIN (combo)->child), FALSE);
 		else
-			gtk_entry_set_editable (GTK_ENTRY (GTK_BIN (combo)->child), TRUE);
+			gtk_editable_set_editable (GTK_EDITABLE (GTK_BIN (combo)->child), TRUE);
 		
 		gtk_widget_show (combo);
 		gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0); 
@@ -2983,7 +2983,7 @@ glade_eprop_object_create_input (GladeEditorProperty *eprop)
 
 	hbox                = gtk_hbox_new (FALSE, 0);
 	eprop_object->entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (eprop_object->entry), FALSE);
+	gtk_editable_set_editable (GTK_EDITABLE (eprop_object->entry), FALSE);
 	gtk_widget_show (eprop_object->entry);
 	gtk_box_pack_start (GTK_BOX (hbox), eprop_object->entry, TRUE, TRUE, 0);
 
@@ -3167,7 +3167,7 @@ glade_eprop_objects_create_input (GladeEditorProperty *eprop)
 
 	hbox                = gtk_hbox_new (FALSE, 0);
 	eprop_objects->entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (eprop_objects->entry), FALSE);
+	gtk_editable_set_editable (GTK_EDITABLE (eprop_objects->entry), FALSE);
 	gtk_widget_show (eprop_objects->entry);
 	gtk_box_pack_start (GTK_BOX (hbox), eprop_objects->entry, TRUE, TRUE, 0);
 
@@ -3323,7 +3323,7 @@ glade_eprop_adjustment_load (GladeEditorProperty *eprop, GladeProperty *property
 		g_signal_handler_unblock (eprop_adj->page_size, eprop_adj->ids.page_size);
 
 		gtk_widget_show (eprop_adj->libglade);
-		gtk_notebook_set_page (GTK_NOTEBOOK (eprop_adj->notebook), 0);
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (eprop_adj->notebook), 0);
 	}
 	else
 	{
@@ -3341,7 +3341,7 @@ glade_eprop_adjustment_load (GladeEditorProperty *eprop, GladeProperty *property
 		else
 			gtk_entry_set_text (GTK_ENTRY (eprop_adj->entry), "");
 
-		gtk_notebook_set_page (GTK_NOTEBOOK (eprop_adj->notebook), 1);
+		gtk_notebook_set_current_page (GTK_NOTEBOOK (eprop_adj->notebook), 1);
 	}
 
 	gtk_widget_queue_resize (eprop_adj->notebook);
@@ -3508,7 +3508,7 @@ glade_eprop_adjustment_create_input_builder (GladeEditorProperty *eprop)
 
 	hbox             = gtk_hbox_new (FALSE, 0);
 	eprop_adj->entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (eprop_adj->entry), FALSE);
+	gtk_editable_set_editable (GTK_EDITABLE (eprop_adj->entry), FALSE);
 	gtk_widget_show (eprop_adj->entry);
 	gtk_box_pack_start (GTK_BOX (hbox), eprop_adj->entry, TRUE, TRUE, 0);
 
diff --git a/plugins/gtk+/glade-accels.c b/plugins/gtk+/glade-accels.c
index 690c8c11..3d06cae2 100644
--- a/plugins/gtk+/glade-accels.c
+++ b/plugins/gtk+/glade-accels.c
@@ -586,7 +586,7 @@ glade_eprop_accel_create_input (GladeEditorProperty *eprop)
 
 	hbox               = gtk_hbox_new (FALSE, 0);
 	eprop_accel->entry = gtk_entry_new ();
-	gtk_entry_set_editable (GTK_ENTRY (eprop_accel->entry), FALSE);
+	gtk_editable_set_editable (GTK_EDITABLE (eprop_accel->entry), FALSE);
 	gtk_widget_show (eprop_accel->entry);
 	gtk_box_pack_start (GTK_BOX (hbox), eprop_accel->entry, TRUE, TRUE, 0);
 
diff --git a/plugins/gtk+/glade-cell-renderer-button.c b/plugins/gtk+/glade-cell-renderer-button.c
index 38d88c21..7f19490f 100644
--- a/plugins/gtk+/glade-cell-renderer-button.c
+++ b/plugins/gtk+/glade-cell-renderer-button.c
@@ -286,7 +286,7 @@ glade_cell_renderer_button_start_editing (GtkCellRenderer     *cell,
 
 	priv->button = text_button = (GladeTextButton *)glade_text_button_new ();
 	gtk_entry_set_text (GTK_ENTRY (text_button->entry), cell_text->text ? cell_text->text : "");
-	gtk_entry_set_editable (GTK_ENTRY (text_button->entry), priv->entry_editable);
+	gtk_editable_set_editable (GTK_EDITABLE (text_button->entry), priv->entry_editable);
 
 	g_object_set (text_button->entry,
 		      "has-frame", FALSE,
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index bc25b0eb..66194898 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -6725,7 +6725,7 @@ glade_gtk_menu_item_remove_child (GladeWidgetAdaptor *adaptor,
 	g_return_if_fail (GTK_IS_MENU_ITEM (object));
 	g_return_if_fail (GTK_IS_MENU (child));
 	
-	gtk_menu_item_remove_submenu (GTK_MENU_ITEM (object));
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (object), NULL);
 }
 
 static void