2004-09-30 Dan Williams <dcbw@redhat.com>

* info-daemon/NetworkManagerInfo.c
	  info-daemon/NetworkManagerInfoDbus.c
	  test/nminfotest.c
		- Escape ESSIDs in gconf

	* src/NetworkManagerDevice.c
		- Fix pseudo-scanning to use netowrk list from info daemon


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@182 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2004-10-01 03:05:16 +00:00
parent 2f00a08a11
commit 999ee47b63
3 changed files with 5 additions and 8 deletions

View file

@ -5,6 +5,9 @@
test/nminfotest.c
- Escape ESSIDs in gconf
* src/NetworkManagerDevice.c
- Fix pseudo-scanning to use netowrk list from info daemon
Wed Sep 29 18:18:24 2004 Jonathan Blandford <jrb@redhat.com>
* configure.in: Add a temporary --enable-notification-icon. This

View file

@ -232,10 +232,8 @@ static DBusMessage *nmi_dbus_get_networks (NMIAppInfo *info, DBusMessage *messag
{
char key[100];
GConfValue *value;
char *escaped_network = gnome_vfs_escape_string ((char *)(element->data));
g_snprintf (&key[0], 99, "%s/essid", escaped_network);
g_free (escaped_network);
g_snprintf (&key[0], 99, "%s/essid", (char *)(element->data));
value = gconf_client_get (info->gconf_client, key, NULL);
if (value && gconf_value_get_string (value))
{

View file

@ -1995,7 +1995,6 @@ static void nm_device_do_normal_scan (NMDevice *dev)
*/
static void nm_device_do_pseudo_scan (NMDevice *dev)
{
NMAccessPointList *list;
NMAPListIter *iter;
NMAccessPoint *ap;
@ -2007,10 +2006,7 @@ static void nm_device_do_pseudo_scan (NMDevice *dev)
nm_device_ref (dev);
if (!(list = nm_device_ap_list_get (dev)))
return;
if (!(iter = nm_ap_list_iter_new (list)))
if (!(iter = nm_ap_list_iter_new (dev->app_data->allowed_ap_list)))
return;
nm_device_set_essid (dev, "");