Revision: 5313 http://geany.svn.sourceforge.net/geany/?rev=5313&view=rev Author: ntrel Date: 2010-10-21 15:59:06 +0000 (Thu, 21 Oct 2010)
Log Message: ----------- Allow 'Foo=' in filetype_extensions.conf to remove all patterns.
Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-10-21 15:41:24 UTC (rev 5312) +++ trunk/ChangeLog 2010-10-21 15:59:06 UTC (rev 5313) @@ -2,6 +2,8 @@
* src/utils.c, src/filetypes.c: Remove filetype default extensions from code. + * src/filetypes.c: + Allow 'Foo=' in filetype_extensions.conf to remove all patterns.
2010-10-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2010-10-21 15:41:24 UTC (rev 5312) +++ trunk/src/filetypes.c 2010-10-21 15:59:06 UTC (rev 5313) @@ -1392,16 +1392,15 @@ gchar **list = g_key_file_get_string_list( (userset) ? userconfig : sysconfig, "Extensions", filetypes[i]->name, &len, NULL);
- if (G_LIKELY(list) && G_LIKELY(len > 0)) - { - g_strfreev(filetypes[i]->pattern); - filetypes[i]->pattern = list; + g_strfreev(filetypes[i]->pattern); + /* Note: we allow 'Foo=' to remove all patterns */ + if (!list) + list = g_new0(gchar*, 1); + filetypes[i]->pattern = list; + #ifdef G_OS_WIN32 - convert_filetype_extensions_to_lower_case(filetypes[i]->pattern, len); + convert_filetype_extensions_to_lower_case(filetypes[i]->pattern, len); #endif - } - else - g_strfreev(list); }
g_free(sysconfigfile); @@ -1409,6 +1408,7 @@ g_key_file_free(sysconfig); g_key_file_free(userconfig);
+ /* Redetect filetype of any documents with none set */ foreach_document(i) { GeanyDocument *doc = documents[i];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.