Mercurial > pidgin.yaz
diff libpurple/plugin.c @ 27577:6d26258e9f1d
propagate from branch 'im.pidgin.pidgin' (head ac87c285c7056f86005dc157b9870745de471f74)
to branch 'im.pidgin.cpw.darkrain42.roster' (head 976d874853ac9745edb77d3cf107b92ebc037c10)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 06 Jul 2009 04:37:41 +0000 |
| parents | 4fd6b50d03b3 |
| children | 386265b369c9 |
line wrap: on
line diff
--- a/libpurple/plugin.c Wed Jun 10 04:42:11 2009 +0000 +++ b/libpurple/plugin.c Mon Jul 06 04:37:41 2009 +0000 @@ -222,7 +222,7 @@ return plugin; else if (!purple_plugin_is_unloadable(plugin)) { - purple_debug_info("plugins", "Not loading %s. " + purple_debug_warning("plugins", "Not loading %s. " "Another plugin with the same name (%s) has already been loaded.\n", filename, plugin->path); return plugin; @@ -861,6 +861,7 @@ } g_list_free(loader_info->exts); + loader_info->exts = NULL; } plugin_loaders = g_list_remove(plugin_loaders, plugin); @@ -1222,6 +1223,12 @@ search_paths = g_list_append(search_paths, g_strdup(path)); } +GList * +purple_plugins_get_search_paths() +{ + return search_paths; +} + void purple_plugins_unload_all(void) {