diff options
| author | Monsta <[email protected]> | 2015-01-10 12:09:35 +0300 |
|---|---|---|
| committer | Monsta <[email protected]> | 2015-01-10 12:09:35 +0300 |
| commit | 54da6f16ad644abc7771d568679a12b79a890e01 (patch) | |
| tree | fb9580b83e4e254bb3a6a92406b9006bca94f22c | |
| parent | c330e38212140a008e77a58bba46af73635e706c (diff) | |
| download | atril-54da6f16ad644abc7771d568679a12b79a890e01.tar.bz2 atril-54da6f16ad644abc7771d568679a12b79a890e01.tar.xz | |
shell: drop ancient code with support for Glib < 2.6.0
| -rw-r--r-- | shell/ev-application.c | 6 | ||||
| -rw-r--r-- | shell/ev-daemon.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/shell/ev-application.c b/shell/ev-application.c index 8a981c24..e2b1ea62 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -989,11 +989,7 @@ static void ev_application_init(EvApplication* ev_application) } else { - #if GLIB_CHECK_VERSION(2, 6, 0) - ev_application->dot_dir = g_build_filename(g_get_user_config_dir(), "atril", NULL); - #else // glib version < 2.6.0 - ev_application->dot_dir = g_build_filename(g_get_home_dir(), ".config", "atril", NULL); - #endif + ev_application->dot_dir = g_build_filename(g_get_user_config_dir(), "atril", NULL); } #ifdef G_OS_WIN32 diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c index c242e550..0448872e 100644 --- a/shell/ev-daemon.c +++ b/shell/ev-daemon.c @@ -178,11 +178,7 @@ ev_migrate_metadata (void) if (userdir) { dot_dir = g_build_filename (userdir, "atril", NULL); } else { - #if GLIB_CHECK_VERSION(2, 6, 0) - dot_dir = g_build_filename(g_get_user_config_dir(), "atril", NULL); - #else // glib version < 2.6.0 - dot_dir = g_build_filename(g_get_home_dir(), ".config", "atril", NULL); - #endif + dot_dir = g_build_filename(g_get_user_config_dir(), "atril", NULL); } updated = g_build_filename (dot_dir, "migrated-to-gvfs", NULL); |