soc.2009.transport: 105c34fd: Fixed initPurple order.

hanzz at soc.pidgin.im hanzz at soc.pidgin.im
Sat May 2 05:25:33 EDT 2009


-----------------------------------------------------------------
Revision: 105c34fd19ed79e33a12268e536d08ec2fe2ff4d
Ancestor: 4935d6862cb942d5fbd9acbfd68a17655537c581
Author: hanzz at soc.pidgin.im
Date: 2009-05-01T08:45:23
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/105c34fd19ed79e33a12268e536d08ec2fe2ff4d

Modified files:
        main.cpp

ChangeLog: 

Fixed initPurple order.

-------------- next part --------------
============================================================
--- main.cpp	325610a2bde43b6fe6aa27550db689b4f073438e
+++ main.cpp	3be25b60bb61ff986b54ba45817845d1188c30fd
@@ -442,11 +442,11 @@ GlooxMessageHandler::GlooxMessageHandler
 	GMainLoop *loop = g_main_loop_new(NULL, FALSE);
 	signal(SIGCHLD, SIG_IGN);
 
-	initPurple();
-	
 	m_sql = new SQLClass(this);
 	m_userManager = new UserManager(this);
-	
+
+	initPurple();
+
 	m_discoHandler=new GlooxDiscoHandler(this);
  	j->removeIqHandler(XMLNS_DISCO_INFO);
 	
@@ -1057,9 +1057,6 @@ bool GlooxMessageHandler::initPurple(){
 
 	purple_core_set_ui_ops(&coreUiOps);
 	purple_eventloop_set_ui_ops(getEventLoopUiOps());
-	
-	purple_set_blist(purple_blist_new());
-	purple_blist_load();
 
 	ret = purple_core_init(HIICQ_UI);
 	if (ret){
@@ -1075,6 +1072,10 @@ bool GlooxMessageHandler::initPurple(){
 				names = g_list_append(names, info->id);
 			}
 		}
+		
+		purple_set_blist(purple_blist_new());
+		purple_blist_load();
+		
 		purple_signal_connect(purple_conversations_get_handle(), "received-im-msg", &conversation_handle, PURPLE_CALLBACK(newMessageReceived), NULL);
 		purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", &conversation_handle, PURPLE_CALLBACK(buddyTyping), NULL);
 		purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped", &conversation_handle, PURPLE_CALLBACK(buddyTypingStopped), NULL);


More information about the Commits mailing list