From 3640b3bc4461f302cc2375e4998c58f7729493eb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ji=C5=99=C3=AD=20Techet?= <techet@gmail.com>
Date: Fri, 1 May 2015 20:08:49 +0200
Subject: [PATCH] Move *.tags files to the tags directory

ignore.tags is still in ~/.config/geany
---
 data/Makefile.am                   | 10 +++++-----
 data/{ => tags}/c99.tags           |  0
 data/{ => tags}/html_entities.tags |  0
 data/{ => tags}/pascal.tags        |  0
 data/{ => tags}/php.tags           |  0
 data/{ => tags}/python.tags        |  0
 src/geany.h                        |  1 +
 src/symbols.c                      |  8 ++++----
 8 files changed, 10 insertions(+), 9 deletions(-)
 rename data/{ => tags}/c99.tags (100%)
 rename data/{ => tags}/html_entities.tags (100%)
 rename data/{ => tags}/pascal.tags (100%)
 rename data/{ => tags}/php.tags (100%)
 rename data/{ => tags}/python.tags (100%)

diff --git a/data/Makefile.am b/data/Makefile.am
index ac85045c4..f9e2a632c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -73,11 +73,11 @@ filetypes = \
 	filedefs/filetypes.zephir
 
 tagfiles = \
-	c99.tags \
-	php.tags \
-	python.tags \
-	pascal.tags \
-	html_entities.tags
+	tags/c99.tags \
+	tags/php.tags \
+	tags/python.tags \
+	tags/pascal.tags \
+	tags/html_entities.tags
 
 template_files = \
 	templates/files/file.html \
diff --git a/data/c99.tags b/data/tags/c99.tags
similarity index 100%
rename from data/c99.tags
rename to data/tags/c99.tags
diff --git a/data/html_entities.tags b/data/tags/html_entities.tags
similarity index 100%
rename from data/html_entities.tags
rename to data/tags/html_entities.tags
diff --git a/data/pascal.tags b/data/tags/pascal.tags
similarity index 100%
rename from data/pascal.tags
rename to data/tags/pascal.tags
diff --git a/data/php.tags b/data/tags/php.tags
similarity index 100%
rename from data/php.tags
rename to data/tags/php.tags
diff --git a/data/python.tags b/data/tags/python.tags
similarity index 100%
rename from data/python.tags
rename to data/tags/python.tags
diff --git a/src/geany.h b/src/geany.h
index df37a234d..3e628a215 100644
--- a/src/geany.h
+++ b/src/geany.h
@@ -41,6 +41,7 @@ G_BEGIN_DECLS
  * listed in the documentation should not be changed */
 #define GEANY_FILEDEFS_SUBDIR			"filedefs"
 #define GEANY_TEMPLATES_SUBDIR			"templates"
+#define GEANY_TAGS_SUBDIR				"tags"
 #define GEANY_CODENAME					"Malvek"
 #define GEANY_HOMEPAGE					"http://www.geany.org/"
 #define GEANY_WIKI						"http://wiki.geany.org/"
diff --git a/src/symbols.c b/src/symbols.c
index 77e2dcc02..e445744a2 100644
--- a/src/symbols.c
+++ b/src/symbols.c
@@ -243,7 +243,7 @@ void symbols_global_tags_loaded(guint file_type_idx)
 
 	if (! tfi->tags_loaded)
 	{
-		gchar *fname = g_build_filename(app->datadir, tfi->tag_file, NULL);
+		gchar *fname = g_build_filename(app->datadir, GEANY_TAGS_SUBDIR, tfi->tag_file, NULL);
 
 		symbols_load_global_tags(fname, filetypes[file_type_idx]);
 		tfi->tags_loaded = TRUE;
@@ -263,7 +263,7 @@ static void html_tags_loaded(void)
 	tfi = &tag_file_info[GTF_HTML_ENTITIES];
 	if (! tfi->tags_loaded)
 	{
-		gchar *file = g_build_filename(app->datadir, tfi->tag_file, NULL);
+		gchar *file = g_build_filename(app->datadir, GEANY_TAGS_SUBDIR, tfi->tag_file, NULL);
 
 		html_entities = utils_read_file_in_array(file);
 		tfi->tags_loaded = TRUE;
@@ -1762,13 +1762,13 @@ static void init_user_tags(void)
 	const GSList *node;
 	gchar *dir;
 
-	dir = g_build_filename(app->configdir, "tags", NULL);
+	dir = g_build_filename(app->configdir, GEANY_TAGS_SUBDIR, NULL);
 	/* create the user tags dir for next time if it doesn't exist */
 	if (! g_file_test(dir, G_FILE_TEST_IS_DIR))
 		utils_mkdir(dir, FALSE);
 	file_list = utils_get_file_list_full(dir, TRUE, FALSE, NULL);
 
-	SETPTR(dir, g_build_filename(app->datadir, "tags", NULL));
+	SETPTR(dir, g_build_filename(app->datadir, GEANY_TAGS_SUBDIR, NULL));
 	list = utils_get_file_list_full(dir, TRUE, FALSE, NULL);
 	g_free(dir);
 
-- 
2.11.4.GIT