summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-17 16:09:07 +0200
committerinfirit <[email protected]>2014-07-24 18:05:54 +0200
commit5115e68d942f1bdae0729841ae420de1a5c61840 (patch)
tree9d22318de75b05df6231246ca1f62e6a9f506fc6
parentd69408760eaa86d0532068c66c92847f2c12379c (diff)
downloadeom-5115e68d942f1bdae0729841ae420de1a5c61840.tar.bz2
eom-5115e68d942f1bdae0729841ae420de1a5c61840.tar.xz
Drop support for glib < 2.36
-rw-r--r--src/eom-application.c8
-rw-r--r--src/eom-file-chooser.c8
-rw-r--r--src/eom-properties-dialog.c4
-rw-r--r--src/eom-thumb-view.c4
-rw-r--r--src/eom-util.c4
-rw-r--r--src/eom-window.c4
6 files changed, 0 insertions, 32 deletions
diff --git a/src/eom-application.c b/src/eom-application.c
index dc6a4cb..ea23410 100644
--- a/src/eom-application.c
+++ b/src/eom-application.c
@@ -543,11 +543,7 @@ eom_application_screensaver_disable (EomApplication *application)
static void
eom_application_load_accelerators (void)
{
- #if GLIB_CHECK_VERSION(2, 6, 0)
gchar* accelfile = g_build_filename(g_get_user_config_dir(), "mate", "accels", "eom", NULL);
- #else // glib version < 2.6.0
- gchar* accelfile = g_build_filename(g_get_home_dir(), ".config", "mate", "accels", "eom", NULL);
- #endif
/* gtk_accel_map_load does nothing if the file does not exist */
gtk_accel_map_load (accelfile);
@@ -557,11 +553,7 @@ eom_application_load_accelerators (void)
static void
eom_application_save_accelerators (void)
{
- #if GLIB_CHECK_VERSION(2, 6, 0)
gchar* accelfile = g_build_filename(g_get_user_config_dir(), "mate", "accels", "eom", NULL);
- #else // glib version < 2.6.0
- gchar* accelfile = g_build_filename(g_get_home_dir(), ".config", "mate", "accels", "eom", NULL);
- #endif
gtk_accel_map_save (accelfile);
g_free (accelfile);
diff --git a/src/eom-file-chooser.c b/src/eom-file-chooser.c
index 9189f55..7d5dda6 100644
--- a/src/eom-file-chooser.c
+++ b/src/eom-file-chooser.c
@@ -271,18 +271,10 @@ set_preview_pixbuf (EomFileChooser *chooser, GdkPixbuf *pixbuf, goffset size)
bytes_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Size");
if (bytes_str != NULL) {
bytes = atoi (bytes_str);
-#if GLIB_CHECK_VERSION (2, 30, 0)
size_str = g_format_size (bytes);
-#else
- size_str = g_format_size_for_display (bytes);
-#endif
}
else {
-#if GLIB_CHECK_VERSION (2, 30, 0)
size_str = g_format_size (size);
-#else
- size_str = g_format_size_for_display (size);
-#endif
}
/* try to read image dimensions */
diff --git a/src/eom-properties-dialog.c b/src/eom-properties-dialog.c
index 2e8beb2..27a8a95 100644
--- a/src/eom-properties-dialog.c
+++ b/src/eom-properties-dialog.c
@@ -165,11 +165,7 @@ pd_update_general_tab (EomPropertiesDialog *prop_dlg,
gtk_label_set_text (GTK_LABEL (prop_dlg->priv->type_label), type_str);
bytes = eom_image_get_bytes (image);
-#if GLIB_CHECK_VERSION (2, 30, 0)
bytes_str = g_format_size (bytes);
-#else
- bytes_str = g_format_size_for_display (bytes);
-#endif
gtk_label_set_text (GTK_LABEL (prop_dlg->priv->bytes_label), bytes_str);
diff --git a/src/eom-thumb-view.c b/src/eom-thumb-view.c
index 78fbe99..b9065d8 100644
--- a/src/eom-thumb-view.c
+++ b/src/eom-thumb-view.c
@@ -367,11 +367,7 @@ thumbview_get_tooltip_string (EomImage *image)
ExifData *exif_data;
#endif
-#if GLIB_CHECK_VERSION (2, 30, 0)
bytes = g_format_size (eom_image_get_bytes (image));
-#else
- bytes = g_format_size_for_display (eom_image_get_bytes (image));
-#endif
eom_image_get_size (image, &width, &height);
diff --git a/src/eom-util.c b/src/eom-util.c
index 07d0115..b2e5255 100644
--- a/src/eom-util.c
+++ b/src/eom-util.c
@@ -254,11 +254,7 @@ eom_util_dot_dir (void)
if (dot_dir == NULL) {
gboolean exists;
- #if GLIB_CHECK_VERSION(2, 6, 0)
dot_dir = g_build_filename(g_get_user_config_dir(), "mate", "eom", NULL);
- #else // glib version < 2.6.0
- dot_dir = g_build_filename(g_get_home_dir(), ".config", "mate", "eom", NULL);
- #endif
exists = ensure_dir_exists (dot_dir);
diff --git a/src/eom-window.c b/src/eom-window.c
index fdfb7ea..597f129 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -724,11 +724,7 @@ update_status_bar (EomWindow *window)
if ((width > 0) && (height > 0)) {
char *size_string;
- #if GLIB_CHECK_VERSION(2, 30, 0)
size_string = g_format_size (bytes);
- #else
- size_string = g_format_size_for_display (bytes);
- #endif
/* Translators: This is the string displayed in the statusbar
* The tokens are from left to right: