From a119aff27095a47431f0c6a2b0b6ee6409dac184 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Tue, 17 Aug 2010 15:02:49 +0000 Subject: [PATCH] r5170 | ntrel | 2010-08-16 17:54:59 +0100 (Mon, 16 Aug 2010) | 2 lines Fix saving non-project filetype error regex. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/Geany-0_19_1@5176 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 2 ++ src/build.c | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7ff2d241..98f623704 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,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 diff --git a/src/build.c b/src/build.c index f642a24e2..de0d09ff0 100644 --- a/src/build.c +++ b/src/build.c @@ -2549,12 +2549,12 @@ static void foreach_project_filetype(gpointer data, gpointer user_data) } +/* 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) { @@ -2564,12 +2564,10 @@ void build_save_menu(GKeyFile *config, gpointer ptr, GeanyBuildSource src) 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); -- 2.11.4.GIT