Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>

[geeqie.git] / src / ui_menu.c

diff --git a/src/ui_menu.c b/src/ui_menu.c
index 5e83560..198a9b7 100644 (file)
--- a/src/ui_menu.c
+++ b/src/ui_menu.c
@@ -130,8 +130,17 @@ GtkWidget *popup_menu_short_lived(void)
        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;