From 276eb145ce96d5f75f8d3901daf6310f60ddbb81 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Tue, 22 Nov 2016 15:02:51 -0500 Subject: move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build option *Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors *Remove GTK2 and libunique specific code. *Leaves selector for specific GTK3 versions. *Remove #DEFINES for vbox/hbox previously required for GTK2 compatability *Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work *spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591 --- src/caja-navigation-window-menus.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/caja-navigation-window-menus.c') diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c index 2f7a1f5b..4b40494c 100644 --- a/src/caja-navigation-window-menus.c +++ b/src/caja-navigation-window-menus.c @@ -64,7 +64,6 @@ static void schedule_refresh_go_menu (CajaNavigationWindow *window); -#if ENABLE_LIBUNIQUE == (FALSE) static void action_close_all_windows_callback (GtkAction *action, gpointer user_data) @@ -74,14 +73,7 @@ action_close_all_windows_callback (GtkAction *action, app = CAJA_APPLICATION (g_application_get_default ()); caja_application_close_all_navigation_windows (app); } -#else -static void -action_close_all_windows_callback (GtkAction *action, - gpointer user_data) -{ - caja_application_close_all_navigation_windows (); -} -#endif + static gboolean should_open_in_new_tab (void) { @@ -622,9 +614,6 @@ action_new_window_callback (GtkAction *action, current_window = CAJA_WINDOW (user_data); new_window = caja_application_create_navigation_window ( current_window->application, -#if ENABLE_LIBUNIQUE == (TRUE) - NULL, -#endif gtk_window_get_screen (GTK_WINDOW (current_window))); caja_window_go_home (new_window); } -- cgit v1.2.1