From 4b5253469b1387c6f62770d2989cbbd8efcfa29d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 23 Jan 2006 01:05:22 +0000 Subject: [PATCH] 2006-01-22 Dan Williams * src/NetworkManagerAP.[ch] src/nm-dbus-nmi.c src/nm-device-802-11-wireless.c - Make nm_ap_get_essid return "const char *" git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1376 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/NetworkManagerAP.c | 4 ++-- src/NetworkManagerAP.h | 3 ++- src/nm-dbus-nmi.c | 2 +- src/nm-device-802-11-wireless.c | 14 +++++++------- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae440e59fa..e0669bbb23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-22 Dan Williams + + * src/NetworkManagerAP.[ch] + src/nm-dbus-nmi.c + src/nm-device-802-11-wireless.c + - Make nm_ap_get_essid return "const char *" + 2006-01-22 Dan Williams * src/NetworkManagerAP.[ch] diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c index 8a4c9e5fdc..2d0d136f82 100644 --- a/src/NetworkManagerAP.c +++ b/src/NetworkManagerAP.c @@ -177,12 +177,12 @@ void nm_ap_set_timestamp (NMAccessPoint *ap, const GTimeVal *timestamp) * Get/set functions for essid * */ -char * nm_ap_get_essid (const NMAccessPoint *ap) +const char * nm_ap_get_essid (const NMAccessPoint *ap) { g_assert (ap); g_return_val_if_fail (ap != NULL, NULL); - return (ap->essid); + return ap->essid; } void nm_ap_set_essid (NMAccessPoint *ap, const char * essid) diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h index 4c997e73c6..6fe9cd9226 100644 --- a/src/NetworkManagerAP.h +++ b/src/NetworkManagerAP.h @@ -40,8 +40,9 @@ void nm_ap_ref (NMAccessPoint *ap); const GTimeVal * nm_ap_get_timestamp (const NMAccessPoint *ap); void nm_ap_set_timestamp (NMAccessPoint *ap, const GTimeVal *timestamp); -char * nm_ap_get_essid (const NMAccessPoint *ap); +const char * nm_ap_get_essid (const NMAccessPoint *ap); void nm_ap_set_essid (NMAccessPoint *ap, const char *essid); +const char * nm_ap_get_orig_essid (const NMAccessPoint *ap); guint32 nm_ap_get_capabilities (NMAccessPoint *ap); void nm_ap_set_capabilities (NMAccessPoint *ap, guint32 capabilities); diff --git a/src/nm-dbus-nmi.c b/src/nm-dbus-nmi.c index f3893a7520..a6eaeb5f21 100644 --- a/src/nm-dbus-nmi.c +++ b/src/nm-dbus-nmi.c @@ -129,7 +129,7 @@ void nm_dbus_get_user_key_for_network (DBusConnection *connection, NMActRequest gint32 attempt = 1; char * dev_path; char * net_path; - char * essid; + const char * essid; g_return_if_fail (connection != NULL); g_return_if_fail (req != NULL); diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 5056e3f979..f663d3d2dc 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -478,8 +478,8 @@ link_to_specific_ap (NMDevice80211Wireless *self, if (is_associated (self)) { - char * dev_essid = nm_device_802_11_wireless_get_essid (self); - char * ap_essid = nm_ap_get_essid (ap); + char * dev_essid = nm_device_802_11_wireless_get_essid (self); + const char * ap_essid = nm_ap_get_essid (ap); if (dev_essid && ap_essid && !strcmp (dev_essid, ap_essid)) { @@ -544,8 +544,8 @@ nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *self) { if ((cur_ap = nm_act_request_get_ap (req))) { - char * essid = nm_ap_get_essid (cur_ap); - gboolean keep = FALSE; + const char * essid = nm_ap_get_essid (cur_ap); + gboolean keep = FALSE; if (nm_ap_get_user_created (cur_ap)) keep = TRUE; @@ -569,8 +569,8 @@ nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *self) return NULL; while ((scan_ap = nm_ap_list_iter_next (iter))) { - NMAccessPoint *tmp_ap; - char *ap_essid = nm_ap_get_essid (scan_ap); + NMAccessPoint *tmp_ap; + const char * ap_essid = nm_ap_get_essid (scan_ap); /* Access points in the "invalid" list cannot be used */ if (nm_ap_list_get_ap_by_essid (app_data->invalid_ap_list, ap_essid)) @@ -2137,7 +2137,7 @@ out: static gboolean ap_need_key (NMDevice80211Wireless *self, NMAccessPoint *ap) { - char * essid; + const char * essid; gboolean need_key = FALSE; NMAPSecurity * security; const char * iface;