diff options
| author | infirit <[email protected]> | 2014-12-16 13:09:06 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-16 13:09:06 +0100 |
| commit | 53e5977084918ba34ca15d25670889201f9355e4 (patch) | |
| tree | f649f1745a6222558f75d6408db0320141c005e5 | |
| parent | 602945c084d45bd3858e564e03a70a2a361a5756 (diff) | |
| download | mate-settings-daemon-53e5977084918ba34ca15d25670889201f9355e4.tar.bz2 mate-settings-daemon-53e5977084918ba34ca15d25670889201f9355e4.tar.xz | |
Revert "Add back Glib 2.32 support"
This reverts commit 602945c084d45bd3858e564e03a70a2a361a5756.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/housekeeping/msd-housekeeping-manager.c | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 9293ca9..93acbac 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,7 @@ dnl - Dependencies dnl --------------------------------------------------------------------------- DBUS_GLIB_REQUIRED_VERSION=0.74 -GLIB_REQUIRED_VERSION=2.32.0 +GLIB_REQUIRED_VERSION=2.36.0 GIO_REQUIRED_VERSION=2.26.0 MATE_DESKTOP_REQUIRED_VERSION=1.9.4 LIBMATEKBD_REQUIRED_VERSION=1.7.0 diff --git a/plugins/housekeeping/msd-housekeeping-manager.c b/plugins/housekeeping/msd-housekeeping-manager.c index b822a5f..9418e92 100644 --- a/plugins/housekeeping/msd-housekeeping-manager.c +++ b/plugins/housekeeping/msd-housekeeping-manager.c @@ -203,38 +203,22 @@ purge_thumbnail_cache (MsdHousekeepingManager *manager) g_debug ("housekeeping: checking thumbnail cache size and freshness"); -#if GLIB_CHECK_VERSION (2, 34, 0) path = g_build_filename (g_get_user_cache_dir (), "thumbnails", -#else - path = g_build_filename (g_get_home_dir (), - ".thumbnails", -#endif "normal", NULL); files = read_dir_for_purge (path, NULL); g_free (path); -#if GLIB_CHECK_VERSION (2, 34, 0) path = g_build_filename (g_get_user_cache_dir (), "thumbnails", -#else - path = g_build_filename (g_get_home_dir (), - ".thumbnails", -#endif "large", NULL); files = read_dir_for_purge (path, files); g_free (path); -#if GLIB_CHECK_VERSION (2, 34, 0) path = g_build_filename (g_get_user_cache_dir (), "thumbnails", -#else - path = g_build_filename (g_get_home_dir (), - ".thumbnails", -#endif - "fail", "mate-thumbnail-factory", NULL); |