Mercurial > pidgin.yaz
changeset 25857:d5cf115b7c58
disapproval of revision '2f2d084c77a5b905a47b7b28508172451a2bb82f'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Wed, 29 Apr 2009 00:39:13 +0000 |
| parents | 1b8c18ab762f |
| children | 1bfc20b76bb2 |
| files | ChangeLog libpurple/core.c libpurple/plugin.c libpurple/plugin.h |
| diffstat | 4 files changed, 11 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 28 20:51:59 2009 +0000 +++ b/ChangeLog Wed Apr 29 00:39:13 2009 +0000 @@ -1,9 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.5.6 (??/??/2009): - libpurple: - * Fix various crashes on exit. - IRC: * Correctly handle WHOIS for users who are joined to a large number of channels.
--- a/libpurple/core.c Tue Apr 28 20:51:59 2009 +0000 +++ b/libpurple/core.c Wed Apr 29 00:39:13 2009 +0000 @@ -209,10 +209,15 @@ /* The SSL plugins must be uninit before they're unloaded */ purple_ssl_uninit(); - /* Unload all non-loader, non-prpl plugins before shutting down - * subsystems. */ - purple_debug_info("main", "Unloading normal plugins\n"); - purple_plugins_unload(PURPLE_PLUGIN_STANDARD); + /* 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(); @@ -234,16 +239,7 @@ purple_imgstore_uninit(); purple_network_uninit(); - /* Everything after unloading all plugins must not fail if prpls aren't - * around */ - 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 prefs_uninit must not try to read any prefs */ + /* Everything after this must not try to read any prefs */ purple_prefs_uninit(); purple_plugins_uninit(); #ifdef HAVE_DBUS @@ -251,7 +247,7 @@ #endif purple_cmds_uninit(); - /* Everything after util_uninit cannot try to write things to the confdir */ + /* Everything after this cannot try to write things to the confdir */ purple_util_uninit(); purple_signals_uninit();
--- a/libpurple/plugin.c Tue Apr 28 20:51:59 2009 +0000 +++ b/libpurple/plugin.c Wed Apr 29 00:39:13 2009 +0000 @@ -1229,21 +1229,6 @@ } void -purple_plugins_unload(PurplePluginType type) -{ -#ifdef PURPLE_PLUGINS - GList *l; - - for (l = plugins; l; l = l->next) { - PurplePlugin *plugin = l->data; - if (plugin->info->type == type && purple_plugin_is_loaded(plugin)) - purple_plugin_unload(plugin); - } - -#endif /* PURPLE_PLUGINS */ -} - -void purple_plugins_destroy_all(void) { #ifdef PURPLE_PLUGINS
--- a/libpurple/plugin.h Tue Apr 28 20:51:59 2009 +0000 +++ b/libpurple/plugin.h Wed Apr 29 00:39:13 2009 +0000 @@ -503,11 +503,6 @@ void purple_plugins_unload_all(void); /** - * Unloads all plugins of a specific type. - */ -void purple_plugins_unload(PurplePluginType type); - -/** * Destroys all registered plugins. */ void purple_plugins_destroy_all(void);