pidgin.2.5.6: 43456871: Alternate, API-safe fix for #8774 (crash...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 434568710239bbdbddea66060d293a3d124825b2
Ancestor: 73c7d5c691f2f0ef8b50a3cca10fb646bdf1b557
Author: elb at pidgin.im
Date: 2009-04-29T00:41:37
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/434568710239bbdbddea66060d293a3d124825b2

Modified files:
        libpurple/core.c

ChangeLog: 

Alternate, API-safe fix for #8774 (crash on exit)

-------------- next part --------------
============================================================
--- libpurple/core.c	7901b8aea56c0d511c622be638656e6dd7e3c45f
+++ libpurple/core.c	9c9216752624589f076a8e78fa947cd08fa70b1f
@@ -206,19 +206,6 @@ purple_core_quit(void)
 	 */
 	purple_certificate_uninit();
 
-	/* The SSL plugins must be uninit before they're unloaded */
-	purple_ssl_uninit();
-
-	/* Unload all plugins before the UI because UI plugins might call
-	 * UI-specific functions */
-	purple_debug_info("main", "Unloading all plugins\n");
-	purple_plugins_destroy_all();
-
-	/* Shut down the UI before all the subsystems */
-	ops = purple_core_get_ui_ops();
-	if (ops != NULL && ops->quit != NULL)
-		ops->quit();
-
 	/* Save .xml files, remove signals, etc. */
 	purple_smileys_uninit();
 	purple_idle_uninit();
@@ -239,6 +226,16 @@ purple_core_quit(void)
 	purple_imgstore_uninit();
 	purple_network_uninit();
 
+	/* The SSL plugins must be uninit before they're unloaded */
+	purple_ssl_uninit();
+
+	purple_debug_info("main", "Unloading all plugins\n");
+	purple_plugins_destroy_all();
+
+	ops = purple_core_get_ui_ops();
+	if (ops != NULL && ops->quit != NULL)
+		ops->quit();
+
 	/* Everything after this must not try to read any prefs */
 	purple_prefs_uninit();
 	purple_plugins_uninit();