Mercurial > pidgin3 / changeset

--- a/src/gtkmain.c	Mon Dec 05 04:10:08 2005 +0000
+++ b/src/gtkmain.c	Mon Dec 05 04:19:07 2005 +0000
@@ -618,11 +618,14 @@
 	gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());
 	gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops());
 
-	/* Set plugin search directories */
-	gaim_plugins_add_search_path(LIBDIR);
+	/*
+	 * Set plugin search directories. Give priority to the plugins
+	 * in user's home directory.
+	 */
 	search_path = g_build_filename(gaim_user_dir(), "plugins", NULL);
 	gaim_plugins_add_search_path(search_path);
 	g_free(search_path);
+	gaim_plugins_add_search_path(LIBDIR);
 
 	if (!gaim_core_init(GAIM_GTK_UI)) {
 		fprintf(stderr,

--- a/src/plugin.c	Mon Dec 05 04:10:08 2005 +0000
+++ b/src/plugin.c	Mon Dec 05 04:19:07 2005 +0000
@@ -200,6 +200,7 @@
 	GaimPlugin *plugin = NULL;
 	GaimPlugin *loader;
 	gpointer unpunned;
+	gchar *basename = NULL;
 	gboolean (*gaim_init_plugin)(GaimPlugin *);
 
 	gaim_debug_misc("plugins", "probing %s\n", filename);
@@ -209,9 +210,17 @@
 		return NULL;
 
 	/* If this plugin has already been probed then exit */
-	plugin = gaim_plugins_find_with_filename(filename);
+	basename = gaim_plugin_get_basename(filename);
+	plugin = gaim_plugins_find_with_basename(basename);
+	g_free(basename);
 	if (plugin != NULL)
+	{
+		if (strcmp(filename, plugin->path))
+			gaim_debug_info("plugins", "Not loading %s."
+							"Another plugin with the same name (%s) has already been loaded.\n",
+							filename, plugin->path);
 		return plugin;
+	}
 
 	plugin = gaim_plugin_new(has_file_extension(filename, G_MODULE_SUFFIX), filename);