summaryrefslogtreecommitdiff
path: root/beos/beos_gui.cpp
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 /beos/beos_gui.cpp
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 'beos/beos_gui.cpp')
-rw-r--r--beos/beos_gui.cpp40
1 files changed, 22 insertions, 18 deletions
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 90db0ff94..d506cdfe6 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -420,6 +420,25 @@ static int32 bapp_thread(void *arg)
return 0;
}
+static void gui_init2(int argc, char** argv)
+{
+ CALLED();
+ const char *addr = NETSURF_HOMEPAGE;
+
+ if (option_homepage_url != NULL && option_homepage_url[0] != '\0')
+ addr = option_homepage_url;
+
+ if (argc > 1) addr = argv[1];
+ if (gFirstRefsReceived) addr = NULL;
+ browser_window_create(addr, 0, 0, true, false);
+ if (gFirstRefsReceived) {
+ // resend the refs we got before having a window to send them to
+ be_app_messenger.SendMessage(gFirstRefsReceived);
+ delete gFirstRefsReceived;
+ gFirstRefsReceived = NULL;
+ }
+}
+
/** Normal entry point from OS */
int main(int argc, char** argv)
{
@@ -428,6 +447,8 @@ int main(int argc, char** argv)
/* initialise netsurf */
netsurf_init(argc, argv);
+ gui_init2(argc, argv);
+
netsurf_main_loop();
netsurf_exit();
@@ -435,6 +456,7 @@ int main(int argc, char** argv)
return 0;
}
+
void gui_init(int argc, char** argv)
{
char buf[PATH_MAX];
@@ -632,24 +654,6 @@ void gui_init(int argc, char** argv)
}
-void gui_init2(int argc, char** argv)
-{
- CALLED();
- const char *addr = NETSURF_HOMEPAGE;
-
- if (option_homepage_url != NULL && option_homepage_url[0] != '\0')
- addr = option_homepage_url;
-
- if (argc > 1) addr = argv[1];
- if (gFirstRefsReceived) addr = NULL;
- browser_window_create(addr, 0, 0, true, false);
- if (gFirstRefsReceived) {
- // resend the refs we got before having a window to send them to
- be_app_messenger.SendMessage(gFirstRefsReceived);
- delete gFirstRefsReceived;
- gFirstRefsReceived = NULL;
- }
-}
void nsbeos_pipe_message(BMessage *message, BView *_this, struct gui_window *gui)