From 781d22892b3f3fde47b97ebb50037e69e436f058 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 16 Oct 2014 09:52:43 +0100
Subject: Update monkey frontend to cope with split operations table headers

---
 monkey/browser.c  |  4 ++--
 monkey/cert.c     |  1 -
 monkey/cert.h     | 28 ++++++++++++++++++++++++++--
 monkey/download.c |  5 +++--
 monkey/fetch.c    |  3 ++-
 monkey/main.c     |  6 +++---
 monkey/poll.c     |  1 -
 7 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/monkey/browser.c b/monkey/browser.c
index 541707aba..f69a2e810 100644
--- a/monkey/browser.c
+++ b/monkey/browser.c
@@ -20,11 +20,11 @@
 
 #include <stdio.h>
 
-
-#include "desktop/gui.h"
 #include "utils/ring.h"
 #include "utils/log.h"
 #include "utils/messages.h"
+#include "desktop/browser_private.h"
+#include "desktop/gui_window.h"
 
 #include "monkey/browser.h"
 #include "monkey/plot.h"
diff --git a/monkey/cert.c b/monkey/cert.c
index 6f2172743..ec1b1ce43 100644
--- a/monkey/cert.c
+++ b/monkey/cert.c
@@ -21,7 +21,6 @@
 
 #include "utils/ring.h"
 #include "utils/nsurl.h"
-#include "desktop/gui.h"
 
 #include "monkey/cert.h"
 
diff --git a/monkey/cert.h b/monkey/cert.h
index 2780f4f57..283817f3d 100644
--- a/monkey/cert.h
+++ b/monkey/cert.h
@@ -1,4 +1,28 @@
-void 
-gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, 
+/*
+ * Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _NETSURF_MONKEY_CERT_H_
+#define _NETSURF_MONKEY_CERT_H_
+
+struct ssl_cert_info;
+
+void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
                 unsigned long num, nserror (*cb)(bool proceed, void *pw),
                 void *cbpw);
+
+#endif
diff --git a/monkey/download.c b/monkey/download.c
index 721f77ddc..6276972c2 100644
--- a/monkey/download.c
+++ b/monkey/download.c
@@ -18,9 +18,10 @@
 
 #include <stdio.h>
 
-#include "desktop/gui.h"
-#include "desktop/download.h"
+#include "utils/errors.h"
 #include "utils/ring.h"
+#include "desktop/gui_download.h"
+#include "desktop/download.h"
 
 #include "monkey/browser.h"
 
diff --git a/monkey/fetch.c b/monkey/fetch.c
index 88cb27dcf..86732cfce 100644
--- a/monkey/fetch.c
+++ b/monkey/fetch.c
@@ -22,10 +22,11 @@
 #include <stdbool.h>
 #include <limits.h>
 
-#include "desktop/gui.h"
+#include "utils/errors.h"
 #include "utils/file.h"
 #include "utils/nsurl.h"
 #include "utils/filepath.h"
+#include "desktop/gui_fetch.h"
 
 #include "monkey/filetype.h"
 #include "monkey/fetch.h"
diff --git a/monkey/main.c b/monkey/main.c
index 803372c66..3d67e113e 100644
--- a/monkey/main.c
+++ b/monkey/main.c
@@ -20,13 +20,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "utils/log.h"
+#include "utils/filepath.h"
 #include "utils/nsoption.h"
 #include "content/urldb.h"
 #include "content/fetchers/resource.h"
-#include "desktop/gui.h"
+#include "desktop/gui_misc.h"
 #include "desktop/netsurf.h"
-#include "utils/log.h"
-#include "utils/filepath.h"
 
 #include "monkey/poll.h"
 #include "monkey/dispatch.h"
diff --git a/monkey/poll.c b/monkey/poll.c
index 3fad21f0f..187849b2a 100644
--- a/monkey/poll.c
+++ b/monkey/poll.c
@@ -19,7 +19,6 @@
 #include <assert.h>
 
 #include "desktop/browser.h"
-#include "desktop/gui.h"
 #include "monkey/schedule.h"
 #include "monkey/browser.h"
 #include "content/fetchers.h"
-- 
cgit v1.2.3