2005-12-31 Dan Williams <dcbw@redhat.com>
* refactor NMDevice into a GObject-based framework with separate objects for wired and wireless. The following files are no longer used but should stick around for a bit so we don't loose code through the cracks: NetworkManagerDevice.c NetworkManagerDevice.h NetworkManagerWireless.c NetworkManagerWireless.h The intent here is to allow each device type to manage its own connection & activation life-cycle, ie to allow wireless devices to interface with wpa_supplicant, etc. There's a fair bit of encapsulation breakage right now that should gradually get pulled back into each device, along with things like periodic property updates and link probing. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1244 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
#include <string.h>
|
||||
#include <dbus/dbus.h>
|
||||
#include "nm-activation-request.h"
|
||||
#include "NetworkManagerDevice.h"
|
||||
#include "nm-device.h"
|
||||
#include "NetworkManagerDbus.h"
|
||||
#include "nm-dhcp-manager.h"
|
||||
#include "nm-utils.h"
|
||||
@@ -62,7 +62,7 @@ NMActRequest * nm_act_request_new (NMData *data, NMDevice *dev, NMAccessPoint *a
|
||||
req->refcount = 1;
|
||||
req->data = data;
|
||||
|
||||
nm_device_ref (dev);
|
||||
g_object_ref (G_OBJECT (dev));
|
||||
req->dev = dev;
|
||||
|
||||
if (ap)
|
||||
@@ -90,7 +90,7 @@ void nm_act_request_unref (NMActRequest *req)
|
||||
req->refcount--;
|
||||
if (req->refcount <= 0)
|
||||
{
|
||||
nm_device_unref (req->dev);
|
||||
g_object_unref (G_OBJECT (req->dev));
|
||||
if (req->ap)
|
||||
nm_ap_unref (req->ap);
|
||||
|
||||
|
Reference in New Issue
Block a user