fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 17:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-10-05 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-device-802-11-wireless.c
		- (set_current_ap): consolidate current_ap handling code into one place
			to ensure that PropertiesChanged signals are emitted in all cases
		- (periodic_update, real_deactivate_quickly, real_act_stage1_prepare,
		   nm_device_802_11_wireless_dispose): use set_current_ap()



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2936 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-10-05 20:23:49 +00:00
parent 37f9149cb7
commit f60d0d930c
2 changed files with 47 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-10-05 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c
- (set_current_ap): consolidate current_ap handling code into one place
to ensure that PropertiesChanged signals are emitted in all cases
- (periodic_update, real_deactivate_quickly, real_act_stage1_prepare,
nm_device_802_11_wireless_dispose): use set_current_ap()
2007-10-05 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-access-point.c

70
src/nm-device-802-11-wireless.c
View file

@ -535,6 +535,40 @@ get_active_ap (NMDevice80211Wireless *self)
return NULL;
}
static void
set_current_ap (NMDevice80211Wireless *self, NMAccessPoint *new_ap)
{
NMDevice80211WirelessPrivate *priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self);
GValue value = {0, };
gboolean changed;
char *old_path = NULL;
g_return_if_fail (NM_IS_DEVICE_802_11_WIRELESS (self));
if (priv->current_ap) {
old_path = g_strdup (nm_ap_get_dbus_path (priv->current_ap));
g_object_unref (priv->current_ap);
priv->current_ap = NULL;
}
g_value_init (&value, DBUS_TYPE_G_OBJECT_PATH);
if (new_ap) {
priv->current_ap = g_object_ref (new_ap);
g_value_set_boxed (&value, nm_ap_get_dbus_path (new_ap));
} else {
g_value_set_boxed (&value, "/");
}
/* Only emit if it's really changed */
if ( (!old_path && new_ap)
|| (old_path && !new_ap)
|| (old_path && new_ap && strcmp (old_path, nm_ap_get_dbus_path (new_ap))))
emit_one_property_changed_signal (self, DBUS_PROP_ACTIVE_ACCESS_POINT, &value);
g_value_unset (&value);
g_free (old_path);
}
static void
periodic_update (NMDevice80211Wireless *self, gboolean honor_scan)
{
@ -585,21 +619,7 @@ periodic_update (NMDevice80211Wireless *self, gboolean honor_scan)
new_bssid ? new_addr : "(none)",
new_ssid ? nm_utils_escape_ssid (new_ssid->data, new_ssid->len) : "(none)");
if (priv->current_ap) {
g_object_unref (priv->current_ap);
priv->current_ap = NULL;
}
g_value_init (&value, DBUS_TYPE_G_OBJECT_PATH);
if (new_ap) {
priv->current_ap = g_object_ref (new_ap);
g_value_set_boxed (&value, nm_ap_get_dbus_path (priv->current_ap));
} else {
g_value_set_boxed (&value, "/");
}
emit_one_property_changed_signal (self, DBUS_PROP_ACTIVE_ACCESS_POINT, &value);
g_value_unset (&value);
set_current_ap (self, new_ap);
}
new_rate = nm_device_802_11_wireless_get_bitrate (self);
@ -706,10 +726,7 @@ real_deactivate_quickly (NMDevice *dev)
cleanup_association_attempt (self, TRUE);
if (priv->current_ap) {
g_object_unref (priv->current_ap);
priv->current_ap = NULL;
}
set_current_ap (self, NULL);
priv->rate = 0;
/* Clean up stuff, don't leave the card associated */
@ -2423,10 +2440,7 @@ real_act_stage1_prepare (NMDevice *dev)
if (!ap)
return NM_ACT_STAGE_RETURN_FAILURE;
if (priv->current_ap)
g_object_unref (priv->current_ap);
priv->current_ap = g_object_ref (ap);
set_current_ap (self, ap);
return NM_ACT_STAGE_RETURN_SUCCESS;
}
@ -2741,10 +2755,7 @@ real_activation_cancel_handler (NMDevice *dev)
cleanup_association_attempt (self, TRUE);
if (priv->current_ap) {
g_object_unref (priv->current_ap);
priv->current_ap = NULL;
}
set_current_ap (self, NULL);
priv->rate = 0;
}
@ -2787,10 +2798,7 @@ nm_device_802_11_wireless_dispose (GObject *object)
device_cleanup (self);
if (priv->current_ap) {
g_object_unref (priv->current_ap);
priv->current_ap = NULL;
}
set_current_ap (self, NULL);
G_OBJECT_CLASS (nm_device_802_11_wireless_parent_class)->dispose (object);
}