fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 04:28:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-04-07 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-gsm-device.c
	  src/nm-cdma-device.c
		- (state_changed_cb): when entering UNAVAILABLE state, schedule an idle
			handler to transition to DISCONNECTED



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3542 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-04-08 03:58:17 +00:00
parent 34d5841b76
commit ff2b85dc3f
3 changed files with 79 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-04-07 Dan Williams <dcbw@redhat.com>
* src/nm-gsm-device.c
src/nm-cdma-device.c
- (state_changed_cb): when entering UNAVAILABLE state, schedule an idle
handler to transition to DISCONNECTED
2008-04-07 Dan Williams <dcbw@redhat.com> 2008-04-07 Dan Williams <dcbw@redhat.com>
Patch from Bill Nottingham Patch from Bill Nottingham

36
src/nm-cdma-device.c
View file

@ -19,6 +19,7 @@ typedef struct {
NMSerialDevice *monitor_device; NMSerialDevice *monitor_device;
guint pending_id; guint pending_id;
guint state_to_disconnected_id;
} NMCdmaDevicePrivate; } NMCdmaDevicePrivate;
enum { enum {
@ -333,6 +334,33 @@ nm_cdma_device_init (NMCdmaDevice *self)
nm_device_set_device_type (NM_DEVICE (self), DEVICE_TYPE_CDMA); nm_device_set_device_type (NM_DEVICE (self), DEVICE_TYPE_CDMA);
} }
static gboolean
unavailable_to_disconnected (gpointer user_data)
{
nm_device_state_changed (NM_DEVICE (user_data), NM_DEVICE_STATE_DISCONNECTED);
return FALSE;
}
static void
device_state_changed (NMDeviceInterface *device, NMDeviceState state, gpointer user_data)
{
NMCdmaDevice *self = NM_CDMA_DEVICE (user_data);
NMCdmaDevicePrivate *priv = NM_CDMA_DEVICE_GET_PRIVATE (self);
/* Remove any previous delayed transition to disconnected */
if (priv->state_to_disconnected_id) {
g_source_remove (priv->state_to_disconnected_id);
priv->state_to_disconnected_id = 0;
}
/* If transitioning to UNAVAILBLE and we have a carrier, transition to
* DISCONNECTED because the device is ready to use. Otherwise the carrier-on
* handler will handle the transition to DISCONNECTED when the carrier is detected.
*/
if (state == NM_DEVICE_STATE_UNAVAILABLE)
priv->state_to_disconnected_id = g_idle_add (unavailable_to_disconnected, self);
}
static GObject* static GObject*
constructor (GType type, constructor (GType type,
guint n_construct_params, guint n_construct_params,
@ -355,6 +383,9 @@ constructor (GType type,
} }
#endif #endif
g_signal_connect (NM_DEVICE (object), "state-changed",
G_CALLBACK (device_state_changed), NM_CDMA_DEVICE (object));
return object; return object;
} }
@ -401,6 +432,11 @@ finalize (GObject *object)
g_free (priv->monitor_iface); g_free (priv->monitor_iface);
if (priv->state_to_disconnected_id) {
g_source_remove (priv->state_to_disconnected_id);
priv->state_to_disconnected_id = 0;
}
G_OBJECT_CLASS (nm_cdma_device_parent_class)->finalize (object); G_OBJECT_CLASS (nm_cdma_device_parent_class)->finalize (object);
} }

36
src/nm-gsm-device.c
View file

@ -26,6 +26,7 @@ typedef struct {
NMGsmSecret need_secret; NMGsmSecret need_secret;
guint pending_id; guint pending_id;
guint state_to_disconnected_id;
} NMGsmDevicePrivate; } NMGsmDevicePrivate;
enum { enum {
@ -639,6 +640,33 @@ nm_gsm_device_init (NMGsmDevice *self)
nm_device_set_device_type (NM_DEVICE (self), DEVICE_TYPE_GSM); nm_device_set_device_type (NM_DEVICE (self), DEVICE_TYPE_GSM);
} }
static gboolean
unavailable_to_disconnected (gpointer user_data)
{
nm_device_state_changed (NM_DEVICE (user_data), NM_DEVICE_STATE_DISCONNECTED);
return FALSE;
}
static void
device_state_changed (NMDeviceInterface *device, NMDeviceState state, gpointer user_data)
{
NMGsmDevice *self = NM_GSM_DEVICE (user_data);
NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (self);
/* Remove any previous delayed transition to disconnected */
if (priv->state_to_disconnected_id) {
g_source_remove (priv->state_to_disconnected_id);
priv->state_to_disconnected_id = 0;
}
/* If transitioning to UNAVAILBLE and we have a carrier, transition to
* DISCONNECTED because the device is ready to use. Otherwise the carrier-on
* handler will handle the transition to DISCONNECTED when the carrier is detected.
*/
if (state == NM_DEVICE_STATE_UNAVAILABLE)
priv->state_to_disconnected_id = g_idle_add (unavailable_to_disconnected, self);
}
static GObject* static GObject*
constructor (GType type, constructor (GType type,
guint n_construct_params, guint n_construct_params,
@ -661,6 +689,9 @@ constructor (GType type,
} }
#endif #endif
g_signal_connect (NM_DEVICE (object), "state-changed",
G_CALLBACK (device_state_changed), NM_GSM_DEVICE (object));
return object; return object;
} }
@ -707,6 +738,11 @@ finalize (GObject *object)
g_free (priv->monitor_iface); g_free (priv->monitor_iface);
if (priv->state_to_disconnected_id) {
g_source_remove (priv->state_to_disconnected_id);
priv->state_to_disconnected_id = 0;
}
G_OBJECT_CLASS (nm_gsm_device_parent_class)->finalize (object); G_OBJECT_CLASS (nm_gsm_device_parent_class)->finalize (object);
} }