Diffstat (limited to 'noncore/settings/sshkeys/sshkeys.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp index 31f6b85..cebc845 100644 --- a/noncore/settings/sshkeys/sshkeys.cpp +++ b/noncore/settings/sshkeys/sshkeys.cpp | |||
@@ -38,29 +38,29 @@ static char *keynames[] = { "identity", "id_rsa", "id_dsa" }; | |||
38 | 38 | ||
39 | SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) | 39 | SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) |
40 | : SSHKeysBase( parent, name, fl ) | 40 | : SSHKeysBase( parent, name, fl ) |
41 | { | 41 | { |
42 | char *home = getenv("HOME"); | 42 | char *home = getenv("HOME"); |
43 | unsigned i; | 43 | unsigned i; |
44 | 44 | ||
45 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); | 45 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); |
46 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); | 46 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); |
47 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); | 47 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); |
48 | 48 | ||
49 | connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 49 | connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
50 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 50 | this, SLOT(log_sshadd_output(Opie::Core::OProcess*,char*,int))); |
51 | connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 51 | connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
52 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 52 | this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int))); |
53 | connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)), | 53 | connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)), |
54 | this, SLOT(ssh_add_exited(OProcess*))); | 54 | this, SLOT(ssh_add_exited(Opie::Core::OProcess*))); |
55 | 55 | ||
56 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), | 56 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), |
57 | this, SLOT(add_text_changed(const QString&))); | 57 | this, SLOT(add_text_changed(const QString&))); |
58 | 58 | ||
59 | if (home) { | 59 | if (home) { |
60 | for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) { | 60 | for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) { |
61 | char thiskeyname[32]; | 61 | char thiskeyname[32]; |
62 | 62 | ||
63 | thiskeyname[31] = 0; | 63 | thiskeyname[31] = 0; |
64 | snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]); | 64 | snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]); |
65 | if (!access(thiskeyname, R_OK)) { | 65 | if (!access(thiskeyname, R_OK)) { |
66 | KeyFileName->insertItem(thiskeyname); | 66 | KeyFileName->insertItem(thiskeyname); |
@@ -79,27 +79,27 @@ void SSHKeysApp::doRefreshListButton() | |||
79 | { | 79 | { |
80 | OProcess sshadd_process; | 80 | OProcess sshadd_process; |
81 | QListViewItem *t = KeyList->firstChild(); | 81 | QListViewItem *t = KeyList->firstChild(); |
82 | 82 | ||
83 | while(t) { | 83 | while(t) { |
84 | QListViewItem *next = t->nextSibling(); | 84 | QListViewItem *next = t->nextSibling(); |
85 | KeyList->takeItem(t); | 85 | KeyList->takeItem(t); |
86 | delete(t); | 86 | delete(t); |
87 | t = next; | 87 | t = next; |
88 | } | 88 | } |
89 | 89 | ||
90 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 90 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
91 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); | 91 | this, SLOT(get_list_keys_output(Opie::Core::OProcess*,char*,int))); |
92 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 92 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
93 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 93 | this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int))); |
94 | 94 | ||
95 | keystate = KeySize; | 95 | keystate = KeySize; |
96 | incoming_keyname=""; | 96 | incoming_keyname=""; |
97 | incoming_keysize=""; | 97 | incoming_keysize=""; |
98 | incoming_keyfingerprint=""; | 98 | incoming_keyfingerprint=""; |
99 | 99 | ||
100 | // log_text("Running ssh-add -l"); | 100 | // log_text("Running ssh-add -l"); |
101 | sshadd_process << "ssh-add" << "-l"; | 101 | sshadd_process << "ssh-add" << "-l"; |
102 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); | 102 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); |
103 | if (!ret) { | 103 | if (!ret) { |
104 | log_text(tr("Error running ssh-add")); | 104 | log_text(tr("Error running ssh-add")); |
105 | return; | 105 | return; |
@@ -270,25 +270,25 @@ void SSHKeysApp::doAddButton() | |||
270 | 270 | ||
271 | void SSHKeysApp::log_text(const char *text) | 271 | void SSHKeysApp::log_text(const char *text) |
272 | { | 272 | { |
273 | TextOutput->append(text); | 273 | TextOutput->append(text); |
274 | TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE); | 274 | TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE); |
275 | } | 275 | } |
276 | 276 | ||
277 | void SSHKeysApp::doRemoveAllButton() | 277 | void SSHKeysApp::doRemoveAllButton() |
278 | { | 278 | { |
279 | OProcess sshadd_process; | 279 | OProcess sshadd_process; |
280 | 280 | ||
281 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 281 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
282 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 282 | this, SLOT(log_sshadd_output(Opie::Core::OProcess*,char*,int))); |
283 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 283 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
284 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 284 | this, SLOT(log_sshadd_stderr(Opie::Core::OProcess*,char*,int))); |
285 | 285 | ||
286 | // log_text(tr("Running ssh-add -D")); | 286 | // log_text(tr("Running ssh-add -D")); |
287 | sshadd_process << "ssh-add" << "-D"; | 287 | sshadd_process << "ssh-add" << "-D"; |
288 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); | 288 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); |
289 | if (!ret) { | 289 | if (!ret) { |
290 | log_text(tr("Error running ssh-add")); | 290 | log_text(tr("Error running ssh-add")); |
291 | } | 291 | } |
292 | flush_sshadd_output(); | 292 | flush_sshadd_output(); |
293 | doRefreshListButton(); | 293 | doRefreshListButton(); |
294 | } | 294 | } |