# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 990418527 0
# Node ID 28921530e20bde37dfb8d25576e5c640beb46669
# Parent  3f6c63edd47f23ca5f2bddfa25f4ba0caa594a2f
[gaim-migrate @ 1880]
sell out with me oh yeah sell out with me tonight
THE RECORD COMPANY IS GONNA MAKE EVERY THING ALL RIGHT

committer: Tailor Script <tailor@pidgin.im>

diff -r 3f6c63edd47f -r 28921530e20b plugins/jabber/jabber.c
--- a/plugins/jabber/jabber.c	Mon May 21 03:54:06 2001 +0000
+++ b/plugins/jabber/jabber.c	Mon May 21 04:15:27 2001 +0000
@@ -1115,7 +1115,7 @@
 			from = xmlnode_get_attrib(p->x, "from");
 			querynode = xmlnode_get_tag(p->x, "query");
 			xmlns = xmlnode_get_attrib(querynode, "xmlns");
-			vcard = xmlnode_get_tag(p->x, "VCARD");
+			vcard = xmlnode_get_tag(p->x, "vCard");
 
 			if (NSCHECK(querynode, NS_ROSTER)) {
 				jabber_handleroster(j, querynode);
diff -r 3f6c63edd47f -r 28921530e20b src/buddy.c
--- a/src/buddy.c	Mon May 21 03:54:06 2001 +0000
+++ b/src/buddy.c	Mon May 21 04:15:27 2001 +0000
@@ -1721,7 +1721,6 @@
 				gtk_option_menu_set_history(GTK_OPTION_MENU(c->menu),
 						g_slist_index(connections, u->gc));
 				update_buttons_by_protocol(c);
-					c = new_conversation(name);
 			}
 			if (b->options & OPT_POUNCE_SEND_IM) {
                         	c = find_conversation(name);