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

List:       kde-commits
Subject:    [bluedevil/bluezqt] src: Wizard: Make sure to register agent when org.bluez restarts
From:       David Rosca <nowrep () gmail ! com>
Date:       2015-03-31 20:39:44
Message-ID: E1Yd2wq-0004V3-Lf () scm ! kde ! org
[Download RAW message or body]

Git commit 324a63773bfaa99409ea686d2e520faffe8593dc by David Rosca.
Committed on 31/03/2015 at 20:29.
Pushed by drosca into branch 'bluezqt'.

Wizard: Make sure to register agent when org.bluez restarts

M  +1    -2    src/daemon/kded/filereceiver/filereceiver.cpp
M  +1    -0    src/sendfile/sendfilewizard.cpp
M  +13   -3    src/wizard/bluewizard.cpp
M  +3    -0    src/wizard/bluewizard.h

http://commits.kde.org/bluedevil/324a63773bfaa99409ea686d2e520faffe8593dc

diff --git a/src/daemon/kded/filereceiver/filereceiver.cpp \
b/src/daemon/kded/filereceiver/filereceiver.cpp index 32d6683..977745f 100644
--- a/src/daemon/kded/filereceiver/filereceiver.cpp
+++ b/src/daemon/kded/filereceiver/filereceiver.cpp
@@ -49,7 +49,6 @@ void FileReceiver::initJobResult(BluezQt::InitObexManagerJob *job)
         return;
     }
 
-
     // Make sure to register agent when obexd starts
     operationalChanged(m_manager->isOperational());
     connect(m_manager, &BluezQt::ObexManager::operationalChanged, this, \
&FileReceiver::operationalChanged); @@ -72,7 +71,7 @@ void \
FileReceiver::operationalChanged(bool operational)  BluezQt::PendingCall *call = \
                m_manager->registerAgent(m_agent);
         connect(call, &BluezQt::PendingCall::finished, this, \
&FileReceiver::agentRegistered);  } else {
-        // Attempt to restart obexd
+        // Attempt to start obexd
         BluezQt::ObexManager::startService();
     }
 }
diff --git a/src/sendfile/sendfilewizard.cpp b/src/sendfile/sendfilewizard.cpp
index 5de073e..4c0c7b4 100644
--- a/src/sendfile/sendfilewizard.cpp
+++ b/src/sendfile/sendfilewizard.cpp
@@ -39,6 +39,7 @@
 
 #include <BluezQt/Device>
 #include <BluezQt/Adapter>
+#include <BluezQt/ObexManager>
 #include <BluezQt/PendingCall>
 #include <BluezQt/InitManagerJob>
 
diff --git a/src/wizard/bluewizard.cpp b/src/wizard/bluewizard.cpp
index cc01b5a..a5bba1f 100644
--- a/src/wizard/bluewizard.cpp
+++ b/src/wizard/bluewizard.cpp
@@ -132,8 +132,9 @@ void BlueWizard::initJobResult(BluezQt::InitManagerJob *job)
 
     qCDebug(WIZARD) << "Manager initialized";
 
-    // Register our agent
-    m_manager->registerAgent(m_agent);
+    // Make sure to register agent when bluetoothd starts
+    operationalChanged(m_manager->isOperational());
+    connect(m_manager, &BluezQt::Manager::operationalChanged, this, \
&BlueWizard::operationalChanged);  
     // Start discovery
     static_cast<DiscoverPage*>(page(Discover))->startDiscovery();
@@ -142,6 +143,16 @@ void BlueWizard::initJobResult(BluezQt::InitManagerJob *job)
     show();
 }
 
+void BlueWizard::operationalChanged(bool operational)
+{
+    if (operational) {
+        m_manager->registerAgent(m_agent);
+    } else {
+        // Attempt to start bluetoothd
+        BluezQt::Manager::startService();
+    }
+}
+
 void BlueWizard::done(int result)
 {
     qCDebug(WIZARD) << "Wizard done: " << result;
@@ -149,4 +160,3 @@ void BlueWizard::done(int result)
     QWizard::done(result);
     qApp->exit(result);
 }
-
diff --git a/src/wizard/bluewizard.h b/src/wizard/bluewizard.h
index 1e19256..73e7df3 100644
--- a/src/wizard/bluewizard.h
+++ b/src/wizard/bluewizard.h
@@ -54,7 +54,10 @@ public:
 
 public Q_SLOTS:
     void restartWizard();
+
+private Q_SLOTS:
     void initJobResult(BluezQt::InitManagerJob *job);
+    void operationalChanged(bool operational);
 
 private:
     void done(int result) Q_DECL_OVERRIDE;


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