Mercurial > pidgin

diff libgaim/protocols/jabber/jabber.c @ 15282:8e39ca9b954a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 18072] Fixed retrieval of initial presence from jabber contacts for non-Talk accounts: We are notified of presence for contacts one we set our own presence, so wait to do so until after we've requested the roster. committer: Tailor Script <tailor@pidgin.im>
author Evan Schoenberg <evan.s@dreskin.net>
date Thu, 04 Jan 2007 19:21:10 +0000
parents 4bf7801a2539
children b6f192c01225
line wrap: on
line diff
--- a/libgaim/protocols/jabber/jabber.c	Thu Jan 04 17:11:48 2007 +0000
+++ b/libgaim/protocols/jabber/jabber.c	Thu Jan 04 19:21:10 2007 +0000
@@ -1008,9 +1008,6 @@
 
 void jabber_stream_set_state(JabberStream *js, JabberStreamState state)
 {
-	GaimPresence *gpresence;
-	GaimStatus *status;
-
 	js->state = state;
 	switch(state) {
 		case JABBER_STREAM_OFFLINE:
@@ -1042,9 +1039,6 @@
 			
 			break;
 		case JABBER_STREAM_CONNECTED:
-			gpresence = gaim_account_get_presence(js->gc->account);
-			status = gaim_presence_get_active_status(gpresence);
-			jabber_presence_send(js->gc->account, status);
 			gaim_connection_set_state(js->gc, GAIM_CONNECTED);
 			jabber_disco_items_server(js);
 			break;