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

Save build commands for filetype None (patch by Lex, thanks).

Browse Source 
Make filetypes_get_conf_extension() return "common" for filetype
None.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5387 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2010-11-09 15:34:24 +00:00
parent e38f2f6a17
commit 025e391dba
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2010-11-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/templates.c, src/filetypes.c:
Save build commands for filetype None (patch by Lex, thanks).
Make filetypes_get_conf_extension() return "common" for filetype
None.
2010-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/editor.c:

6
src/filetypes.c
View File

@ -1191,8 +1191,7 @@ void filetypes_load_config(gint ft_id, gboolean reload)
config_home = g_key_file_new();
{
/* highlighting uses GEANY_FILETYPES_NONE for common settings */
gchar *ext = (ft_id != GEANY_FILETYPES_NONE) ?
filetypes_get_conf_extension(ft_id) : g_strdup("common");
gchar *ext = filetypes_get_conf_extension(ft_id);
gchar *f0 = g_strconcat(app->datadir, G_DIR_SEPARATOR_S "filetypes.", ext, NULL);
gchar *f = g_strconcat(app->configdir,
G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", ext, NULL);
@ -1227,6 +1226,7 @@ gchar *filetypes_get_conf_extension(gint filetype_idx)
case GEANY_FILETYPES_CPP: result = g_strdup("cpp"); break;
case GEANY_FILETYPES_CS: result = g_strdup("cs"); break;
case GEANY_FILETYPES_MAKE: result = g_strdup("makefile"); break;
case GEANY_FILETYPES_NONE: result = g_strdup("common"); break;
default:
result = g_ascii_strdown(ft->name, -1);
/* truncate at slash (e.g. for Matlab/Octave) */
@ -1245,7 +1245,7 @@ void filetypes_save_commands(void)
G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", NULL);
guint i;
for (i = 1; i < filetypes_array->len; i++)
for (i = 0; i < filetypes_array->len; i++)
{
GKeyFile *config_home;
gchar *fname, *ext, *data;

3
src/templates.c
View File

@ -159,7 +159,8 @@ static void init_ft_templates(const gchar *year, const gchar *date, const gchar
for (ft_id = 0; ft_id < GEANY_MAX_BUILT_IN_FILETYPES; ft_id++)
{
gchar *ext = filetypes_get_conf_extension(ft_id);
gchar *ext = (ft_id != GEANY_FILETYPES_NONE) ?
filetypes_get_conf_extension(ft_id) : g_strdup("none");
gchar *shortname = g_strconcat("filetype.", ext, NULL);
gchar *fname = TEMPLATES_GET_FILENAME(shortname);