Changeset 6bbb939 for protocols/msn

Timestamp:

2007-04-16T04:01:13Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cfc8d58

Parents:

84b045d

Message:

Split serv_got_update() into imcb_buddy_(status|times). (Well, the second
one isn't implemented yet, but I'll do that later.) At last I got rid of
the hack called get_status_string(). And now Yahoo seems to mess up away
messages...

Location:

protocols/msn

Files:

• msn.c (modified) (2 diffs)
• ns.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -192 +192 @@
 }
 
-static char *msn_get_status_string( struct im_connection *ic, int number )
-{
-        const struct msn_away_state *st = msn_away_state_by_number( number );
-        
-        if( st )
-                return( (char*) st->name );
-        else
-                return( "" );
-}
-
 static void msn_set_away( struct im_connection *ic, char *state, char *message )
 {
@@ -399 +389 @@
         ret->send_im = msn_send_im;
         ret->away_states = msn_away_states;
-        ret->get_status_string = msn_get_status_string;
         ret->set_away = msn_set_away;
         ret->get_info = msn_get_info;

protocols/msn/ns.c

@@ -400 +400 @@
                 }
                 
-                serv_got_update( ic, cmd[3], 1, 0, 0, 0, st->number, 0 );
+                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN |
+                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
         }
         else if( strcmp( cmd[0], "FLN" ) == 0 )
         {
                 if( cmd[1] )
-                        serv_got_update( ic, cmd[1], 0, 0, 0, 0, 0, 0 );
+                        imcb_buddy_status( ic, cmd[1], 0, NULL, NULL );
         }
         else if( strcmp( cmd[0], "NLN" ) == 0 )
@@ -428 +429 @@
                 }
                 
-                serv_got_update( ic, cmd[2], 1, 0, 0, 0, st->number, 0 );
+                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN |
+                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )