diff options
author | Elias Aebi <[email protected]> | 2013-02-04 11:32:27 +0100 |
---|---|---|
committer | Elias Aebi <[email protected]> | 2013-02-04 11:32:27 +0100 |
commit | d9088cc4f3e2f7f6b77033b813c559bb6cf3f04f (patch) | |
tree | 0d315557729c25eb06a2d2192a1cbb7d3202b3d3 | |
parent | 2369d535fd8e960ffcc7bbf464c6d5722abd3b26 (diff) | |
download | eom-d9088cc4f3e2f7f6b77033b813c559bb6cf3f04f.tar.bz2 eom-d9088cc4f3e2f7f6b77033b813c559bb6cf3f04f.tar.xz |
replace some deprecated code
-rw-r--r-- | src/eom-properties-dialog.c | 8 | ||||
-rw-r--r-- | src/eom-thumb-view.c | 4 |
2 files changed, 10 insertions, 2 deletions
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); |