Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Sun, 13 Mar 2016 16:35:14 UTC Commit: 3640b3bc4461f302cc2375e4998c58f7729493eb https://github.com/geany/geany/commit/3640b3bc4461f302cc2375e4998c58f7729493...
Log Message: ----------- Move *.tags files to the tags directory
ignore.tags is still in ~/.config/geany
Modified Paths: -------------- data/Makefile.am data/tags/c99.tags data/tags/html_entities.tags data/tags/pascal.tags data/tags/php.tags data/tags/python.tags src/geany.h src/symbols.c
Modified: data/Makefile.am 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -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 \
Modified: data/tags/c99.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/html_entities.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/pascal.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/php.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: data/tags/python.tags 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: src/geany.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -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/"
Modified: src/symbols.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -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);
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).