diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-04-01 17:44:42 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-04-01 17:44:42 +0000 |
commit | d3276dfbafa0c18dcb6c62b57f619da152f23584 (patch) | |
tree | 9dd0578d96029e41cd2faacfbe2c31d9dc432fe9 /amiga/gui.c | |
parent | 0194e4bb55ca90f447344403ed01fea5a7a3fed6 (diff) | |
download | netsurf-d3276dfbafa0c18dcb6c62b57f619da152f23584.tar.gz netsurf-d3276dfbafa0c18dcb6c62b57f619da152f23584.tar.bz2 |
netsurf_init expects a char ***, not a char **
Change command template so URL is a keyword. This avoids the platform code
re-interpreting core options (eg -v as a URL).
Move screen open code slightly so "NetSurf ?" shows the template visibly, rather than
opening an empty screen and the user not knowing what is happening.
svn path=/trunk/netsurf/; revision=10224
Diffstat (limited to 'amiga/gui.c')
-rwxr-xr-x | amiga/gui.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 71c7b4074..42117e49c 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -532,12 +532,11 @@ void ami_openscreenfirst(void) static void gui_init2(int argc, char** argv) { struct browser_window *bw = NULL; - long rarray[] = {0,0}; struct RDArgs *args; - STRPTR template = "URL,FORCE/S"; STRPTR temp_homepage_url = NULL; BOOL notalreadyrunning; - + STRPTR template = "URL/K,FORCE/S"; + long rarray[] = {0,0}; enum { A_URL, @@ -550,16 +549,17 @@ static void gui_init2(int argc, char** argv) search_web_provider_details(option_search_provider); - if(notalreadyrunning && (option_startup_no_window == false)) - ami_openscreenfirst(); - if(argc) // argc==0 is started from wb { if(args = ReadArgs(template,rarray,NULL)) { + if(notalreadyrunning && (option_startup_no_window == false)) + ami_openscreenfirst(); + if(rarray[A_URL]) { temp_homepage_url = (char *)strdup(rarray[A_URL]); + if(notalreadyrunning) { bw = browser_window_create(temp_homepage_url, 0, 0, true,false); @@ -582,6 +582,9 @@ static void gui_init2(int argc, char** argv) int first=0,i=0; char fullpath[1024]; + if(notalreadyrunning && (option_startup_no_window == false)) + ami_openscreenfirst(); + for(i=0,wbarg=WBenchMsg->sm_ArgList;i<WBenchMsg->sm_NumArgs;i++,wbarg++) { if(i==0) continue; @@ -684,7 +687,7 @@ int main(int argc, char** argv) ami_messages_load(messages); - netsurf_init(&argc, argv, "PROGDIR:Resources/Options", messages); + netsurf_init(&argc, &argv, "PROGDIR:Resources/Options", messages); gui_init(argc, argv); |