From aaf22127f31f9613d750c73565771f425b1e6cce Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 19 Nov 2014 17:17:55 +0100 Subject: Drop compat code for Glib < 2.32 --- src/dlg-prop.c | 8 -------- src/fr-window.c | 13 ------------- 2 files changed, 21 deletions(-) (limited to 'src') diff --git a/src/dlg-prop.c b/src/dlg-prop.c index 94af615..3a2529a 100644 --- a/src/dlg-prop.c +++ b/src/dlg-prop.c @@ -145,11 +145,7 @@ dlg_prop (FrWindow *window) label = _gtk_builder_get_widget (data->builder, "p_size_label"); size = get_file_size (fr_window_get_archive_uri (window)); -#if GLIB_CHECK_VERSION (2, 30, 0) s = g_format_size (size); -#else - s = g_format_size_for_display (size); -#endif gtk_label_set_text (GTK_LABEL (label), s); g_free (s); @@ -169,11 +165,7 @@ dlg_prop (FrWindow *window) } label = _gtk_builder_get_widget (data->builder, "p_uncomp_size_label"); -#if GLIB_CHECK_VERSION (2, 30, 0) s = g_format_size (uncompressed_size); -#else - s = g_format_size_for_display (uncompressed_size); -#endif gtk_label_set_text (GTK_LABEL (label), s); g_free (s); diff --git a/src/fr-window.c b/src/fr-window.c index 65e99de..2eecc67 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -1503,13 +1503,8 @@ fr_window_update_statusbar_list_info (FrWindow *window) g_list_free (selection); } -#if GLIB_CHECK_VERSION (2, 30, 0) size_txt = g_format_size (tot_size); sel_size_txt = g_format_size (sel_size); -#else - size_txt = g_format_size_for_display (tot_size); - sel_size_txt = g_format_size_for_display (sel_size); -#endif if (tot_n == 0) archive_info = g_strdup (""); @@ -1577,11 +1572,7 @@ fr_window_populate_file_list (FrWindow *window, utf8_path = g_filename_display_name (tmp); g_free (tmp); -#if GLIB_CHECK_VERSION (2, 30, 0) s_size = g_format_size (fdata->dir_size); -#else - s_size = g_format_size_for_display (fdata->dir_size); -#endif if (fdata->list_dir) s_time = g_strdup (""); @@ -1610,11 +1601,7 @@ fr_window_populate_file_list (FrWindow *window, utf8_path = g_filename_display_name (fdata->path); -#if GLIB_CHECK_VERSION (2, 30, 0) s_size = g_format_size (fdata->size); -#else - s_size = g_format_size_for_display (fdata->size); -#endif s_time = get_time_string (fdata->modified); desc = g_content_type_get_description (fdata->content_type); -- cgit v1.2.1