[maemo-commits] [maemo-commits] r16449 - in projects/haf/trunk/gnome-vfs-filechooser-backend: . debian src

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-10-22 10:01:28 +0300 (Wed, 22 Oct 2008)
New Revision: 16449

Modified:
   projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog
   projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac
   projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog
   projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c
Log:
NB#88054

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog	2008-10-21 16:16:21 UTC (rev 16448)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog	2008-10-22 07:01:28 UTC (rev 16449)
@@ -1,3 +1,8 @@
+2008-10-22  Richard Hult  <richard at imendio.com>
+
+	* src/gtkfilesystemgnomevfs.c (is_desktop_file): Apply similar
+	workaround as Debian for GNOME bug #512555.
+
 2008-04-16  Richard Hult  <richard at imendio.com>
 
 	* Release 1.9.5.

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac	2008-10-21 16:16:21 UTC (rev 16448)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac	2008-10-22 07:01:28 UTC (rev 16449)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(gnome-vfs-filechooser-backend, 1.9.5)
+AC_INIT(gnome-vfs-filechooser-backend, 1.9.6)
 AC_CONFIG_SRCDIR(src/gtkfilesystemgnomevfs.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog	2008-10-21 16:16:21 UTC (rev 16448)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog	2008-10-22 07:01:28 UTC (rev 16449)
@@ -1,3 +1,9 @@
+gnome-vfs-filechooser-backend (1.9.6-1) unstable; urgency=low
+
+  * Fixes: NB#88054, File Manager crashes when user tries to browse through
+
+ -- Richard Hult <richard at imendio.com>  Wed, 22 Oct 2008 08:48:07 +0200
+
 gnome-vfs-filechooser-backend (1.9.5-1) unstable; urgency=low
 
   * Fixes: NB#84064, Bugs in the gtkfilechooser backend

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c	2008-10-21 16:16:21 UTC (rev 16448)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c	2008-10-22 07:01:28 UTC (rev 16449)
@@ -917,6 +917,12 @@
 static gboolean
 is_desktop_file (GnomeVFSFileInfo *vfs_info)
 {
+  /* Kludge to fix mysterious crash (see
+     http://bugzilla.gnome.org/show_bug.cgi?id=512555)
+  */
+  if (gnome_vfs_file_info_get_mime_type (vfs_info) == NULL)
+    return FALSE;
+
   return ((vfs_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0
 	  && strcmp (gnome_vfs_file_info_get_mime_type (vfs_info), "application/x-desktop") == 0);
 }