From 75a1cf7f0361fa92117e5b7cca11b718df740083 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 1 May 2008 14:51:47 +0000
Subject: [PATCH] Add filetypes_new() to create and initialize a new filetype.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/custom-filetypes@2545 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog       |  2 ++
 src/filetypes.c | 31 +++++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a2c1c6db..9f74cd7c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
    filetype in filetypes_hash until TRUE is returned.
    Make filetypes_detect_from_extension() work for all filetypes
    in filetypes_hash.
+ * src/filetypes.c:
+   Add filetypes_new() to create and initialize a new filetype.
 
 
 2008-04-29  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/src/filetypes.c b/src/filetypes.c
index f27c5184d..5f6cb8299 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -50,7 +50,7 @@ static GtkWidget *radio_items[GEANY_MAX_FILE_TYPES];
 static void create_radio_menu_item(GtkWidget *menu, const gchar *label, filetype *ftype);
 
 
-static void fill_filetypes(void)
+static void init_builtin_filetypes(void)
 {
 #define C	/* these macros are only to ease navigation */
 	filetypes[GEANY_FILETYPES_C]->id = GEANY_FILETYPES_C;
@@ -405,17 +405,18 @@ static void fill_filetypes(void)
 }
 
 
-static void create_built_in_filetypes(void)
+/* initialize fields. */
+static filetype *filetypes_new(void)
 {
-	filetype_id ft_id;
+	filetype *ft = g_new0(filetype, 1);
 
-	for (ft_id = 0; ft_id < GEANY_MAX_BUILT_IN_FILETYPES; ft_id++)
-	{
-		filetypes[ft_id] = g_new0(filetype, 1);
-		filetypes[ft_id]->programs = g_new0(struct build_programs, 1);
-		filetypes[ft_id]->actions = g_new0(struct build_actions, 1);
-	}
-	fill_filetypes();
+/*
+	ft->id = GEANY_FILETYPES_OTHER;
+*/
+	ft->lang = -2;	/* no tagmanager parser */
+	ft->programs = g_new0(struct build_programs, 1);
+	ft->actions = g_new0(struct build_actions, 1);
+	return ft;
 }
 
 
@@ -426,10 +427,16 @@ void filetypes_init_types()
 
 	g_return_if_fail(filetypes_hash == NULL);
 
-	create_built_in_filetypes();
-
 	filetypes_hash = g_hash_table_new(g_str_hash, g_str_equal);
 
+	/* Create built-in filetypes */
+	for (ft_id = 0; ft_id < GEANY_MAX_BUILT_IN_FILETYPES; ft_id++)
+	{
+		filetypes[ft_id] = filetypes_new();
+	}
+	init_builtin_filetypes();
+
+	/* Add built-in filetypes to the hash */
 	for (ft_id = 0; ft_id < GEANY_MAX_BUILT_IN_FILETYPES; ft_id++)
 	{
 		filetypes_add(filetypes[ft_id]);