SF.net SVN: geany:[4072] branches/custom-filetypes

[ntrel at users.sourceforge.net]

Revision: 4072
          http://geany.svn.sourceforge.net/geany/?rev=4072&view=rev
Author:   ntrel
Date:     2009-08-12 15:12:50 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
Prevent adding entries for both system and user custom filetype
files.

Modified Paths:
--------------
    branches/custom-filetypes/ChangeLog
    branches/custom-filetypes/src/filetypes.c

Modified: branches/custom-filetypes/ChangeLog
===================================================================
--- branches/custom-filetypes/ChangeLog	2009-08-12 14:47:44 UTC (rev 4071)
+++ branches/custom-filetypes/ChangeLog	2009-08-12 15:12:50 UTC (rev 4072)
@@ -11,6 +11,9 @@
    Fix loading custom filetype settings (e.g. default extension).
    Add note about using GeanyFiletype pointer instead of filetype_id
    for function arguments.
+ * src/filetypes.c:
+   Prevent adding entries for both system and user custom filetype
+   files.
 
 
 2009-08-11  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/custom-filetypes/src/filetypes.c
===================================================================
--- branches/custom-filetypes/src/filetypes.c	2009-08-12 14:47:44 UTC (rev 4071)
+++ branches/custom-filetypes/src/filetypes.c	2009-08-12 15:12:50 UTC (rev 4072)
@@ -670,6 +670,9 @@
 
 	*dot = 0x0;
 
+	if (g_hash_table_lookup(filetypes_hash, fn))
+		return;
+
 	geany_debug("Adding filetype %s.", fn);
 	ft = filetype_new();
 	ft->name = g_strdup(fn);


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