Changeset 58adb7e for protocols

Timestamp:

2010-03-07T00:22:33Z (15 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.

Location:

protocols

Files:

• nogaim.c (modified) (3 diffs)
• nogaim.h (modified) (1 diff)

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 );