Merge lp:~cyphermox/powerd/nm-sleep-mode into lp:powerd

[Mathieu Trudel-Lapierre]

Allow NetworkManager to go in sleep mode as well when we get to deep sleep; so that network interfaces can be taken down.

Allow NetworkManager to go in sleep mode as well when we get to deep sleep; so that network interfaces can be taken down.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/powerd-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/165/rebuild

review: Approve (continuous-integration)

Unmerged revisions

143. By Mathieu Trudel-Lapierre on 2014-10-07

Make powerd notify NetworkManager when going in and out of Sleep mode.

=== modified file 'src/powerd-object.c'
--- src/powerd-object.c	2014-08-18 21:33:32 +0000
+++ src/powerd-object.c	2014-10-07 14:31:46 +0000
@@ -31,6 +31,7 @@
     GDBusConnection * system_bus;
     const gchar * path;
     ComCanonicalPowerd * skel;
+    GDBusProxy * nm_proxy;
 };
 
 static void powerd_source_class_init (PowerdSourceClass * klass);
@@ -48,12 +49,26 @@
 /* This hash table is used to track which dbus names we are watching */
 static GHashTable *dbus_name_watch_hash = NULL;
 
+static void nm_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
+                                gpointer user_data);
+
 /* Instance */
 static void
 powerd_source_init (PowerdSource *self)
 {
     self->priv = POWERD_SOURCE_GET_PRIVATE(self);
     self->priv->system_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
+
+    g_dbus_proxy_new (self->priv->system_bus,
+                      G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
+                      | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+                      NULL,
+                      "org.freedesktop.NetworkManager",
+                      "/org/freedesktop/NetworkManager",
+                      "org.freedesktop.NetworkManager",
+                      NULL,
+                      (GAsyncReadyCallback) nm_proxy_connect_cb,
+                      self);
     return;
 }
 
@@ -273,6 +288,19 @@
     if (!powerd_source)
         return;
 
+    g_dbus_proxy_call_sync (POWERD_SOURCE_GET_PRIVATE(powerd_source)->nm_proxy,
+                            "Sleep",
+                            g_variant_new ("(b)", state == POWERD_SYS_STATE_SUSPEND),
+                            G_DBUS_CALL_FLAGS_NONE,
+                            -1,
+                            NULL,
+                            &error);
+    if (error) {
+        powerd_warn("Unable to signal a state change to NetworkManager: %s", error->message);
+        g_error_free(error);
+        error = NULL;
+    }
+
     powerd_debug("Emitting signal for transition to state %s (%d)",
             state_to_string(state), state);
     g_dbus_connection_emit_signal(
@@ -286,6 +314,7 @@
     if (error) {
         powerd_warn("Unable to signal a state change update: %s", error->message);
         g_error_free(error);
+        error = NULL;
     }
 }
 
@@ -431,6 +460,22 @@
     *proxy = unity_proxy;
 }
 
+static void nm_proxy_connect_cb(GObject *source_object, GAsyncResult *res,
+                                gpointer user_data)
+{
+    PowerdSource *self = POWERD_SOURCE(user_data);
+    GError *error = NULL;
+
+    powerd_debug("nm_proxy_connect_cb");
+
+    self->priv->nm_proxy = g_dbus_proxy_new_finish(res, &error);
+    if (error) {
+        powerd_warn("%s failed: %s", __func__, error->message);
+        g_error_free(error);
+        return;
+    }
+}
+
 void
 powerd_name_vanished_cb(GDBusConnection *connection,
                         const gchar *name,