summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2010-03-29 16:59:30 +0000
committerVincent Sanders <vince@netsurf-browser.org>2010-03-29 16:59:30 +0000
commit7e6752726790043bc14c1843690cf9c7d32a6bc6 (patch)
treeb8d51521208881c8c68c4ec7541eb1c966bda020 /gtk
parent99dee5e3d090a8cd03d1f786fe903b699aa2ac09 (diff)
downloadnetsurf-7e6752726790043bc14c1843690cf9c7d32a6bc6.tar.gz
netsurf-7e6752726790043bc14c1843690cf9c7d32a6bc6.tar.bz2
first part of initialisation refactor move gui_init2 into frontends
svn path=/trunk/netsurf/; revision=10202
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtk_gui.c41
1 files changed, 22 insertions, 19 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c
index faa38a960..00d668a4f 100644
--- a/gtk/gtk_gui.c
+++ b/gtk/gtk_gui.c
@@ -114,24 +114,6 @@ static void nsgtk_PDF_no_pass(GtkButton *w, gpointer data);
#define THROBBER_FRAMES 9
-/**
- * Main entry point from OS.
- */
-int main(int argc, char** argv)
-{
- gtk_init(&argc, &argv);
-
- setbuf(stderr, NULL);
-
- /* initialise netsurf */
- netsurf_init(argc, argv);
-
- netsurf_main_loop();
-
- netsurf_exit();
-
- return 0;
-}
/**
@@ -321,7 +303,7 @@ void nsgtk_init_glade(void)
*
* Opens the main browser window.
*/
-void gui_init2(int argc, char** argv)
+static void gui_init2(int argc, char** argv)
{
struct browser_window *bw;
const char *addr = NETSURF_HOMEPAGE;
@@ -335,6 +317,27 @@ void gui_init2(int argc, char** argv)
bw = browser_window_create(addr, 0, 0, true, false);
}
+/**
+ * Main entry point from OS.
+ */
+int main(int argc, char** argv)
+{
+ gtk_init(&argc, &argv);
+
+ setbuf(stderr, NULL);
+
+ /* initialise netsurf */
+ netsurf_init(argc, argv);
+
+ gui_init2(argc, argv);
+
+ netsurf_main_loop();
+
+ netsurf_exit();
+
+ return 0;
+}
+
void gui_poll(bool active)
{