comparison libpurple/plugin.c @ 27590:a08e84032814

merge of '2348ff22f0ff3453774b8b25b36238465580c609' and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Jul 2009 05:43:38 +0000
parents 4fd6b50d03b3
children 386265b369c9
comparison
equal deleted inserted replaced
27104:048bcf41deef 27590:a08e84032814
220 { 220 {
221 if (purple_strequal(filename, plugin->path)) 221 if (purple_strequal(filename, plugin->path))
222 return plugin; 222 return plugin;
223 else if (!purple_plugin_is_unloadable(plugin)) 223 else if (!purple_plugin_is_unloadable(plugin))
224 { 224 {
225 purple_debug_info("plugins", "Not loading %s. " 225 purple_debug_warning("plugins", "Not loading %s. "
226 "Another plugin with the same name (%s) has already been loaded.\n", 226 "Another plugin with the same name (%s) has already been loaded.\n",
227 filename, plugin->path); 227 filename, plugin->path);
228 return plugin; 228 return plugin;
229 } 229 }
230 else 230 else
859 } 859 }
860 } 860 }
861 } 861 }
862 862
863 g_list_free(loader_info->exts); 863 g_list_free(loader_info->exts);
864 loader_info->exts = NULL;
864 } 865 }
865 866
866 plugin_loaders = g_list_remove(plugin_loaders, plugin); 867 plugin_loaders = g_list_remove(plugin_loaders, plugin);
867 } 868 }
868 869
1218 1219
1219 if (g_list_find_custom(search_paths, path, (GCompareFunc)strcmp)) 1220 if (g_list_find_custom(search_paths, path, (GCompareFunc)strcmp))
1220 return; 1221 return;
1221 1222
1222 search_paths = g_list_append(search_paths, g_strdup(path)); 1223 search_paths = g_list_append(search_paths, g_strdup(path));
1224 }
1225
1226 GList *
1227 purple_plugins_get_search_paths()
1228 {
1229 return search_paths;
1223 } 1230 }
1224 1231
1225 void 1232 void
1226 purple_plugins_unload_all(void) 1233 purple_plugins_unload_all(void)
1227 { 1234 {