fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 02:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-01-22 Dan Williams <dcbw@redhat.com>

Browse source 
* 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
This commit is contained in:
Dan Williams 2006-01-23 01:05:22 +00:00
parent 2864ede525
commit 4b5253469b
5 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-01-22 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com>
* src/NetworkManagerAP.[ch]

4
src/NetworkManagerAP.c
View file

@ -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)

3
src/NetworkManagerAP.h
View file

@ -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);

2
src/nm-dbus-nmi.c
View file

@ -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);

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

@ -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;