SF.net SVN: geany:[5387] trunk

[ntrel at users.sourceforge.net]

Revision: 5387
          http://geany.svn.sourceforge.net/geany/?rev=5387&view=rev
Author:   ntrel
Date:     2010-11-09 15:34:24 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
Save build commands for filetype None (patch by Lex, thanks).
Make filetypes_get_conf_extension() return "common" for filetype
None.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/filetypes.c
    trunk/src/templates.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-08 18:15:14 UTC (rev 5386)
+++ trunk/ChangeLog	2010-11-09 15:34:24 UTC (rev 5387)
@@ -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:

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2010-11-08 18:15:14 UTC (rev 5386)
+++ trunk/src/filetypes.c	2010-11-09 15:34:24 UTC (rev 5387)
@@ -1191,8 +1191,7 @@
 	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 @@
 		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 @@
 		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;

Modified: trunk/src/templates.c
===================================================================
--- trunk/src/templates.c	2010-11-08 18:15:14 UTC (rev 5386)
+++ trunk/src/templates.c	2010-11-09 15:34:24 UTC (rev 5387)
@@ -159,7 +159,8 @@
 
 	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);
 


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