| -rw-r--r-- | noncore/settings/sshkeys/sshkeys.cpp | 12 |
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 @@ -45,12 +45,14 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); 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*))); connect(KeyFileName, SIGNAL(textChanged(const QString&)), this, SLOT(add_text_changed(const QString&))); @@ -84,12 +86,14 @@ void SSHKeysApp::doRefreshListButton() delete(t); t = next; } 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; incoming_keyname=""; incoming_keysize=""; incoming_keyfingerprint=""; @@ -98,13 +102,12 @@ void SSHKeysApp::doRefreshListButton() bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); if (!ret) { log_text(tr("Error running ssh-add")); return; } if (sshadd_process.exitStatus() == 2) { - log_text(tr("Connection to ssh-agent failed")); setEnabled(FALSE); } } void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen) { @@ -185,15 +188,14 @@ void SSHKeysApp::log_sshadd_output(OProcess *proc, char *buffer, int buflen) void SSHKeysApp::ssh_add_exited(OProcess *proc) { (void)proc; doRefreshListButton(); setEnabled(TRUE); - if (proc->exitStatus()) { - - log_text(QString(tr("ssh-add failed"))); + if (proc->exitStatus() == 2) { + setEnabled(FALSE); } } void SSHKeysApp::add_text_changed(const QString &text) { struct stat sbuf; @@ -236,12 +238,14 @@ void SSHKeysApp::log_text(const char *text) void SSHKeysApp::doRemoveAllButton() { OProcess sshadd_process; 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")); sshadd_process << "ssh-add" << "-D"; bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); if (!ret) { log_text(tr("Error running ssh-add")); |