diff --git a/plugins/gtk+/glade-model-data.c b/plugins/gtk+/glade-model-data.c
index f17ff2e..d90ce92 100644
--- a/plugins/gtk+/glade-model-data.c
+++ b/plugins/gtk+/glade-model-data.c
@@ -1239,10 +1239,10 @@ glade_eprop_model_data_create_input (GladeEditorProperty *eprop)
 	gtk_misc_set_padding (GTK_MISC (label), 2, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), label,  FALSE, FALSE, 0);
 
-	combo = gtk_combo_box_new_text ();
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Off"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Horizontal"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Vertical"));
+	combo = gtk_combo_box_text_new ();
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Off"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Horizontal"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Vertical"));
 
 
 	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), eprop_data->sequence);
diff --git a/src/glade-window.c b/src/glade-window.c
index f88c55e..c59af8d 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -3049,29 +3049,6 @@ glade_window_config_load (GladeWindow *window)
 	load_paned_position (config, window->priv->right_pane, "right_pane", 220);
 }
 
-static gboolean
-glade_window_state_event (GtkWidget           *widget,
-			  GdkEventWindowState *event)
-{
-	GladeWindow *window = GLADE_WINDOW (widget);
-
-	/* Incase GtkWindow decides to do something */
-	if (GTK_WIDGET_CLASS (glade_window_parent_class)->window_state_event)
-		GTK_WIDGET_CLASS (glade_window_parent_class)->window_state_event (widget, event);
-
-	if (event->changed_mask &
-	    (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN))
-	{
-		gboolean show;
-
-		show = !(event->new_window_state &
-			(GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN));
-
-		gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (window->priv->statusbar), show);
-	}
-
-	return FALSE;
-}
 
 static void
 show_dock_first_time (GladeWindow    *window,
@@ -3364,7 +3341,6 @@ glade_window_class_init (GladeWindowClass *klass)
 	object_class->finalize = glade_window_finalize;
 
 	widget_class->configure_event    = glade_window_configure_event;
-	widget_class->window_state_event = glade_window_state_event;
 
 	g_type_class_add_private (klass, sizeof (GladeWindowPrivate));
 }
