Changeset 6d8cc05 for irc.c

Timestamp:

2010-07-18T23:50:27Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5a61bf59

Parents:

94d5da9c

Message:

Adding easy migration from old show_offline/away_devoice settings, and
documentation.

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -33 +33 @@
 static char *set_eval_charset( set_t *set, char *value );
 static char *set_eval_password( set_t *set, char *value );
+static char *set_eval_bw_compat( set_t *set, char *value );
 
 irc_t *irc_new( int fd )
@@ -101 +102 @@
         
         s = set_add( &b->set, "allow_takeover", "true", set_eval_bool, irc );
-        s = set_add( &b->set, "away_devoice", "true", set_eval_away_devoice, irc );
+        s = set_add( &b->set, "away_devoice", "true", set_eval_bw_compat, irc );
         s = set_add( &b->set, "away_reply_timeout", "3600", set_eval_int, irc );
         s = set_add( &b->set, "charset", "utf-8", set_eval_charset, irc );
@@ -121 +122 @@
         s = set_add( &b->set, "query_order", "lifo", NULL, irc );
         s = set_add( &b->set, "root_nick", ROOT_NICK, set_eval_root_nick, irc );
+        s = set_add( &b->set, "show_offline", "false", set_eval_bw_compat, irc );
         s = set_add( &b->set, "simulate_netsplit", "true", set_eval_bool, irc );
         s = set_add( &b->set, "timezone", "local", set_eval_timezone, irc );
@@ -901 +903 @@
 }
 
-char *set_eval_away_devoice( set_t *set, char *value )
+/* Mostly meant for upgrades. If one of these is set to the non-default,
+   set show_users of all channels to something with the same effect. */
+static char *set_eval_bw_compat( set_t *set, char *value )
 {
         irc_t *irc = set->data;
-        
-        if( !is_bool( value ) )
+        char *val;
+        GSList *l;
+        
+        irc_usermsg( irc, "Setting `%s' is obsolete, use the `show_users' "
+                     "channel setting instead.", set->key );
+        
+        if( strcmp( set->key, "away_devoice" ) == 0 && !bool2int( value ) )
+                val = "online,away";
+        else if( strcmp( set->key, "show_offline" ) == 0 && bool2int( value ) )
+                val = "online@,away+,offline";
+        else
                 return SET_INVALID;
         
-        /* The usual problem: The setting isn't actually changed at this
-           point and we need it to be, so do it by hand. */
-        g_free( set->value );
-        set->value = g_strdup( value );
-        
-        bee_irc_channel_update( irc, NULL, NULL );
-        
-        return value;
-}
+        for( l = irc->channels; l; l = l->next )
+        {
+                irc_channel_t *ic = l->data;
+                /* No need to check channel type, if the setting doesn't exist it
+                   will just be ignored. */
+                set_setstr( &ic->set, "show_users", val );
+        }
+        
+        return SET_INVALID;
+}