Changeset 58adb7e

Timestamp:

2010-03-07T00:22:33Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

68198e9

Parents:

34fbbf9

Message:

Added global and per-account settings "away" and "status" so the user can
set these things individually.

Files:

• account.c (modified) (4 diffs)
• irc.c (modified) (3 diffs)
• irc_commands.c (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (1 diff)

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                *
   \********************************************************************/
 
@@ -69 +69 @@
                 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 +130 @@
                 
                 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 +291 @@
         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';

irc.c

@@ -78 +78 @@
 }
 
+static char *set_eval_away_status( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        account_t *a;
+        
+        g_free( set->value );
+        set->value = g_strdup( value );
+        
+        for( a = irc->accounts; a; a = a->next )
+        {
+                struct im_connection *ic = a->ic;
+                
+                if( ic && ic->flags & OPT_LOGGED_IN )
+                        imc_away_send_update( ic );
+        }
+        
+        return value;
+}
+
 irc_t *irc_new( int fd )
 {
@@ -143 +162 @@
         irc_connection_list = g_slist_append( irc_connection_list, irc );
         
+        s = set_add( &irc->set, "away", NULL,  set_eval_away_status, irc );
+        s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
         s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
@@ -163 +184 @@
         s = set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
+        s = set_add( &irc->set, "status", NULL,  set_eval_away_status, irc );
+        s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "strip_html", "true", NULL, irc );
         s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );

irc_commands.c

@@ -475 +475 @@
         }
         
-        for( a = irc->accounts; a; a = a->next )
-        {
-                struct im_connection *ic = a->ic;
-                
-                if( ic && ic->flags & OPT_LOGGED_IN )
-                        imc_set_away( ic, u->away );
-        }
+        set_setstr( &irc->set, "away", u->away );
 }
 

protocols/nogaim.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -268 +268 @@
         ic->flags |= OPT_LOGGED_IN;
         
-        /* Also necessary when we're not away, at least for some of the
-           protocols. */
-        imc_set_away( ic, u->away );
+        /* Necessary to send initial presence status, even if we're not away. */
+        imc_away_send_update( ic );
         
         /* Apparently we're connected successfully, so reset the
@@ -1072 +1071 @@
 static char *imc_away_state_find( GList *gcm, char *away, char **message );
 
-int imc_set_away( struct im_connection *ic, char *away )
-{
-        char *s = NULL, *msg = away;
-        
+int imc_away_send_update( struct im_connection *ic )
+{
+        char *away, *msg;
+        
+        away = set_getstr( &ic->acc->set, "away" ) ?
+             : set_getstr( &ic->irc->set, "away" );
         if( away && *away )
         {
                 GList *m = ic->acc->prpl->away_states( ic );
-                s = imc_away_state_find( m, away, &msg ) ? : m->data;
-        }
-        
-        if( set_getbool( &ic->irc->set, "debug" ) )
-                imcb_log( ic, "Setting away state to %s", s );
-        
-        ic->acc->prpl->set_away( ic, s, ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? msg : NULL );
+                msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
+                away = imc_away_state_find( m, away, &msg ) ? : m->data;
+        }
+        else if( ic->acc->flags & ACC_FLAG_STATUS_MESSAGE )
+        {
+                away = NULL;
+                msg = set_getstr( &ic->acc->set, "status" ) ?
+                    : set_getstr( &ic->irc->set, "status" );
+        }
+        
+        ic->acc->prpl->set_away( ic, away, msg );
         
         return 1;

protocols/nogaim.h

@@ -314 +314 @@
 
 /* Actions, or whatever. */
-int imc_set_away( struct im_connection *ic, char *away );
+int imc_away_send_update( struct im_connection *ic );
 int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags );
 int imc_chat_msg( struct groupchat *c, char *msg, int flags );