colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-01-06 Robert Love <rml@novell.com>

Browse Source 
* gnome/applet/applet-dbus-devices.c, gnome/applet/applet.c,
	  gnome/applet/applet-dbus-devices.h, src/nm-dbus-nm.c: Remove global
	  hangup code and add per-device hangup.  Tie last commit into the
	  GNOME applet.  TODO:  Save, understand, and respond to the state of
	  each dialup device.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1273 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-01-06 15:52:40 +00:00
committed by Robert Love
parent 9837697e06
commit 9dd733b3b5
5 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nm-dbus-nm.c
View File

@@ -210,31 +210,6 @@ out:
}
static DBusMessage *nm_dbus_nm_hangup_dialup (DBusConnection *connection, DBusMessage *message, NMDbusCBData *data)
{
DBusMessage *reply = NULL;
NMData *nm_data = (NMData *) data->data;
const char *dialup;
g_return_val_if_fail (data != NULL, NULL);
g_return_val_if_fail (data->data != NULL, NULL);
g_return_val_if_fail (connection != NULL, NULL);
g_return_val_if_fail (message != NULL, NULL);
reply = dbus_message_new_method_return (message);
if (!reply)
return NULL;
nm_lock_mutex (nm_data->dialup_list_mutex, __FUNCTION__);
nm_system_deactivate_all_dialup (nm_data->dialup_list);
nm_unlock_mutex (nm_data->dialup_list_mutex, __FUNCTION__);
out:
return reply;
}
/*
* nm_dbus_nm_set_active_device
*
@@ -645,7 +620,6 @@ NMDbusMethodList *nm_dbus_nm_methods_setup (void)
nm_dbus_method_list_add_method (list, "getDialup", nm_dbus_nm_get_dialup);
nm_dbus_method_list_add_method (list, "activateDialup", nm_dbus_nm_activate_dialup);
nm_dbus_method_list_add_method (list, "deactivateDialup", nm_dbus_nm_deactivate_dialup);
nm_dbus_method_list_add_method (list, "hangupDialup", nm_dbus_nm_hangup_dialup);
nm_dbus_method_list_add_method (list, "setActiveDevice", nm_dbus_nm_set_active_device);
nm_dbus_method_list_add_method (list, "createWirelessNetwork", nm_dbus_nm_create_wireless_network);
nm_dbus_method_list_add_method (list, "setWirelessEnabled", nm_dbus_nm_set_wireless_enabled);