From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj460-0007eg-Qu for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xj45p-0005p4-LB for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:33:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj45p-0005oq-Ef for qemu-devel@nongnu.org; Tue, 28 Oct 2014 06:33:37 -0400 From: Gerd Hoffmann Date: Tue, 28 Oct 2014 11:33:31 +0100 Message-Id: <1414492411-14924-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1414492411-14924-1-git-send-email-kraxel@redhat.com> References: <1414492411-14924-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/2] gtk: avoid gd_widget_reparent with gtk 3.14+ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori gtk_widget_reparent is depricated in gtk 3.14, stop using it. Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 9727dec..a5f6869 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -435,6 +435,15 @@ static void gtk_release_modifiers(GtkDisplayState *s) } } +static void gd_widget_reparent(GtkWidget *from, GtkWidget *to, + GtkWidget *widget) +{ + g_object_ref(G_OBJECT(widget)); + gtk_container_remove(GTK_CONTAINER(from), widget); + gtk_container_add(GTK_CONTAINER(to), widget); + g_object_unref(G_OBJECT(widget)); +} + /** DisplayState Callbacks **/ static void gd_update(DisplayChangeListener *dcl, @@ -1031,7 +1040,7 @@ static gboolean gd_tab_window_close(GtkWidget *widget, GdkEvent *event, GtkDisplayState *s = vc->s; gtk_widget_set_sensitive(vc->menu_item, true); - gtk_widget_reparent(vc->tab_item, s->notebook); + gd_widget_reparent(vc->window, s->notebook, vc->tab_item); gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(s->notebook), vc->tab_item, vc->label); gtk_widget_destroy(vc->window); @@ -1065,7 +1074,7 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque) if (!vc->window) { gtk_widget_set_sensitive(vc->menu_item, false); vc->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_widget_reparent(vc->tab_item, vc->window); + gd_widget_reparent(s->notebook, vc->window, vc->tab_item); g_signal_connect(vc->window, "delete-event", G_CALLBACK(gd_tab_window_close), vc); -- 1.8.3.1