propagate from branch 'im.pidgin.pidgin' (head 0586b2340f0fbf15ea7f68c48cd7272c72809621) mxit

Tue, 11 May 2010 07:14:31 +0000

author
Andrew Victor <andrew.victor@mxit.com>
date
Tue, 11 May 2010 07:14:31 +0000
branch
mxit
changeset 30175
f987ba4bed3d
parent 30174
0586b2340f0f (current diff)
parent 30167
bdf1bd968a91 (diff)
child 30176
b380932e86ea

propagate from branch 'im.pidgin.pidgin' (head 0586b2340f0fbf15ea7f68c48cd7272c72809621)
to branch 'im.pidgin.pidgin.mxit' (head bdf1bd968a91edee7d5db9ef4f1edec0c862d3db)

--- a/libpurple/protocols/mxit/protocol.c	Tue May 04 17:42:49 2010 +0000
+++ b/libpurple/protocols/mxit/protocol.c	Tue May 11 07:14:31 2010 +0000
@@ -1266,6 +1266,15 @@
 	purple_connection_update_progress( session->con, _( "Successfully Logged In..." ), 3, 4 );
 	purple_connection_set_state( session->con, PURPLE_CONNECTED );
 
+	/* save extra info if this is a HTTP connection */
+	if ( session->http ) {
+		/* save the http server to use for this session */
+		g_strlcpy( session->http_server, records[1]->fields[3]->data, sizeof( session->http_server ) );
+
+		/* save the session id */
+		session->http_sesid = atoi( records[0]->fields[0]->data );
+	}
+
 	/* display the current splash-screen */
 	if ( splash_popup_enabled( session ) )
 		splash_display( session );
@@ -1290,15 +1299,6 @@
 		g_free( statusmsg2 );
 	}
 
-	/* save extra info if this is a HTTP connection */
-	if ( session->http ) {
-		/* save the http server to use for this session */
-		g_strlcpy( session->http_server, records[1]->fields[3]->data, sizeof( session->http_server ) );
-
-		/* save the session id */
-		session->http_sesid = atoi( records[0]->fields[0]->data );
-	}
-
 	/* retrieve our MXit profile */
 	mxit_send_extprofile_request( session, NULL, ARRAY_SIZE( profilelist ), profilelist );
 }

mercurial