[gnome-keyring/ssh-wip: 4/4] More work

[Stefan Walter <stefw src gnome org>]

commit b25593c6799dbbb98f752c9bfbd21f4f592953b1
Author: Stef Walter <stefw redhat com>
Date:   Fri Aug 29 15:34:46 2014 +0200

    More work

 ...-ssh-agent-process.c => gkd-ssh-agent-client.c} |    4 ++--
 daemon/ssh-agent/gkd-ssh-agent-client.h            |    2 +-
 daemon/ssh-agent/gkd-ssh-agent-ops.c               |    2 +-
 daemon/ssh-agent/gkd-ssh-agent.c                   |    6 ++++++
 4 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/daemon/ssh-agent/gkd-ssh-agent-process.c b/daemon/ssh-agent/gkd-ssh-agent-client.c
similarity index 98%
rename from daemon/ssh-agent/gkd-ssh-agent-process.c
rename to daemon/ssh-agent/gkd-ssh-agent-client.c
index 3e4acb2..2f4b340 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-process.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Red Hat Inc.
+ * Copyright (C) 2014 Stef Walter
  *
  * Gnome keyring is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * Author: Stef Walter <stefw redhat com>
+ * Author: Stef Walter <stef thewalter net>
  */
 
 #include "config.h"
diff --git a/daemon/ssh-agent/gkd-ssh-agent-client.h b/daemon/ssh-agent/gkd-ssh-agent-client.h
index c3cd135..4328fe4 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-client.h
+++ b/daemon/ssh-agent/gkd-ssh-agent-client.h
@@ -42,7 +42,7 @@ GType                gkd_ssh_agent_client_get_type            (void);
 
 GkdSshAgentClient *  gkd_ssh_agent_client_connect             (void);
 
-gboolean             gkd_ssh_agent_client_call                (GkdSshAgentClient *self,
+gboolean             gkd_ssh_agent_client_transact            (GkdSshAgentClient *self,
                                                               EggBuffer *req,
                                                               EggBuffer *resp);
 
diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c
index c2b02a7..6636c4e 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-ops.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c
@@ -174,7 +174,7 @@ preload_key_if_necessary (GkdSshAgentClient *agent,
        blob = g_bytes_get_data (priv, &length);
        egg_buffer_add_byte_array (&buf, blob, length);
 
-       if (gkd_ssh_agent_client_call (agent, &buf, &buf)) {
+       if (gkd_ssh_agent_client_transact (agent, &buf, &buf)) {
                if (!egg_buffer_get_byte (&buf, 4, NULL, &code) || code != GKD_SSH_RES_SUCCESS) {
                        comment = gkd_ssh_agent_client_preload_comment (agent, key);
                        g_warning ("couldn't add private key '%s' to ssh-agent", comment);
diff --git a/daemon/ssh-agent/gkd-ssh-agent.c b/daemon/ssh-agent/gkd-ssh-agent.c
index 5245034..8d64ef3 100644
--- a/daemon/ssh-agent/gkd-ssh-agent.c
+++ b/daemon/ssh-agent/gkd-ssh-agent.c
@@ -134,6 +134,12 @@ gkd_ssh_agent_write_packet (gint fd,
        return write_all (fd, buffer->buf, buffer->len);
 }
 
+gboolean
+gkd_ssh_agent_relay (GkdSshAgentCall *call)
+{
+       return gkd_ssh_agent_client_transact (call->agent, call->req, call->resp);
+}
+
 static gpointer
 run_client_thread (gpointer data)
 {