diff options
| author | lukefromdc <[email protected]> | 2016-10-14 16:28:27 -0400 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-10-14 16:28:27 -0400 |
| commit | a4822f6221c000f4db2a38a8b63e22ff64f6ee7e (patch) | |
| tree | 1e23e11ab8451341a381c76f9c853b7742d46741 /src/caja-window.c | |
| parent | 15a9e9a073a799341c18ace6b568e5317135056c (diff) | |
| download | caja-a4822f6221c000f4db2a38a8b63e22ff64f6ee7e.tar.bz2 caja-a4822f6221c000f4db2a38a8b63e22ff64f6ee7e.tar.xz | |
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
Diffstat (limited to 'src/caja-window.c')
| -rw-r--r-- | src/caja-window.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/caja-window.c b/src/caja-window.c index 398ec91c..69c62429 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -32,7 +32,7 @@ #include "caja-application.h" #include "caja-bookmarks-window.h" #include "caja-information-panel.h" -#if ENABLE_LIBUNIQUE == (1) +#if ENABLE_LIBUNIQUE == (TRUE) #include "caja-main.h" #endif #include "caja-window-manage-views.h" @@ -238,7 +238,7 @@ caja_window_init (CajaWindow *window) /* Register to menu provider extension signal managing menu updates */ g_signal_connect_object (caja_signaller_get_current (), "popup_menu_changed", G_CALLBACK (caja_window_load_extension_menus), window, G_CONNECT_SWAPPED); -#if ENABLE_LIBUNIQUE == (1) +#if ENABLE_LIBUNIQUE == (TRUE) /* Keep the main event loop alive as long as the window exists */ #if GTK_CHECK_VERSION(3, 0, 0) /* FIXME: port to GtkApplication with GTK3 */ @@ -1907,7 +1907,7 @@ caja_forget_history (void) CajaWindowSlot *slot; CajaNavigationWindowSlot *navigation_slot; GList *window_node, *l, *walk; -#if ENABLE_LIBUNIQUE == (0) +#if ENABLE_LIBUNIQUE == (FALSE) CajaApplication *app; app = CAJA_APPLICATION (g_application_get_default ()); @@ -1916,7 +1916,7 @@ caja_forget_history (void) * each window's current location bookmark from history list * so it doesn't get clobbered. */ -#if ENABLE_LIBUNIQUE == (0) +#if ENABLE_LIBUNIQUE == (FALSE) for (window_node = gtk_application_get_windows (GTK_APPLICATION (app)); #else for (window_node = caja_application_get_window_list (); @@ -1963,7 +1963,7 @@ caja_forget_history (void) free_history_list (); /* Re-add each window's current location to history list. */ -#if ENABLE_LIBUNIQUE == (0) +#if ENABLE_LIBUNIQUE == (FALSE) for (window_node = gtk_application_get_windows (GTK_APPLICATION (app)); #else for (window_node = caja_application_get_window_list (); |