glib r6307 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Mon Jan 14 15:04:25 2008
New Revision: 6307
URL: http://svn.gnome.org/viewvc/glib?rev=6307&view=rev

Log:
2008-01-14  Alexander Larsson  <alexl redhat com>

	* gfile.c (g_file_monitor_file):
	Don't set error here, since we fallback to polling monitor.



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gfile.c

Modified: trunk/gio/gfile.c
==============================================================================
--- trunk/gio/gfile.c	(original)
+++ trunk/gio/gfile.c	Mon Jan 14 15:04:25 2008
@@ -3322,7 +3322,7 @@
   monitor = NULL;
   
   if (iface->monitor_file)
-    monitor = (* iface->monitor_file) (file, flags, cancellable, error);
+    monitor = (* iface->monitor_file) (file, flags, cancellable, NULL);
 
 /* Fallback to polling */
   if (monitor == NULL)