From 6330f8e475bad2aa9dd3f0f7994a25980491023c Mon Sep 17 00:00:00 2001
From: François Revel <mmu_man@netsurf-browser.org>
Date: Thu, 16 Oct 2008 11:10:43 +0000
Subject: Have netsurf_main() do the real work and main() call it. This allows
 ports to call it from elsewhere to embed NetSurf in another application. The
 netsurf_embedded bool remembers it for later (like, we shouldn't probably
 save the hotlist and preferences in that case).

svn path=/trunk/netsurf/; revision=5579
---
 desktop/netsurf.c | 14 +++++++++++++-
 desktop/netsurf.h |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'desktop')

diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 7342ac443..4e6b6e085 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -40,6 +40,7 @@
 #include "utils/utils.h"
 
 bool netsurf_quit = false;
+bool netsurf_embedded = true;
 bool verbose_log = false;
 
 static void netsurf_init(int argc, char** argv);
@@ -49,10 +50,21 @@ static void lib_init(void);
 
 
 /**
- * Gui NetSurf main().
+ * The regular main(), when not embedded
  */
 
 int main(int argc, char** argv)
+{
+	netsurf_embedded = false;
+	return netsurf_main(argc, argv);
+}
+
+
+/**
+ * Gui NetSurf main().
+ */
+
+int netsurf_main(int argc, char** argv)
 {
 	setbuf(stderr, NULL);
 	netsurf_init(argc, argv);
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
index 1dc4834c2..bfb97c539 100644
--- a/desktop/netsurf.h
+++ b/desktop/netsurf.h
@@ -22,9 +22,12 @@
 #include <stdbool.h>
 
 extern bool netsurf_quit;
+extern bool netsurf_embedded;
 extern bool verbose_log;
 extern const char * const netsurf_version;
 extern const int netsurf_version_major;
 extern const int netsurf_version_minor;
 
+extern int netsurf_main(int argc, char** argv);
+
 #endif
-- 
cgit v1.2.3