diff options
author | Rob Kendrick <rjek@netsurf-browser.org> | 2006-07-28 15:52:37 +0000 |
---|---|---|
committer | Rob Kendrick <rjek@netsurf-browser.org> | 2006-07-28 15:52:37 +0000 |
commit | fb91840001beaa7e7ab2c4c728fc8007aff5501b (patch) | |
tree | bf9222349cb9687cc2e916c532e1058ba9b206a0 | |
parent | 286567b673284a5227758f2faf3ef3e563389267 (diff) | |
download | netsurf-fb91840001beaa7e7ab2c4c728fc8007aff5501b.tar.gz netsurf-fb91840001beaa7e7ab2c4c728fc8007aff5501b.tar.bz2 |
Make url_suggest option core, rather than RISC OS-specific.
svn path=/trunk/netsurf/; revision=2799
-rw-r--r-- | desktop/options.c | 3 | ||||
-rw-r--r-- | desktop/options.h | 1 | ||||
-rw-r--r-- | riscos/options.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/desktop/options.c b/desktop/options.c index 2bb609d9d..65d1e25c8 100644 --- a/desktop/options.c +++ b/desktop/options.c @@ -91,6 +91,8 @@ char *option_cookie_file = 0; char *option_cookie_jar = 0; /** Home page location */ char *option_homepage_url = 0; +/** URL completion in url bar */ +bool option_url_suggestion = true; /* Fetcher configuration */ /** Maximum simultaneous active fetchers */ int option_max_fetchers = 24; @@ -139,6 +141,7 @@ struct { { "cookie_file", OPTION_STRING, &option_cookie_file }, { "cookie_jar", OPTION_STRING, &option_cookie_jar }, { "homepage_url", OPTION_STRING, &option_homepage_url }, + { "url_suggestion", OPTION_BOOL, &option_url_suggestion }, /* Fetcher options */ { "max_fetchers", OPTION_INTEGER, &option_max_fetchers }, { "max_fetchers_per_host", diff --git a/desktop/options.h b/desktop/options.h index 02b2fd21a..d3b738480 100644 --- a/desktop/options.h +++ b/desktop/options.h @@ -57,6 +57,7 @@ extern char *option_ca_bundle; extern char *option_cookie_file; extern char *option_cookie_jar; extern char *option_homepage_url; +extern bool option_url_suggestion; /* Fetcher configuration. */ extern int option_max_fetchers; diff --git a/riscos/options.h b/riscos/options.h index fe771928b..faa3b8e7c 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -47,7 +47,6 @@ extern bool option_buffer_everything; extern bool option_open_browser_at_startup; extern bool option_no_plugins; extern bool option_block_popups; -extern bool option_url_suggestion; extern int option_image_memory_direct; /* -1 means auto-detect */ extern int option_image_memory_compressed; /* -1 means auto-detect */ extern bool option_strip_extensions; @@ -94,7 +93,6 @@ bool option_buffer_everything = false; \ bool option_open_browser_at_startup = false; \ bool option_no_plugins = false; \ bool option_block_popups = false; \ -bool option_url_suggestion = true; \ int option_image_memory_direct = -1; \ int option_image_memory_compressed = -1; \ bool option_strip_extensions = true; \ @@ -141,7 +139,6 @@ bool option_thumbnail_iconise = true; { "open_browser_at_startup",OPTION_BOOL, &option_open_browser_at_startup }, \ { "no_plugins", OPTION_BOOL, &option_no_plugins }, \ { "block_popups", OPTION_BOOL, &option_block_popups }, \ -{ "url_suggestion", OPTION_BOOL, &option_url_suggestion }, \ { "image_memory_direct", OPTION_INTEGER, &option_image_memory_direct }, \ { "image_memory_compressed",OPTION_INTEGER, &option_image_memory_compressed }, \ { "strip_extensions", OPTION_BOOL, &option_strip_extensions }, \ |