From bd4333d78abc0a63c507fcc3a46673eaeb9b2f73 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Fri, 29 Apr 2011 15:48:59 +0000 Subject: [PATCH] Remove now unnecessary Custom filetype group. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5745 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 8 +++++++- src/filetypes.c | 3 +-- src/filetypes.h | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7c129e7..f83017f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ +2011-04-29 Nick Treleaven + + * src/filetypes.c, src/filetypes.h: + Remove now unnecessary Custom filetype group. + + 2011-04-26 Nick Treleaven * src/filetypes.c, src/filetypes.h, src/main.c, data/filetype_extensions.conf: - Make filetype groups configurable using [Groups] in + Make filetype group membership configurable using [Groups] in filetype_extensions.conf. Read filetype_extensions.conf when calling filetypes_init_types(), don't require doclist initialization. diff --git a/src/filetypes.c b/src/filetypes.c index 48af39f6..47358581 100644 --- a/src/filetypes.c +++ b/src/filetypes.c @@ -493,6 +493,7 @@ static GeanyFiletype *filetype_new(void) { GeanyFiletype *ft = g_new0(GeanyFiletype, 1); + ft->group = GEANY_FILETYPE_GROUP_NONE; ft->lang = -2; /* assume no tagmanager parser */ /* pattern must not be null */ ft->pattern = g_new0(gchar*, 1); @@ -573,7 +574,6 @@ static void add_custom_filetype(const gchar *filename) ft = filetype_new(); ft->name = g_strdup(fn); filetype_make_title(ft, TITLE_SOURCE_FILE); - ft->group = GEANY_FILETYPE_GROUP_CUSTOM; ft->priv->custom = TRUE; filetype_add(ft); geany_debug("Added filetype %s (%d).", ft->name, ft->id); @@ -708,7 +708,6 @@ static void create_set_filetype_menu(void) create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_SCRIPT, _("_Scripting Languages")); create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_MARKUP, _("_Markup Languages")); create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_MISC, _("M_iscellaneous Languages")); - create_sub_menu(filetype_menu, GEANY_FILETYPE_GROUP_CUSTOM, _("_Custom Filetypes")); /* Append all filetypes to the filetype menu */ foreach_slist(node, filetypes_by_title) diff --git a/src/filetypes.h b/src/filetypes.h index 35afb10e..f574c701 100644 --- a/src/filetypes.h +++ b/src/filetypes.h @@ -101,7 +101,6 @@ typedef enum GEANY_FILETYPE_GROUP_SCRIPT, GEANY_FILETYPE_GROUP_MARKUP, GEANY_FILETYPE_GROUP_MISC, - GEANY_FILETYPE_GROUP_CUSTOM, GEANY_FILETYPE_GROUP_COUNT } GeanyFiletypeGroupID;