diff options
| author | Dan Williams <dcbw@redhat.com> | 2004-10-04 15:44:00 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2004-10-04 15:44:00 +0000 |
| commit | 9383651b306ac66b117a500a2e1ecbbcc0b886bd (patch) | |
| tree | 5be41ea1bda25084e78696ca451ab50dd16b1e1c /info-daemon | |
| parent | c4031a846db636dc047d0b429cc7883c110f4a70 (diff) | |
| download | NetworkManager-9383651b306ac66b117a500a2e1ecbbcc0b886bd.tar.gz | |
2004-10-04 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerDevice.[ch]
- Add a slightly more robust method of determining if the WEP key
is correct or not, by checking the WEP-discarded packet count
on the card
* info-daemon/NetworkManagerInfo.c
- (nmi_gconf_notify_callback): Fix GConf essid escaping, should
un-escape values we pull out rather than escaping them
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@189 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'info-daemon')
| -rw-r--r-- | info-daemon/NetworkManagerInfo.c | 10 | ||||
| -rw-r--r-- | info-daemon/NetworkManagerInfoDbus.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/info-daemon/NetworkManagerInfo.c b/info-daemon/NetworkManagerInfo.c index 654fe6f23f..32fec8d165 100644 --- a/info-daemon/NetworkManagerInfo.c +++ b/info-daemon/NetworkManagerInfo.c @@ -67,17 +67,17 @@ void nmi_gconf_notify_callback (GConfClient *client, guint connection_id, GConfE { char *network = g_strdup ((key + path_len)); char *slash_pos; - char *escaped_network; + char *unescaped_network; /* If its a key under the network name, zero out the slash so we * are left with only the network name. */ - if ((slash_pos = strchr (network, '/'))) + unescaped_network = gnome_vfs_unescape_string (network, ""); + if ((slash_pos = strchr (unescaped_network, '/'))) *slash_pos = '\0'; - escaped_network = gnome_vfs_escape_string (network); - nmi_dbus_signal_update_network (info->connection, network, NETWORK_TYPE_ALLOWED); - g_free (escaped_network); + nmi_dbus_signal_update_network (info->connection, unescaped_network, NETWORK_TYPE_ALLOWED); + g_free (unescaped_network); g_free (network); } } diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c index 6f2b5c3f27..1f8457bb7f 100644 --- a/info-daemon/NetworkManagerInfoDbus.c +++ b/info-daemon/NetworkManagerInfoDbus.c @@ -488,7 +488,7 @@ static DBusHandlerResult nmi_dbus_nmi_message_handler (DBusConnection *connectio method = dbus_message_get_member (message); path = dbus_message_get_path (message); - syslog (LOG_WARNING, "nmi_dbus_nmi_message_handler() got method %s for path %s", method, path); +/* syslog (LOG_WARNING, "nmi_dbus_nmi_message_handler() got method %s for path %s", method, path);*/ if (strcmp ("getKeyForNetwork", method) == 0) { |