diff options
| author | infirit <[email protected]> | 2014-07-01 14:23:44 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-07-01 15:06:50 +0200 |
| commit | 88214725a380c8616dbd11c0106c1a14e950f2ce (patch) | |
| tree | 503353a6b8da0f2d36c868a2922b0622f96a8d95 /baobab | |
| parent | 17008f9f3f248364b8eb248934afd3bf0919894f (diff) | |
| download | mate-utils-88214725a380c8616dbd11c0106c1a14e950f2ce.tar.bz2 mate-utils-88214725a380c8616dbd11c0106c1a14e950f2ce.tar.xz | |
Drop support for Glib < 2.36
Diffstat (limited to 'baobab')
| -rw-r--r-- | baobab/src/baobab-prefs.c | 5 | ||||
| -rw-r--r-- | baobab/src/baobab-utils.c | 8 | ||||
| -rw-r--r-- | baobab/src/baobab.c | 23 |
3 files changed, 0 insertions, 36 deletions
diff --git a/baobab/src/baobab-prefs.c b/baobab/src/baobab-prefs.c index 33af5159..2c9553dc 100644 --- a/baobab/src/baobab-prefs.c +++ b/baobab/src/baobab-prefs.c @@ -248,13 +248,8 @@ fill_props_model (GtkListStore *store) fstotal = fsusage.blocks * fsusage.block_size; fsavail = fsusage.bfree * fsusage.block_size; - #if GLIB_CHECK_VERSION (2, 30, 0) total = g_format_size(fstotal); avail = g_format_size(fsavail); - #else - total = g_format_size_for_display(fstotal); - avail = g_format_size_for_display(fsavail); - #endif file = g_file_new_for_path (mountentry->mountdir); uri = g_file_get_uri (file); diff --git a/baobab/src/baobab-utils.c b/baobab/src/baobab-utils.c index 3e065350..68a6cb84 100644 --- a/baobab/src/baobab-utils.c +++ b/baobab/src/baobab-utils.c @@ -196,11 +196,7 @@ show_bars (GtkTreeModel *mdl, gtk_tree_model_get (mdl, iter, size_col, &size, -1); - #if GLIB_CHECK_VERSION (2, 30, 0) sizecstr = g_format_size (size); - #else - sizecstr = g_format_size_for_display (size); - #endif if (readelements == -1) { gtk_tree_store_set (GTK_TREE_STORE (mdl), iter, @@ -226,11 +222,7 @@ show_bars (GtkTreeModel *mdl, gtk_tree_model_get (mdl, iter, size_col, &size, -1); - #if GLIB_CHECK_VERSION (2, 30, 0) sizecstr = g_format_size (size); - #else - sizecstr = g_format_size_for_display (size); - #endif gtk_tree_store_set (GTK_TREE_STORE (mdl), iter, COL_H_PERC, 100.0, diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c index 253355ce..cb566afd 100644 --- a/baobab/src/baobab.c +++ b/baobab/src/baobab.c @@ -172,15 +172,9 @@ update_scan_label (void) gchar *available; GtkWidget *label; - #if GLIB_CHECK_VERSION (2, 30, 0) total = g_format_size (baobab.fs.total); used = g_format_size (baobab.fs.used); available = g_format_size (baobab.fs.avail); - #else - total = g_format_size_for_display (baobab.fs.total); - used = g_format_size_for_display (baobab.fs.used); - available = g_format_size_for_display (baobab.fs.avail); - #endif /* Translators: these are labels for disk space */ markup = g_markup_printf_escaped ("<small>%s <b>%s</b> (%s %s %s %s )</small>", @@ -389,11 +383,7 @@ first_row (void) gtk_tree_store_append (baobab.model, &root_iter, NULL); - #if GLIB_CHECK_VERSION (2, 30, 0) capacity_size = g_format_size (baobab.fs.total); - #else - capacity_size = g_format_size_for_display (baobab.fs.total); - #endif capacity_label = g_strdup (_("Total filesystem capacity")); gtk_tree_store_set (baobab.model, &root_iter, @@ -410,11 +400,7 @@ first_row (void) gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (baobab.tree_view), FALSE); gtk_tree_store_append (baobab.model, &firstiter, &root_iter); - #if GLIB_CHECK_VERSION (2, 30, 0) size = g_format_size (baobab.fs.used); - #else - size = g_format_size_for_display (baobab.fs.used); - #endif if (baobab.fs.total == 0 && baobab.fs.used == 0) { perc = 100.0; @@ -462,11 +448,7 @@ baobab_fill_model (struct chan_data *data) hardlinks = g_string_new (""); if (data->tempHLsize > 0) { - #if GLIB_CHECK_VERSION (2, 30, 0) size = g_format_size (data->tempHLsize); - #else - size = g_format_size_for_display (data->tempHLsize); - #endif g_string_assign (hardlinks, "<i>("); g_string_append (hardlinks, _("contains hardlinks for:")); @@ -481,13 +463,8 @@ baobab_fill_model (struct chan_data *data) ngettext ("%5d item", "%5d items", data->elements), data->elements); - #if GLIB_CHECK_VERSION (2, 30, 0) size = g_format_size (data->size); alloc_size = g_format_size (data->alloc_size); - #else - size = g_format_size_for_display (data->size); - alloc_size = g_format_size_for_display (data->alloc_size); - #endif gtk_tree_store_set (baobab.model, &iter, COL_DIR_NAME, name, |