Hello community, here is the log from the commit of package eog checked in at Fri Jun 2 01:42:57 CEST 2006. -------- --- GNOME/eog/eog.changes 2006-03-27 00:39:46.000000000 +0200 +++ eog/eog.changes 2006-06-01 21:14:13.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 21:13:40 CEST 2006 - joeshaw@suse.de + +- Add a patch to fix a crash when toggling very quickly between + two images. (bnc #180396) + +------------------------------------------------------------------- New: ---- eog-fast-image-switch-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eog.spec ++++++ --- /var/tmp/diff_new_pack.8PtjOl/_old 2006-06-02 01:39:11.000000000 +0200 +++ /var/tmp/diff_new_pack.8PtjOl/_new 2006-06-02 01:39:12.000000000 +0200 @@ -20,10 +20,11 @@ Obsoletes: eog2 Autoreqprov: on Version: 2.12.2 -Release: 14 +Release: 22 Summary: Eye of GNOME for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Patch: eog-casts.patch +Patch1: eog-fast-image-switch-crash.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -38,6 +39,7 @@ %prep %setup -q %patch +%patch1 %build rename no nb po/no.* @@ -92,6 +94,9 @@ %{prefix}/share/pixmaps/eog %changelog -n eog +* Thu Jun 01 2006 - joeshaw@suse.de +- Add a patch to fix a crash when toggling very quickly between + two images. (bnc #180396) * Mon Mar 27 2006 - ro@suse.de - remove scrollkeeper stuff if created on s390* * Tue Feb 28 2006 - sbrabec@suse.cz ++++++ eog-fast-image-switch-crash.patch ++++++ Index: libeog/eog-image.c =================================================================== RCS file: /cvs/gnome/eog/libeog/eog-image.c,v retrieving revision 1.58.6.1 diff -u -p -u -r1.58.6.1 eog-image.c --- libeog/eog-image.c 13 Oct 2005 03:05:31 -0000 1.58.6.1 +++ libeog/eog-image.c 31 May 2006 17:12:52 -0000 @@ -917,8 +917,7 @@ eog_image_load (EogImage *img, guint dat } if (eog_image_has_data (img, data2read)) { - g_warning ("Image %s has requested data already loaded.\n", - eog_image_get_caption (img)); + return TRUE; } if (priv->status == EOG_IMAGE_STATUS_FAILED) { Index: shell/eog-window.c =================================================================== RCS file: /cvs/gnome/eog/shell/eog-window.c,v retrieving revision 1.152.6.3 diff -u -p -u -r1.152.6.3 eog-window.c --- shell/eog-window.c 30 Oct 2005 04:01:12 -0000 1.152.6.3 +++ shell/eog-window.c 31 May 2006 17:12:52 -0000 @@ -2972,7 +2972,7 @@ job_image_load_finished (EogJob *job, gp g_assert_not_reached (); } - g_object_unref (image); + eog_image_data_unref (image); } static void @@ -3020,10 +3020,12 @@ handle_image_selection_changed (EogWrapL data = g_new0 (EogJobImageLoadData, 1); EOG_JOB_DATA (data)->window = window; - data->image = image; /* no additional ref required, since - * its already increased by - * eog_wrap_lsit_get_first_selected_image - */ + data->image = eog_image_data_ref (image); + + /* Need to unref this, because the refcount was already + * increased by eog_wrap_list_get_first_selected_image + */ + g_object_unref (image); job = eog_job_new_full (data, job_image_load_action, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org