Hello community, here is the log from the commit of package f-spot checked in at Mon May 29 23:47:58 CEST 2006. -------- --- GNOME/f-spot/f-spot.changes 2006-05-24 23:30:36.000000000 +0200 +++ f-spot/f-spot.changes 2006-05-29 22:00:35.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 29 21:58:04 CEST 2006 - lewing@suse.de + +- Handle errors while sharpening and loading images. Fixes 177400 and 178681. +- Work around gtk+ filechooser bug. Fixes 178122. + +------------------------------------------------------------------- New: ---- f-spot-bemorecareful.patch f-spot-choosercrash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.HhNN4K/_old 2006-05-29 23:47:39.000000000 +0200 +++ /var/tmp/diff_new_pack.HhNN4K/_new 2006-05-29 23:47:39.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Suggests: dcraw Version: 0.1.11 -Release: 24 +Release: 26 Summary: GNOME Photo Management Application URL: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 @@ -48,6 +48,8 @@ Patch20: %{name}-black.patch Patch21: %{name}-colordialog.patch Patch22: %{name}-popup.patch +Patch23: %{name}-choosercrash.patch +Patch24: %{name}-bemorecareful.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 @@ -96,6 +98,8 @@ %patch20 %patch21 %patch22 +%patch23 +%patch24 %build rename no nb po/no.* @@ -154,6 +158,9 @@ %endif %changelog -n f-spot +* Mon May 29 2006 - lewing@suse.de +- Handle errors while sharpening and loading images. Fixes 177400 and 178681. +- Work around gtk+ filechooser bug. Fixes 178122. * Wed May 24 2006 - lewing@suse.de - Avoid long intervals with no refresh in slideshow. Fixes 177745. - Handle errors while attempting to adjust colors. Fixes 178415. ++++++ f-spot-bemorecareful.patch ++++++ Index: src/MainWindow.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/MainWindow.cs,v retrieving revision 1.286.2.3 diff -u -p -r1.286.2.3 MainWindow.cs --- src/MainWindow.cs 19 May 2006 18:54:41 -0000 1.286.2.3 +++ src/MainWindow.cs 29 May 2006 17:44:59 -0000 @@ -1810,15 +1811,15 @@ public class MainWindow { if (response == Gtk.ResponseType.Ok) { foreach (int id in SelectedIds ()) { - Gdk.Pixbuf orig = FSpot.PhotoLoader.Load (query, id); - Gdk.Pixbuf final = PixbufUtils.UnsharpMask (orig, radius_spin.Value, amount_spin.Value, threshold_spin.Value); - Photo photo = query.Photos [id]; - - bool create_version = photo.DefaultVersionId == Photo.OriginalVersionId; - try { + Gdk.Pixbuf orig = FSpot.PhotoLoader.Load (query, id); + Gdk.Pixbuf final = PixbufUtils.UnsharpMask (orig, radius_spin.Value, amount_spin.Value, threshold_spin.Value); + + bool create_version = photo.DefaultVersionId == Photo.OriginalVersionId; + photo.SaveVersion (final, create_version); + query.Commit (id); } catch (System.Exception e) { string msg = Mono.Posix.Catalog.GetString ("Error saving sharpened photo"); string desc = String.Format (Mono.Posix.Catalog.GetString ("Received exception \"{0}\". Unable to save photo {1}"), Index: src/Loupe.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/Loupe.cs,v retrieving revision 1.20.2.1 diff -u -p -r1.20.2.1 Loupe.cs --- src/Loupe.cs 17 May 2006 22:15:20 -0000 1.20.2.1 +++ src/Loupe.cs 29 May 2006 17:44:59 -0000 @@ -41,12 +41,12 @@ namespace FSpot { if (photo == null) return; - Gdk.Pixbuf orig = view.Pixbuf; - Gdk.Pixbuf final = PixbufUtils.UnsharpMask (orig, radius_spin.Value, amount_spin.Value, threshold_spin.Value); - - bool create_version = photo.DefaultVersionId == Photo.OriginalVersionId; - try { + Gdk.Pixbuf orig = view.Pixbuf; + Gdk.Pixbuf final = PixbufUtils.UnsharpMask (orig, radius_spin.Value, amount_spin.Value, threshold_spin.Value); + + bool create_version = photo.DefaultVersionId == Photo.OriginalVersionId; + photo.SaveVersion (final, create_version); } catch (System.Exception e) { string msg = Mono.Posix.Catalog.GetString ("Error saving sharpened photo"); Index: src/AsyncPixbufLoader.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/AsyncPixbufLoader.cs,v retrieving revision 1.51 diff -u -p -r1.51 AsyncPixbufLoader.cs --- src/syncPixbufLoader.cs 23 Feb 2006 05:28:53 -0000 1.51 +++ src/AsyncPixbufLoader.cs 29 May 2006 17:44:59 -0000 @@ -355,7 +355,7 @@ namespace FSpot { loader.Write (buffer, (ulong)len); } catch (System.ObjectDisposedException od) { len = -1; - } catch (GLib.GException e) { + } catch (System.Exception e) { System.Console.WriteLine (e.ToString ()); pixbuf = null; len = -1; ++++++ f-spot-choosercrash.patch ++++++ Index: src/FolderExport.cs =================================================================== RCS file: /cvs/gnome/f-spot/src/FolderExport.cs,v retrieving revision 1.28 diff -u -p -r1.28 FolderExport.cs --- src/FolderExport.cs 24 Feb 2006 18:43:31 -0000 1.28 +++ src/FolderExport.cs 26 May 2006 23:52:18 -0000 @@ -192,7 +192,8 @@ namespace FSpot { // created. if (!dest.IsLocal) System.IO.Directory.Delete (gallery_path, true); - Dialog.Destroy (); + + Gtk.Application.Invoke (delegate { Dialog.Destroy(); }); } } @@ -239,7 +240,13 @@ namespace FSpot { private void HandleResponse (object sender, Gtk.ResponseArgs args) { if (args.ResponseId != Gtk.ResponseType.Ok) { + // FIXME this is to work around a bug in gtk+ where + // the filesystem events are still listened to when + // a FileChooserButton is destroyed but not finalized + // and an event comes in that wants to update the child widgets. Dialog.Destroy (); + uri_chooser.Dispose (); + uri_chooser = null; return; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...