Mercurial > pidgin.yaz

changeset 4790:4e617a0719ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5110] Fixes ICQ receive contacts from another ICQ user. Previously, the name and alias were swapped when you try to add a buddy. Also, I think Gaim should try to be the St. Pauli Girl spokesperson for 2004. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 15 Mar 2003 19:47:54 +0000
parents f1fde07ed951
children e737e3e08b4a
files src/protocols/oscar/oscar.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c	Sat Mar 15 18:23:38 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Mar 15 19:47:54 2003 +0000
@@ -2422,8 +2422,8 @@
 					struct name_data *data = g_new(struct name_data, 1);
 					gchar *message = g_strdup_printf(_("ICQ user %lu has sent you a contact: %s (%s)"), args->uin, text[i*2+2], text[i*2+1]);
 					data->gc = gc;
-					data->name = g_strdup(text[i*2+2]);
-					data->nick = g_strdup(text[i*2+1]);
+					data->name = g_strdup(text[i*2+1]);
+					data->nick = g_strdup(text[i*2+2]);
 					do_ask_dialog(message, _("Do you want to add this contact to your Buddy List?"), data, _("Add"), gaim_icq_contactadd, _("Decline"), gaim_free_name_data, my_protocol->plug ? my_protocol->plug->handle : NULL, FALSE);
 					g_free(message);
 				}