Modified icons.

Started NLS support.
Added kpsion KDE2 application.
Unified file-headers.

1 files changed, 74 insertions, 66 deletions

diff --git a/lib/rfsvfactory.cc b/lib/rfsvfactory.cc
index 3699903..3a142da 100644
--- a/lib/rfsvfactory.cc
+++ b/lib/rfsvfactory.cc
@@ -1,23 +1,25 @@
-//
-//  RFSVFACTORY - factory object that creates an appropriate RFSV object
-//  based on whatever the NCP daemon discovered in the INFO exchange.
-//
-//  Copyright (C) 1999 Matt J. Gumbley <matt@gumbley.demon.co.uk>
-//
-//  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
-
+/*-*-c++-*-
+ * $Id$
+ *
+ * This file is part of plptools.
+ *
+ *  Copyright (C) 1999 Matt J. Gumbley <matt@gumbley.demon.co.uk>
+ *
+ *  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
+ *
+ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -38,62 +40,68 @@
 #include "Enum.h"
 
 ENUM_DEFINITION(rfsvfactory::errs, rfsvfactory::FACERR_NONE) {
-	stringRep.add(rfsvfactory::FACERR_NONE,           "no error");
-	stringRep.add(rfsvfactory::FACERR_COULD_NOT_SEND, "could not send version request");
-	stringRep.add(rfsvfactory::FACERR_AGAIN,          "try again");
-	stringRep.add(rfsvfactory::FACERR_NOPSION,        "no psion connected");
-	stringRep.add(rfsvfactory::FACERR_PROTVERSION,    "wrong protocol version");
-	stringRep.add(rfsvfactory::FACERR_NORESPONSE,     "no response from ncpd");
+    stringRep.add(rfsvfactory::FACERR_NONE,           N_("no error"));
+    stringRep.add(rfsvfactory::FACERR_COULD_NOT_SEND, N_("could not send version request"));
+    stringRep.add(rfsvfactory::FACERR_AGAIN,          N_("try again"));
+    stringRep.add(rfsvfactory::FACERR_NOPSION,        N_("no psion connected"));
+    stringRep.add(rfsvfactory::FACERR_PROTVERSION,    N_("wrong protocol version"));
+    stringRep.add(rfsvfactory::FACERR_NORESPONSE,     N_("no response from ncpd"));
 }
 
 rfsvfactory::rfsvfactory(ppsocket *_skt) : serNum(0)
 {
-	err = FACERR_NONE;
-	skt = _skt;
+    err = FACERR_NONE;
+    skt = _skt;
 }
 
 rfsv * rfsvfactory::create(bool reconnect)
 {
-	// skt is connected to the ncp daemon, which will have (hopefully) seen
-	// an INFO exchange, where the protocol version of the remote Psion was
-	// sent, and noted. We have to ask the ncp daemon which protocol it saw,
-	// so we can instantiate the correct RFSV protocol handler for the
-	// caller. We announce ourselves to the NCP daemon, and the relevant
-	// RFSV module will also announce itself.
+    // skt is connected to the ncp daemon, which will have (hopefully) seen
+    // an INFO exchange, where the protocol version of the remote Psion was
+    // sent, and noted. We have to ask the ncp daemon which protocol it saw,
+    // so we can instantiate the correct RFSV protocol handler for the
+    // caller. We announce ourselves to the NCP daemon, and the relevant
+    // RFSV module will also announce itself.
 
-	bufferStore a;
+    bufferStore a;
 
-	err = FACERR_NONE;
-	a.addStringT("NCP$INFO");
-	if (!skt->sendBufferStore(a)) {
-		if (!reconnect)
-			err = FACERR_COULD_NOT_SEND;
-		else {
-			skt->closeSocket();
-			serNum = 0;
-			skt->reconnect();
-			err = FACERR_AGAIN;
-		}
-		return NULL;
+    err = FACERR_NONE;
+    a.addStringT("NCP$INFO");
+    if (!skt->sendBufferStore(a)) {
+	if (!reconnect)
+	    err = FACERR_COULD_NOT_SEND;
+	else {
+	    skt->closeSocket();
+	    serNum = 0;
+	    skt->reconnect();
+	    err = FACERR_AGAIN;
 	}
-	if (skt->getBufferStore(a) == 1) {
-		if (a.getLen() > 8 && !strncmp(a.getString(), "Series 3", 8)) {
-			return new rfsv16(skt);
-		}
-		else if (a.getLen() > 8 && !strncmp(a.getString(), "Series 5", 8)) {
-			return new rfsv32(skt);
-		}
-		if ((a.getLen() > 8) && !strncmp(a.getString(), "No Psion", 8)) {
-			skt->closeSocket();
-			serNum = 0;
-			skt->reconnect();
-			err = FACERR_NOPSION;
-			return NULL;
-		}
-		// Invalid protocol version
-		err = FACERR_PROTVERSION;
-	} else
-		err = FACERR_NORESPONSE;
-
 	return NULL;
+    }
+    if (skt->getBufferStore(a) == 1) {
+	if (a.getLen() > 8 && !strncmp(a.getString(), "Series 3", 8)) {
+	    return new rfsv16(skt);
+	}
+	else if (a.getLen() > 8 && !strncmp(a.getString(), "Series 5", 8)) {
+	    return new rfsv32(skt);
+	}
+	if ((a.getLen() > 8) && !strncmp(a.getString(), "No Psion", 8)) {
+	    skt->closeSocket();
+	    serNum = 0;
+	    skt->reconnect();
+	    err = FACERR_NOPSION;
+	    return NULL;
+	}
+	// Invalid protocol version
+	err = FACERR_PROTVERSION;
+    } else
+	err = FACERR_NORESPONSE;
+
+    return NULL;
 }
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * End:
+ */