[maemo-commits] [maemo-commits] r16201 - in projects/haf/trunk/osso-gnomevfs-extra: . debian obex-module/src

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-09-24 12:56:13 +0300 (Wed, 24 Sep 2008)
New Revision: 16201

Modified:
   projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
   projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
   projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-fl-parser.c
Log:
Attempt at NB#88054

Modified: projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2008-09-24 07:45:12 UTC (rev 16200)
+++ projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2008-09-24 09:56:13 UTC (rev 16201)
@@ -1,3 +1,9 @@
+2008-09-24  Richard Hult  <richard at imendio.com>
+
+	* obex-module/src/om-fl-parser.c (fl_parser_fill_file_info): In
+	case we get an empty string as MIME type from the device, don't
+	use it.
+
 2008-03-19  Richard Hult  <richard at imendio.com>
 
 	* Release 1.9.6.

Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2008-09-24 07:45:12 UTC (rev 16200)
+++ projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2008-09-24 09:56:13 UTC (rev 16201)
@@ -1,3 +1,9 @@
+osso-gnomevfs-extra (1.9.6-2) unstable; urgency=low
+
+  * Fixes: NB#88054, File Manager crashes when user tries to browse through
+
+ -- Richard Hult <richard at imendio.com>  Wed, 24 Sep 2008 08:56:04 +0200
+
 osso-gnomevfs-extra (1.9.6-1) unstable; urgency=low
 
   * Fixes: NB#79291, gnome-vfs-daemon core dumps are generated when trying

Modified: projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-fl-parser.c
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-fl-parser.c	2008-09-24 07:45:12 UTC (rev 16200)
+++ projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/om-fl-parser.c	2008-09-24 09:56:13 UTC (rev 16201)
@@ -110,6 +110,7 @@
 			     G_MARKUP_ERROR_UNKNOWN_ELEMENT,  
 			     "Unknown element '%s'",  
 			     node_name);
+		gnome_vfs_file_info_unref (info);
 		return;
 	}
 
@@ -273,9 +274,12 @@
 			d(g_print ("Group: '%s'\n", value));
 		}
 		else if (strcmp (name, "type") == 0) {
-			info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE;
-			info->mime_type = g_strdup (value);
-			d(g_print ("Mime-Type: '%s'\n", info->mime_type));
+			if (value[0] != '\0') {
+				info->mime_type = g_strdup (value);
+				d(g_print ("Mime-Type: '%s'\n", info->mime_type));
+			} else {
+				d(g_print ("Mime-Type: (empty)\n"));
+			}
 		}
 		else if (strcmp (name, "xml:lang") == 0) {
 			d(g_print ("Lang: '%s'\n", value));