From f17e88e7098a5b1c817184e6bf59dcc5d9073ae9 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 4 Aug 2016 23:50:06 +0100
Subject: [PATCH] rename gtk global history implementation

---
 frontends/gtk/Makefile                        | 2 +-
 frontends/gtk/cookies.c                       | 1 -
 frontends/gtk/{history.c => global_history.c} | 3 +--
 frontends/gtk/{history.h => global_history.h} | 0
 frontends/gtk/gui.c                           | 2 +-
 frontends/gtk/scaffolding.c                   | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename frontends/gtk/{history.c => global_history.c} (99%)
 rename frontends/gtk/{history.h => global_history.h} (100%)

diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index f8f7d8c69..71dec1e69 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -160,7 +160,7 @@ endif
 # S_FRONTEND are sources purely for the GTK frontend
 S_FRONTEND := gui.c schedule.c layout_pango.c bitmap.c plotters.c	\
 	treeview.c scaffolding.c gdk.c completion.c login.c throbber.c	\
-	selection.c history.c window.c fetch.c download.c menu.c	\
+	selection.c global_history.c window.c fetch.c download.c menu.c	\
 	print.c search.c tabs.c toolbar.c gettext.c			\
 	compat.c cookies.c hotlist.c viewdata.c viewsource.c		\
 	preferences.c about.c ssl_cert.c resources.c corewindow.c
diff --git a/frontends/gtk/cookies.c b/frontends/gtk/cookies.c
index d8f8b5dbd..3c5d93a87 100644
--- a/frontends/gtk/cookies.c
+++ b/frontends/gtk/cookies.c
@@ -33,7 +33,6 @@
 
 #include "gtk/cookies.h"
 #include "gtk/plotters.h"
-#include "gtk/scaffolding.h"
 #include "gtk/resources.h"
 #include "gtk/corewindow.h"
 
diff --git a/frontends/gtk/history.c b/frontends/gtk/global_history.c
similarity index 99%
rename from frontends/gtk/history.c
rename to frontends/gtk/global_history.c
index 22cf1e889..df6fe06e7 100644
--- a/frontends/gtk/history.c
+++ b/frontends/gtk/global_history.c
@@ -33,11 +33,10 @@
 #include "desktop/treeview.h"
 
 #include "gtk/compat.h"
-#include "gtk/history.h"
 #include "gtk/plotters.h"
-#include "gtk/scaffolding.h"
 #include "gtk/resources.h"
 #include "gtk/corewindow.h"
+#include "gtk/global_history.h"
 
 struct nsgtk_global_history_window {
 	struct nsgtk_corewindow core;
diff --git a/frontends/gtk/history.h b/frontends/gtk/global_history.h
similarity index 100%
rename from frontends/gtk/history.h
rename to frontends/gtk/global_history.h
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index 1f22b6076..8d0bb75d7 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -58,7 +58,7 @@
 #include "gtk/download.h"
 #include "gtk/fetch.h"
 #include "gtk/gui.h"
-#include "gtk/history.h"
+#include "gtk/global_history.h"
 #include "gtk/hotlist.h"
 #include "gtk/throbber.h"
 #include "gtk/treeview.h"
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index 3c47b4df1..cdf238bb5 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -60,7 +60,7 @@
 #include "gtk/viewsource.h"
 #include "gtk/bitmap.h"
 #include "gtk/gui.h"
-#include "gtk/history.h"
+#include "gtk/global_history.h"
 #include "gtk/hotlist.h"
 #include "gtk/download.h"
 #include "gtk/menu.h"