[w3m-dev 03377] sync_with_option

* etc.c (loadPassword): reset passwords
* form.c (loadPreForm): reset PreForm
* main.c (option_assigned): deleted
	(parse_proxy): deleted
	(MAIN): move initCookie(), setLocalCookie()
		  after sync_with_option()
		delete parseURL for *_proxy
		s/WrapSearch/WrapDefault/
		move initKeymap(), initMenu() after setupscreen()
		sync_with_option() after init_rc()
* rc.c (pre_form_file): move in params9 (network settting)
	(sync_with_option): initKeymap(), initMenu() is done
			if fmInitialized
	(init_rc): delete sync_with_option()
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-06 03:26:56 +00:00
parent 8503b2be4e
commit 91b3b8a09b
5 changed files with 56 additions and 46 deletions

4
etc.c
View File

@@ -1,4 +1,4 @@
/* $Id: etc.c,v 1.33 2002/11/05 17:54:39 ukai Exp $ */
/* $Id: etc.c,v 1.34 2002/11/06 03:27:04 ukai Exp $ */
#include "fm.h"
#include <pwd.h>
#include "myctype.h"
@@ -1076,6 +1076,8 @@ void
loadPasswd(void)
{
FILE *fp;
passwords = NULL;
fp = openSecretFile(passwd_file);
if (fp != NULL) {
parsePasswd(fp, 0);