diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-17 14:50:01 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-17 14:50:01 +0100 |
| commit | 6e9ae727bcd95eb820fa28becaf9f79ac463de5f (patch) | |
| tree | 2d1d2a0f511d1356caf4a3f7c29c1578f0583a95 /protocols/purple/purple.c | |
| parent | 87dddee3a14d7755204d6fc4b321729bad02ce4e (diff) | |
| parent | 17f057d70b1513710e3d765969205625f0fc7b76 (diff) | |
Mainline merge.
Diffstat (limited to 'protocols/purple/purple.c')
| -rw-r--r-- | protocols/purple/purple.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index 55678f92..3dedd20c 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -180,7 +180,7 @@ static void purple_init( account_t *acc ) default: /** No way to talk to the user right now, invent one when this becomes important. - irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n", + irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n", name, purple_account_option_get_type( o ) ); */ name = NULL; @@ -749,6 +749,8 @@ static void prplcb_blist_update( PurpleBuddyList *list, PurpleBlistNode *node ) if( bud->server_alias ) imcb_rename_buddy( ic, bud->name, bud->server_alias ); + else if( bud->alias ) + imcb_rename_buddy( ic, bud->name, bud->alias ); if( group ) imcb_add_buddy( ic, bud->name, purple_group_get_name( group ) ); |