summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Zesch <[email protected]>2013-03-23 17:25:30 -0700
committerSteve Zesch <[email protected]>2013-03-23 17:25:30 -0700
commit2ceef175c289f4d9ae920fc50b9d12d031b768b3 (patch)
tree6ba0a62a0e3bfc455233f12de448be44dfe48b62 /src
parenteb78dbb97f6e21fcc5afd3e3db5abe11f1e97d44 (diff)
parentd2ccf9aec7fd655e83de51167d36b68f9d0a8bb7 (diff)
downloadeom-2ceef175c289f4d9ae920fc50b9d12d031b768b3.tar.bz2
eom-2ceef175c289f4d9ae920fc50b9d12d031b768b3.tar.xz
Merge pull request #9 from eyelash/master
Replace some deprecated code
Diffstat (limited to 'src')
-rw-r--r--src/eom-file-chooser.c8
-rw-r--r--src/eom-properties-dialog.c8
-rw-r--r--src/eom-thumb-view.c4
3 files changed, 18 insertions, 2 deletions
diff --git a/src/eom-file-chooser.c b/src/eom-file-chooser.c
index c73d268..b1ee955 100644
--- a/src/eom-file-chooser.c
+++ b/src/eom-file-chooser.c
@@ -271,10 +271,18 @@ 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 2549897..6cc737e 100644
--- a/src/eom-properties-dialog.c
+++ b/src/eom-properties-dialog.c
@@ -161,7 +161,11 @@ 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);
@@ -491,8 +495,8 @@ pd_close_button_clicked_cb (GtkButton *button,
static gboolean
eom_properties_dialog_page_switch (GtkNotebook *notebook,
- GtkNotebookPage *page,
- gint page_index,
+ gpointer page,
+ guint page_index,
EomPropertiesDialog *prop_dlg)
{
diff --git a/src/eom-thumb-view.c b/src/eom-thumb-view.c
index 3375332..9c1a30e 100644
--- a/src/eom-thumb-view.c
+++ b/src/eom-thumb-view.c
@@ -345,7 +345,11 @@ 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);