aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/msn
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/msn')
-rw-r--r--protocols/msn/msn.c11
-rw-r--r--protocols/msn/ns.c8
2 files changed, 5 insertions, 14 deletions
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index 676a8ad7..5eea68af 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -191,16 +191,6 @@ static GList *msn_away_states( struct im_connection *ic )
return l;
}
-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 )
{
char buf[1024];
@@ -398,7 +388,6 @@ void msn_initmodule()
ret->logout = msn_logout;
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;
ret->set_my_name = msn_set_my_name;
diff --git a/protocols/msn/ns.c b/protocols/msn/ns.c
index ba428d82..c80fc177 100644
--- a/protocols/msn/ns.c
+++ b/protocols/msn/ns.c
@@ -399,12 +399,13 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
st = msn_away_state_list;
}
- 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 )
{
@@ -427,7 +428,8 @@ static int msn_ns_command( gpointer data, char **cmd, int num_parts )
st = msn_away_state_list;
}
- 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 )
{