[maemo-commits] [maemo-commits] r12653 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-07-04 17:33:47 +0300 (Wed, 04 Jul 2007)
New Revision: 12653

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/33-NB62082-inotify-event-in-future.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
Fixes: NB#62082, GnomeVFS monitor events not emitted when date set to past


Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-07-04 14:26:29 UTC (rev 12652)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-07-04 14:33:47 UTC (rev 12653)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.16.3-1osso22~unreleased) unstable; urgency=low
+
+  * Fixes: NB#62082, GnomeVFS monitor events not emitted when date set to past
+
+ -- Richard Hult <richard at imendio.com>  Fri,  6 Jul 2007 17:00:00 +0200
+
 osso-gnome-vfs2 (2.16.3-1osso21) unstable; urgency=low
 
   * Fixes: NB#62096, gnomevfs daemon shall call g_thread_init()

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/33-NB62082-inotify-event-in-future.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/33-NB62082-inotify-event-in-future.patch	2007-07-04 14:26:29 UTC (rev 12652)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/33-NB62082-inotify-event-in-future.patch	2007-07-04 14:33:47 UTC (rev 12653)
@@ -0,0 +1,24 @@
+Index: libgnomevfs/gnome-vfs-monitor.c
+===================================================================
+--- libgnomevfs/gnome-vfs-monitor.c	(revision 12626)
++++ libgnomevfs/gnome-vfs-monitor.c	(working copy)
+@@ -452,7 +452,18 @@ gnome_vfs_monitor_callback (GnomeVFSMeth
+ 				send_uri_changes_now (monitor_handle, uri, now);
+ 				callback_data->send_at = now;
+ 			} else {
+-				callback_data->send_at = last_data->send_at + CONSECUTIVE_CALLBACK_DELAY;
++				time_t when;
++
++				/* To make sure we don't have a
++				 * callback send time in the future,
++				 * we make sure that 'now' is the
++				 * longest the user will wait for the
++				 * event.
++				 */
++				when  = MIN(last_data->send_at, now);
++				when += CONSECUTIVE_CALLBACK_DELAY;
++
++				callback_data->send_at = when;
+ 			}
+ 		}
+