HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check whether the custom plugin path is one of the user or system plugin paths and if so, ignore it.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5825 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2011-05-29 20:08:53 +00:00
parent 8693bde80d
commit 4b206e86be
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@
code into the function definition. code into the function definition.
Do not add active plugins to the list of plugins when they are Do not add active plugins to the list of plugins when they are
already in the list (closes #3308191). already in the list (closes #3308191).
Check whether the custom plugin path is one of the user or system
plugin paths and if so, ignore it.
2011-05-27 Colomban Wendling <colomban(at)geany(dot)org> 2011-05-27 Colomban Wendling <colomban(at)geany(dot)org>

43
src/plugins.c
View File

@ -895,8 +895,8 @@ load_plugins_from_path(const gchar *path)
static gchar *get_plugin_path() static gchar *get_plugin_path()
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *install_dir = win32_get_installation_dir();
gchar *path; gchar *path;
gchar *install_dir = win32_get_installation_dir();
path = g_strconcat(install_dir, "\\lib", NULL); path = g_strconcat(install_dir, "\\lib", NULL);
g_free(install_dir); g_free(install_dir);
@ -908,24 +908,49 @@ static gchar *get_plugin_path()
} }
static gboolean validate_custom_plugin_path(const gchar *plugin_path_custom,
const gchar *plugin_path_config,
const gchar *plugin_path_system)
{
/* check whether the custom plugin path is one of the system or user plugin paths
* and abort if so */
if (utils_str_equal(plugin_path_custom, plugin_path_config) ||
utils_str_equal(plugin_path_custom, plugin_path_system))
return FALSE;
return TRUE;
}
/* Load (but don't initialize) all plugins for the Plugin Manager dialog */ /* Load (but don't initialize) all plugins for the Plugin Manager dialog */
static void load_all_plugins(void) static void load_all_plugins(void)
{ {
gchar *path; gchar *plugin_path_config;
gchar *plugin_path_system;
plugin_path_config = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", NULL);
plugin_path_system = get_plugin_path();
path = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "plugins", NULL);
/* first load plugins in ~/.config/geany/plugins/ */ /* first load plugins in ~/.config/geany/plugins/ */
load_plugins_from_path(path); load_plugins_from_path(plugin_path_config);
g_free(path);
/* load plugins from a custom path */ /* load plugins from a custom path */
if (NZV(prefs.custom_plugin_path)) if (NZV(prefs.custom_plugin_path))
load_plugins_from_path(prefs.custom_plugin_path); {
gchar *plugin_path_custom = utils_get_locale_from_utf8(prefs.custom_plugin_path);
utils_tidy_path(plugin_path_custom);
if (validate_custom_plugin_path(plugin_path_custom, plugin_path_config, plugin_path_system))
load_plugins_from_path(plugin_path_custom);
g_free(plugin_path_custom);
}
/* finally load plugins from $prefix/lib/geany */ /* finally load plugins from $prefix/lib/geany */
path = get_plugin_path(); load_plugins_from_path(plugin_path_system);
load_plugins_from_path(path);
g_free(path); g_free(plugin_path_config);
g_free(plugin_path_system);
} }