NetworkManager r3497 - trunk/libnm-glib
- From: dcbw svn gnome org
- To: svn-commits-list gnome org
- Subject: NetworkManager r3497 - trunk/libnm-glib
- Date: Mon, 24 Mar 2008 19:48:56 +0000 (GMT)
Author: dcbw
Date: Mon Mar 24 19:48:56 2008
New Revision: 3497
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3497&view=rev
Log:
Handle errors better when updating active AP
Modified:
trunk/libnm-glib/nm-device-802-11-wireless.c
Modified: trunk/libnm-glib/nm-device-802-11-wireless.c
==============================================================================
--- trunk/libnm-glib/nm-device-802-11-wireless.c (original)
+++ trunk/libnm-glib/nm-device-802-11-wireless.c Mon Mar 24 19:48:56 2008
@@ -181,11 +181,13 @@
path = nm_object_get_object_path_property (NM_OBJECT (self),
NM_DBUS_INTERFACE_DEVICE_WIRELESS,
DBUS_PROP_ACTIVE_ACCESS_POINT);
+ if (path) {
+ g_value_init (&value, DBUS_TYPE_G_OBJECT_PATH);
+ g_value_take_boxed (&value, path);
+ demarshal_active_ap (NM_OBJECT (self), NULL, &value, &priv->active_ap);
+ g_value_unset (&value);
+ }
- g_value_init (&value, DBUS_TYPE_G_OBJECT_PATH);
- g_value_take_boxed (&value, path);
- demarshal_active_ap (NM_OBJECT (self), NULL, &value, &priv->active_ap);
- g_value_unset (&value);
return priv->active_ap;
}
@@ -356,7 +358,7 @@
return FALSE;
path = g_value_get_boxed (value);
- if (strcmp (path, "/")) {
+ if (path && strcmp (path, "/")) {
ap = NM_ACCESS_POINT (nm_object_cache_get (path));
if (ap)
ap = g_object_ref (ap);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]