SF.net SVN: geany:[5603] trunk

[ntrel at users.sourceforge.net]

Revision: 5603
          http://geany.svn.sourceforge.net/geany/?rev=5603&view=rev
Author:   ntrel
Date:     2011-03-17 17:03:01 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
Make special case for filetypes.matlab instead of truncating all 
filetype config filenames at slash.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-03-17 16:51:18 UTC (rev 5602)
+++ trunk/ChangeLog	2011-03-17 17:03:01 UTC (rev 5603)
@@ -20,6 +20,9 @@
  * data/filetypes.Scala.conf, data/filetype_extensions.conf:
    Add Scala custom filetype, based on file by werg (thanks).
    (This uses the newly added [styling=C] syntax).
+ * src/filetypes.c:
+   Make special case for filetypes.matlab instead of truncating all 
+   filetype config filenames at slash.
 
 
 2011-03-15  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2011-03-17 16:51:18 UTC (rev 5602)
+++ trunk/src/filetypes.c	2011-03-17 17:03:01 UTC (rev 5603)
@@ -1290,7 +1290,7 @@
 
 gchar *filetypes_get_conf_extension(gint filetype_idx)
 {
-	gchar *result, *ptr;
+	gchar *result;
 	GeanyFiletype *ft = filetypes[filetype_idx];
 
 	if (ft->priv->custom)
@@ -1303,12 +1303,10 @@
 		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;
+		/* name is Matlab/Octave */
+		case GEANY_FILETYPES_MATLAB: result = g_strdup("matlab"); break;
 		default:
 			result = g_ascii_strdown(ft->name, -1);
-			/* truncate at slash (e.g. for Matlab/Octave) */
-			ptr = strstr(result, "/");
-			if (ptr)
-				*ptr = 0x0;
 			break;
 	}
 	return result;


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