Merge lp:~mterry/indicator-network/watch-nm-dbus into lp:indicator-network/14.10

[Michael Terry]

Watch for NetworkManager name changes on DBus and re-register with it when they happen.

Watch for NetworkManager name changes on DBus and re-register with it when they happen.

Before this change, if NM starts after we do or gets restarted while we exist, we won't be registered with it as a secret agent.

This is easy to test with:
sudo restart network-manager

And then try to connect to a wifi network with a password. Without this change, you won't get a popup.

(Resubmitted to drop the deprecated notify-ftbfs branch prerequisite)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/3/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/130/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/4/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM!
Thanks!!

review: Approve

=== modified file 'secret-agent/SecretAgent.cpp'
--- secret-agent/SecretAgent.cpp	2014-03-28 15:47:23 +0000
+++ secret-agent/SecretAgent.cpp	2014-05-15 14:41:43 +0000
@@ -45,15 +45,20 @@
 SecretAgent::SecretAgent(const QDBusConnection &systemConnection,
 		const QDBusConnection &sessionConnection, QObject *parent) :
 		QObject(parent), m_adaptor(new SecretAgentAdaptor(this)), m_systemConnection(
-				systemConnection), m_sessionConnection(sessionConnection), m_agentManager(
-		NM_DBUS_SERVICE, NM_DBUS_PATH_AGENT_MANAGER, m_systemConnection), m_notifications(
-				"org.freedesktop.Notifications",
-				"/org/freedesktop/Notifications", m_sessionConnection), m_request(nullptr) {
+				systemConnection), m_sessionConnection(sessionConnection), m_managerWatcher(
+				NM_DBUS_SERVICE, m_systemConnection), m_agentManager(NM_DBUS_SERVICE,
+				NM_DBUS_PATH_AGENT_MANAGER, m_systemConnection), m_notifications(
+				"org.freedesktop.Notifications", "/org/freedesktop/Notifications",
+				m_sessionConnection), m_request(nullptr) {
 	if (!m_systemConnection.registerObject(NM_DBUS_PATH_SECRET_AGENT, this)) {
 		throw logic_error(
 				_("Unable to register user secret agent object on DBus"));
 	}
 
+	// Watch for NM restarting (or starting after we do)
+	connect(&m_managerWatcher, SIGNAL(serviceOwnerChanged(QString, QString, QString)),
+	        this, SLOT(serviceOwnerChanged(QString, QString, QString)));
+
 	m_agentManager.Register("com.canonical.indicator.SecretAgent").waitForFinished();
 }
 
@@ -62,6 +67,15 @@
 	m_systemConnection.unregisterObject(NM_DBUS_PATH_SECRET_AGENT);
 }
 
+void SecretAgent::serviceOwnerChanged(const QString &name,
+		const QString &oldOwner, const QString &newOwner) {
+	Q_UNUSED(name)
+	Q_UNUSED(oldOwner)
+	if (!newOwner.isEmpty()) {
+		m_agentManager.Register("com.canonical.indicator.SecretAgent").waitForFinished();
+	}
+}
+
 /**
  * Example call:
  * [Argument: a{sa{sv}}

=== modified file 'secret-agent/SecretAgent.h'
--- secret-agent/SecretAgent.h	2013-10-16 14:17:50 +0000
+++ secret-agent/SecretAgent.h	2014-05-15 14:41:43 +0000
@@ -74,6 +74,10 @@
 
 	org::freedesktop::Notifications & notifications();
 
+protected Q_SLOTS:
+    void serviceOwnerChanged(const QString &name, const QString &oldOwner,
+            const QString &newOwner);
+
 protected:
 	QScopedPointer<SecretAgentAdaptor> m_adaptor;
 
@@ -81,6 +85,8 @@
 
 	QDBusConnection m_sessionConnection;
 
+	QDBusServiceWatcher m_managerWatcher;
+
 	org::freedesktop::NetworkManager::AgentManager m_agentManager;
 
 	org::freedesktop::Notifications m_notifications;