summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xamiga/gui.c4
-rw-r--r--amiga/options.h3
-rwxr-xr-xamiga/pkg/makepackage2
3 files changed, 2 insertions, 7 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index efc61a40d..c6b382253 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -403,12 +403,11 @@ void gui_init(int argc, char** argv)
ami_open_resources(); /* alloc ports/asl reqs, open libraries/devices */
ami_print_init();
ami_clipboard_init();
+ ami_openurl_open();
ami_set_options(); /* check options and set defaults where required */
win_destroyed = false;
- verbose_log = option_verbose_log;
-
nsscreentitle = ASPrintf("NetSurf %s",netsurf_version);
default_stylesheet_url = "file:///PROGDIR:Resources/amiga.css";
@@ -544,7 +543,6 @@ static void gui_init2(int argc, char** argv)
notalreadyrunning = ami_arexx_init();
ami_fetch_file_register();
- ami_openurl_open();
search_web_provider_details(option_search_provider);
diff --git a/amiga/options.h b/amiga/options.h
index 18d9e0905..70963ba64 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -20,7 +20,6 @@
#define AMIGA_OPTIONS_H
#include "desktop/options.h"
-extern bool option_verbose_log;
extern char *option_url_file;
extern char *option_hotlist_file;
extern char *option_use_pubscreen;
@@ -51,7 +50,6 @@ extern bool option_close_no_quit;
extern bool option_hide_docky_icon;
#define EXTRA_OPTION_DEFINE \
-bool option_verbose_log = false; \
char *option_url_file = 0; \
char *option_hotlist_file = 0; \
char *option_use_pubscreen = 0; \
@@ -82,7 +80,6 @@ bool option_close_no_quit = false; \
bool option_hide_docky_icon = false; \
#define EXTRA_OPTION_TABLE \
-{ "verbose_log", OPTION_BOOL, &option_verbose_log}, \
{ "url_file", OPTION_STRING, &option_url_file }, \
{ "hotlist_file", OPTION_STRING, &option_hotlist_file }, \
{ "use_pubscreen", OPTION_STRING, &option_use_pubscreen}, \
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index 0dfa481b1..902bb8cf3 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -21,6 +21,6 @@ copy amiga/pkg/fitr ram:NetSurf/
makedir ram:NetSurf/Rexx
copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
makedir ram:NetSurf/SObjs
-copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 ram:NetSurf/SObjs clone
+copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so ram:NetSurf/SObjs clone
;sobjs:libssl-0.9.8.so sobjs:libexpat.so
;sobjs:libgcc.so sobjs:libc.so sobjs:libpthread.so \ No newline at end of file