Mercurial > geeqie

diff src/ui_menu.c @ 88:2099ee3f9a8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net> * layout.c, ui_menu.c, ui_misc.c: Use g_object_ref_sink when gtk_object_sink is not available as it is deprecated.
author gqview
date Sat, 28 Oct 2006 00:03:15 +0000
parents d907d608745f
children 55166d93498d
line wrap: on
line diff
--- a/src/ui_menu.c	Wed Oct 25 19:23:46 2006 +0000
+++ b/src/ui_menu.c	Sat Oct 28 00:03:15 2006 +0000
@@ -130,8 +130,17 @@
 	GtkWidget *menu;
 
 	menu = gtk_menu_new();
+
+	/* take ownership of menu */
+#ifdef GTK_OBJECT_FLOATING
+	/* GTK+ < 2.10 */
 	g_object_ref(G_OBJECT(menu));
 	gtk_object_sink(GTK_OBJECT(menu));
+#else
+	/* GTK+ >= 2.10 */
+	g_object_ref_sink(G_OBJECT(menu));
+#endif
+
 	g_signal_connect(G_OBJECT(menu), "selection_done",
 			 G_CALLBACK(popup_menu_short_lived_cb), menu);
 	return menu;