summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-03-28 08:13:01 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-03-28 08:13:01 +0000
commit2c0980778e78c8bc60371a095c0abb890d81039e (patch)
treec925973095e5b51b69704b0ec84d18c815e9db50
parentc3104802ff92cfbba12b2eb7359ad1eb61a5146c (diff)
downloadgvfs-2c0980778e78c8bc60371a095c0abb890d81039e.tar.gz
Actually increment count so that timeouts works. Pointed out by Joe Marcus
2008-03-28 Alexander Larsson <alexl@redhat.com> * client/gdaemonfileenumerator.c (g_daemon_file_enumerator_next_file): Actually increment count so that timeouts works. Pointed out by Joe Marcus Clarke svn path=/trunk/; revision=1686
-rw-r--r--ChangeLog6
-rw-r--r--client/gdaemonfileenumerator.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f31da596..8402ec11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-28 Alexander Larsson <alexl@redhat.com>
+
+ * client/gdaemonfileenumerator.c (g_daemon_file_enumerator_next_file):
+ Actually increment count so that timeouts works.
+ Pointed out by Joe Marcus Clarke
+
2008-03-27 Alexander Larsson <alexl@redhat.com>
* daemon/gvfsbackendsftp.c:
diff --git a/client/gdaemonfileenumerator.c b/client/gdaemonfileenumerator.c
index 3df80904..60bd7160 100644
--- a/client/gdaemonfileenumerator.c
+++ b/client/gdaemonfileenumerator.c
@@ -201,7 +201,7 @@ g_daemon_file_enumerator_next_file (GFileEnumerator *enumerator,
info = NULL;
done = FALSE;
count = 0;
- while (count < G_VFS_DBUS_TIMEOUT_MSECS / 100)
+ while (count++ < G_VFS_DBUS_TIMEOUT_MSECS / 100)
{
G_LOCK (infos);
if (daemon->infos)