Mercurial > pidgin.yaz
changeset 20298:a2220ad38ebd
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.
committer: Luke Schierer <lschiere@pidgin.im>
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 19 Oct 2007 16:22:08 +0000 |
| parents | 40a6d017f18d |
| children | 62d0c7885618 |
| files | libpurple/plugin.c |
| diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugin.c Fri Oct 19 16:19:30 2007 +0000 +++ b/libpurple/plugin.c Fri Oct 19 16:22:08 2007 +0000 @@ -1275,13 +1275,9 @@ if (basename) basename = purple_plugin_get_basename(filename); - if ((plugin = purple_plugins_find_with_filename(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) + 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);