aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--protocols/bee_user.c2
-rw-r--r--protocols/msn/sb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/bee_user.c b/protocols/bee_user.c
index 71b15d29..1f9b1b47 100644
--- a/protocols/bee_user.c
+++ b/protocols/bee_user.c
@@ -222,7 +222,7 @@ void imcb_buddy_status_msg( struct im_connection *ic, const char *handle, const
old = g_memdup( bu, sizeof( bee_user_t ) );
- bu->status_msg = g_strdup( message );
+ bu->status_msg = message && *message ? g_strdup( message ) : NULL;
if( bee->ui->user_status )
bee->ui->user_status( bee, bu, old );
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index fdad2882..75417fae 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -751,8 +751,8 @@ static int msn_sb_message( gpointer data, char *msg, int msglen, char **cmd, int
#endif
else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 )
{
- imcb_error( sb->ic, "Cannot receive file from %s: BitlBee does not "
- "support msnmsgrp2p yet.", sb->who );
+ /* Not currently implemented. Don't warn about it since
+ this seems to be used for avatars now. */
g_free( ct );
}
else if( g_strncasecmp( ct, "text/x-msmsgscontrol", 20 ) == 0 )