Revision: 5822 http://geany.svn.sourceforge.net/geany/?rev=5822&view=rev Author: eht16 Date: 2011-05-29 19:35:38 +0000 (Sun, 29 May 2011)

Log Message: ----------- Define and use get_plugin_path() always and move platform dependent code into the function definition.

Modified Paths: -------------- trunk/ChangeLog trunk/src/plugins.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-05-29 17:40:50 UTC (rev 5821) +++ trunk/ChangeLog 2011-05-29 19:35:38 UTC (rev 5822) @@ -3,6 +3,9 @@ * tagmanager/python.c: When checking for literal strings to ignore, consider also unicode, binary and raw strings. + * src/plugins.c: + Define and use get_plugin_path() always and move platform dependent + code into the function definition.

2011-05-27 Colomban Wendling <colomban(at)geany(dot)org>

Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2011-05-29 17:40:50 UTC (rev 5821) +++ trunk/src/plugins.c 2011-05-29 19:35:38 UTC (rev 5822) @@ -886,9 +886,9 @@ }

-#ifdef G_OS_WIN32 static gchar *get_plugin_path() { +#ifdef G_OS_WIN32 gchar *install_dir = win32_get_installation_dir(); gchar *path;

@@ -896,8 +896,10 @@ g_free(install_dir);

return path; -} +#else + return g_strconcat(GEANY_LIBDIR, G_DIR_SEPARATOR_S "geany", NULL); #endif +}

/* Load (but don't initialize) all plugins for the Plugin Manager dialog */ @@ -915,11 +917,7 @@ load_plugins_from_path(prefs.custom_plugin_path);

/* finally load plugins from $prefix/lib/geany */ -#ifdef G_OS_WIN32 path = get_plugin_path(); -#else - path = g_strconcat(GEANY_LIBDIR, G_DIR_SEPARATOR_S "geany", NULL); -#endif load_plugins_from_path(path); g_free(path); }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.