Changes in protocols/nogaim.c [449a51d:4cf80bb]

File:

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

protocols/nogaim.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2006 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -98 +98 @@
 void register_protocol (struct prpl *p)
 {
-        int i;
-        gboolean refused = global.conf->protocols != NULL;
- 
-        for (i = 0; global.conf->protocols && global.conf->protocols[i]; i++)
-        {
-                if (g_strcasecmp(p->name, global.conf->protocols[i]) == 0)
-                        refused = FALSE;
-        }
-
-        if (refused)
-                log_message(LOGLVL_WARNING, "Protocol %s disabled\n", p->name);
-        else
-                protocols = g_list_append(protocols, p);
+        protocols = g_list_append(protocols, p);
 }
 
@@ -280 +268 @@
         ic->flags |= OPT_LOGGED_IN;
         
-        /* Necessary to send initial presence status, even if we're not away. */
-        imc_away_send_update( ic );
+        /* Also necessary when we're not away, at least for some of the
+           protocols. */
+        imc_set_away( ic, u->away );
         
         /* Apparently we're connected successfully, so reset the
@@ -383 +372 @@
 /* list.c */
 
-void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group )
+void imcb_add_buddy( struct im_connection *ic, char *handle, char *group )
 {
         user_t *u;
@@ -457 +446 @@
 }
 
-void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
+void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
 {
         user_t *u = user_findhandle( ic, handle );
-        char *set;
         
         if( !u || !realname ) return;
@@ -473 +461 @@
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
-        
-        set = set_getstr( &ic->acc->set, "nick_source" );
-        if( strcmp( set, "handle" ) != 0 )
-        {
-                char *name = g_strdup( realname );
-                
-                if( strcmp( set, "first_name" ) == 0 )
-                {
-                        int i;
-                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
-                        name[i] = '\0';
-                }
-                
-                imcb_buddy_nick_hint( ic, handle, name );
-                
-                g_free( name );
-        }
-}
-
-void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
+}
+
+void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group )
 {
         user_t *u;
@@ -502 +473 @@
 /* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
    modules to suggest a nickname for a handle. */
-void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick )
+void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick )
 {
         user_t *u = user_findhandle( ic, handle );
@@ -647 +618 @@
         oo = u->online;
         
-        g_free( u->away );
-        g_free( u->status_msg );
-        u->away = u->status_msg = NULL;
+        if( u->away )
+        {
+                g_free( u->away );
+                u->away = NULL;
+        }
         
         if( ( flags & OPT_LOGGED_IN ) && !u->online )
@@ -687 +660 @@
                 }
         }
-        else
-        {
-                u->status_msg = g_strdup( message );
-        }
+        /* else waste_any_state_information_for_now(); */
         
         /* LISPy... */
@@ -715 +685 @@
 }
 
-void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
+void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at )
 {
         irc_t *irc = ic->irc;
@@ -848 +818 @@
 }
 
-void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at )
+void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at )
 {
         struct im_connection *ic = c->ic;
@@ -920 +890 @@
 /* buddy_chat.c */
 
-void imcb_chat_add_buddy( struct groupchat *b, const char *handle )
+void imcb_chat_add_buddy( struct groupchat *b, char *handle )
 {
         user_t *u = user_findhandle( b->ic, handle );
@@ -955 +925 @@
 
 /* This function is one BIG hack... :-( EREWRITE */
-void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
+void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason )
 {
         user_t *u;
@@ -1100 +1070 @@
 }
 
-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;
+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 );
 }
 
@@ -1138 +1129 @@
 };
 
-static char *imc_away_state_find( GList *gcm, char *away, char **message )
+static char *imc_away_alias_find( GList *gcm, char *away )
 {
         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 */
@@ -1172 +1146 @@
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                 {
-                        for( m = gcm; m; m = m->next )
+                        m = gcm;
+                        while( m )
+                        {
                                 if( g_strcasecmp( imc_away_alias_list[i][j], m->data ) == 0 )
-                                {
-                                        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;
+                                        return( imc_away_alias_list[i][j] );
+                                m = m->next;
+                        }
+                }
+        }
+        
+        return( NULL );
 }