r16602 - in /desktop/unstable/nautilus/debian: changelog patches/24_smb_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jul 21 15:08:37 2008
New Revision: 16602

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16602
Log:
24_smb_crash.patch: patch from upstream to handle NULL MIME types 
set by the SMB module gracefully, avoiding a lot of crashes.

Added:
    desktop/unstable/nautilus/debian/patches/24_smb_crash.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=16602&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Mon Jul 21 15:08:37 2008
@@ -1,3 +1,10 @@
+nautilus (2.20.0-6) unstable; urgency=low
+
+  * 24_smb_crash.patch: patch from upstream to handle NULL MIME types 
+    set by the SMB module gracefully, avoiding a lot of crashes.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 21 Jul 2008 17:09:01 +0200
+
 nautilus (2.20.0-5) unstable; urgency=low
 
   * 05_places-sidebar_single-click.patch: replaced by upstream version 

Added: desktop/unstable/nautilus/debian/patches/24_smb_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/24_smb_crash.patch?rev=16602&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/24_smb_crash.patch (added)
+++ desktop/unstable/nautilus/debian/patches/24_smb_crash.patch Mon Jul 21 15:08:37 2008
@@ -1,0 +1,26 @@
+GNOME #522534
+
+Index: nautilus-2.20.0/libnautilus-private/nautilus-directory-async.c
+===================================================================
+--- nautilus-2.20.0.orig/libnautilus-private/nautilus-directory-async.c	2008-07-21 16:55:49.615586966 +0200
++++ nautilus-2.20.0/libnautilus-private/nautilus-directory-async.c	2008-07-21 16:56:01.647855383 +0200
+@@ -844,7 +844,8 @@ dequeue_pending_idle_callback (gpointer 
+ 
+ 			/* Add the MIME type to the set. */
+ 			if ((file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0
+-			    && directory->details->load_mime_list_hash != NULL) {
++			    && directory->details->load_mime_list_hash != NULL
++			    && file_info->mime_type != NULL) {
+ 				istr_set_insert (directory->details->load_mime_list_hash,
+ 						 file_info->mime_type);
+ 			}
+@@ -2522,7 +2523,8 @@ mime_list_one (NautilusDirectory *direct
+ 		return;
+ 	}
+ 
+-	if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0) {
++	if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0 &&
++	     info->mime_type != NULL) {
+ 		istr_set_insert (directory->details->mime_list_hash, info->mime_type);
+ 	}
+ }

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=16602&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Mon Jul 21 15:08:37 2008
@@ -15,4 +15,5 @@
 20_upstream_nautilus-dnd-user-owned.patch
 21_nautilus_xmp.patch
 23_thumbnails_add-border.patch
+24_smb_crash.patch
 99_ltmain_as-needed.patch