summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--copy-n-paste/eggsmclient-xsmp.c6
-rw-r--r--src/dlg-prop.c8
-rw-r--r--src/fr-window.c13
3 files changed, 0 insertions, 27 deletions
diff --git a/copy-n-paste/eggsmclient-xsmp.c b/copy-n-paste/eggsmclient-xsmp.c
index 8c6ba4d..f974136 100644
--- a/copy-n-paste/eggsmclient-xsmp.c
+++ b/copy-n-paste/eggsmclient-xsmp.c
@@ -36,9 +36,7 @@
#include <X11/SM/SMlib.h>
#include <gdk/gdk.h>
-#if GLIB_CHECK_VERSION (2, 24, 0)
#include <gdk/gdkx.h>
-#endif
#define EGG_TYPE_SM_CLIENT_XSMP (egg_sm_client_xsmp_get_type ())
#define EGG_SM_CLIENT_XSMP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP))
@@ -370,11 +368,7 @@ sm_client_xsmp_startup (EggSMClient *client,
free (ret_client_id);
gdk_threads_enter ();
-#if GLIB_CHECK_VERSION (2, 24, 0)
gdk_x11_set_sm_client_id (xsmp->client_id);
-#else
- gdk_set_sm_client_id (xsmp->client_id);
-#endif
gdk_threads_leave ();
g_debug ("Got client ID \"%s\"", xsmp->client_id);
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);