From bc343b9737d180ed90c58f84755812d1fb92ce59 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Mon, 27 Jun 2005 14:02:29 +0000 Subject: [PATCH] 2005-06-27 Robert Love * src/nm-dbus-nm.c: fix "setWirelessEnabled" call for the enabling case. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@760 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/nm-dbus-nm.c | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ee523ffc6..0c666b3bff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-06-27 Robert Love + + * src/nm-dbus-nm.c: fix "setWirelessEnabled" call for the enabling + case. + 2005-06-27 Robert Love * gnome/applet/applet.c: make the 'Wireless Network Discovery' menu diff --git a/src/nm-dbus-nm.c b/src/nm-dbus-nm.c index 3e35f2b083..d1db98daf1 100644 --- a/src/nm-dbus-nm.c +++ b/src/nm-dbus-nm.c @@ -345,17 +345,20 @@ static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, { gboolean enabled = FALSE; DBusError err; + NMData *app_data; g_return_val_if_fail (data && data->data && connection && message, NULL); dbus_error_init (&err); - if (dbus_message_get_args (message, &err, DBUS_TYPE_BOOLEAN, &enabled, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, &err, DBUS_TYPE_BOOLEAN, &enabled, DBUS_TYPE_INVALID)) + return NULL; + + app_data = data->data; + app_data->wireless_enabled = enabled; + + if (!enabled) { GSList *elt; - NMData *app_data; - - app_data = data->data; - app_data->wireless_enabled = enabled; /* Physically down all wireless devices */ nm_lock_mutex (app_data->dev_list_mutex, __FUNCTION__); @@ -369,9 +372,10 @@ static DBusMessage *nm_dbus_nm_set_wireless_enabled (DBusConnection *connection, } } nm_unlock_mutex (app_data->dev_list_mutex, __FUNCTION__); - nm_policy_schedule_device_change_check (data->data); } + nm_policy_schedule_device_change_check (data->data); + return NULL; }