comparison libpurple/plugin.c @ 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 <[e-mail]>

20297:40a6d017f18d

		/* Strip the extension */
		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)
		{
			purple_debug_info("plugins", "Loading saved plugin %s\n",
							plugin->path);
			purple_plugin_load(plugin);
		}

20298:a2220ad38ebd

		/* Strip the extension */
		if (basename)
			basename = purple_plugin_get_basename(filename);

		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);
		}