display stderr from ssh-add process too.

1 files changed, 8 insertions, 4 deletions

diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index 88acf94..c5e1170 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -49,4 +49,6 @@ SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
         connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)),
                 this, SLOT(log_sshadd_output(OProcess*,char*,int)));
+        connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)),
+                this, SLOT(log_sshadd_output(OProcess*,char*,int)));
         connect(&addprocess, SIGNAL(processExited(OProcess*)),
                 this, SLOT(ssh_add_exited(OProcess*)));
@@ -88,4 +90,6 @@ void SSHKeysApp::doRefreshListButton()
         connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
                 this, SLOT(get_list_keys_output(OProcess*,char*,int)));
+        connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
+                this, SLOT(log_sshadd_output(OProcess*,char*,int)));
 
         keystate = KeySize;
@@ -102,5 +106,4 @@ void SSHKeysApp::doRefreshListButton()
         }
         if (sshadd_process.exitStatus() == 2) {
-                log_text(tr("Connection to ssh-agent failed"));
                 setEnabled(FALSE);
         }
@@ -189,7 +192,6 @@ void SSHKeysApp::ssh_add_exited(OProcess *proc)
         doRefreshListButton();
         setEnabled(TRUE);
-        if (proc->exitStatus()) {
-                
-                log_text(QString(tr("ssh-add failed")));
+        if (proc->exitStatus() == 2) {
+                setEnabled(FALSE);
         }
 }
@@ -240,4 +242,6 @@ void SSHKeysApp::doRemoveAllButton()
         connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
                 this, SLOT(log_sshadd_output(OProcess*,char*,int)));
+        connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
+                this, SLOT(log_sshadd_output(OProcess*,char*,int)));
 
         log_text(tr("Running ssh-add -D"));