| author | dwmw2 <dwmw2> | 2002-09-21 08:42:42 (UTC) |
|---|---|---|
| committer | dwmw2 <dwmw2> | 2002-09-21 08:42:42 (UTC) |
| commit | 51f94f502b2b9a92d562a3ad726ad58372860c5e (patch) (unidiff) | |
| tree | 3f587669a6fd91b36a68a37d1c2d3182d92eaab8 | |
| parent | 0bb8b359d20f7d5ead88c260c5560ab7b60358b9 (diff) | |
| download | opie-51f94f502b2b9a92d562a3ad726ad58372860c5e.zip opie-51f94f502b2b9a92d562a3ad726ad58372860c5e.tar.gz opie-51f94f502b2b9a92d562a3ad726ad58372860c5e.tar.bz2 | |
display stderr from ssh-add process too.
| -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 | |||
| @@ -50,2 +50,4 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) | |||
| 50 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 50 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); |
| 51 | connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)), | ||
| 52 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | ||
| 51 | connect(&addprocess, SIGNAL(processExited(OProcess*)), | 53 | connect(&addprocess, SIGNAL(processExited(OProcess*)), |
| @@ -89,2 +91,4 @@ void SSHKeysApp::doRefreshListButton() | |||
| 89 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); | 91 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); |
| 92 | connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), | ||
| 93 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | ||
| 90 | 94 | ||
| @@ -103,3 +107,2 @@ void SSHKeysApp::doRefreshListButton() | |||
| 103 | if (sshadd_process.exitStatus() == 2) { | 107 | if (sshadd_process.exitStatus() == 2) { |
| 104 | log_text(tr("Connection to ssh-agent failed")); | ||
| 105 | setEnabled(FALSE); | 108 | setEnabled(FALSE); |
| @@ -190,5 +193,4 @@ void SSHKeysApp::ssh_add_exited(OProcess *proc) | |||
| 190 | setEnabled(TRUE); | 193 | setEnabled(TRUE); |
| 191 | if (proc->exitStatus()) { | 194 | if (proc->exitStatus() == 2) { |
| 192 | 195 | setEnabled(FALSE); | |
| 193 | log_text(QString(tr("ssh-add failed"))); | ||
| 194 | } | 196 | } |
| @@ -241,2 +243,4 @@ void SSHKeysApp::doRemoveAllButton() | |||
| 241 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 243 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); |
| 244 | connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), | ||
| 245 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | ||
| 242 | 246 | ||