-rw-r--r-- | noncore/settings/sshkeys/main.cpp | 28 | ||||
-rw-r--r-- | noncore/settings/sshkeys/opie-sshkeys.control | 2 | ||||
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.cpp | 16 | ||||
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.h | 1 | ||||
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.pro | 4 |
5 files changed, 20 insertions, 31 deletions
diff --git a/noncore/settings/sshkeys/main.cpp b/noncore/settings/sshkeys/main.cpp index 9f19d0f..d0c0e2b 100644 --- a/noncore/settings/sshkeys/main.cpp +++ b/noncore/settings/sshkeys/main.cpp @@ -1,3 +1,3 @@ -/* +/* * ssh-agent key manipulation utility * @@ -20,30 +20,8 @@ */ -#include <qpe/qpeapplication.h> +#include <opie2/oapplicationfactory.h> #include "sshkeys.h" -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <unistd.h> -int main(int argc, char *argv[]) -{ - QPEApplication a(argc, argv); - SSHKeysApp app; - int fd; +OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<SSHKeysApp> ) - /* If we had a controlling TTY, detach from it. - This is to ensure that SSH uses ssh-askpass */ - fd = open("/dev/tty", O_RDONLY); - if (fd != -1) { - ioctl(fd, TIOCNOTTY, NULL); - close(fd); - } - - a.showMainWidget(&app); - - return a.exec(); -} diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control index 08e3508..1f2a1fc 100644 --- a/noncore/settings/sshkeys/opie-sshkeys.control +++ b/noncore/settings/sshkeys/opie-sshkeys.control @@ -1,4 +1,4 @@ Package: opie-sshkeys -Files: bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png +Files: plugins/applications/libsshkeys.so* bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png Priority: optional Section: opie/settings diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp index cebc845..d8b1014 100644 --- a/noncore/settings/sshkeys/sshkeys.cpp +++ b/noncore/settings/sshkeys/sshkeys.cpp @@ -22,4 +22,6 @@ #include <qpe/qpeapplication.h> +#include <qdir.h> +#include <qfile.h> #include <qmultilineedit.h> #include <qpushbutton.h> @@ -29,4 +31,6 @@ #include <sys/types.h> #include <sys/stat.h> +#include <fcntl.h> +#include <sys/ioctl.h> #include <stdlib.h> #include <unistd.h> @@ -40,5 +44,13 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) : SSHKeysBase( parent, name, fl ) { - char *home = getenv("HOME"); + /* If we had a controlling TTY, detach from it. + This is to ensure that SSH uses ssh-askpass */ + int fd = open("/dev/tty", O_RDONLY); + if (fd != -1) { + ioctl(fd, TIOCNOTTY, NULL); + close(fd); + } + + QCString home = QFile::encodeName( QDir::homeDirPath() ); unsigned i; @@ -62,5 +74,5 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) thiskeyname[31] = 0; - snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]); + snprintf(thiskeyname, 31, "%s/.ssh/%s", home.data(), keynames[i]); if (!access(thiskeyname, R_OK)) { KeyFileName->insertItem(thiskeyname); diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h index 519f540..0807f74 100644 --- a/noncore/settings/sshkeys/sshkeys.h +++ b/noncore/settings/sshkeys/sshkeys.h @@ -34,4 +34,5 @@ class SSHKeysApp : public SSHKeysBase SSHKeysApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SSHKeysApp(); + static QString appName() { return QString::fromLatin1( QUICKAPP_NAME); } private: diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro index 87d5ce9..0910d29 100644 --- a/noncore/settings/sshkeys/sshkeys.pro +++ b/noncore/settings/sshkeys/sshkeys.pro @@ -1,4 +1,3 @@ -TEMPLATE = app -CONFIG += qt warn_on +CONFIG += qt quick-app HEADERS = sshkeys.h SOURCES = main.cpp sshkeys.cpp @@ -8,5 +7,4 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopiecore2 -DESTDIR = $(OPIEDIR)/bin include ( $(OPIEDIR)/include.pro ) |