diff options
author | Alexander Larsson <alexl@redhat.com> | 2008-01-14 15:04:25 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@src.gnome.org> | 2008-01-14 15:04:25 +0000 |
commit | fd6e3887360be0e6755d06ca6287950a6dafb073 (patch) | |
tree | dced0eb5af68f9e279e653d3a965c4a05cdaae3f | |
parent | 3690cb75a67377a169264e226655d8fa3a5d003a (diff) | |
download | glib-fd6e3887360be0e6755d06ca6287950a6dafb073.tar.gz |
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
-rw-r--r-- | gio/ChangeLog | 5 | ||||
-rw-r--r-- | gio/gfile.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog index d88c45fed..27cba3511 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 0d0a5e129..309c1ecf5 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) |