[gnome-control-center] network: fix wired/mobile activation



commit 8df1069f7dedc31886acc04ae744cd052926472d
Author: Dan Winship <danw gnome org>
Date:   Wed Aug 22 09:22:03 2012 -0400

    network: fix wired/mobile activation
    
    You have to pass the NMDevice to nm_client_activate_connection() for a
    device-specific connection. This got broken at some point in the
    rewrites since 3.4.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682469

 panels/network/net-device-mobile.c |    5 +++--
 panels/network/net-device-wired.c  |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
index 8c06529..18debd7 100644
--- a/panels/network/net-device-mobile.c
+++ b/panels/network/net-device-mobile.c
@@ -331,8 +331,9 @@ device_off_toggled (GtkSwitch *sw,
                 if (connection == NULL)
                         return;
                 nm_client_activate_connection (client,
-                                               connection, NULL, NULL,
-                                               NULL, NULL);
+                                               connection,
+                                               net_device_get_nm_device (NET_DEVICE (device_mobile)),
+                                               NULL, NULL, NULL);
         } else {
                 connection = net_device_get_find_connection (NET_DEVICE (device_mobile));
                 if (connection == NULL)
diff --git a/panels/network/net-device-wired.c b/panels/network/net-device-wired.c
index 40e6c43..88450d2 100644
--- a/panels/network/net-device-wired.c
+++ b/panels/network/net-device-wired.c
@@ -168,8 +168,9 @@ device_off_toggled (GtkSwitch *sw,
                 if (connection == NULL)
                         return;
                 nm_client_activate_connection (client,
-                                               connection, NULL, NULL,
-                                               NULL, NULL);
+                                               connection,
+                                               net_device_get_nm_device (NET_DEVICE (device_wired)),
+                                               NULL, NULL, NULL);
         } else {
                 connection = net_device_get_find_connection (NET_DEVICE (device_wired));
                 if (connection == NULL)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]