Merge lp:~marcustomlinson/indicator-network/lp-1427064 into lp:indicator-network/15.04

[Marcus Tomlinson]

Connect RootState::Private::updateNetworkingIcon() to changes in connected AP strength.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-vivid-armhf-ci/53/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/264/rebuild

review: Approve (continuous-integration)

=== modified file 'src/indicator/root-state.cpp'
--- src/indicator/root-state.cpp	2015-02-16 18:33:02 +0000
+++ src/indicator/root-state.cpp	2015-03-02 06:41:24 +0000
@@ -34,6 +34,8 @@
     std::shared_ptr<networking::Manager> m_manager;
     ModemManager::Ptr m_modemManager;
     core::Property<Variant> m_state;
+    networking::wifi::AccessPoint::Ptr m_activeAP;
+    std::shared_ptr<core::ScopedConnection> m_activeAP_conn;
 
     std::string m_label;
 
@@ -224,9 +226,35 @@
 
                 int strength = -1;
                 bool secured = false;
-                if (wifiLink->activeAccessPoint().get()) {
-                    strength = wifiLink->activeAccessPoint().get()->strength().get();
-                    secured  = wifiLink->activeAccessPoint().get()->secured();
+
+                // check if the currently active AP has changed
+                if (m_activeAP != wifiLink->activeAccessPoint().get())
+                {
+                    // locally store the active AP
+                    m_activeAP = wifiLink->activeAccessPoint().get();
+                    if (m_activeAP)
+                    {
+                        // connect updateNetworkingIcon() to changes in AP strength
+                        auto that = shared_from_this();
+                        m_activeAP_conn = std::make_shared<core::ScopedConnection>(
+                            m_activeAP->strength().changed().connect([that](double)
+                            {
+                                GMainLoopDispatch([that](){
+                                    that->updateNetworkingIcon();
+                                });
+                            })
+                        );
+                    }
+                    else
+                    {
+                        // there is no active AP, so we disconnect from strength updates
+                        m_activeAP_conn = nullptr;
+                    }
+                }
+
+                if (m_activeAP) {
+                    strength = m_activeAP->strength().get();
+                    secured  = m_activeAP->secured();
                 }
 
                 /// @todo deal with a11ydesc