From a4822f6221c000f4db2a38a8b63e22ff64f6ee7e Mon Sep 17 00:00:00 2001
From: lukefromdc <lukefromdc@hushmail.com>
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-application.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/caja-application.h')

diff --git a/src/caja-application.h b/src/caja-application.h
index 6eb54138..7aeaa8a4 100644
--- a/src/caja-application.h
+++ b/src/caja-application.h
@@ -27,10 +27,11 @@
 #ifndef CAJA_APPLICATION_H
 #define CAJA_APPLICATION_H
 
+#include <config.h>
 #include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#if ENABLE_LIBUNIQUE == (1)
+#if ENABLE_LIBUNIQUE == (TRUE)
 #include <unique/unique.h>
 #endif
 #include <libegg/eggsmclient.h>
@@ -60,7 +61,7 @@ typedef struct CajaWindow CajaWindow;
 typedef struct _CajaSpatialWindow CajaSpatialWindow;
 #endif
 
-#if ENABLE_LIBUNIQUE == (0)
+#if ENABLE_LIBUNIQUE == (FALSE)
 typedef struct _CajaApplicationPriv CajaApplicationPriv;
 #else
 typedef struct CajaShell CajaShell;
@@ -68,7 +69,7 @@ typedef struct CajaShell CajaShell;
 
 typedef struct
 {
-#if ENABLE_LIBUNIQUE == (0)
+#if ENABLE_LIBUNIQUE == (FALSE)
     GtkApplication parent;
     CajaApplicationPriv *priv;
 #else
@@ -85,7 +86,7 @@ typedef struct
 } CajaApplication;
 
 
-#if ENABLE_LIBUNIQUE == (0)
+#if ENABLE_LIBUNIQUE == (FALSE)
 typedef struct
 {
 	GtkApplicationClass parent_class;
@@ -121,18 +122,18 @@ CajaWindow *     caja_application_get_spatial_window     (CajaApplication *appli
         gboolean        *existing);
 
 CajaWindow *     caja_application_create_navigation_window     (CajaApplication *application,
-#if ENABLE_LIBUNIQUE == (1)
+#if ENABLE_LIBUNIQUE == (TRUE)
         const char          *startup_id,
 #endif
         GdkScreen           *screen);
-#if ENABLE_LIBUNIQUE == (0)
+#if ENABLE_LIBUNIQUE == (FALSE)
 void caja_application_close_all_navigation_windows (CajaApplication *self);
 #else
 void caja_application_close_all_navigation_windows (void);
 #endif
 void caja_application_close_parent_windows     (CajaSpatialWindow *window);
 void caja_application_close_all_spatial_windows  (void);
-#if ENABLE_LIBUNIQUE == (1)
+#if ENABLE_LIBUNIQUE == (TRUE)
 void caja_application_open_desktop      (CajaApplication *application);
 void caja_application_close_desktop     (void);
 gboolean caja_application_save_accel_map    (gpointer data);
-- 
cgit v1.2.1