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

2 files changed, 16 insertions, 1 deletions

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,11 +50,22 @@ 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