# HG changeset patch
# User Andreas Monitzer <pidgin@monitzer.com>
# Date 1184196432 0
# Node ID c03e3fe11ea96fc1f0939f8e27514808fe1bf77d
# Parent  5c1ed6296b5621fcaa999f0adf440bf788889c99
Fixed errors created by merge conflict resolve mistakes.

diff -r 5c1ed6296b56 -r c03e3fe11ea9 libpurple/protocols/jabber/disco.c
--- a/libpurple/protocols/jabber/disco.c	Wed Jul 11 22:27:44 2007 +0000
+++ b/libpurple/protocols/jabber/disco.c	Wed Jul 11 23:27:12 2007 +0000
@@ -291,9 +291,7 @@
 	}
 
 	/* Send initial presence; this will trigger receipt of presence for contacts on the roster */
-	gpresence = purple_account_get_presence(js->gc->account);
-	status = purple_presence_get_active_status(gpresence);
-	jabber_presence_send(js->gc->account, status);
+	jabber_presence_send(js->gc->account, NULL);
 	
 	if (js->server_caps & JABBER_CAP_ADHOC) {
 		/* The server supports ad-hoc commands, so let's request the list */
diff -r 5c1ed6296b56 -r c03e3fe11ea9 libpurple/protocols/jabber/jabber.h
--- a/libpurple/protocols/jabber/jabber.h	Wed Jul 11 22:27:44 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Wed Jul 11 23:27:12 2007 +0000
@@ -157,9 +157,10 @@
 	int sasl_state;
 	int sasl_maxbuf;
 	GString *sasl_mechs;
-#endif
 	char *serverFQDN;
 	
+	gboolean vcard_fetched;
+	
 	/* does the local server support PEP? */
 	gboolean pep;