Mercurial > pidgin
changeset 31138:d5b710c91104
merge of 'bdb9e04ffa44988c3cb76672342070f9e798772a'
and 'e97fa87108d60ea0e2ce4aaeaee31e5967e0b6db'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Mon, 10 Jan 2011 03:30:05 +0000 |
| parents | 38cd00d46b4d (current diff) 601820fe2acc (diff) |
| children | 365ec0996ca0 |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Jan 10 01:17:34 2011 +0000 +++ b/COPYRIGHT Mon Jan 10 03:30:05 2011 +0000 @@ -81,6 +81,7 @@ Norbert Buchmuller Johannes Buchner Sean Burke +Gabriel Burt Thomas Butter Trevor Caira Andrea Canciani
--- a/ChangeLog Mon Jan 10 01:17:34 2011 +0000 +++ b/ChangeLog Mon Jan 10 03:30:05 2011 +0000 @@ -10,6 +10,10 @@ * Perl bindings now respect LDFLAGS. (Peter Volkov, Markos Chandras) (#12638) + Groupwise: + * Don't show two windows when using "Get Info" on a buddy. (Gabriel Burt; + Novell, Inc.) (#13108) + IRC: * Don't send ISON messages longer than 512 bytes. (Jeffrey Honig) (#9692)
--- a/libpurple/protocols/novell/novell.c Mon Jan 10 01:17:34 2011 +0000 +++ b/libpurple/protocols/novell/novell.c Mon Jan 10 03:30:05 2011 +0000 @@ -74,7 +74,7 @@ _sync_privacy_lists(NMUser *user); static void -_show_info(PurpleConnection * gc, NMUserRecord * user_record); +_show_info(PurpleConnection * gc, NMUserRecord * user_record, char * name); const char * _get_conference_name(int id); @@ -705,7 +705,7 @@ user_record = (NMUserRecord *) resp_data; if (user_record) { _show_info(purple_account_get_connection(user->client_data), - user_record); + user_record, g_strdup(name)); } } else { gc = purple_account_get_connection(user->client_data); @@ -1505,7 +1505,7 @@ /* Display a dialog box showing the properties for the given user record */ static void -_show_info(PurpleConnection * gc, NMUserRecord * user_record) +_show_info(PurpleConnection * gc, NMUserRecord * user_record, char * name) { PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); int count, i; @@ -1544,9 +1544,10 @@ } } - purple_notify_userinfo(gc, nm_user_record_get_userid(user_record), - user_info, NULL, NULL); + purple_notify_userinfo(gc, name, user_info, NULL, NULL); purple_notify_user_info_destroy(user_info); + + g_free(name); } /* Send a join conference, the first item in the parms list is the @@ -2912,11 +2913,9 @@ user_record = nm_find_user_record(user, name); if (user_record) { - - _show_info(gc, user_record); + _show_info(gc, user_record, g_strdup(name)); } else { - rc = nm_send_get_details(user, name, _get_details_resp_show_info, g_strdup(name));