Changeset bb5ce568

Timestamp:

2012-06-07T22:41:17Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e222c36

Parents:

aa88e50

Message:

s/ACC_SET_NOSAVE/SET_NOSAVE/.

Files:

• protocols/account.c (modified) (2 diffs)
• protocols/account.h (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/skype/skype.c (modified) (1 diff)
• set.h (modified) (1 diff)
• storage_xml.c (modified) (1 diff)

protocols/account.c

@@ -53 +53 @@
         
         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 );
@@ -61 +61 @@
         
         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 );
         

protocols/account.h

@@ -61 +61 @@
 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. */

protocols/jabber/jabber.c

@@ -80 +80 @@
         
         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 );

protocols/msn/msn.c

@@ -39 +39 @@
         
         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 );

protocols/oscar/oscar.c

@@ -378 +378 @@
                     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) {

protocols/skype/skype.c

@@ -1509 +1509 @@
         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);

set.h

@@ -45 +45 @@
 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;
 

storage_xml.c

@@ -310 +310 @@
                 
                 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;