Revert "Moar threading stuff"

This reverts commit 4688f084568139bec4aa32f3f37c362f35ca6ced.

Conflicts:

	src/onlinepollerthread.cpp
	src/selectremotedlg.cpp

diff --git a/src/onlinepollerthread.cpp b/src/onlinepollerthread.cpp
new file mode 100644 (file)
index 0000000..89cc31a
--- /dev/null
+++ b/src/onlinepollerthread.cpp
@@ -0,0 +1,33 @@
+#include "onlinepollerthread.h"
+#include <QNetworkConfigurationManager>
+#include <QDBusMessage>
+#include <QDBusConnection>
+
+void OnlinePollerThread::run()
+{
+    running = true;
+    QTM_PREPEND_NAMESPACE(QNetworkConfigurationManager) qncm;
+    if (!qncm.isOnline()) {
+        QDBusMessage m = QDBusMessage::createMethodCall(
+                "com.nokia.icd_ui", "/com/nokia/icd_ui", 
+                "com.nokia.icd_ui", "show_conn_dlg");
+        m << false;
+        QDBusConnection::systemBus().send(m);
+        while(running)
+        {
+            if (!qncm.isOnline()) {
+                msleep(250);
+            } else {
+                break;
+            }
+        }
+    }
+    emit online();
+    exec();
+}
+
+void OnlinePollerThread::stop()
+{
+    running = false;
+}
+

diff --git a/src/selectremotedlg.cpp b/src/selectremotedlg.cpp
index 2ffc121..3f83249 100644 (file)
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@ -111,7 +111,13 @@ void SelectRemoteDlg::downloadRemote()
 void SelectRemoteDlg::refreshDB()
 {
     setBusy(true);
-    remoteDBMgr.getDBAsync();
+    if (onlinePollerThread != NULL) {
+        delete onlinePollerThread;
+    }
+    onlinePollerThread = new OnlinePollerThread();
+    connect(onlinePollerThread, SIGNAL(online()),
+            this, SLOT(getDB()));
+    onlinePollerThread->run();
 }
 
 void SelectRemoteDlg::showEvent(QShowEvent *event)