From 276eb145ce96d5f75f8d3901daf6310f60ddbb81 Mon Sep 17 00:00:00 2001
From: lukefromdc <lukefromdc@hushmail.com>
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/Makefile.am | 94 ---------------------------------------------------------
 1 file changed, 94 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index ec3f575b..daeaa38b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DVERSION="\"$(VERSION)\"" \
 	$(DISABLE_DEPRECATED_CFLAGS) \
-	$(UNIQUE_CFLAGS) \
 	$(NULL)
 
 LDADD = \
@@ -66,7 +65,6 @@ BUILT_SOURCES = \
 	caja-src-marshal.h \
 	$(dbus_freedesktop_built_sources) \
 	$(NULL)
-if ENABLE_LIBUNIQUE
 caja_SOURCES = \
 	caja-actions.h \
 	caja-application.c \
@@ -156,98 +154,6 @@ caja_SOURCES = \
 	caja-zoom-control.c \
 	caja-zoom-control.h \
 	$(NULL)
-else
-caja_SOURCES = \
-	caja-actions.h \
-	caja-application.c \
-	caja-application.h \
-	caja-bookmark-list.c \
-	caja-bookmark-list.h \
-	caja-bookmarks-window.c \
-	caja-bookmarks-window.h \
-	caja-connect-server-dialog.c \
-	caja-connect-server-dialog.h \
-	caja-connect-server-dialog-nonmain.c \
-	caja-connect-server-operation.c	\
-	caja-connect-server-operation.h	\
-	caja-desktop-window.c \
-	caja-desktop-window.h \
-	caja-emblem-sidebar.c \
-	caja-emblem-sidebar.h \
-	caja-file-management-properties.c \
-	caja-file-management-properties.h \
-	caja-freedesktop-dbus.c \
-	caja-freedesktop-dbus.h \
-	caja-history-sidebar.c \
-	caja-history-sidebar.h \
-	caja-image-properties-page.c \
-	caja-image-properties-page.h \
-	caja-information-panel.c \
-	caja-information-panel.h \
-	caja-location-bar.c \
-	caja-location-bar.h \
-	caja-location-dialog.c \
-	caja-location-dialog.h \
-	caja-location-entry.c \
-	caja-location-entry.h \
-	caja-main.c \
-	caja-main.h \
-	caja-navigation-action.c \
-	caja-navigation-action.h \
-	caja-navigation-window-menus.c \
-	caja-navigation-window.c \
-	caja-navigation-window.h \
-	caja-navigation-window-pane.c \
-	caja-navigation-window-pane.h \
-	caja-navigation-window-slot.c \
-	caja-navigation-window-slot.h \
-	caja-notebook.c \
-	caja-notebook.h \
-	caja-notes-viewer.c \
-	caja-notes-viewer.h \
-	caja-pathbar.c \
-	caja-pathbar.h \
-	caja-places-sidebar.c \
-	caja-places-sidebar.h \
-	caja-property-browser.c \
-	caja-property-browser.h \
-	caja-query-editor.c \
-	caja-query-editor.h \
-	caja-search-bar.c \
-	caja-search-bar.h \
-	caja-self-check-functions.c \
-	caja-self-check-functions.h \
-	caja-side-pane.c \
-	caja-side-pane.h \
-	caja-sidebar-title.c \
-	caja-sidebar-title.h \
-	caja-spatial-window.c \
-	caja-spatial-window.h \
-	caja-trash-bar.c \
-	caja-trash-bar.h \
-	caja-view-as-action.c \
-	caja-view-as-action.h \
-	caja-window-bookmarks.c \
-	caja-window-bookmarks.h \
-	caja-window-manage-views.c \
-	caja-window-manage-views.h \
-	caja-window-menus.c \
-	caja-window-pane.c \
-	caja-window-pane.h \
-	caja-window-private.h \
-	caja-window-slot.c \
-	caja-window-slot.h \
-	caja-window-toolbars.c \
-	caja-window.c \
-	caja-window.h \
-	caja-x-content-bar.c \
-	caja-x-content-bar.h \
-	caja-zoom-action.c \
-	caja-zoom-action.h \
-	caja-zoom-control.c \
-	caja-zoom-control.h \
-	$(NULL)
-endif
 
 nodist_caja_SOURCES = \
 	$(BUILT_SOURCES) \
-- 
cgit v1.2.1