Changeset 728a981 for protocols/nogaim.c

Timestamp:

2006-03-24T15:16:38Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f32d557

Parents:

96ace1b (diff), 9b8a38b (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:

[merge] Wilmer

File:

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

protocols/nogaim.c

@@ -14 +14 @@
  * (except for the function names).
  *
- * Copyright 2002-2004 Wilmer van der Gaast <lintux@lintux.cx>
+ * Copyright 2002-2006 Wilmer van der Gaast <wilmer@gaast.net> and others
  */
 
@@ -39 +39 @@
 #include <iconv.h>
 
-static char *proto_away_alias[7][5] =
+static char *proto_away_alias[8][5] =
 {
         { "Away from computer", "Away", "Extended away", NULL },
@@ -47 +47 @@
         { "On the phone", "Phone", "On phone", NULL },
         { "Out to lunch", "Lunch", "Food", NULL },
+        { "Invisible", "Hidden" },
         { NULL }
 };
@@ -305 +306 @@
 {
         va_list params;
-        char text[1024], buf[1024], acc_id[33];
+        char text[1024], buf[1024], *acc_id;
         char *msg;
         account_t *a;
@@ -330 +331 @@
         /* If we found one, add the screenname to the acc_id. */
         if( a )
-                g_snprintf( acc_id, 32, "%s(%s)", gc->prpl->name, gc->username );
+                acc_id = g_strdup_printf( "%s(%s)", gc->prpl->name, gc->username );
         else
-                g_snprintf( acc_id, 32, "%s", gc->prpl->name );
+                acc_id = g_strdup( gc->prpl->name );
         
         irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
+        
+        g_free( acc_id );
 }
 
@@ -352 +355 @@
         
         /* MSN servers sometimes redirect you to a different server and do
-           the whole login sequence again, so subsequent calls to this
+           the whole login sequence again, so these "late" calls to this
            function should be handled correctly. (IOW, ignored) */
         if( gc->flags & OPT_LOGGED_IN )
@@ -364 +367 @@
         gc->flags |= OPT_LOGGED_IN;
         
-        if( u && u->away ) proto_away( gc, u->away );
-        
-        if( !strcmp(gc->prpl->name, "icq") )
+        /* Also necessary when we're not away, at least for some of the
+           protocols. */
+        proto_away( gc, u->away );
+        
+        if( strcmp( gc->prpl->name, "ICQ" ) == 0 )
         {
                 for( u = gc->irc->users; u; u = u->next )
@@ -470 +475 @@
 /* list.c */
 
-int bud_list_cache_exists( struct gaim_connection *gc )
-{
-        return( 0 );
-}
-
-void do_import( struct gaim_connection *gc, void *null )
-{
-        return;
-}
-
 void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *realname )
 {
@@ -531 +526 @@
         u->gc = gc;
         u->handle = g_strdup( handle );
+        if( group ) u->group = g_strdup( group );
         u->send_handler = buddy_send_handler;
         u->last_typing_notice = 0;
@@ -552 +548 @@
         
         return( b );
-}
-
-void do_export( struct gaim_connection *gc )
-{
-        return;
 }
 
@@ -882 +873 @@
         
         return( c );
-}
-
-void serv_finish_login( struct gaim_connection *gc )
-{
-        return;
 }