From f97c0109a6df5fe2cf4349f26d488f886f51c138 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 16 Oct 2014 09:53:55 +0100
Subject: Update gtk frontend to cope with split operations table headers

---
 gtk/download.c  |  2 +-
 gtk/fetch.c     |  2 +-
 gtk/gui.c       | 20 ++++++++++----------
 gtk/login.c     |  6 +++---
 gtk/search.c    |  8 ++++----
 gtk/selection.c |  2 +-
 gtk/window.c    |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gtk/download.c b/gtk/download.c
index 3a321ec5f..d2588ed5a 100644
--- a/gtk/download.c
+++ b/gtk/download.c
@@ -29,7 +29,7 @@
 #include "utils/messages.h"
 #include "utils/nsoption.h"
 #include "desktop/download.h"
-#include "desktop/gui.h"
+#include "desktop/gui_download.h"
 
 #include "gtk/gui.h"
 #include "gtk/scaffolding.h"
diff --git a/gtk/fetch.c b/gtk/fetch.c
index 42ba89839..fbe6f953e 100644
--- a/gtk/fetch.c
+++ b/gtk/fetch.c
@@ -28,7 +28,7 @@
 #include "utils/log.h"
 #include "utils/filepath.h"
 #include "utils/file.h"
-#include "desktop/gui.h"
+#include "desktop/gui_fetch.h"
 
 #include "gtk/gui.h"
 #include "gtk/fetch.h"
diff --git a/gtk/gui.c b/gtk/gui.c
index 70b7c90e4..12f1c1602 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -37,6 +37,13 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
+#include "utils/filepath.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
+#include "utils/file.h"
+#include "utils/nsoption.h"
 #include "content/content.h"
 #include "content/fetch.h"
 #include "content/fetchers.h"
@@ -45,23 +52,16 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "content/backing_store.h"
+#include "render/form.h"
 #include "desktop/browser.h"
-#include "desktop/gui.h"
-#include "desktop/netsurf.h"
-#include "utils/nsoption.h"
 #include "desktop/save_complete.h"
 #include "desktop/save_pdf/pdf_plotters.h"
 #include "desktop/searchweb.h"
 #include "desktop/sslcert_viewer.h"
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
-#include "render/form.h"
-#include "utils/filepath.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utf8.h"
-#include "utils/utils.h"
-#include "utils/file.h"
+#include "desktop/gui_misc.h"
+#include "desktop/netsurf.h"
 
 #include "gtk/compat.h"
 #include "gtk/completion.h"
diff --git a/gtk/login.c b/gtk/login.c
index f98a78703..c237dec30 100644
--- a/gtk/login.c
+++ b/gtk/login.c
@@ -23,14 +23,14 @@
 #include <gtk/gtk.h>
 
 #include "utils/log.h"
-#include "gtk/gui.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
-#include "desktop/gui.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "desktop/browser.h"
+
+#include "gtk/gui.h"
 
 struct session_401 {
 	nsurl *url;				/**< URL being fetched */
diff --git a/gtk/search.c b/gtk/search.c
index 02bfed713..2d735bf77 100644
--- a/gtk/search.c
+++ b/gtk/search.c
@@ -26,15 +26,15 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "utils/config.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "desktop/browser.h"
-#include "desktop/gui.h"
 #include "desktop/search.h"
 #include "desktop/searchweb.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/utils.h"
+#include "desktop/gui_search.h"
 
 #include "gtk/compat.h"
 #include "gtk/search.h"
diff --git a/gtk/selection.c b/gtk/selection.c
index 231e5fd0d..d1388ed27 100644
--- a/gtk/selection.c
+++ b/gtk/selection.c
@@ -22,7 +22,7 @@
 
 #include "utils/log.h"
 #include "desktop/browser.h"
-#include "desktop/gui.h"
+#include "desktop/gui_clipboard.h"
 
 #include "gtk/window.h"
  
diff --git a/gtk/window.c b/gtk/window.c
index 4d279fb82..e444d7bfa 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -33,11 +33,11 @@
 #include "content/hlcache.h"
 #include "gtk/window.h"
 #include "gtk/selection.h"
-#include "desktop/gui.h"
 #include "desktop/browser.h"
 #include "desktop/mouse.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
+#include "desktop/gui_window.h"
 
 #include "gtk/compat.h"
 #include "gtk/gui.h"
-- 
cgit v1.2.3