synced with old CVS. Fixed bug that blocked kinetd after an invitation expired

svn path=/trunk/kdenetwork/krfb/; revision=146713

ROADMAP

@@ -7,7 +7,7 @@ Version 0.6 (2002/02/18): Improved RFB backend
 - dcop support
 - knotify
 
-Version 0.7 (2002/4/1): Better integration with KDE, improved GUI, invitations
+Version 0.7 (2002/4/X): Better integration with KDE, improved GUI, invitations
 - kded module 'kinetd' that listens on the Rfb port and starts KRfb
 - invitation support
 - kcontrol module

kinetd/kinetd.cpp

@@ -147,9 +147,6 @@ int PortListener::port() {
 }
 
 void PortListener::setEnabled(bool e) {
-	if (e == enabled)
-		return;
-
 	setEnabledInternal(e, QDateTime());
 }
 
@@ -158,12 +155,15 @@ void PortListener::setEnabledInternal(bool e, const QDateTime &ex) {
 	if (e) {
 		if (portNum < 0)
 			acquirePort();
-		if (portNum < 0)
+		if (portNum < 0) {
+			enabled = false;
 			return;
+		}
 	}
 	else {
 		portNum = -1;
-		delete socket;
+		if (socket)
+			delete socket;
 		socket = 0;
 	}
 

krfb/main.cpp

@@ -89,8 +89,7 @@ static KCmdLineOptions options[] =
  *   + does not accept connections, no tray icon
  *
  * TODO:
- * - error on 'close connection' in kinetd mode
- * - disable kinetd when no invitation valid
+ * - fix bug on 'close connection' in kinetd mode
  */
 
 void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
@@ -114,7 +113,6 @@ void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
 	kinetdAvailable = true;
 }
 
-
 int main(int argc, char *argv[])
 {
 	enum krfb_mode mode = KRFB_UNKNOWN_MODE;
@@ -122,7 +120,7 @@ int main(int argc, char *argv[])
 	KAboutData aboutData( "krfb", I18N_NOOP("Desktop Sharing"),
 		VERSION, description, KAboutData::License_GPL,
 		"(c) 2001-2002, Tim Jansen\n"
-		"(c) 2001 Johannes E. Schindelin\n"
+		"(c) 2001, Johannes E. Schindelin\n"
 		"(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n"
 		"(c) 2000, Const Kaplinsky\n"
 		"(c) 2000, Tridia Corporation\n"
@@ -148,7 +146,7 @@ int main(int argc, char *argv[])
 	KCmdLineArgs::init(argc, argv, &aboutData);
 	KCmdLineArgs::addCmdLineOptions(options);
 
- 	KApplication app;
+	KApplication app;
 
 	Configuration *config;
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();