[ekg2-commit] r4017 - trunk/plugins/jabber: trunk/plugins/jabber/jabber_handlers.c trunk/plugins/jabber/jabber_handlers_iq_result.c

[SVN commit]

Author: wiechu
Date: 2008-06-18 23:54:51 +0200 (Wed, 18 Jun 2008)
New Revision: 4017

Modified:
   trunk/plugins/jabber/jabber_handlers.c
   trunk/plugins/jabber/jabber_handlers_iq_result.c
Log:
    fix recv presence before roster

Modified: trunk/plugins/jabber/jabber_handlers.c
===================================================================
--- trunk/plugins/jabber/jabber_handlers.c	2008-06-18 18:18:53 UTC (rev 4016)
+++ trunk/plugins/jabber/jabber_handlers.c	2008-06-18 21:54:51 UTC (rev 4017)
@@ -1685,7 +1685,6 @@
 
 	userlist_free(s);
 	watch_write(j->send_watch, "<iq type=\"get\"><query xmlns=\"jabber:iq:roster\"/></iq>");
-	jabber_write_status(s);
 
 	if (session_int_get(s, "auto_bookmark_sync") != 0) command_exec(NULL, s, ("/xmpp:bookmark --get"), 1);
 	if (session_int_get(s, "auto_privacylist_sync") != 0) {

Modified: trunk/plugins/jabber/jabber_handlers_iq_result.c
===================================================================
--- trunk/plugins/jabber/jabber_handlers_iq_result.c	2008-06-18 18:18:53 UTC (rev 4016)
+++ trunk/plugins/jabber/jabber_handlers_iq_result.c	2008-06-18 21:54:51 UTC (rev 4017)
@@ -658,8 +658,10 @@
 		}
 	}
 	
-	if (!roster_retrieved)
+	if (!roster_retrieved) {
 		session_int_set(s, "__roster_retrieved", 1);
+		jabber_write_status(s);
+	}
 
 	query_emit_id(NULL, USERLIST_REFRESH);
 }