summaryrefslogtreecommitdiff
path: root/src/nautilus-image-properties-page.c
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2007-07-10 02:11:45 +0000
committerMartin Wehner <mwehner@src.gnome.org>2007-07-10 02:11:45 +0000
commitaae99fea95c5d42147097121c55585e5d7aaad6e (patch)
tree9b06f86f558fc5d2c4da29f728fc30cb707eee0e /src/nautilus-image-properties-page.c
parentd237e4d33cc6d0bbfe83e8ba6de6ac1d9376c5e7 (diff)
downloadnautilus-aae99fea95c5d42147097121c55585e5d7aaad6e.tar.gz
Don't ignore EXIF metadata of JPEG with XMP. (#451344) Patch from Hubert
2007-07-10 Martin Wehner <martin.wehner@gmail.com> * src/nautilus-image-properties-page.c: (file_read_callback): Don't ignore EXIF metadata of JPEG with XMP. (#451344) Patch from Hubert Figuiere <hfiguiere@teaser.fr> svn path=/trunk/; revision=12991
Diffstat (limited to 'src/nautilus-image-properties-page.c')
-rw-r--r--src/nautilus-image-properties-page.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index ae2ef2acb..d47537496 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -329,7 +329,7 @@ file_read_callback (GnomeVFSAsyncHandle *vfs_handle,
}
if (page->details->pixbuf_still_loading
#ifdef HAVE_EXIF
- && (exif_still_loading == 1)
+ || (exif_still_loading == 1)
#endif
) {
gnome_vfs_async_read (page->details->vfs_handle,