s/ACC_SET_NOSAVE/SET_NOSAVE/.

8 files changed, 17 insertions, 18 deletions

diff --git a/protocols/account.c b/protocols/account.c
index 12831531..020a55cd 100644
--- a/protocols/account.c
+++ b/protocols/account.c
@@ -52,7 +52,7 @@ account_t *account_add( bee_t *bee, struct prpl *prpl, char *user, char *pass )
 	a->bee = bee;
 	
 	s = set_add( &a->set, "auto_connect", "true", set_eval_account, a );
-	s->flags |= ACC_SET_NOSAVE;
+	s->flags |= SET_NOSAVE;
 	
 	s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
 	
@@ -60,16 +60,16 @@ account_t *account_add( bee_t *bee, struct prpl *prpl, char *user, char *pass )
 	s->flags |= SET_NULL_OK;
 	
 	s = set_add( &a->set, "nick_source", "handle", set_eval_nick_source, a );
-	s->flags |= ACC_SET_NOSAVE; /* Just for bw compatibility! */
+	s->flags |= SET_NOSAVE; /* Just for bw compatibility! */
 	
 	s = set_add( &a->set, "password", NULL, set_eval_account, a );
-	s->flags |= ACC_SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
+	s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
 	
 	s = set_add( &a->set, "tag", NULL, set_eval_account, a );
-	s->flags |= ACC_SET_NOSAVE;
+	s->flags |= SET_NOSAVE;
 	
 	s = set_add( &a->set, "username", NULL, set_eval_account, a );
-	s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+	s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
 	set_setstr( &a->set, "username", user );
 	
 	/* Hardcode some more clever tag guesses. */
diff --git a/protocols/account.h b/protocols/account.h
index a39be2e2..ddc2b3e7 100644
--- a/protocols/account.h
+++ b/protocols/account.h
@@ -60,7 +60,6 @@ int account_reconnect_delay( account_t *a );
 
 typedef enum
 {
-	ACC_SET_NOSAVE = 0x01,          /* Don't save this setting (i.e. stored elsewhere). */
 	ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
 	ACC_SET_ONLINE_ONLY = 0x04,     /* Allow changes only if the acct is online. */
 } account_set_flag_t;
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 723894fe..dbae9ff9 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -79,7 +79,7 @@ static void jabber_init( account_t *acc )
 	s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
 	
 	s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
-	s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
+	s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 	
 	s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );
 	s->flags |= ACC_SET_OFFLINE_ONLY;
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index 03f28422..b1bd4b0a 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -38,7 +38,7 @@ static void msn_init( account_t *acc )
 	set_t *s;
 	
 	s = set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
-	s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+	s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 	
 	set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
 	set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index 1366fe41..8fbd3026 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -377,7 +377,7 @@ static void oscar_init(account_t *acc)
 	s = set_add(&acc->set, "server",
 	            icq ? AIM_DEFAULT_LOGIN_SERVER_ICQ
 	                : AIM_DEFAULT_LOGIN_SERVER_AIM, set_eval_account, acc);
-	s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+	s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
 	
 	if (icq) {
 		s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc);
diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c
index 6515a801..8638b5c1 100644
--- a/protocols/skype/skype.c
+++ b/protocols/skype/skype.c
@@ -1508,13 +1508,13 @@ static void skype_init(account_t *acc)
 
 	s = set_add(&acc->set, "display_name", NULL, skype_set_display_name,
 		acc);
-	s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+	s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
 	s = set_add(&acc->set, "call", NULL, skype_set_call, acc);
-	s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+	s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
 	s = set_add(&acc->set, "balance", NULL, skype_set_balance, acc);
-	s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+	s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
 	s = set_add(&acc->set, "skypeout_offline", "true", set_eval_bool, acc);
 
diff --git a/set.h b/set.h
index d4915546..2a3ce4d1 100644
--- a/set.h
+++ b/set.h
@@ -44,11 +44,11 @@ extern char *SET_INVALID;
 
 typedef enum
 {
-	SET_NOSAVE = 0x0001,
-	SET_NULL_OK = 0x0100,
-	SET_HIDDEN = 0x0200,
-	SET_PASSWORD = 0x0400,
-	SET_HIDDEN_DEFAULT = 0x0800,
+	SET_NOSAVE = 0x0001,   /* Don't save this setting (i.e. stored elsewhere). */
+	SET_NULL_OK = 0x0100,  /* set->value == NULL is allowed. */
+	SET_HIDDEN = 0x0200,   /* Don't show up in setting lists. Mostly for internal storage. */
+	SET_PASSWORD = 0x0400, /* Value shows up in settings list as "********". */
+	SET_HIDDEN_DEFAULT = 0x0800, /* Hide unless changed from default. */
 } set_flags_t;
 
 typedef struct set
diff --git a/storage_xml.c b/storage_xml.c
index caaf8a1d..4684686a 100644
--- a/storage_xml.c
+++ b/storage_xml.c
@@ -309,7 +309,7 @@ struct xt_node *xml_generate( irc_t *irc )
 		g_free( pass_b64 );
 		
 		for( set = acc->set; set; set = set->next )
-			if( set->value && !( set->flags & ACC_SET_NOSAVE ) )
+			if( set->value && !( set->flags & SET_NOSAVE ) )
 			{
 				struct xt_node *xset;
 				xt_add_child( cur, xset = xt_new_node( "setting", set->value, NULL ) );