Hello community, here is the log from the commit of package beagle checked in at Sun Apr 2 12:37:35 CEST 2006. -------- --- GNOME/beagle/beagle.changes 2006-03-24 22:42:20.000000000 +0100 +++ beagle/beagle.changes 2006-03-31 19:00:39.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 31 18:59:53 CEST 2006 - gekker@suse.de + +- Fix crashes in beagle search (#161421,bgo#336708) + +------------------------------------------------------------------- New: ---- beagle-search-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.FSZACq/_old 2006-04-02 12:37:21.000000000 +0200 +++ /var/tmp/diff_new_pack.FSZACq/_new 2006-04-02 12:37:21.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.3 -Release: 4 +Release: 6 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz @@ -30,6 +30,7 @@ Patch3: beagle-python-no-strict-aliasing.patch Patch4: beagle-log-level-warn.patch Patch5: beagle-widget-space.patch +Patch6: beagle-search-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Prereq: /usr/sbin/groupadd /usr/sbin/useradd Requires: mono-core >= 1.1.13 @@ -273,6 +274,7 @@ %patch3 %patch4 %patch5 +%patch6 %build rename no nb po/no.* @@ -428,6 +430,8 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n beagle +* Fri Mar 31 2006 - gekker@suse.de +- Fix crashes in beagle search (#161421,bgo#336708) * Fri Mar 24 2006 - joeshaw@suse.de - Fix alignment of widgets in the search bar. Fixes bnc #153001. * Wed Mar 22 2006 - joeshaw@suse.de ++++++ beagle-search-crash.patch ++++++ =================================================================== RCS file: /cvs/gnome/beagle/search/Tiles/Image.cs,v retrieving revision 1.10 retrieving revision 1.12 diff -u -r1.10 -r1.12 --- search/Tiles/Image.cs 2006/03/02 14:53:33 1.10 +++ search/Tiles/Image.cs 2006/03/31 11:53:03 1.12 @@ -44,10 +44,19 @@ base.LoadIcon (image, size); // Draw the F-Spot overlay - if (Hit ["fspot:IsIndexed"] == "true") { + if (size > 32 && Hit ["fspot:IsIndexed"] == "true") { Gdk.Pixbuf icon = image.Pixbuf; - Gdk.Pixbuf emblem = Beagle.Images.GetPixbuf ("emblem-fspot.png", 16, 16); + + if (icon == null || emblem == null) + return; + + // FIXME: Ideally we'd composite into a fresh new pixbuf of + // the correct size in this case, but really, who's going to + // have images shorter or narrower than 16 pixels in f-spot?? + if (icon.Height < emblem.Height || icon.Width < emblem.Width) + return; + emblem.Composite (icon, 0, icon.Height - emblem.Height, emblem.Width, emblem.Height, 0, icon.Height - emblem.Height, 1, 1, Gdk.InterpType.Bilinear, 255); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...