summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Hoegelow <h.hoegelow@raumfeld.com>2010-11-25 22:37:43 +0100
committerSven Neumann <s.neumann@raumfeld.com>2010-12-07 20:30:12 +0100
commit2b6c559ea87fc929ac43527da5cc61c6d831f357 (patch)
treef842d9c0bf272ac8d4abda2595f0adf22c7ee066
parent9c01f34888eac9e346f5638062905ed8a139b551 (diff)
downloadgvfs-2b6c559ea87fc929ac43527da5cc61c6d831f357.tar.gz
Fix return value of async_connection_accept_new_fd()
async_connection_accept_new_fd() is a GSource callback and needs to return TRUE so that it is called again. Add the missing return value. Fixes gvfs client code on the ARM platform (and probably other platforms too). See https://bugzilla.gnome.org/show_bug.cgi?id=633330 for further details. Acked-by: Sven Neumann <sven@gimp.org>
-rw-r--r--client/gvfsdaemondbus.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c
index 2f999eed..fe9702e3 100644
--- a/client/gvfsdaemondbus.c
+++ b/client/gvfsdaemondbus.c
@@ -244,7 +244,7 @@ outstanding_fd_free (OutstandingFD *outstanding)
g_free (outstanding);
}
-static void
+static gboolean
async_connection_accept_new_fd (VfsConnectionData *data,
GIOCondition condition,
int fd)
@@ -260,7 +260,7 @@ async_connection_accept_new_fd (VfsConnectionData *data,
g_source_destroy (data->extra_fd_source);
g_source_unref (data->extra_fd_source);
data->extra_fd_source = NULL;
- return;
+ return FALSE;
}
fd_id = data->extra_fd_count;
@@ -287,6 +287,8 @@ async_connection_accept_new_fd (VfsConnectionData *data,
outstanding_fd);
}
}
+
+ return TRUE;
}
static void