Mercurial > pidgin.yaz
changeset 25864:52c50f8a978e
merge of '0d0a22730c3a0782d275ea2ad549bf3d93c70700'
and '1f7289ec41898b40159870ac726cf573812ce4e3'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Wed, 29 Apr 2009 00:43:26 +0000 |
| parents | 1784eb0d66c0 (diff) 51167c69228e (current diff) |
| children | f1efe664bd7b |
| files | ChangeLog |
| diffstat | 3 files changed, 5 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/core.c Tue Apr 28 21:14:11 2009 +0000 +++ b/libpurple/core.c Wed Apr 29 00:43:26 2009 +0000 @@ -206,14 +206,6 @@ */ purple_certificate_uninit(); - /* 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); - /* Save .xml files, remove signals, etc. */ purple_smileys_uninit(); purple_idle_uninit(); @@ -234,8 +226,9 @@ purple_imgstore_uninit(); purple_network_uninit(); - /* Everything after unloading all plugins must not fail if prpls aren't - * around */ + /* 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(); @@ -243,7 +236,7 @@ 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 +244,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 21:14:11 2009 +0000 +++ b/libpurple/plugin.c Wed Apr 29 00:43:26 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 21:14:11 2009 +0000 +++ b/libpurple/plugin.h Wed Apr 29 00:43:26 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);