Changeset be609ff for protocols/nogaim.c

Timestamp:

2010-03-12T19:10:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dde9d571

Parents:

08e5bb2 (diff), 8b6b740 (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 mainline.

File:

• protocols/nogaim.c (modified) (5 diffs)

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
@@ -1070 +1069 @@
 }
 
-static char *imc_away_alias_find( GList *gcm, char *away );
-
-int imc_set_away( struct im_connection *ic, char *away )
-{
-        GList *m, *ms;
-        char *s;
-        
-        if( !away ) away = "";
-        ms = m = ic->acc->prpl->away_states( ic );
-        
-        while( m )
-        {
-                if( *away )
-                {
-                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
-                                break;
-                }
-                else
-                {
-                        if( g_strcasecmp( m->data, "Available" ) == 0 )
-                                break;
-                        if( g_strcasecmp( m->data, "Online" ) == 0 )
-                                break;
-                }
-                m = m->next;
-        }
-        
-        if( m )
-        {
-                ic->acc->prpl->set_away( ic, m->data, *away ? away : NULL );
-        }
-        else
-        {
-                s = imc_away_alias_find( ms, away );
-                if( s )
-                {
-                        ic->acc->prpl->set_away( ic, s, away );
-                        if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "Setting away state to %s", s );
-                }
-                else
-                        ic->acc->prpl->set_away( ic, GAIM_AWAY_CUSTOM, away );
-        }
-        
-        return( 1 );
+static char *imc_away_state_find( GList *gcm, char *away, char **message );
+
+int imc_away_send_update( struct im_connection *ic )
+{
+        char *away, *msg = NULL;
+        
+        away = set_getstr( &ic->acc->set, "away" ) ?
+             : set_getstr( &ic->irc->set, "away" );
+        if( away && *away )
+        {
+                GList *m = ic->acc->prpl->away_states( ic );
+                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;
 }
 
@@ -1129 +1107 @@
 };
 
-static char *imc_away_alias_find( GList *gcm, char *away )
+static char *imc_away_state_find( GList *gcm, char *away, char **message )
 {
         GList *m;
         int i, j;
         
+        for( m = gcm; m; m = m->next )
+                if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
+                {
+                        /* At least the Yahoo! module works better if message
+                           contains no data unless it adds something to what
+                           we have in state already. */
+                        if( strlen( m->data ) == strlen( away ) )
+                                *message = NULL;
+                        
+                        return m->data;
+                }
+        
         for( i = 0; *imc_away_alias_list[i]; i ++ )
         {
+                int keep_message;
+                
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                         if( g_strncasecmp( away, imc_away_alias_list[i][j], strlen( imc_away_alias_list[i][j] ) ) == 0 )
+                        {
+                                keep_message = strlen( away ) != strlen( imc_away_alias_list[i][j] );
                                 break;
+                        }
                 
                 if( !imc_away_alias_list[i][j] )        /* If we reach the end, this row */
@@ -1146 +1141 @@
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                 {
-                        m = gcm;
-                        while( m )
-                        {
+                        for( m = gcm; m; m = m->next )
                                 if( g_strcasecmp( imc_away_alias_list[i][j], m->data ) == 0 )
-                                        return( imc_away_alias_list[i][j] );
-                                m = m->next;
-                        }
-                }
-        }
-        
-        return( NULL );
+                                {
+                                        if( !keep_message )
+                                                *message = NULL;
+                                        
+                                        return imc_away_alias_list[i][j];
+                                }
+                }
+                
+                /* No need to look further, apparently this state doesn't
+                   have any good alias for this protocol. */
+                break;
+        }
+        
+        return NULL;
 }