From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 14 Jan 2008 15:04:25 +0000 (+0000)
Subject: Don't set error here, since we fallback to polling monitor.
X-Git-Tag: GLIB_2_15_2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd6e3887360be0e6755d06ca6287950a6dafb073;p=platform%2Fupstream%2Fglib.git

Don't set error here, since we fallback to polling monitor.

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.


svn path=/trunk/; revision=6307
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index d88c45f..27cba35 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,10 @@
 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.
+
+2008-01-14  Alexander Larsson  <alexl@redhat.com>
+
         * gfile.[ch]:
         (g_file_monitor_directory):
         (g_file_monitor_file):
diff --git a/gio/gfile.c b/gio/gfile.c
index 0d0a5e1..309c1ec 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -3322,7 +3322,7 @@ g_file_monitor_file (GFile             *file,
   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)