diff options
| author | Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> | 2012-01-29 03:10:33 +0100 |
|---|---|---|
| committer | Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> | 2012-08-09 21:06:05 +0200 |
| commit | daa712e7a8848c923ce698e4296e21ab5fde6c68 (patch) | |
| tree | bc8081a0deef6d385e8b1fc7b7fd01c17ddb2ffa | |
| parent | 198c6c28b2adfe371a92aa5a9c14561173a98905 (diff) | |
| download | gvfs-daa712e7a8848c923ce698e4296e21ab5fde6c68.tar.gz | |
afp: append _sync to g_vfs_afp_connection_[open|close]
| -rw-r--r-- | daemon/gvfsafpconnection.c | 12 | ||||
| -rw-r--r-- | daemon/gvfsafpconnection.h | 4 | ||||
| -rw-r--r-- | daemon/gvfsafpserver.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/daemon/gvfsafpconnection.c b/daemon/gvfsafpconnection.c index e7f66286..26c42bab 100644 --- a/daemon/gvfsafpconnection.c +++ b/daemon/gvfsafpconnection.c @@ -1540,9 +1540,9 @@ g_vfs_afp_connection_send_command_sync (GVfsAfpConnection *afp_connection, } gboolean -g_vfs_afp_connection_close (GVfsAfpConnection *afp_connection, - GCancellable *cancellable, - GError **error) +g_vfs_afp_connection_close_sync (GVfsAfpConnection *afp_connection, + GCancellable *cancellable, + GError **error) { GVfsAfpConnectionPrivate *priv = afp_connection->priv; @@ -1568,9 +1568,9 @@ g_vfs_afp_connection_close (GVfsAfpConnection *afp_connection, } gboolean -g_vfs_afp_connection_open (GVfsAfpConnection *afp_connection, - GCancellable *cancellable, - GError **error) +g_vfs_afp_connection_open_sync (GVfsAfpConnection *afp_connection, + GCancellable *cancellable, + GError **error) { GVfsAfpConnectionPrivate *priv = afp_connection->priv; diff --git a/daemon/gvfsafpconnection.h b/daemon/gvfsafpconnection.h index ddde954f..57db8627 100644 --- a/daemon/gvfsafpconnection.h +++ b/daemon/gvfsafpconnection.h @@ -352,11 +352,11 @@ GVfsAfpReply* g_vfs_afp_query_server_info (GSocketConnectable *a GVfsAfpConnection* g_vfs_afp_connection_new (GSocketConnectable *addr); -gboolean g_vfs_afp_connection_open (GVfsAfpConnection *afp_connection, +gboolean g_vfs_afp_connection_open_sync (GVfsAfpConnection *afp_connection, GCancellable *cancellable, GError **error); -gboolean g_vfs_afp_connection_close (GVfsAfpConnection *afp_connection, +gboolean g_vfs_afp_connection_close_sync (GVfsAfpConnection *afp_connection, GCancellable *cancellable, GError **error); diff --git a/daemon/gvfsafpserver.c b/daemon/gvfsafpserver.c index b4729959..e405917a 100644 --- a/daemon/gvfsafpserver.c +++ b/daemon/gvfsafpserver.c @@ -1038,7 +1038,7 @@ g_vfs_afp_server_login (GVfsAfpServer *server, try_login: /* Open connection */ - res = g_vfs_afp_connection_open (server->conn, cancellable, &err); + res = g_vfs_afp_connection_open_sync (server->conn, cancellable, &err); if (!res) break; @@ -1046,7 +1046,7 @@ try_login: cancellable, &err); if (!res) { - g_vfs_afp_connection_close (server->conn, cancellable, NULL); + g_vfs_afp_connection_close_sync (server->conn, cancellable, NULL); if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) break; |