Mercurial > pidgin.yaz
changeset 20670:6b9e964f0572
merge of 'a5dd91b5d76972cf72a56209503c7e32d71c6e3c'
and 'd33243e8f5347776c81f81a0e4ba3a76ae5505a5'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Fri, 28 Sep 2007 01:54:07 +0000 |
parents | 22034ce81dc4 (diff) 8d9db4584f02 (current diff) |
children | 4dd60add6a7c |
files | |
diffstat | 1 files changed, 1 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/switchboard.c Thu Sep 27 10:06:29 2007 +0000 +++ b/libpurple/protocols/msn/switchboard.c Fri Sep 28 01:54:07 2007 +0000 @@ -958,25 +958,14 @@ nudge_msg(MsnCmdProc *cmdproc, MsnMessage *msg) { MsnSwitchBoard *swboard; - char *username, *str; PurpleAccount *account; - PurpleBuddy *buddy; const char *user; - str = NULL; - swboard = cmdproc->data; account = cmdproc->session->account; user = msg->remote_user; - if ((buddy = purple_find_buddy(account, user)) != NULL) - username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1); - else - username = g_markup_escape_text(user, -1); - - serv_got_attention(account->gc, buddy->name, MSN_NUDGE); - g_free(username); - g_free(str); + serv_got_attention(account->gc, user, MSN_NUDGE); } /**************************************************************************