diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index f5d9555..f6d9245 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); 
@@ -2981,7 +2981,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);
 
@@ -3165,7 +3165,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);
 
@@ -3321,7 +3321,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
 	{
@@ -3339,7 +3339,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);
@@ -3506,7 +3506,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 690c8c1..3d06cae 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 38d88c2..7f19490 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 0e807e1..adffb1b 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -6691,7 +6691,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
diff --git a/src/glade-window.c b/src/glade-window.c
index 3b8c2d5..01307eb 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -505,32 +505,6 @@ create_recent_chooser_menu (GladeWindow *window, GtkRecentManager *manager)
 }
 
 static void
-window_screen_changed_cb (GtkWidget *widget,
-			  GdkScreen *old_screen,
-			  GladeWindow *window)
-{
-	GtkWidget *menu_item;
-	GdkScreen *screen;
-
-	screen = gtk_widget_get_screen (widget);	
-
-	window->priv->recent_manager = gtk_recent_manager_get_for_screen (screen);
-
-	gtk_menu_detach (GTK_MENU (window->priv->recent_menu));
-	g_object_unref (G_OBJECT (window->priv->recent_menu));
-	
-	window->priv->recent_menu = create_recent_chooser_menu (window, window->priv->recent_manager);
-
-	g_signal_connect (window->priv->recent_menu,
-			  "item-activated",
-			  G_CALLBACK (recent_chooser_item_activated_cb),
-			  window);
-			  
-	menu_item = gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/OpenRecent");
-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), window->priv->recent_menu);
-}
-
-static void
 activate_action (GtkToolButton *toolbutton,
 				      GladeWidgetAction *action) 
 {
@@ -2386,10 +2360,8 @@ create_selector_tool_button (GtkToolbar *toolbar)
 	gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (button), image);
 	gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Select"));
 	
-	gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (button),
-				   toolbar->tooltips,
-				   _("Select widgets in the workspace"),
-				   NULL);
+	gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button),
+				        _("Select widgets in the workspace"));
 	
 	gtk_widget_show (GTK_WIDGET (button));
 	gtk_widget_show (image);
@@ -2414,10 +2386,8 @@ create_drag_resize_tool_button (GtkToolbar *toolbar)
 	gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (button), image);
 	gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Drag Resize"));
 	
-	gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (button),
-				   toolbar->tooltips,
-				   _("Drag and resize widgets in the workspace"),
-				   NULL);
+	gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button),
+				        _("Drag and resize widgets in the workspace"));
 	
 	gtk_widget_show (GTK_WIDGET (button));
 	gtk_widget_show (image);
@@ -3073,7 +3043,7 @@ glade_window_init (GladeWindow *window)
 	gtk_widget_show (vbox);
 	
 	/* recent files */	
-	priv->recent_manager = gtk_recent_manager_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
+	priv->recent_manager = gtk_recent_manager_get_default ();
 
 	priv->recent_menu = create_recent_chooser_menu (window, priv->recent_manager);
 
@@ -3140,10 +3110,6 @@ glade_window_init (GladeWindow *window)
 			  window);
 			  
 	/* GtkWindow events */
-	g_signal_connect (window, "screen-changed",
-			  G_CALLBACK (window_screen_changed_cb),
-			  window);
-			  
 	g_signal_connect (window, "window-state-event",
 			  G_CALLBACK (window_state_event_cb),
 			  window);
