[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/kbluetooth/src
From:       Alex Fiestas <alex () eyeos ! org>
Date:       2009-11-17 17:03:02
Message-ID: 1258477382.294198.15376.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1050568 by afiestas:

Fix a 3 crashes related to ObexServer managment (playing with enable/disable obex \
server should be secure now).

 M  +14 -8     trayicon.cpp  


--- trunk/playground/network/kbluetooth/src/trayicon.cpp #1050567:1050568
@@ -255,11 +255,13 @@
 	m_sendClipboardText->setEnabled(true);
 	m_sendMenu->setEnabled(true);
 
-	if (server) {
-		KConfigGroup obexServerConfig(config, "ObexServer");
-		server->start(config->group("ObexServer").readEntry("savePath"), true, false);
-	} else {
-		createObexServer();
+	if(serverAction->isChecked()) {
+		if (server) {
+			KConfigGroup obexServerConfig(config, "ObexServer");
+			server->start(config->group("ObexServer").readEntry("savePath"), true, false);
+		} else {
+			createObexServer();
+		}
 	}
 }
 
@@ -652,12 +654,16 @@
 void KBlueTray::enableServer() {
 	if(serverAction->isChecked()) {
 		config->group("ObexServer").writeEntry("Autostart", "true");
-		if(server)
+		if(server) {
+			kDebug() << "THIS SHOULD NOT HAPPEN!";
 			slotServerReady();
+		} else {
+			createObexServer();
+		}
 	} else {
 		config->group("ObexServer").writeEntry("Autostart", "false");
 		if(server)
-			server->stop();
+			server->close();
 	}
 }
 
@@ -749,7 +755,7 @@
 #endif
 	KIO::getJobTracker()->registerJob(fileTransfer);
 	fileTransfer->start();
-// 	kDebug() << "Remote addr: " << fileTransfer->remoteAddr();
+//	kDebug() << "Remote addr: " << fileTransfer->remoteAddr();
 	/*KNotification* notification = new KNotification("receiveFiles", 0, \
KNotification::Persistent);  notification->setText("Recieve files over bluetooth?");
 	notification->setPixmap( KIcon("kbluetooth4").pixmap(20, 20) );


[prev in list] [next in list] [prev in thread] [next in thread]