diff options
| author | infirit <[email protected]> | 2014-05-18 02:24:58 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-18 02:24:58 +0200 |
| commit | 39f3f3c703ae0b6f6bd669c3b07a151ebcd582a1 (patch) | |
| tree | 36351f5f0dca5aad2a67d2beaccfee78b3cd4f8a | |
| parent | b80af3d3d5748e4f27d354be429d09fe7f25241f (diff) | |
| download | mate-settings-daemon-39f3f3c703ae0b6f6bd669c3b07a151ebcd582a1.tar.bz2 mate-settings-daemon-39f3f3c703ae0b6f6bd669c3b07a151ebcd582a1.tar.xz | |
Drop support for glib < 2.36
| -rw-r--r-- | plugins/housekeeping/msd-disk-space.c | 4 | ||||
| -rw-r--r-- | plugins/housekeeping/msd-housekeeping-manager.c | 15 | ||||
| -rw-r--r-- | plugins/housekeeping/msd-ldsm-dialog.c | 7 |
3 files changed, 1 insertions, 25 deletions
diff --git a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c index 4a3de04..94c5800 100644 --- a/plugins/housekeeping/msd-disk-space.c +++ b/plugins/housekeeping/msd-disk-space.c @@ -546,11 +546,7 @@ ldsm_mounts_changed (GObject *monitor, mounts = g_unix_mounts_get (time_read); g_hash_table_foreach_remove (ldsm_notified_hash, ldsm_is_hash_item_not_in_mounts, mounts); -#if GLIB_CHECK_VERSION (2, 28, 0) g_list_free_full (mounts, (GDestroyNotify) g_unix_mount_free); -#else - g_list_foreach (mounts, (GFunc) g_unix_mount_free, NULL); -#endif /* check the status now, for the new mounts */ ldsm_check_all_mounts (NULL); diff --git a/plugins/housekeeping/msd-housekeeping-manager.c b/plugins/housekeeping/msd-housekeeping-manager.c index bd27898..9418e92 100644 --- a/plugins/housekeeping/msd-housekeeping-manager.c +++ b/plugins/housekeeping/msd-housekeeping-manager.c @@ -203,37 +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); diff --git a/plugins/housekeeping/msd-ldsm-dialog.c b/plugins/housekeeping/msd-ldsm-dialog.c index 0624448..0b13cf7 100644 --- a/plugins/housekeeping/msd-ldsm-dialog.c +++ b/plugins/housekeeping/msd-ldsm-dialog.c @@ -17,16 +17,11 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <glib.h> #include <glib/gi18n.h> #include <gio/gio.h> #include "msd-ldsm-dialog.h" -#if GLIB_CHECK_VERSION (2, 30, 0) -#define g_format_size_for_display g_format_size -#endif - #define SETTINGS_SCHEMA "org.mate.SettingsDaemon.plugins.housekeeping" #define SETTINGS_IGNORE_PATHS "ignore-paths" @@ -79,7 +74,7 @@ msd_ldsm_dialog_get_primary_text (MsdLdsmDialog *dialog) g_return_val_if_fail (MSD_IS_LDSM_DIALOG (dialog), NULL); - free_space = g_format_size_for_display (dialog->priv->space_remaining); + free_space = g_format_size (dialog->priv->space_remaining); if (dialog->priv->other_partitions) { primary_text = g_strdup_printf (_("The volume \"%s\" has only %s disk space remaining."), |