Hello community, here is the log from the commit of package beagle checked in at Wed Jun 14 13:04:29 CEST 2006. -------- --- GNOME/beagle/beagle.changes 2006-06-08 14:19:40.000000000 +0200 +++ beagle/beagle.changes 2006-06-13 22:57:27.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jun 13 22:57:14 CEST 2006 - sreeves@suse.de + +- Fix for 182999 - Change beagle settings name + +------------------------------------------------------------------- +Mon Jun 12 21:49:46 CEST 2006 - joeshaw@suse.de + +- Don't split up a calendar's description field if it's empty. + Fixes bnc #183722. + +------------------------------------------------------------------- Old: ---- beagle-desktop-categories.patch New: ---- beagle-calendar-null-description-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.tRd6Bd/_old 2006-06-14 13:04:12.000000000 +0200 +++ /var/tmp/diff_new_pack.tRd6Bd/_new 2006-06-14 13:04:12.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.3 -Release: 53 +Release: 56 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz @@ -35,7 +35,6 @@ Patch7: beagle-use-native-open-locking.patch Patch8: beagle-index-sqlite-database.patch Patch9: beagle-cron-daily.patch -Patch10: beagle-desktop-categories.patch Patch11: beagle-x-connection-clean-shutdown.patch Patch12: beagle-inotify-spew.patch Patch13: beagle-safe-process-launch.patch @@ -56,6 +55,7 @@ Patch28: beagle-terminal-lockdown.patch Patch29: beagle-zh_CN.patch Patch30: beagle-search-resize.patch +Patch31: beagle-calendar-null-description-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Prereq: /usr/sbin/groupadd /usr/sbin/useradd Requires: mono-core >= 1.1.13.5 @@ -307,7 +307,6 @@ %patch7 %patch8 %patch9 -%patch10 %patch11 %patch12 %patch13 @@ -328,6 +327,7 @@ %patch28 %patch29 %patch30 +%patch31 %build rm po/no.* @@ -377,7 +377,7 @@ unzip -o $RPM_BUILD_ROOT%{prefix}/%{_lib}/browser-extensions/firefox/beagle.xpi -d $RPM_BUILD_ROOT%{prefix}/lib/browser-extensions/firefox/{fda00e13-8c62-4f63-9d19-d168115b11ca} rm $RPM_BUILD_ROOT%{prefix}/%{_lib}/browser-extensions/firefox/beagle.xpi rm $RPM_BUILD_ROOT%{sysconfdir}/beagle/crawl-windows -%suse_update_desktop_file -C "Configure how searching works" -G "Search Settings" -N "Beagle Settings" beagle-settings X-SuSE-ControlCenter-System +%suse_update_desktop_file -C "Configure how searching works" -G "" -N "Search Settings" -r beagle-settings Application Settings Utility Filesystem X-SuSE-ControlCenter-System %post -n libbeagle %run_ldconfig @@ -485,6 +485,11 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n beagle +* Tue Jun 13 2006 - sreeves@suse.de +- Fix for 182999 - Change beagle settings name +* Mon Jun 12 2006 - joeshaw@suse.de +- Don't split up a calendar's description field if it's empty. + Fixes bnc #183722. * Thu Jun 08 2006 - danw@suse.de - Make sure that if a tile gets wider, the window gets wider as well (rather than just hiding the rightmost part of the search area). ++++++ beagle-calendar-null-description-fix.patch ++++++ --- search/Tiles/Calendar.cs +++ search/Tiles/Calendar.cs @@ -32,11 +32,14 @@ Title = (time == "") ? summary : time + ": " + summary; description = hit.GetFirstProperty ("fixme:description"); - newline = description.IndexOf ('\n'); - if (newline == -1) - Description = description; - else - Description = description.Substring (0, newline); + + if (description != null && description != "") { + newline = description.IndexOf ('\n'); + if (newline == -1) + Description = description; + else + Description = description.Substring (0, newline); + } } protected override void LoadIcon (Gtk.Image image, int size) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org