From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhLDd-0005V5-4E for qemu-devel@nongnu.org; Thu, 23 Oct 2014 12:26:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhLDX-0004NI-MQ for qemu-devel@nongnu.org; Thu, 23 Oct 2014 12:26:33 -0400 Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]:56616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhLDX-0004Mo-D4 for qemu-devel@nongnu.org; Thu, 23 Oct 2014 12:26:27 -0400 Received: by mail-lb0-f174.google.com with SMTP id p9so1142349lbv.19 for ; Thu, 23 Oct 2014 09:26:26 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <54492C2D.5000407@redhat.com> Date: Thu, 23 Oct 2014 18:26:21 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1414077919-29271-1-git-send-email-kraxel@redhat.com> <1414077919-29271-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1414077919-29271-2-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] gtk: avoid gd_widget_reparent with gtk 3.14+ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann , qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Anthony Liguori On 10/23/2014 05:25 PM, Gerd Hoffmann wrote: > gtk_widget_reparent is depricated in gtk 3.14. Unfortunaly the > gtk_widget_{ref,unref} functions needed to to the same manually > without having the widget destroyed while it has no parent are > pretty new. So there is no way around #ifdef'ing the code, > otherwise it breaks with older gtk versions, I cannot find gtk_widget_ref/unref in https://developer.gnome.org/gtk3/stable/GtkWidget.html. How do they differ from g_object_ref(G_OBJECT(widget))? Paolo > Signed-off-by: Gerd Hoffmann > --- > ui/gtk.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/ui/gtk.c b/ui/gtk.c > index 5249820..1d071b9 100644 > --- a/ui/gtk.c > +++ b/ui/gtk.c > @@ -437,6 +437,19 @@ static void gtk_release_modifiers(GtkDisplayState *s) > } > } > > +static void gd_widget_reparent(GtkWidget *from, GtkWidget *to, > + GtkWidget *widget) > +{ > +#if GTK_CHECK_VERSION(3, 14, 0) > + gtk_widget_ref(widget); > + gtk_container_remove(GTK_CONTAINER(from), widget); > + gtk_container_add(GTK_CONTAINER(to), widget); > + gtk_widget_unref(widget); > +#else > + gtk_widget_reparent(widget, to); > +#endif > +} > + > /** DisplayState Callbacks **/ > > static void gd_update(DisplayChangeListener *dcl, > @@ -1054,7 +1067,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); > @@ -1089,7 +1102,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); >