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

[geeqie.git] / src / layout.c

diff --git a/src/layout.c b/src/layout.c
index a38ab2b..baef16f 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -257,9 +257,15 @@ static void layout_sort_button_press_cb(GtkWidget *widget, gpointer data)
 
        menu = submenu_add_sort(NULL, G_CALLBACK(layout_sort_menu_cb), lw, FALSE, FALSE, TRUE, lw->sort_method);
 
-       /* apparently the menu is never sunk, even on a popup */
+       /* 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
 
         /* ascending option */
        menu_item_add_divider(menu);