Mercurial > pidgin.yaz
diff libpurple/core.c @ 25895:a81f75025e14
propagate from branch 'im.pidgin.pidgin.2.5.5.veracode' (head 1744a346c5951c97b5d6ec102b49606f3dd918cc)
to branch 'im.pidgin.pidgin.2.5.6' (head 9fe90237b75569f21f8de666d690a38109709df0)
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Thu, 14 May 2009 21:17:11 +0000 |
parents | 1bfc20b76bb2 |
children | 01f1929d0936 |
line wrap: on
line diff
--- a/libpurple/core.c Sun May 03 23:18:28 2009 +0000 +++ b/libpurple/core.c Thu May 14 21:17:11 2009 +0000 @@ -206,19 +206,6 @@ */ 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_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();