diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-02-12 20:20:49 +1300 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-02-12 20:20:49 +1300 |
| commit | ec3e4116687f5e990e6d24e2c79e629665ac5e7e (patch) | |
| tree | b99eab8a9fcab6125bc37914c10ebcf7a514df7f /protocols | |
| parent | 9fae35c9cf2d5a319623946705e5d7179ea5c338 (diff) | |
| parent | 1d2e3c2ee2fb4c12ad25832b93ae9513d042717a (diff) | |
Merge Wilmer
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/msn/msn.c | 4 | ||||
| -rw-r--r-- | protocols/msn/sb.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c index b03c898e..3c7064f8 100644 --- a/protocols/msn/msn.c +++ b/protocols/msn/msn.c @@ -83,13 +83,13 @@ static void msn_close( struct gaim_connection *gc ) for( l = md->msgq; l; l = l->next ) { m = l->data; + + serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who ); g_free( m->who ); g_free( m->text ); g_free( m ); } g_slist_free( md->msgq ); - - serv_got_crap( gc, "Warning: Closing down MSN connection with unsent message(s), you'll have to resend them." ); } for( l = gc->permit; l; l = l->next ) diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c index 9e7ef841..deaceba1 100644 --- a/protocols/msn/sb.c +++ b/protocols/msn/sb.c @@ -212,13 +212,16 @@ void msn_sb_destroy( struct msn_switchboard *sb ) for( l = sb->msgq; l; l = l->next ) { m = l->data; + g_free( m->who ); g_free( m->text ); g_free( m ); } g_slist_free( sb->msgq ); - serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with unsent message(s), you'll have to resend them." ); + serv_got_crap( gc, "Warning: Closing down MSN switchboard connection with " + "unsent message to %s, you'll have to resend it.", + m->who ? m->who : "(unknown)" ); } if( sb->chat ) |