Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/836c13f87d792f074c6c5ad7a3da3fa8f7237175
...commit
http://git.netsurf-browser.org/netsurf.git/commit/836c13f87d792f074c6c5ad7a3da3fa8f7237175
...tree
http://git.netsurf-browser.org/netsurf.git/tree/836c13f87d792f074c6c5ad7a3da3fa8f7237175
The branch, master has been updated
via 836c13f87d792f074c6c5ad7a3da3fa8f7237175 (commit)
from bae65c18a907cd43ad21dc30c2dfa8f0f003eec7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/836c13f87d792f074c6c5ad7a3da3fa8f7237175
commit 836c13f87d792f074c6c5ad7a3da3fa8f7237175
Author: Ole Loots <[email protected]>
Commit: Ole Loots <[email protected]>
Set default cookie filename when not set.
diff --git a/atari/gui.c b/atari/gui.c
index e500ad6..8478bd3 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -951,13 +951,18 @@ static void gui_init(int argc, char** argv)
LOG(("Enabling core select menu"));
nsoption_set_bool(core_select_menu, true);
-
+
+ LOG(("Loading url.db from: %s", nsoption_charp(url_file) ));
if( strlen(nsoption_charp(url_file)) ){
urldb_load(nsoption_charp(url_file));
- }
+ }
+
+ if (nsoption_charp(cookie_file) == NULL ){
+ nsoption_set_charp(cookie_file, "cookies");
+ }
+ LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
if( strlen(nsoption_charp(cookie_file)) ){
urldb_load_cookies(nsoption_charp(cookie_file));
- LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
}
if (process_cmdline(argc,argv) != true)
-----------------------------------------------------------------------
Summary of changes:
atari/gui.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/atari/gui.c b/atari/gui.c
index e500ad6..8478bd3 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -951,13 +951,18 @@ static void gui_init(int argc, char** argv)
LOG(("Enabling core select menu"));
nsoption_set_bool(core_select_menu, true);
-
+
+ LOG(("Loading url.db from: %s", nsoption_charp(url_file) ));
if( strlen(nsoption_charp(url_file)) ){
urldb_load(nsoption_charp(url_file));
- }
+ }
+
+ if (nsoption_charp(cookie_file) == NULL ){
+ nsoption_set_charp(cookie_file, "cookies");
+ }
+ LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
if( strlen(nsoption_charp(cookie_file)) ){
urldb_load_cookies(nsoption_charp(cookie_file));
- LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
}
if (process_cmdline(argc,argv) != true)
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
