diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-07-10 00:25:07 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-07-10 00:25:07 +0100 |
| commit | b556e46f9bfeeb630b45a3c0f0951110ac3de0f2 (patch) | |
| tree | 503b810a5e9322b444dc7e84e4d8535dc0f4807e /protocols | |
| parent | c5bff810e6919dc3daf7f82f761197a27f04538b (diff) | |
| parent | 9a9b520df6044cfc034f9736fb97660a46e879b9 (diff) | |
Merging main ui-fix.
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/bee.h | 1 | ||||
| -rw-r--r-- | protocols/bee_user.c | 1 | ||||
| -rw-r--r-- | protocols/nogaim.c | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/protocols/bee.h b/protocols/bee.h index e82913d6..4b6a1f4a 100644 --- a/protocols/bee.h +++ b/protocols/bee.h @@ -61,6 +61,7 @@ typedef struct bee_user struct im_connection *ic; char *handle; char *fullname; + char *nick; struct bee_group *group; bee_user_flags_t flags; diff --git a/protocols/bee_user.c b/protocols/bee_user.c index faa2acb7..4399a566 100644 --- a/protocols/bee_user.c +++ b/protocols/bee_user.c @@ -59,6 +59,7 @@ int bee_user_free( bee_t *bee, bee_user_t *bu ) g_free( bu->handle ); g_free( bu->fullname ); + g_free( bu->nick ); g_free( bu->status ); g_free( bu->status_msg ); g_free( bu ); diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 0998291b..c23b0a3a 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -427,6 +427,9 @@ void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const c if( !bu || !nick ) return; + g_free( bu->nick ); + bu->nick = g_strdup( nick ); + if( bee->ui->user_nick_hint ) bee->ui->user_nick_hint( bee, bu, nick ); } |