2007-10-01 Dan Williams <dcbw@redhat.com>

* src/nm-manager.c
		- (impl_manager_activate_device): ensure the D-Bus method sends a return
			value when the connection can be activated immediately



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2922 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-02 01:12:55 +00:00
parent 84cd0661af
commit ee3f96cfd9
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2007-10-01 Dan Williams <dcbw@redhat.com>
* src/nm-manager.c
- (impl_manager_activate_device): ensure the D-Bus method sends a return
value when the connection can be activated immediately
2007-10-01 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-device.c

View file

@ -955,7 +955,9 @@ impl_manager_activate_device (NMManager *manager,
connection = nm_manager_get_connection_by_object_path (manager, connection_type, connection_path);
if (connection) {
if (!nm_manager_activate_device (manager, device, connection, specific_object_path, TRUE)) {
if (nm_manager_activate_device (manager, device, connection, specific_object_path, TRUE)) {
dbus_g_method_return (context, TRUE);
} else {
err = nm_manager_error_new ("Error in device activation");
goto err;
}