diff options
| author | monsta <[email protected]> | 2015-08-25 14:40:58 +0300 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-02 11:34:01 +0200 |
| commit | b24934e186456b50d7702192ec3a270926831791 (patch) | |
| tree | e7daae0af65482e5f1a5598808e4e55792dd7e6d /plugins/taglist/pluma-taglist-plugin-parser.c | |
| parent | f6d7a422f3f5f97e676cd18cef5bb46aca8da6be (diff) | |
| download | pluma-b24934e186456b50d7702192ec3a270926831791.tar.bz2 pluma-b24934e186456b50d7702192ec3a270926831791.tar.xz | |
drop support for win32/osx and checkupdate plugin
that plugin has never been built in linux anyway due to logic
in configure.ac
Diffstat (limited to 'plugins/taglist/pluma-taglist-plugin-parser.c')
| -rwxr-xr-x | plugins/taglist/pluma-taglist-plugin-parser.c | 65 |
1 files changed, 29 insertions, 36 deletions
diff --git a/plugins/taglist/pluma-taglist-plugin-parser.c b/plugins/taglist/pluma-taglist-plugin-parser.c index 05f50ba5..a67fae5d 100755 --- a/plugins/taglist/pluma-taglist-plugin-parser.c +++ b/plugins/taglist/pluma-taglist-plugin-parser.c @@ -31,7 +31,7 @@ /* FIXME: we should rewrite the parser to avoid using DOM */ #ifdef HAVE_CONFIG_H - #include <config.h> +#include <config.h> #endif #include <string.h> @@ -602,45 +602,38 @@ TagList* create_taglist(const gchar* data_dir) return taglist; } - #ifndef G_OS_WIN32 - const gchar* home; - const gchar* envvar; + const gchar* home; + const gchar* envvar; - /* load user's taglists */ + /* 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); - g_free (pdir); - } + /* 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); + } - #else - pdir = g_build_filename(g_get_user_config_dir(), "pluma", "taglist", NULL); + /* 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); - g_free(pdir); - #endif + g_free (pdir); + } /* load system's taglists */ parse_taglist_dir(data_dir); |