SSH Keys: libopie->libopie2

4 files changed, 4 insertions, 4 deletions

diff --git a/noncore/settings/sshkeys/opie-sshkeys.control b/noncore/settings/sshkeys/opie-sshkeys.control
index 4deccf4..08e3508 100644
--- a/noncore/settings/sshkeys/opie-sshkeys.control
+++ b/noncore/settings/sshkeys/opie-sshkeys.control
@@ -1,9 +1,9 @@
 Package: opie-sshkeys
 Files:  bin/sshkeys apps/Settings/sshkeys.desktop pics/sshkeys/sshkeys.png
 Priority: optional
 Section: opie/settings
 Maintainer: David Woodhouse <dwmw2@infradead.org>
 Architecture: arm
-Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass
+Depends: task-opie-minimal, ssh, opie-sh-ssh-askpass, libopiecore2
 Description: Utility for managing ssh-agent keys.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index 43e02af..e76fd6b 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -1,280 +1,279 @@
 /* 
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 #include "sshkeys.h"
 
 #include <qpe/qpeapplication.h>
-#include <opie/oprocess.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
 static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
 
 SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
     : SSHKeysBase( parent, name, fl )
 {
 	char *home = getenv("HOME");
 	unsigned i;
 
 	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_stderr(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&)));
 
 	if (home) {
 		for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) {
 			char thiskeyname[32];
 
 			thiskeyname[31] = 0;
 			snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]);
 			if (!access(thiskeyname, R_OK)) {
 				KeyFileName->insertItem(thiskeyname);
 			}
 		}
 	}
 
 	doRefreshListButton();
 }
 
 SSHKeysApp::~SSHKeysApp()
 {
 }
 
 void SSHKeysApp::doRefreshListButton()
 {
 	OProcess sshadd_process;
 	QListViewItem *t = KeyList->firstChild();
 
 	while(t) {
 		QListViewItem *next = t->nextSibling();
 		KeyList->takeItem(t);
 		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_stderr(OProcess*,char*,int)));
 
 	keystate = KeySize;
 	incoming_keyname="";
 	incoming_keysize="";
 	incoming_keyfingerprint="";
 
 //	log_text("Running ssh-add -l");
 	sshadd_process << "ssh-add" << "-l";
 	bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
 	if (!ret) {
 		log_text(tr("Error running ssh-add"));
 		return;
 	}
 	flush_sshadd_output();
 	if (sshadd_process.exitStatus() == 2) {
 		setEnabled(FALSE);
 	}
 }
 
 void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen)
 {
 	int i;
 	(void) proc;
 
 	for (i=0; i<buflen; i++) {
 		switch(keystate) {
 		case Noise:
 		noise:
 			if (buffer[i] == '\n') {
 				log_text(incoming_noise.local8Bit());
 				incoming_noise = "";
 				keystate = KeySize;
 			} else {
 				incoming_noise += buffer[i];
 			}
 			break;
 
 		case KeySize:
 			if (isdigit(buffer[i])) {
 				incoming_keysize += buffer[i];
 			} else if (buffer[i] == ' ') {
 				keystate = KeyFingerprint;
 			} else {
 				incoming_keysize = "";
 				incoming_noise = "";
 				keystate = Noise;
 				goto noise;
 			}
 			break;
 
 		case KeyFingerprint:
 			if (isxdigit(buffer[i]) || buffer[i] == ':') {
 				incoming_keyfingerprint += buffer[i];
 			} else if (buffer[i] == ' ') {
 				keystate = KeyName;
 			} else {
 				incoming_keysize = "";
 				incoming_keyfingerprint = "";
 				incoming_noise = "";
 				keystate = Noise;
 				goto noise;
 			}
 			break;
 	
 		case KeyName:
 			if (buffer[i] == '\n') {
 				/* Wheee. Got one. */
 				KeyList->insertItem(new 
 					QListViewItem(KeyList, incoming_keyname, incoming_keysize, incoming_keyfingerprint));
 				incoming_keysize = "";
 				incoming_keyfingerprint = "";
 				incoming_keyname = "";
 				keystate = KeySize;
 			} else if (isprint(buffer[i])) {
 				incoming_keyname += buffer[i];
 			} else {
 				incoming_keysize = "";
 				incoming_keyfingerprint = "";
 				incoming_noise = "";
 				keystate = Noise;
 				goto noise;
 			}
 			break;
 		}
 	}
 }
 
 void SSHKeysApp::flush_sshadd_output(void)
 {
 	if (pending_stdout.length()) {
 		log_text(pending_stdout.ascii());
 	}
 	pending_stdout = "";
 
 	if (pending_stderr.length()) {
 		log_text(pending_stderr.ascii());
 	}
 	pending_stderr = "";
 }
 
 void SSHKeysApp::log_sshadd_output(OProcess *proc, char *buffer, int buflen)
 {
 	(void) proc;
 
 	while (buflen) {
 		if (*buffer == '\n') {
 			log_text(pending_stdout);
 			pending_stdout = "";
 		} else {
 			pending_stdout += *buffer;
 		}
 		buffer++;
 		buflen--;
 	}
 }
 
 void SSHKeysApp::log_sshadd_stderr(OProcess *proc, char *buffer, int buflen)
 {
 	(void) proc;
 
 	while (buflen) {
 		if (*buffer == '\n') {
 			log_text(pending_stderr);
 			pending_stderr = "";
 		} else {
 			pending_stderr += *buffer;
 		}
 		buffer++;
 		buflen--;
 	}
 }
 
 void SSHKeysApp::ssh_add_exited(OProcess *proc)
 {
 	(void)proc;
 
 	doRefreshListButton();
 	setEnabled(TRUE);
 	if (proc->exitStatus() == 2) {
 		setEnabled(FALSE);
 	}
 }
 
 void SSHKeysApp::add_text_changed(const QString &text)
 {
 	struct stat sbuf;
 
 	if (!text.length() || (!access(text.ascii(), R_OK) &&
 				!stat(text.ascii(), &sbuf) &&
 			       S_ISREG(sbuf.st_mode)))
 		AddButton->setEnabled(TRUE);
 	else
 		AddButton->setEnabled(FALSE);
 }
 
 void SSHKeysApp::doAddButton()
 {
 	addprocess.clearArguments();
 	
 	setEnabled(FALSE);
 
 	if (KeyFileName->currentText().length()) {
 		addprocess << "ssh-add" << "--" << KeyFileName->currentText();
 //		log_text(QString(tr("Running ssh-add -- ")) + KeyFileName->currentText());
 	} else {
 		addprocess << "ssh-add";
 //		log_text(tr("Running ssh-add"));
 	}
 	bool ret = addprocess.start(OProcess::NotifyOnExit, OProcess::AllOutput);
 	if (!ret) {
 		log_text(tr("Error running ssh-add"));
 		doRefreshListButton();
 		setEnabled(TRUE);
 	}
 	flush_sshadd_output();
 }
 
 void SSHKeysApp::log_text(const char *text)
 {
 	TextOutput->append(text);
 	TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE);
 }
 
 void SSHKeysApp::doRemoveAllButton()
 {
 	OProcess sshadd_process;
 
diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h
index bbc6993..7483bbc 100644
--- a/noncore/settings/sshkeys/sshkeys.h
+++ b/noncore/settings/sshkeys/sshkeys.h
@@ -1,60 +1,61 @@
 /* 
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 
 #ifndef SSHKEYSAPP_H
 #define SSHKEYSAPP_H
 
 #include "sshkeysbase.h"
-#include <opie/oprocess.h>
+
+#include <opie2/oprocess.h>
 
 class SSHKeysApp : public SSHKeysBase
 {
 	Q_OBJECT
 		
  public:
 	SSHKeysApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~SSHKeysApp();
 
  private:
 	void log_text(const char *text);
 	void flush_sshadd_output(void);
 
 	enum { Noise, KeyName, KeySize, KeyFingerprint } keystate;
 	QString incoming_keyname;
 	QString incoming_keysize;
 	QString incoming_keyfingerprint;
 	QString incoming_noise;
 	OProcess addprocess;
 	QString pending_stdout;
 	QString pending_stderr;
 
  private slots:
 	void doAddButton();
 	void doRefreshListButton();
 	void doRemoveAllButton();
 	void get_list_keys_output(OProcess *proc, char *buffer, int buflen);
 	void log_sshadd_output(OProcess *proc, char *buffer, int buflen);
 	void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen);
 	void ssh_add_exited(OProcess *proc);
 	void add_text_changed(const QString &text);
 };
 #endif 
 
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index e98df2e..273db3c 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -1,12 +1,12 @@
 TEMPLATE = app
 CONFIG += qt warn_on release
 HEADERS = sshkeys.h
 SOURCES = main.cpp sshkeys.cpp
 TARGET = sshkeys
 INTERFACES = sshkeysbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2
 DESTDIR = $(OPIEDIR)/bin
 
 include ( $(OPIEDIR)/include.pro )