2007-03-15 Tambet Ingo <tambet@ximian.com>
* src/nm-device-802-11-wireless.c (constructor): Initialize the iw_ext structures with zeroes before passing them to functions - the functions never do that and reading the values back may produce wrong values. (real_bring_up): Store the signal handler id ... (real_bring_down): ... So that it can be removed here. Disconnect the supplicant interface here as well. (nm_device_802_11_wireless_ap_list_get_ap_by_obj_path): Use the dbus object path from the access point instead of old $device/Networks/$essid. * src/nm-manager.c (nm_manager_get_state): Return NM_STATE_CONNECTED when the device state is connected (instead of just having link/carrier). * src/nm-activation-request.c: Don't store NMData in activation request, it's already easily accessible through the device. * src/NetworkManagerAP.c (nm_ap_init): Construct the dbus object path here and store it within the object. (nm_ap_get_dbus_path): Export it to public as well. * src/dhcp-manager/nm-dhcp-manager.c (nm_dhcp_manager_get): Keep the ownership of the singleton. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2478 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -33,7 +33,6 @@
|
||||
struct NMActRequest
|
||||
{
|
||||
int refcount;
|
||||
NMData * data;
|
||||
NMDevice * dev;
|
||||
NMAccessPoint * ap;
|
||||
NMIP4Config * ip4_config;
|
||||
@@ -44,11 +43,10 @@ struct NMActRequest
|
||||
};
|
||||
|
||||
|
||||
NMActRequest * nm_act_request_new (NMData *data, NMDevice *dev, NMAccessPoint *ap, gboolean user_requested)
|
||||
NMActRequest * nm_act_request_new (NMDevice *dev, NMAccessPoint *ap, gboolean user_requested)
|
||||
{
|
||||
NMActRequest * req;
|
||||
|
||||
g_return_val_if_fail (data != NULL, NULL);
|
||||
g_return_val_if_fail (dev != NULL, NULL);
|
||||
|
||||
if (NM_IS_DEVICE_802_11_WIRELESS (dev))
|
||||
@@ -56,7 +54,6 @@ NMActRequest * nm_act_request_new (NMData *data, NMDevice *dev, NMAccessPoint *a
|
||||
|
||||
req = g_malloc0 (sizeof (NMActRequest));
|
||||
req->refcount = 1;
|
||||
req->data = data;
|
||||
|
||||
g_object_ref (G_OBJECT (dev));
|
||||
req->dev = dev;
|
||||
@@ -97,14 +94,6 @@ NMDevice * nm_act_request_get_dev (NMActRequest *req)
|
||||
}
|
||||
|
||||
|
||||
NMData * nm_act_request_get_data (NMActRequest *req)
|
||||
{
|
||||
g_return_val_if_fail (req != NULL, NULL);
|
||||
|
||||
return req->data;
|
||||
}
|
||||
|
||||
|
||||
NMAccessPoint * nm_act_request_get_ap (NMActRequest *req)
|
||||
{
|
||||
g_return_val_if_fail (req != NULL, NULL);
|
||||
|
Reference in New Issue
Block a user