Revision: 5170 http://geany.svn.sourceforge.net/geany/?rev=5170&view=rev Author: ntrel Date: 2010-08-16 16:54:59 +0000 (Mon, 16 Aug 2010)

Log Message: ----------- Fix saving non-project filetype error regex.

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

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-16 16:53:40 UTC (rev 5169) +++ trunk/ChangeLog 2010-08-16 16:54:59 UTC (rev 5170) @@ -6,6 +6,8 @@ * scintilla/LexMarkdown.cxx: Fix infinite loop in Markdown lexer (patch by Colomban Wendling, thanks). + * src/build.c: + Fix saving non-project filetype error regex.

2010-08-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2010-08-16 16:53:40 UTC (rev 5169) +++ trunk/src/build.c 2010-08-16 16:54:59 UTC (rev 5170) @@ -2569,12 +2569,12 @@ }

+/* TODO: untyped ptr is too ugly (also for build_load_menu) */ void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src) { GeanyFiletype *ft; GeanyProject *pj; ForEachData data; - gchar *regkey;

switch (src) { @@ -2584,12 +2584,10 @@ return; build_save_menu_grp(config, ft->homefilecmds, GEANY_GBG_FT, NULL); build_save_menu_grp(config, ft->homeexeccmds, GEANY_GBG_EXEC, NULL); - regkey = g_strdup_printf("%serror_regex", ft->name); if (NZV(ft->homeerror_regex_string)) - g_key_file_set_string(config, build_grp_name, regkey, ft->projerror_regex_string); + g_key_file_set_string(config, build_grp_name, "error_regex", ft->homeerror_regex_string); else - g_key_file_remove_key(config, build_grp_name, regkey, NULL); - g_free(regkey); + g_key_file_remove_key(config, build_grp_name, "error_regex", NULL); break; case GEANY_BCS_PREF: build_save_menu_grp(config, non_ft_pref, GEANY_GBG_NON_FT, NULL);

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