im.pidgin.pidgin.2.2.2: 8ef7c12581e5060a9cb45668391b66749a205f45

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 8ef7c12581e5060a9cb45668391b66749a205f45
Ancestor: 297ec7b52dbf78b4e8a2ba19aa54679eb4542b0a
Author: sadrul at pidgin.im
Date: 2007-10-19T16:22:08
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/plugin.c

ChangeLog: 

applied changes from 63162f419a649bdd77b85cff73c4c490ec863ed1
             through 70099adae9dd083166660f2de8b4ee6f447d9d08
log message:
|   Try to load a plugin from the saved preference even if it is not in the standard path.

-------------- next part --------------
============================================================
--- libpurple/plugin.c	76813f49f76dead775126f60499d2e46791351c6
+++ libpurple/plugin.c	9377a1d1619f7662f2d883a0b3d98203d5947bcf
@@ -1275,18 +1275,14 @@ purple_plugins_load_saved(const char *ke
 		if (basename)
 			basename = purple_plugin_get_basename(filename);
 
-		if ((plugin = purple_plugins_find_with_filename(filename)) != NULL)
+		if (((plugin = purple_plugins_find_with_filename(filename)) != NULL) ||
+				(basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL) ||
+				((plugin = purple_plugin_probe(filename)) != NULL))
 		{
 			purple_debug_info("plugins", "Loading saved plugin %s\n",
 							plugin->path);
 			purple_plugin_load(plugin);
 		}
-		else if (basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL)
-		{
-			purple_debug_info("plugins", "Loading saved plugin %s\n",
-							plugin->path);
-			purple_plugin_load(plugin);
-		}
 		else
 		{
 			purple_debug_error("plugins", "Unable to find saved plugin %s\n",