diff --git a/ChangeLog b/ChangeLog index a25a646f53..ebc4a7050f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2007-10-03 Dan Williams + + * src/nm-device-802-11-wireless.c + src/nm-device-802-11-wireless.h + introspection/nm-device-802-11-wireless.xml + - GetActiveNetworks -> GetAccessPoints + - ActiveNetwork -> ActiveAccessPoint + - NetworkAdded -> AccessPointAdded + - NetowrkRemoved -> AccessPointRemoved + + * libnm-glib/nm-device-802-11-wireless.c + libnm-glib/nm-device-802-11-wireless.h + - network-added signal -> access-point-added + - network-removed signal -> access-point-removed + - nm_device_802_11_wireless_get_active_network() -> + nm_device_802_11_wireless_get_active_access_point() + - nm_device_802_11_wireless_get_network_by_path() -> + nm_device_802_11_wireless_get_access_point_by_path() + - nm_device_802_11_wireless_get_networks() -> + nm_device_802_11_wireless_get_access_points() + + * libnm-glib/libnm-glib-test.c + test/nm-tool.c + src/NetworkManagerPolicy.c + - Fixups for Network -> AccessPoint + 2007-10-03 Dan Williams Add a GetActiveConnections() method on the Manager object. diff --git a/introspection/nm-device-802-11-wireless.xml b/introspection/nm-device-802-11-wireless.xml index 7c0c3c2125..d37520c951 100644 --- a/introspection/nm-device-802-11-wireless.xml +++ b/introspection/nm-device-802-11-wireless.xml @@ -2,23 +2,23 @@ - - - + + + - + - - + + - - + + diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 8f99cba71f..bd7d1d4235 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -191,7 +191,7 @@ dump_wireless (NMDevice80211Wireless *device) { char *str; GSList *iter; - GSList *networks; + GSList *aps; g_print ("Mode: %d\n", nm_device_802_11_wireless_get_mode (device)); g_print ("Bitrate: %d\n", nm_device_802_11_wireless_get_bitrate (device)); @@ -200,15 +200,15 @@ dump_wireless (NMDevice80211Wireless *device) g_print ("MAC: %s\n", str); g_free (str); - g_print ("Networks:\n"); - networks = nm_device_802_11_wireless_get_networks (device); - for (iter = networks; iter; iter = iter->next) { + g_print ("AccessPoints:\n"); + aps = nm_device_802_11_wireless_get_access_points (device); + for (iter = aps; iter; iter = iter->next) { dump_access_point (NM_ACCESS_POINT (iter->data)); g_print ("\n"); } - g_slist_foreach (networks, (GFunc) g_object_unref, NULL); - g_slist_free (networks); + g_slist_foreach (aps, (GFunc) g_object_unref, NULL); + g_slist_free (aps); } static void diff --git a/libnm-glib/nm-device-802-11-wireless.c b/libnm-glib/nm-device-802-11-wireless.c index 3a8f74d9ab..edad36fd79 100644 --- a/libnm-glib/nm-device-802-11-wireless.c +++ b/libnm-glib/nm-device-802-11-wireless.c @@ -9,23 +9,23 @@ G_DEFINE_TYPE (NMDevice80211Wireless, nm_device_802_11_wireless, NM_TYPE_DEVICE) typedef struct { DBusGProxy *wireless_proxy; - gboolean have_network_list; - GHashTable *networks; + gboolean have_ap_list; + GHashTable *aps; gboolean disposed; } NMDevice80211WirelessPrivate; enum { - NETWORK_ADDED, - NETWORK_REMOVED, + ACCESS_POINT_ADDED, + ACCESS_POINT_REMOVED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0 }; -static void network_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data); -static void network_removed_proxy (DBusGProxy *proxy, char *path, gpointer user_data); +static void access_point_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data); +static void access_point_removed_proxy (DBusGProxy *proxy, char *path, gpointer user_data); static void nm_device_802_11_wireless_init (NMDevice80211Wireless *device) @@ -33,9 +33,9 @@ nm_device_802_11_wireless_init (NMDevice80211Wireless *device) NMDevice80211WirelessPrivate *priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device); priv->disposed = FALSE; - priv->networks = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) g_object_unref); + priv->aps = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_object_unref); } static GObject* @@ -59,14 +59,14 @@ constructor (GType type, nm_object_get_path (NM_OBJECT (object)), NM_DBUS_INTERFACE_DEVICE_WIRELESS); - dbus_g_proxy_add_signal (priv->wireless_proxy, "NetworkAdded", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); - dbus_g_proxy_connect_signal (priv->wireless_proxy, "NetworkAdded", - G_CALLBACK (network_added_proxy), + dbus_g_proxy_add_signal (priv->wireless_proxy, "AccessPointAdded", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); + dbus_g_proxy_connect_signal (priv->wireless_proxy, "AccessPointAdded", + G_CALLBACK (access_point_added_proxy), object, NULL); - dbus_g_proxy_add_signal (priv->wireless_proxy, "NetworkRemoved", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); - dbus_g_proxy_connect_signal (priv->wireless_proxy, "NetworkRemoved", - G_CALLBACK (network_removed_proxy), + dbus_g_proxy_add_signal (priv->wireless_proxy, "AccessPointRemoved", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); + dbus_g_proxy_connect_signal (priv->wireless_proxy, "AccessPointRemoved", + G_CALLBACK (access_point_removed_proxy), object, NULL); return object; @@ -92,7 +92,7 @@ finalize (GObject *object) { NMDevice80211WirelessPrivate *priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (object); - g_hash_table_destroy (priv->networks); + g_hash_table_destroy (priv->aps); G_OBJECT_CLASS (nm_device_802_11_wireless_parent_class)->finalize (object); } @@ -110,21 +110,21 @@ nm_device_802_11_wireless_class_init (NMDevice80211WirelessClass *device_class) object_class->finalize = finalize; /* signals */ - signals[NETWORK_ADDED] = - g_signal_new ("network-added", + signals[ACCESS_POINT_ADDED] = + g_signal_new ("access-point-added", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDevice80211WirelessClass, network_added), + G_STRUCT_OFFSET (NMDevice80211WirelessClass, access_point_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); - signals[NETWORK_REMOVED] = - g_signal_new ("network-removed", + signals[ACCESS_POINT_REMOVED] = + g_signal_new ("access-point-removed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDevice80211WirelessClass, network_removed), + G_STRUCT_OFFSET (NMDevice80211WirelessClass, access_point_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, @@ -176,32 +176,32 @@ nm_device_802_11_wireless_get_capabilities (NMDevice80211Wireless *device) } static NMAccessPoint * -get_network (NMDevice80211Wireless *device, const char *path, gboolean create_if_not_found) +get_access_point (NMDevice80211Wireless *device, const char *path, gboolean create_if_not_found) { NMDevice80211WirelessPrivate *priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device); NMAccessPoint *ap; - ap = g_hash_table_lookup (priv->networks, path); + ap = g_hash_table_lookup (priv->aps, path); if (!ap && create_if_not_found) { ap = nm_access_point_new (nm_object_get_connection (NM_OBJECT (device)), path); if (ap) - g_hash_table_insert (priv->networks, g_strdup (path), ap); + g_hash_table_insert (priv->aps, g_strdup (path), ap); } return ap; } NMAccessPoint * -nm_device_802_11_wireless_get_active_network (NMDevice80211Wireless *device) +nm_device_802_11_wireless_get_active_access_point (NMDevice80211Wireless *device) { char *path; NMAccessPoint *ap = NULL; g_return_val_if_fail (NM_IS_DEVICE_802_11_WIRELESS (device), NULL); - path = nm_object_get_object_path_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE_WIRELESS, "ActiveNetwork"); + path = nm_object_get_object_path_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE_WIRELESS, "ActiveAccessPoint"); if (path) { - ap = get_network (device, path, TRUE); + ap = get_access_point (device, path, TRUE); g_free (path); } @@ -209,17 +209,17 @@ nm_device_802_11_wireless_get_active_network (NMDevice80211Wireless *device) } NMAccessPoint * -nm_device_802_11_wireless_get_network_by_path (NMDevice80211Wireless *device, - const char *object_path) +nm_device_802_11_wireless_get_access_point_by_path (NMDevice80211Wireless *device, + const char *object_path) { g_return_val_if_fail (NM_IS_DEVICE_802_11_WIRELESS (device), NULL); g_return_val_if_fail (object_path != NULL, NULL); - return get_network (device, object_path, TRUE); + return get_access_point (device, object_path, TRUE); } static void -networks_to_slist (gpointer key, gpointer value, gpointer user_data) +access_points_to_slist (gpointer key, gpointer value, gpointer user_data) { GSList **list = (GSList **) user_data; @@ -227,7 +227,7 @@ networks_to_slist (gpointer key, gpointer value, gpointer user_data) } GSList * -nm_device_802_11_wireless_get_networks (NMDevice80211Wireless *device) +nm_device_802_11_wireless_get_access_points (NMDevice80211Wireless *device) { NMDevice80211WirelessPrivate *priv; GSList *list = NULL; @@ -238,21 +238,21 @@ nm_device_802_11_wireless_get_networks (NMDevice80211Wireless *device) priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device); - if (priv->have_network_list) { - g_hash_table_foreach (priv->networks, networks_to_slist, &list); + if (priv->have_ap_list) { + g_hash_table_foreach (priv->aps, access_points_to_slist, &list); return list; } - if (!org_freedesktop_NetworkManager_Device_Wireless_get_active_networks + if (!org_freedesktop_NetworkManager_Device_Wireless_get_access_points (NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device)->wireless_proxy, &array, &err)) { - g_warning ("Error in get_networks: %s", err->message); + g_warning ("Error in get_access_points: %s", err->message); g_error_free (err); } else { int i; for (i = 0; i < array->len; i++) { - NMAccessPoint *ap = get_network (device, (const char *) g_ptr_array_index (array, i), TRUE); + NMAccessPoint *ap = get_access_point (device, (const char *) g_ptr_array_index (array, i), TRUE); if (ap) list = g_slist_prepend (list, ap); } @@ -260,32 +260,32 @@ nm_device_802_11_wireless_get_networks (NMDevice80211Wireless *device) g_ptr_array_free (array, TRUE); list = g_slist_reverse (list); - priv->have_network_list = TRUE; + priv->have_ap_list = TRUE; } return list; } static void -network_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data) +access_point_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data) { NMDevice80211Wireless *device = NM_DEVICE_802_11_WIRELESS (user_data); NMAccessPoint *ap; - ap = get_network (device, path, TRUE); + ap = get_access_point (device, path, TRUE); if (device) - g_signal_emit (device, signals[NETWORK_ADDED], 0, ap); + g_signal_emit (device, signals[ACCESS_POINT_ADDED], 0, ap); } static void -network_removed_proxy (DBusGProxy *proxy, char *path, gpointer user_data) +access_point_removed_proxy (DBusGProxy *proxy, char *path, gpointer user_data) { NMDevice80211Wireless *device = NM_DEVICE_802_11_WIRELESS (user_data); NMAccessPoint *ap; - ap = get_network (device, path, FALSE); + ap = get_access_point (device, path, FALSE); if (device) { - g_signal_emit (device, signals[NETWORK_REMOVED], 0, ap); - g_hash_table_remove (NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device)->networks, path); + g_signal_emit (device, signals[ACCESS_POINT_REMOVED], 0, ap); + g_hash_table_remove (NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device)->aps, path); } } diff --git a/libnm-glib/nm-device-802-11-wireless.h b/libnm-glib/nm-device-802-11-wireless.h index b807c69ad8..260ff1eb86 100644 --- a/libnm-glib/nm-device-802-11-wireless.h +++ b/libnm-glib/nm-device-802-11-wireless.h @@ -21,8 +21,8 @@ typedef struct { NMDeviceClass parent; /* Signals */ - void (*network_added) (NMDevice80211Wireless *device, NMAccessPoint *ap); - void (*network_removed) (NMDevice80211Wireless *device, NMAccessPoint *ap); + void (*access_point_added) (NMDevice80211Wireless *device, NMAccessPoint *ap); + void (*access_point_removed) (NMDevice80211Wireless *device, NMAccessPoint *ap); } NMDevice80211WirelessClass; GType nm_device_802_11_wireless_get_type (void); @@ -30,16 +30,16 @@ GType nm_device_802_11_wireless_get_type (void); NMDevice80211Wireless *nm_device_802_11_wireless_new (DBusGConnection *connection, const char *path); -char *nm_device_802_11_wireless_get_hw_address (NMDevice80211Wireless *device); -int nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *device); -int nm_device_802_11_wireless_get_bitrate (NMDevice80211Wireless *device); -guint32 nm_device_802_11_wireless_get_capabilities (NMDevice80211Wireless *device); -NMAccessPoint *nm_device_802_11_wireless_get_active_network (NMDevice80211Wireless *device); +char * nm_device_802_11_wireless_get_hw_address (NMDevice80211Wireless *device); +int nm_device_802_11_wireless_get_mode (NMDevice80211Wireless *device); +int nm_device_802_11_wireless_get_bitrate (NMDevice80211Wireless *device); +guint32 nm_device_802_11_wireless_get_capabilities (NMDevice80211Wireless *device); +NMAccessPoint * nm_device_802_11_wireless_get_active_access_point (NMDevice80211Wireless *device); -NMAccessPoint *nm_device_802_11_wireless_get_network_by_path (NMDevice80211Wireless *device, - const char *object_path); +NMAccessPoint * nm_device_802_11_wireless_get_access_point_by_path (NMDevice80211Wireless *device, + const char *object_path); -GSList *nm_device_802_11_wireless_get_networks (NMDevice80211Wireless *device); +GSList * nm_device_802_11_wireless_get_access_points (NMDevice80211Wireless *device); G_END_DECLS diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c index 9760f775ea..bd66dff9b0 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/NetworkManagerPolicy.c @@ -437,10 +437,10 @@ device_added (NMManager *manager, NMDevice *device, gpointer user_data) policy); if (NM_IS_DEVICE_802_11_WIRELESS (device)) { - g_signal_connect (device, "network-added", + g_signal_connect (device, "access-point-added", G_CALLBACK (wireless_networks_changed), policy); - g_signal_connect (device, "network-removed", + g_signal_connect (device, "access-point-removed", G_CALLBACK (wireless_networks_changed), policy); } diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 5356bae35d..7f23fcf95d 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -43,9 +43,9 @@ #include "nm-supplicant-interface.h" #include "nm-supplicant-config.h" -static gboolean impl_device_get_active_networks (NMDevice80211Wireless *device, - GPtrArray **networks, - GError **err); +static gboolean impl_device_get_access_points (NMDevice80211Wireless *device, + GPtrArray **aps, + GError **err); #if DEBUG static void nm_device_802_11_wireless_ap_list_print (NMDevice80211Wireless *self); @@ -72,15 +72,15 @@ enum { PROP_HW_ADDRESS, PROP_MODE, PROP_BITRATE, - PROP_ACTIVE_NETWORK, + PROP_ACTIVE_ACCESS_POINT, PROP_CAPABILITIES, LAST_PROP }; enum { - NETWORK_ADDED, - NETWORK_REMOVED, + ACCESS_POINT_ADDED, + ACCESS_POINT_REMOVED, LAST_SIGNAL }; @@ -180,15 +180,15 @@ static void device_cleanup (NMDevice80211Wireless *self); static void -network_added (NMDevice80211Wireless *device, NMAccessPoint *ap) +access_point_added (NMDevice80211Wireless *device, NMAccessPoint *ap) { - g_signal_emit (device, signals[NETWORK_ADDED], 0, ap); + g_signal_emit (device, signals[ACCESS_POINT_ADDED], 0, ap); } static void -network_removed (NMDevice80211Wireless *device, NMAccessPoint *ap) +access_point_removed (NMDevice80211Wireless *device, NMAccessPoint *ap) { - g_signal_emit (device, signals[NETWORK_REMOVED], 0, ap); + g_signal_emit (device, signals[ACCESS_POINT_REMOVED], 0, ap); } /* @@ -566,7 +566,7 @@ nm_device_802_11_periodic_update (gpointer data) new_bssid ? new_addr : "(none)", new_ssid ? nm_utils_escape_ssid (new_ssid->data, new_ssid->len) : "(none)"); - // FIXME: emit PropertiesChanged for active network + // FIXME: emit PropertiesChanged for active AP } return TRUE; @@ -975,19 +975,19 @@ nm_device_802_11_wireless_ap_list_get_ap_by_obj_path (NMDevice80211Wireless *sel } static gboolean -impl_device_get_active_networks (NMDevice80211Wireless *self, - GPtrArray **networks, - GError **err) +impl_device_get_access_points (NMDevice80211Wireless *self, + GPtrArray **aps, + GError **err) { GSList *elt; - *networks = g_ptr_array_new (); + *aps = g_ptr_array_new (); for (elt = self->priv->ap_list; elt; elt = g_slist_next (elt)) { NMAccessPoint * ap = NM_AP (elt->data); if (nm_ap_get_ssid (ap)) - g_ptr_array_add (*networks, g_strdup (nm_ap_get_dbus_path (ap))); + g_ptr_array_add (*aps, g_strdup (nm_ap_get_dbus_path (ap))); } return TRUE; } @@ -1753,7 +1753,7 @@ merge_scanned_ap (NMDevice80211Wireless *self, g_object_ref (merge_ap); self->priv->ap_list = g_slist_append (self->priv->ap_list, merge_ap); nm_ap_export_to_dbus (merge_ap); - network_added (self, merge_ap); + access_point_added (self, merge_ap); } } @@ -1795,7 +1795,7 @@ cull_scan_list (NMDevice80211Wireless * self) for (elt = outdated_list; elt; elt = g_slist_next (elt)) { NMAccessPoint * outdated_ap = NM_AP (elt->data); - network_removed (self, outdated_ap); + access_point_removed (self, outdated_ap); self->priv->ap_list = g_slist_remove (self->priv->ap_list, outdated_ap); g_object_unref (outdated_ap); } @@ -2884,7 +2884,7 @@ get_property (GObject *object, guint prop_id, case PROP_CAPABILITIES: g_value_set_uint (value, priv->capabilities); break; - case PROP_ACTIVE_NETWORK: + case PROP_ACTIVE_ACCESS_POINT: if ((ap = nm_device_802_11_wireless_get_activation_ap (device))) g_value_set_object (value, ap); break; @@ -2951,10 +2951,10 @@ nm_device_802_11_wireless_class_init (NMDevice80211WirelessClass *klass) 0, G_MAXINT32, 0, G_PARAM_READABLE)); g_object_class_install_property - (object_class, PROP_ACTIVE_NETWORK, - g_param_spec_object (NM_DEVICE_802_11_WIRELESS_ACTIVE_NETWORK, - "Active network", - "Currently active network", + (object_class, PROP_ACTIVE_ACCESS_POINT, + g_param_spec_object (NM_DEVICE_802_11_WIRELESS_ACTIVE_ACCESS_POINT, + "Active access point", + "Currently active access point", G_TYPE_OBJECT, G_PARAM_READABLE)); g_object_class_install_property @@ -2966,21 +2966,21 @@ nm_device_802_11_wireless_class_init (NMDevice80211WirelessClass *klass) G_PARAM_READABLE)); /* Signals */ - signals[NETWORK_ADDED] = - g_signal_new ("network-added", + signals[ACCESS_POINT_ADDED] = + g_signal_new ("access-point-added", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDevice80211WirelessClass, network_added), + G_STRUCT_OFFSET (NMDevice80211WirelessClass, access_point_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); - signals[NETWORK_REMOVED] = - g_signal_new ("network-removed", + signals[ACCESS_POINT_REMOVED] = + g_signal_new ("access-point-removed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDevice80211WirelessClass, network_removed), + G_STRUCT_OFFSET (NMDevice80211WirelessClass, access_point_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, diff --git a/src/nm-device-802-11-wireless.h b/src/nm-device-802-11-wireless.h index 071e691422..4f12bf4a39 100644 --- a/src/nm-device-802-11-wireless.h +++ b/src/nm-device-802-11-wireless.h @@ -45,7 +45,7 @@ G_BEGIN_DECLS #define NM_DEVICE_802_11_WIRELESS_HW_ADDRESS "hw-address" #define NM_DEVICE_802_11_WIRELESS_MODE "mode" #define NM_DEVICE_802_11_WIRELESS_BITRATE "bitrate" -#define NM_DEVICE_802_11_WIRELESS_ACTIVE_NETWORK "active-network" +#define NM_DEVICE_802_11_WIRELESS_ACTIVE_ACCESS_POINT "active-access-point" #define NM_DEVICE_802_11_WIRELESS_CAPABILITIES "wireless-capabilities" #ifndef NM_DEVICE_802_11_WIRELESS_DEFINED @@ -69,8 +69,8 @@ struct _NMDevice80211WirelessClass NMDeviceClass parent; /* Signals */ - void (*network_added) (NMDevice80211Wireless *device, NMAccessPoint *ap); - void (*network_removed) (NMDevice80211Wireless *device, NMAccessPoint *ap); + void (*access_point_added) (NMDevice80211Wireless *device, NMAccessPoint *ap); + void (*access_point_removed) (NMDevice80211Wireless *device, NMAccessPoint *ap); }; diff --git a/test/nm-tool.c b/test/nm-tool.c index 02e6da981c..d98ba0cd42 100644 --- a/test/nm-tool.c +++ b/test/nm-tool.c @@ -141,7 +141,7 @@ print_string (const char *label, const char *data) static void -detail_network (gpointer data, gpointer user_data) +detail_access_point (gpointer data, gpointer user_data) { NMAccessPoint *ap = NM_ACCESS_POINT (data); const char *active_bssid = (const char *) user_data; @@ -286,7 +286,7 @@ detail_device (gpointer data, gpointer user_data) guint32 wcaps; NMAccessPoint *active_ap = NULL; char *active_bssid = NULL; - GSList *networks; + GSList *aps; printf ("\n Wireless Settings\n"); @@ -300,16 +300,16 @@ detail_device (gpointer data, gpointer user_data) print_string (" WPA2 Encryption", "yes"); if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED) { - active_ap = nm_device_802_11_wireless_get_active_network (NM_DEVICE_802_11_WIRELESS (device)); + active_ap = nm_device_802_11_wireless_get_active_access_point (NM_DEVICE_802_11_WIRELESS (device)); active_bssid = active_ap ? nm_access_point_get_hw_address (active_ap) : NULL; } - printf ("\n Wireless Networks%s\n", active_ap ? "(* = Current Network)" : ""); + printf ("\n Wireless Access Points%s\n", active_ap ? "(* = Current AP)" : ""); - networks = nm_device_802_11_wireless_get_networks (NM_DEVICE_802_11_WIRELESS (device)); - g_slist_foreach (networks, detail_network, active_bssid); + aps = nm_device_802_11_wireless_get_access_points (NM_DEVICE_802_11_WIRELESS (device)); + g_slist_foreach (aps, detail_access_point, active_bssid); g_free (active_bssid); - g_slist_free (networks); + g_slist_free (aps); } else if (NM_IS_DEVICE_802_3_ETHERNET (device)) { printf ("\n Wired Settings\n"); /* FIXME */