From da8d189ae2ca44e32920dba59d0c31b1a8671f75 Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 13 Dec 2016 17:01:31 +0300 Subject: taglist plugin: don't look for taglist in non-existing legacy dirs these names are result of excessive gedit -> pluma renaming (back in 2011), so these dirs never actually existed --- plugins/taglist/pluma-taglist-plugin-parser.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/plugins/taglist/pluma-taglist-plugin-parser.c b/plugins/taglist/pluma-taglist-plugin-parser.c index a67fae5d..75c06f39 100644 --- a/plugins/taglist/pluma-taglist-plugin-parser.c +++ b/plugins/taglist/pluma-taglist-plugin-parser.c @@ -43,8 +43,6 @@ #include "pluma-taglist-plugin-parser.h" -/* we screwed up so we still look here for compatibility */ -#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma/plugins/taglist/" #define USER_PLUMA_TAGLIST_PLUGIN_LOCATION "pluma/taglist/" TagList* taglist = NULL; @@ -603,32 +601,11 @@ TagList* create_taglist(const gchar* data_dir) } const gchar* home; - const gchar* envvar; /* load user's taglists */ - /* legacy dir */ home = g_get_home_dir (); if (home != NULL) - { - pdir = g_build_filename (home, - USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY, - NULL); - parse_taglist_dir (pdir); - g_free (pdir); - } - - /* Support old libmate env var */ - envvar = g_getenv ("MATE22_USER_DIR"); - if (envvar != NULL) - { - pdir = g_build_filename (envvar, - USER_PLUMA_TAGLIST_PLUGIN_LOCATION, - NULL); - parse_taglist_dir (pdir); - g_free (pdir); - } - else if (home != NULL) { pdir = g_build_filename(home, ".config", USER_PLUMA_TAGLIST_PLUGIN_LOCATION, NULL); parse_taglist_dir(pdir); -- cgit v1.2.1