From 1891113571d9e39bd29b8b6abc661e178ffbcefd Mon Sep 17 00:00:00 2001
From: Omari Stephens <xsdg@google.com>
Date: Wed, 5 Jul 2017 21:41:18 +0000
Subject: [PATCH] Refactor: move view_file implementations to their own
 subdirectory.

---
 src/Makefile.am                      | 6 ++----
 src/view_file.c                      | 4 ++--
 src/view_file/Makefile.am            | 5 +++++
 src/{ => view_file}/view_file_icon.c | 0
 src/{ => view_file}/view_file_icon.h | 4 ++--
 src/{ => view_file}/view_file_list.c | 0
 src/{ => view_file}/view_file_list.h | 4 ++--
 7 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 src/view_file/Makefile.am
 rename src/{ => view_file}/view_file_icon.c (100%)
 rename src/{ => view_file}/view_file_icon.h (97%)
 rename src/{ => view_file}/view_file_list.c (100%)
 rename src/{ => view_file}/view_file_list.h (97%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3900a396..15bdf1b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,12 +81,14 @@ extra_SLIK = \
 	$(extra_ICONS)
 
 include $(srcdir)/pan-view/Makefile.am
+include $(srcdir)/view_file/Makefile.am
 
 bin_PROGRAMS = geeqie
 
 geeqie_SOURCES = \
 	$(module_SLIK)	\
 	$(module_pan_view)	\
+	$(module_view_file)	\
 	ClayRGB1998.icc \
 	ClayRGB1998_icc.h \
 	advanced_exif.c	\
@@ -251,10 +253,6 @@ geeqie_SOURCES = \
 	view_dir_tree.h	\
 	view_file.c	\
 	view_file.h	\
-	view_file_list.c	\
-	view_file_list.h	\
-	view_file_icon.c	\
-	view_file_icon.h	\
 	window.c	\
 	window.h	\
 	lua.c		\
diff --git a/src/view_file.c b/src/view_file.c
index 7fc5017c..d537e8a0 100644
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -31,8 +31,8 @@
 #include "ui_menu.h"
 #include "ui_fileops.h"
 #include "utilops.h"
-#include "view_file_list.h"
-#include "view_file_icon.h"
+#include "view_file/view_file_list.h"
+#include "view_file/view_file_icon.h"
 
 /*
  *-----------------------------------------------------------------------------
diff --git a/src/view_file/Makefile.am b/src/view_file/Makefile.am
new file mode 100644
index 00000000..6837e720
--- /dev/null
+++ b/src/view_file/Makefile.am
@@ -0,0 +1,5 @@
+module_view_file = \
+	%D%/view_file_icon.c	\
+	%D%/view_file_icon.h	\
+	%D%/view_file_list.c	\
+	%D%/view_file_list.h
diff --git a/src/view_file_icon.c b/src/view_file/view_file_icon.c
similarity index 100%
rename from src/view_file_icon.c
rename to src/view_file/view_file_icon.c
diff --git a/src/view_file_icon.h b/src/view_file/view_file_icon.h
similarity index 97%
rename from src/view_file_icon.h
rename to src/view_file/view_file_icon.h
index 086491b6..1cdc8678 100644
--- a/src/view_file_icon.h
+++ b/src/view_file/view_file_icon.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef VIEW_FILE_ICON_H
-#define VIEW_FILE_ICON_H
+#ifndef VIEW_FILE_VIEW_FILE_ICON_H
+#define VIEW_FILE_VIEW_FILE_ICON_H
 
 gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);
 gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
diff --git a/src/view_file_list.c b/src/view_file/view_file_list.c
similarity index 100%
rename from src/view_file_list.c
rename to src/view_file/view_file_list.c
diff --git a/src/view_file_list.h b/src/view_file/view_file_list.h
similarity index 97%
rename from src/view_file_list.h
rename to src/view_file/view_file_list.h
index ca9e75d9..217b35ab 100644
--- a/src/view_file_list.h
+++ b/src/view_file/view_file_list.h
@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef VIEW_FILE_LIST_H
-#define VIEW_FILE_LIST_H
+#ifndef VIEW_FILE_VIEW_FILE_LIST_H
+#define VIEW_FILE_VIEW_FILE_LIST_H
 
 
 #include "filedata.h"
-- 
2.20.1