Changeset 75554d0 for account.c

Timestamp:

2010-03-17T13:56:52Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b788246

Parents:

e5e795d (diff), f9928cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in 1.2.5.

File:

• account.c (modified) (5 diffs)

account.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -55 +55 @@
         s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
         
+        s = set_add( &a->set, "nick_source", "handle", NULL, a );
+        
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
         s->flags |= ACC_SET_NOSAVE | SET_NULL_OK;
@@ -69 +71 @@
                 prpl->init( a );
         
-        return( a );
+        s = set_add( &a->set, "away", NULL, set_eval_account, a );
+        s->flags |= SET_NULL_OK;
+        
+        if( a->flags & ACC_FLAG_STATUS_MESSAGE )
+        {
+                s = set_add( &a->set, "status", NULL, set_eval_account, a );
+                s->flags |= SET_NULL_OK;
+        }
+        
+        return a;
 }
 
@@ -121 +132 @@
                 
                 acc->auto_connect = bool2int( value );
+                return value;
+        }
+        else if( strcmp( set->key, "away" ) == 0 ||
+                 strcmp( set->key, "status" ) == 0 )
+        {
+                if( acc->ic && acc->ic->flags & OPT_LOGGED_IN )
+                {
+                        /* If we're currently on-line, set the var now already
+                           (bit of a hack) and send an update. */
+                        g_free( set->value );
+                        set->value = g_strdup( value );
+                        
+                        imc_away_send_update( acc->ic );
+                }
+                
                 return value;
         }
@@ -267 +293 @@
         p->max = 86400;
         
-        /* Format: /[0-9]+([*+][0-9]+(<[0-9+]))/ */
+        /* Format: /[0-9]+([*+][0-9]+(<[0-9+])?)?/ */
         while( *value && isdigit( *value ) )
                 p->start = p->start * 10 + *value++ - '0';