Merge lp:~cyphermox/unity-control-center/lp1354987 into lp:unity-control-center

[Mathieu Trudel-Lapierre]

Deactivate the wired device when wired is switched off.

Deactivate the wired device when wired is switched off.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:12786
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/110/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, but that fails to build. Could you also give details on the change, does it come from upstream g-c-c?

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

Seems like the same fix is in gnome-control-center upstream, indeed; but it's just the obvious and right way to deactivate the device if you don't want it to connect automatically.

[lp:~cyphermox/unity-control-center/lp1354987]

12787. By Mathieu Trudel-Lapierre on 2014-09-08

Fix typo in nm_device_disconnect() call.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12787
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/111/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-utopic-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/111/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

is it upstream?
reading https://git.gnome.org/browse/gnome-control-center/tree/panels/network/net-device-simple.c it seems to still have the code you are changing there
would it make sense to send the fix to GNOME as well in this case?

[Mathieu Trudel-Lapierre (cyphermox)]

On Mon, Sep 8, 2014 at 3:00 PM, Sebastien Bacher <email address hidden> wrote:
> is it upstream?

Yes, but only for the ethernet device:
https://git.gnome.org/browse/gnome-control-center/tree/panels/network/net-device-ethernet.c

> reading https://git.gnome.org/browse/gnome-control-center/tree/panels/network/net-device-simple.c it seems to still have the code you are changing there
> would it make sense to send the fix to GNOME as well in this case?

Agreed, it should also be changed in net-device-simple; though nothing
seems to use that right now. I'll push the changes upstream.

/ Matt

[Sebastien Bacher (seb128)]

thanks, can you update the bug with the upstream ticket reference when you do that?

review: Approve

=== modified file 'panels/network/net-device-wired.c'
--- panels/network/net-device-wired.c	2012-08-22 14:32:59 +0000
+++ panels/network/net-device-wired.c	2014-09-08 18:18:39 +0000
@@ -157,34 +157,25 @@
         NMActiveConnection *a;
         NMConnection *connection;
         NMClient *client;
+        NMDevice *nm_device;
 
         if (device_wired->priv->updating_device)
                 return;
 
+        client = net_object_get_client (NET_OBJECT (device_wired));
+        nm_device = net_device_get_nm_device (NET_DEVICE (device_wired));
+
         active = gtk_switch_get_active (sw);
         if (active) {
-                client = net_object_get_client (NET_OBJECT (device_wired));
                 connection = net_device_get_find_connection (NET_DEVICE (device_wired));
                 if (connection == NULL)
                         return;
                 nm_client_activate_connection (client,
                                                connection,
-                                               net_device_get_nm_device (NET_DEVICE (device_wired)),
+                                               nm_device,
                                                NULL, NULL, NULL);
         } else {
-                connection = net_device_get_find_connection (NET_DEVICE (device_wired));
-                if (connection == NULL)
-                        return;
-                path = nm_connection_get_path (connection);
-                client = net_object_get_client (NET_OBJECT (device_wired));
-                acs = nm_client_get_active_connections (client);
-                for (i = 0; i < acs->len; i++) {
-                        a = (NMActiveConnection*)acs->pdata[i];
-                        if (strcmp (nm_active_connection_get_connection (a), path) == 0) {
-                                nm_client_deactivate_connection (client, a);
-                                break;
-                        }
-                }
+                nm_device_disconnect (nm_device, NULL, NULL);
         }
 }