diff options
| author | Tim P. Gerla <timg@src.gnome.org> | 2005-10-04 02:26:17 +0000 |
|---|---|---|
| committer | Tim P. Gerla <timg@src.gnome.org> | 2005-10-04 02:26:17 +0000 |
| commit | 0eec320a5842ea263a34dfc5c100d8411ffe0619 (patch) | |
| tree | 53d6e5883ddb2b808af81617f440cb1b5cda295d | |
| parent | 0f9290d48500b2503d4900b6b592d100d712d36e (diff) | |
| download | eog-EOG_2_12_1.tar.gz | |
Update for 2.12.1 Fix a couple of crashing bugs. Fixes bugs #313892 andGNOME_2_12_BRANCHPOINTEOG_2_12_1
* configure.in, NEWS: Update for 2.12.1
* libeog/eog-image.c, libeog/eog-thumbnail.c: Fix
a couple of crashing bugs. Fixes bugs #313892 and
#313397. Patches from lucasr.at.mundo@gmail.com.
* shell/eog-window.c: Update the statusbar correctly.
Fixes bug #317757, patch from lucasr.at.mundo@gmail.com.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libeog/eog-image.c | 8 | ||||
| -rw-r--r-- | libeog/eog-thumbnail.c | 1 | ||||
| -rw-r--r-- | shell/eog-window.c | 5 |
6 files changed, 33 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2005-10-03 Tim Gerla <tim+gnomebugs@gerla.net> + + * configure.in, NEWS: Update for 2.12.1 + * libeog/eog-image.c, libeog/eog-thumbnail.c: Fix + a couple of crashing bugs. Fixes bugs #313892 and + #313397. Patches from lucasr.at.mundo@gmail.com. + * shell/eog-window.c: Update the statusbar correctly. + Fixes bug #317757, patch from lucasr.at.mundo@gmail.com. + 2005-09-04 Tim Gerla <tim+gnomebugs@gerla.net> * configure.in, NEWS: Update for 2.12.0 @@ -1,3 +1,15 @@ +Version 2.12.1 +-------------- + +- Several bug fixes from Lucas Rocha: fixes a crash reading broken + SVG files, fixes a crash when opening a symlink to an image, + and properly updates the status bar on opening. +- Translation Updaes: Vladimir Petkov (bg), Mahay Alam Khan (bn), + Miloslav Trmac (cs), Iñaki Larrañaga Murgoitio (eu), Ignacio + Casal Quinteiro (gl), Alessio Frusciante (it), Christian Rose (sv), + Clytie Siddall (vi) + + Version 2.12.0 -------------- diff --git a/configure.in b/configure.in index 10d6a125..cc37f6b6 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_INIT(shell/main.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(eog, 2.12.0) +AM_INIT_AUTOMAKE(eog, 2.12.1) dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS") diff --git a/libeog/eog-image.c b/libeog/eog-image.c index 1502c848..3726baed 100644 --- a/libeog/eog-image.c +++ b/libeog/eog-image.c @@ -455,7 +455,8 @@ eog_image_determine_file_bytes (EogImage *img, GError **error) info = gnome_vfs_file_info_new (); result = gnome_vfs_get_file_info_uri (img->priv->uri, info, - GNOME_VFS_FILE_INFO_DEFAULT); + GNOME_VFS_FILE_INFO_DEFAULT | + GNOME_VFS_FILE_INFO_FOLLOW_LINKS); if ((result != GNOME_VFS_OK) || (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) == 0) { bytes = 0; @@ -803,6 +804,11 @@ eog_image_real_load (EogImage *img, guint data2read, EogJob *job, GError **error failed = (failed || bytes_read_total == 0 || priv->cancel_loading); + if (*error != NULL) { + failed = TRUE; + priv->status = EOG_IMAGE_STATUS_FAILED; + } + if (priv->cancel_loading) { priv->cancel_loading = FALSE; failed = TRUE; diff --git a/libeog/eog-thumbnail.c b/libeog/eog-thumbnail.c index 5088aee9..7404c5bf 100644 --- a/libeog/eog-thumbnail.c +++ b/libeog/eog-thumbnail.c @@ -145,6 +145,7 @@ eog_thumb_data_new (GnomeVFSURI *uri, GError **error) info = gnome_vfs_file_info_new (); result = gnome_vfs_get_file_info_uri (uri, info, GNOME_VFS_FILE_INFO_DEFAULT | + GNOME_VFS_FILE_INFO_FOLLOW_LINKS | GNOME_VFS_FILE_INFO_GET_MIME_TYPE); if (result != GNOME_VFS_OK) { diff --git a/shell/eog-window.c b/shell/eog-window.c index 6f0d570b..d69babc6 100644 --- a/shell/eog-window.c +++ b/shell/eog-window.c @@ -2885,7 +2885,6 @@ display_image_data (EogWindow *window, EogImage *image) eog_scroll_view_set_image (EOG_SCROLL_VIEW (priv->scroll_view), image); eog_info_view_set_image (EOG_INFO_VIEW (priv->info_view), image); - update_status_bar (window); if (priv->displayed_image != NULL) g_object_unref (priv->displayed_image); @@ -2898,7 +2897,9 @@ display_image_data (EogWindow *window, EogImage *image) title = _("Eye of GNOME"); } - gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_title (GTK_WINDOW (window), title); + + update_status_bar (window); } /* this runs in its own thread */ |