[Gaim-commits] CVS: gaim/src account.c,1.138,1.139 blist.c,1.209,1.210

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11779

Modified Files:
	account.c blist.c 
Log Message:
0 is not a valid value for account->perm_deny.



Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -p -r1.138 -r1.139
--- account.c	24 Apr 2005 20:38:36 -0000	1.138
+++ account.c	26 May 2005 13:04:41 -0000	1.139
@@ -682,6 +682,8 @@ gaim_account_new(const char *username, c
 	account->ui_settings = g_hash_table_new_full(g_str_hash, g_str_equal,
 				g_free, (GDestroyNotify)g_hash_table_destroy);
 	account->system_log = NULL;
+	/* 0 is not a valid privacy setting */
+	account->perm_deny = 1;
 
 	account->presence = gaim_presence_new_for_account(account);
 

Index: blist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -p -r1.209 -r1.210
--- blist.c	19 Apr 2005 19:48:24 -0000	1.209
+++ blist.c	26 May 2005 13:04:41 -0000	1.210
@@ -561,6 +561,7 @@ gaim_blist_load()
 		for (anode = privacy->child; anode; anode = anode->next) {
 			xmlnode *x;
 			GaimAccount *account;
+			int imode;
 			const char *acct_name, *proto, *mode, *protocol;
 
 			acct_name = xmlnode_get_attrib(anode, "name");
@@ -576,7 +577,8 @@ gaim_blist_load()
 			if (!account)
 				continue;
 
-			account->perm_deny = atoi(mode);
+			imode = atoi(mode);
+			account->perm_deny = (imode != 0 ? imode : 1);
 
 			for (x = anode->child; x; x = x->next) {
 				char *name;