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

2008-03-02 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-device.c
	  src/nm-device.h
	  src/nm-device-802-11-wireless.c
	  src/nm-device-802-3-ethernet.c
	  src/NetworkManagerPolicy.c
		- s/link_active/carrier
		- nm_device_set_active_link() -> nm_device_set_carrier()
		- nm_device_has_active_link() -> nm_device_get_carrier()



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3371 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-03-03 04:09:58 +00:00
parent 827dcd3ed6
commit ced88ef3cd
6 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nm-device.c
View File

@@ -66,7 +66,7 @@ struct _NMDevicePrivate
guint32 capabilities;
char * driver;
gboolean link_active;
gboolean carrier;
guint32 ip4_address;
struct in6_addr ip6_address;
@@ -123,7 +123,7 @@ nm_device_init (NMDevice * self)
self->priv->capabilities = NM_DEVICE_CAP_NONE;
self->priv->driver = NULL;
self->priv->link_active = FALSE;
self->priv->carrier = FALSE;
self->priv->ip4_address = 0;
memset (&self->priv->ip6_address, 0, sizeof (struct in6_addr));
@@ -347,28 +347,28 @@ nm_device_get_act_request (NMDevice *self)
/*
* Get/set functions for link_active
* Get/set functions for carrier
*/
gboolean
nm_device_has_active_link (NMDevice *self)
nm_device_get_carrier (NMDevice *self)
{
g_return_val_if_fail (self != NULL, FALSE);
return self->priv->link_active;
return self->priv->carrier;
}
void
nm_device_set_active_link (NMDevice *self,
const gboolean link_active)
nm_device_set_carrier (NMDevice *self,
const gboolean carrier)
{
NMDevicePrivate *priv;
g_return_if_fail (NM_IS_DEVICE (self));
priv = NM_DEVICE_GET_PRIVATE (self);
if (priv->link_active != link_active) {
priv->link_active = link_active;
g_signal_emit_by_name (self, "carrier-changed", link_active);
if (priv->carrier != carrier) {
priv->carrier = carrier;
g_signal_emit_by_name (self, "carrier-changed", carrier);
}
}
@@ -1667,7 +1667,7 @@ get_property (GObject *object, guint prop_id,
g_value_set_uint (value, priv->type);
break;
case NM_DEVICE_INTERFACE_PROP_CARRIER:
g_value_set_boolean (value, priv->link_active);
g_value_set_boolean (value, priv->carrier);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);