diff options
| author | Monsta <[email protected]> | 2015-01-06 13:34:48 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-03-15 22:45:54 +0100 |
| commit | 821e4a1be8a16a59316c5cca1f200b667c0c93d1 (patch) | |
| tree | c75549d52ca2fba7742ab1a16ac7f782d8eaa582 /src/eom-window.c | |
| parent | 6621348ea4f4fd49a959ac3dbf78efd5f7c0b1dd (diff) | |
| download | eom-821e4a1be8a16a59316c5cca1f200b667c0c93d1.tar.bz2 eom-821e4a1be8a16a59316c5cca1f200b667c0c93d1.tar.xz | |
some fixes from upstream:
https://git.gnome.org/browse/eog/commit/?id=ffd057a0be9610b49f2dc718060c82c4ee1065be
https://git.gnome.org/browse/eog/commit/?id=40919ebb2ce1fd70edae61c7b578c6a7ce8ef432
https://git.gnome.org/browse/eog/commit/?id=a3b769506abbbf7b24547b95c9c99349e99d44c0
Closes https://github.com/mate-desktop/eom/pull/67
Diffstat (limited to 'src/eom-window.c')
| -rw-r--r-- | src/eom-window.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/eom-window.c b/src/eom-window.c index 2c75d23..ef8dd9d 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -487,7 +487,7 @@ update_status_bar (EomWindow *window) priv = window->priv; if (priv->image != NULL && - eom_image_has_data (priv->image, EOM_IMAGE_DATA_ALL)) { + eom_image_has_data (priv->image, EOM_IMAGE_DATA_DIMENSION)) { int zoom, width, height; goffset bytes = 0; @@ -847,7 +847,7 @@ eom_window_display_image (EomWindow *window, EomImage *image) eom_debug (DEBUG_WINDOW); - g_assert (eom_image_has_data (image, EOM_IMAGE_DATA_ALL)); + g_assert (eom_image_has_data (image, EOM_IMAGE_DATA_IMAGE)); priv = window->priv; @@ -1438,7 +1438,7 @@ handle_image_selection_changed_cb (EomThumbView *thumbview, EomWindow *window) priv->image_info_message_cid); eom_scroll_view_set_image (EOM_SCROLL_VIEW (priv->view), NULL); -} + } if (eom_thumb_view_get_n_selected (EOM_THUMB_VIEW (priv->thumbview)) == 0) return; @@ -1461,7 +1461,11 @@ handle_image_selection_changed_cb (EomThumbView *thumbview, EomWindow *window) return; } - if (eom_image_has_data (image, EOM_IMAGE_DATA_ALL)) { + if (eom_image_has_data (image, EOM_IMAGE_DATA_IMAGE)) { + if (priv->image != NULL) + g_object_unref (priv->image); + + priv->image = image; eom_window_display_image (window, image); return; } |