From a4822f6221c000f4db2a38a8b63e22ff64f6ee7e Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Fri, 14 Oct 2016 16:28:27 -0400 Subject: GTK2: Use emanuele-f 's patch for build failure, fix build w/o libunique Apply https://github.com/mate-desktop/caja/pull/658/commits/4b36a91af42d8efe0f594a95d28ab8448fd73b31 then fix the selectors in source files to use the boolean selectors for libunique --- src/caja-window-manage-views.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/caja-window-manage-views.c') diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c index 2fa24e2a..74578525 100644 --- a/src/caja-window-manage-views.c +++ b/src/caja-window-manage-views.c @@ -33,7 +33,7 @@ #include "caja-location-bar.h" #include "caja-search-bar.h" #include "caja-pathbar.h" -#if ENABLE_LIBUNIQUE == (1) +#if ENABLE_LIBUNIQUE == (TRUE) #include "caja-main.h" #endif #include "caja-window-private.h" @@ -603,7 +603,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, } else if (target_navigation) { target_window = caja_application_create_navigation_window (window->application, -#if ENABLE_LIBUNIQUE == (1) +#if ENABLE_LIBUNIQUE == (TRUE) NULL, #endif gtk_window_get_screen (GTK_WINDOW (window))); @@ -1199,7 +1199,7 @@ got_file_info_for_view_selection_callback (CajaFile *file, GFile *location; GMountOperation *mount_op; MountNotMountedData *data; -#if ENABLE_LIBUNIQUE == (0) +#if ENABLE_LIBUNIQUE == (FALSE) CajaApplication *app; #endif slot = callback_data; @@ -1314,7 +1314,7 @@ got_file_info_for_view_selection_callback (CajaFile *file, * happens when a new window cannot display its initial URI. */ /* if this is the only window, we don't want to quit, so we redirect it to home */ -#if ENABLE_LIBUNIQUE == (0) +#if ENABLE_LIBUNIQUE == (FALSE) app = CAJA_APPLICATION (g_application_get_default ()); if (g_list_length (gtk_application_get_windows (GTK_APPLICATION (app))) == 1) { -- cgit v1.2.1