gobjectification: 19adaafc: I don't know why aluink changed the orde...

qulogic at pidgin.im qulogic at pidgin.im
Fri Jul 9 01:12:25 EDT 2010


----------------------------------------------------------------------
Revision: 19adaafca695167a05ff56529f9293f8f3ed453e
Parent:   5a2cd84369c5fa636f11767b153b243514ba2313
Author:   qulogic at pidgin.im
Date:     07/08/10 00:48:36
Branch:   im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/19adaafca695167a05ff56529f9293f8f3ed453e

Changelog: 

I don't know why aluink changed the order here, but init'ing UI so
early causes lots of asserts, and probably isn't a good idea, anyway.

Changes against parent 5a2cd84369c5fa636f11767b153b243514ba2313

  patched  libpurple/core.c

-------------- next part --------------
============================================================
--- libpurple/core.c	9c92c653f62d14cd94007a8e150f69ce659c3863
+++ libpurple/core.c	a674049816fa2caef6f92ec4970af7c42c5c5d41
@@ -128,9 +128,6 @@ purple_core_init(const char *ui)
 			ops->debug_ui_init();
 	}
 	
-	if (ops != NULL && ops->ui_init != NULL)
-		ops->ui_init();
-
 #ifdef HAVE_DBUS
 	purple_dbus_init();
 #endif
@@ -183,6 +180,9 @@ purple_core_init(const char *ui)
 	 */
 	purple_network_get_my_ip(-1);
 
+	if (ops != NULL && ops->ui_init != NULL)
+		ops->ui_init();
+
 	/* The UI may have registered some theme types, so refresh them */
 	purple_theme_manager_refresh();
 


More information about the Commits mailing list