Hello community, here is the log from the commit of package nautilus checked in at Thu May 1 14:48:15 CEST 2008. -------- --- GNOME/nautilus/nautilus.changes 2008-04-28 18:07:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2008-05-01 10:36:39.705703000 +0200 @@ -1,0 +2,10 @@ +Thu May 1 10:36:36 CEST 2008 - hpj@suse.de + +- Removed previously disabled patches that were made obsolete by + upstream changes: + * nautilus-default-thumbnail-size.diff + * nautilus-6014-network-servers-in-places-sidebar.diff +- Added nautilus-bnc376070-null-exifdata-crash, which fixes + crashes when showing the properties of a picture (bnc#376070). + +------------------------------------------------------------------- Old: ---- nautilus-6014-network-servers-in-places-sidebar.diff nautilus-default-thumbnail-size.diff New: ---- nautilus-bnc376070-null-exifdata-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.d29007/_old 2008-05-01 14:47:39.000000000 +0200 +++ /var/tmp/diff_new_pack.d29007/_new 2008-05-01 14:47:39.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL v2 or later Group: Productivity/File utilities Version: 2.22.2 -Release: 11 +Release: 14 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -31,8 +31,6 @@ Patch6: nautilus-genericname.patch # PATCH-FIX-OPENSUSE nautilus-disable-zoom-control-and-view-as-option-menu.patch Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch -# PATCH-NEEDS-REBASE nautilus-default-thumbnail-size.diff bgo350972 -Patch8: nautilus-default-thumbnail-size.diff # PATCH-FIX-UPSTREAM nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com Patch9: nautilus-146947-rename-bad-parameters-message.diff # PATCH-NEEDS-REBASE nautilus-mime.patch @@ -41,8 +39,6 @@ Patch11: nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff # PATCH-FIX-UPSTREAM nautilus-212649-search-bar-visibility.patch bgo368424 federico@novell.com Patch12: nautilus-212649-search-bar-visibility.patch -# PATCH-NEEDS-REBASE nautilus-6014-network-servers-in-places-sidebar.diff bgo350974 bnc6014 federico@novell.com -Patch13: nautilus-6014-network-servers-in-places-sidebar.diff # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bgo335411 federico@novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff Patch17: nautilus-181941-i18n.patch @@ -54,6 +50,8 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff # PATCH-FEATURE-UPSTREAM nautilus-bnc368446-network-in-places.patch bnc368446 bgo350974 vuntz@novell.com -- Add network:// in the places sidebar Patch21: nautilus-bnc368446-network-in-places.patch +# PATCH-FIX-UPSTREAM nautilus-bnc-376070-null-exifdata-crash.patch bnc376070 hpj@novell.com +Patch22: nautilus-bnc376070-null-exifdata-crash.patch Requires: gnome-icon-theme Requires: %{name}-lang = %{version} Requires: gvfs @@ -93,18 +91,17 @@ %patch5 -p1 %patch6 -p0 %patch7 -### %patch8 -p1 %patch9 -p0 ### %patch10 %patch11 -p1 %patch12 -### %patch13 -p1 ### %patch15 -p1 %patch17 -p1 ### %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 +%patch22 -p1 gnome-patch-translation-update %build @@ -188,6 +185,13 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 01 2008 hpj@suse.de +- Removed previously disabled patches that were made obsolete by + upstream changes: + * nautilus-default-thumbnail-size.diff + * nautilus-6014-network-servers-in-places-sidebar.diff +- Added nautilus-bnc376070-null-exifdata-crash, which fixes + crashes when showing the properties of a picture (bnc#376070). * Mon Apr 28 2008 federico@novell.com - Rebased these patches: nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff ++++++ nautilus-bnc376070-null-exifdata-crash.patch ++++++ diff -upr nautilus-2.22.2-pre/src/nautilus-image-properties-page.c nautilus-2.22.2-post/src/nautilus-image-properties-page.c --- nautilus-2.22.2-pre/src/nautilus-image-properties-page.c 2008-03-29 03:40:25.000000000 -0600 +++ nautilus-2.22.2-post/src/nautilus-image-properties-page.c 2008-05-01 01:17:45.000000000 -0500 @@ -228,7 +228,7 @@ append_tag_value_pair (GString *string, static void append_exifdata_string (ExifData *exifdata, GString *string) { - if (exifdata->ifd[0] && exifdata->ifd[0]->count) { + if (exifdata && exifdata->ifd[0] && exifdata->ifd[0]->count) { append_tag_value_pair (string, exifdata, EXIF_TAG_MAKE, _("Camera Brand")); append_tag_value_pair (string, exifdata, EXIF_TAG_MODEL, _("Camera Model")); Only in nautilus-2.22.2-post/src: nautilus-image-properties-page.c~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org