[maemo-commits] [maemo-commits] r19409 - in projects/haf/trunk/osso-gnome-vfs2: . debian libgnomevfs modules

[From: subversion at stage.maemo.org]

Author: risun
Date: 2009-10-02 10:26:31 +0300 (Fri, 02 Oct 2009)
New Revision: 19409

Modified:
   projects/haf/trunk/osso-gnome-vfs2/ChangeLog
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
   projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info-cache.c
   projects/haf/trunk/osso-gnome-vfs2/modules/inotify-kernel.c
Log:
Fixes: NB#141096

Modified: projects/haf/trunk/osso-gnome-vfs2/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2009-10-01 11:52:57 UTC (rev 19408)
+++ projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2009-10-02 07:26:31 UTC (rev 19409)
@@ -1,3 +1,10 @@
+2009-10-02  Kristian Rietveld  <kris at lanedo.com>
+
+	* libgnomevfs/gnome-vfs-mime-info-cache.c:
+	- Check if the cache folder exists, otherwise skip it
+	* modules/inotify-kernel.c:
+	- Output a warning if watching fails and the environment variable GNOME_VFS_INOTIFY_DEBUG is set
+
 2007-02-01  Richard Hult  <richard at imendio.com>
 
 	* configure.in: Merge patch from 2.17.x to disable HTTP debug output.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2009-10-01 11:52:57 UTC (rev 19408)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2009-10-02 07:26:31 UTC (rev 19409)
@@ -1,3 +1,10 @@
+osso-gnome-vfs2 (2.16.3-2osso7) unstable; urgency=low
+
+  * Fixes: NB#141096 [AF-UT]Every 4 seconds polling for a mime info cache in
+    gnome vfs
+
+ -- Kristian Rietveld  <kris at lanedo.com>  Fri, 02 Oct 2009 10:21:51 +0300
+
 osso-gnome-vfs2 (2.16.3-2osso6) unstable; urgency=low
 
   * Fixes: NB#135623, rss application crashed...

Modified: projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info-cache.c
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info-cache.c	2009-10-01 11:52:57 UTC (rev 19408)
+++ projects/haf/trunk/osso-gnome-vfs2/libgnomevfs/gnome-vfs-mime-info-cache.c	2009-10-02 07:26:31 UTC (rev 19409)
@@ -360,6 +360,10 @@
 	dir = g_new0 (GnomeVFSMimeInfoCacheDir, 1);
 	dir->path = g_strdup (path);
 
+	if (!g_file_test (dir->path, G_FILE_TEST_EXISTS)) {
+		return NULL;
+	}
+
 	filename = g_build_filename (dir->path, "mimeinfo.cache", NULL);
 
 	gnome_vfs_monitor_add (&dir->cache_monitor_handle,

Modified: projects/haf/trunk/osso-gnome-vfs2/modules/inotify-kernel.c
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/modules/inotify-kernel.c	2009-10-01 11:52:57 UTC (rev 19408)
+++ projects/haf/trunk/osso-gnome-vfs2/modules/inotify-kernel.c	2009-10-02 07:26:31 UTC (rev 19409)
@@ -300,7 +300,8 @@
    if (wd < 0)
    {
       int e = errno;
-      // FIXME: debug msg failed to add watch
+      if (g_getenv ("GNOME_VFS_INOTIFY_DEBUG"))
+          g_warning ("inotify_add_watch failed for '%s': %d", path, errno);
       if (err)
          *err = e;
       return wd;