Mercurial > pidgin
comparison libpurple/plugin.c @ 20715:df58938e9f61
Try to load a plugin from the saved preference even if it is not in the standard path.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2007 08:52:41 +0000 |
| parents | 44b4e8bd759b |
| children | 96929e7acb86 a8332645ce5b |
comparison
equal
deleted
inserted
replaced
| 20714:1e123d315ac6 | 20715:df58938e9f61 |
|---|---|
| 1273 | 1273 |
| 1274 /* Strip the extension */ | 1274 /* Strip the extension */ |
| 1275 if (basename) | 1275 if (basename) |
| 1276 basename = purple_plugin_get_basename(filename); | 1276 basename = purple_plugin_get_basename(filename); |
| 1277 | 1277 |
| 1278 if ((plugin = purple_plugins_find_with_filename(filename)) != NULL) | 1278 if (((plugin = purple_plugins_find_with_filename(filename)) != NULL) || |
| 1279 { | 1279 (basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL) || |
| 1280 purple_debug_info("plugins", "Loading saved plugin %s\n", | 1280 ((plugin = purple_plugin_probe(filename)) != NULL)) |
| 1281 plugin->path); | |
| 1282 purple_plugin_load(plugin); | |
| 1283 } | |
| 1284 else if (basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL) | |
| 1285 { | 1281 { |
| 1286 purple_debug_info("plugins", "Loading saved plugin %s\n", | 1282 purple_debug_info("plugins", "Loading saved plugin %s\n", |
| 1287 plugin->path); | 1283 plugin->path); |
| 1288 purple_plugin_load(plugin); | 1284 purple_plugin_load(plugin); |
| 1289 } | 1285 } |