Merge lp:~unity-api-team/indicator-network/fix_unlock_v2 into lp:indicator-network/14.10

[Antti Kaijanmäki]

deadlock if calling unlock() inside ready signal for a modem that does not require unlocking.

[Marcus Tomlinson (marcustomlinson)]

Can modem ever be null?

review: Needs Information

[Antti Kaijanmäki (kaijanmaki)]

> Can modem ever be null?

no.

[Marcus Tomlinson (marcustomlinson)]

struct thing
{
    int x = 0;
};

int main(int argc, char* argv[])
{
    std::shared_ptr<thing> thingy = nullptr;
    std::list<std::shared_ptr<thing>> list;
    list.push_back(thingy);
    list.front()->x = 5; // EXPLOSION!!!
}

just saying...

[Marcus Tomlinson (marcustomlinson)]

But... had a look at the surrounding code, looks good. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/201/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/75/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/indicator/modem-manager.cpp'
--- src/indicator/modem-manager.cpp	2014-10-14 19:54:51 +0000
+++ src/indicator/modem-manager.cpp	2014-10-15 11:31:49 +0000
@@ -71,7 +71,8 @@
             if (!m_pendingUnlocks.empty()) {
                 auto modem = m_pendingUnlocks.front();
                 m_pendingUnlocks.pop_front();
-                m_unlockDialog->unlock(modem);
+                if (modem->requiredPin().get() != Modem::PinType::none)
+                    m_unlockDialog->unlock(modem);
             }
         });