From dc41de959b6b76263f8640c4075a6ed5b873b722 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 6 Apr 2013 20:48:44 -0500
Subject: Use threading and select instead of busywaiting on the lock control
 socket This resolves the remainder of Bug 690

---
 tdm/kfrontend/kgapp.cpp    | 5 +++++
 tdm/kfrontend/kgapp.h      | 1 +
 tdm/kfrontend/kgreeter.cpp | 2 +-
 tdm/kfrontend/sakdlg.cc    | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'tdm/kfrontend')

diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 259e2666b..cc278f706 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -104,6 +104,11 @@ GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : T
 	init();
 }
 
+GreeterApp::~GreeterApp()
+{
+	//
+}
+
 void GreeterApp::init()
 {
 	pingInterval = _isLocal ? 0 : _pingInterval;
diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h
index 2c903634b..6150b4f5d 100644
--- a/tdm/kfrontend/kgapp.h
+++ b/tdm/kfrontend/kgapp.h
@@ -37,6 +37,7 @@ class GreeterApp : public TDEApplication {
 	GreeterApp();
 	GreeterApp(Display *dpy);
 	GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap);
+	~GreeterApp();
 	virtual bool x11EventFilter( XEvent * );
 
   protected:
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index c603c54b7..2111a1e9d 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -221,7 +221,7 @@ KGreeter::~KGreeter()
 	mControlPipeHandlerThread->terminate();
 	mControlPipeHandlerThread->wait();
 	delete mControlPipeHandler;
-	delete mControlPipeHandlerThread;
+// 	delete mControlPipeHandlerThread;
 
 	hide();
 	delete userList;
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index 4818c1cdd..e5ad75a88 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -165,7 +165,7 @@ SAKDlg::~SAKDlg()
     mControlPipeHandlerThread->terminate();
     mControlPipeHandlerThread->wait();
     delete mControlPipeHandler;
-    delete mControlPipeHandlerThread;
+//     delete mControlPipeHandlerThread;
 
     hide();
 }
-- 
cgit v1.2.3