Drop obsolete GTK_OBJECT_FLOATING

diff --git a/src/layout.cc b/src/layout.cc
index df0403f..2179a8b 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -535,14 +535,7 @@ static void layout_sort_button_press_cb(GtkWidget *, gpointer data)
        menu = submenu_add_sort(nullptr, G_CALLBACK(layout_sort_menu_cb), lw, FALSE, FALSE, TRUE, lw->options.file_view_list_sort.method);
 
        /* 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);
@@ -618,14 +611,7 @@ static void layout_zoom_button_press_cb(GtkWidget *, gpointer data)
                        lw, FALSE, FALSE, TRUE, options->image.zoom_mode);
 
        /* 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
 
        menu_item_add_divider(menu);
 

diff --git a/src/ui-menu.cc b/src/ui-menu.cc
index 47bb7f3..2fd315e 100644 (file)
--- a/src/ui-menu.cc
+++ b/src/ui-menu.cc
@@ -415,14 +415,7 @@ GtkWidget *popup_menu_short_lived()
        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);