diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-22 11:42:27 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-22 11:42:27 +0100 |
| commit | 9b1d2d6fa7edb911e3dbcd8785aaa797ebb20d0a (patch) | |
| tree | 71c59c49beaadc05e0c3cf01e3da6decfb59443b /protocols | |
| parent | fd424c891db6da587cce3da8ac98ab7dfa986fb3 (diff) | |
Ignore empty status messages, and msnmsgrp2p invitations.
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/bee_user.c | 2 | ||||
| -rw-r--r-- | protocols/msn/sb.c | 4 |
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 ) |