From 9b602d81510b044d20a32b4b2c44fe2878b732ce Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 8 Jan 2006 21:34:38 +0000 Subject: [PATCH] 2006-01-08 Dan Williams * gnome/applet/nm-gconf-wso-wpa-psk.c - (nm_gconf_wso_wpa_psk_new_deserialize_dbus): feed correct arguments to nmu_security_deserialize_wpa_psk() * src/nm-ap-security-wpa-psk.c - (nm_ap_security_wpa_psk_new_deserialize): feed correct arguments to nmu_security_deserialize_wpa_psk() git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1295 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 10 ++++++++++ gnome/applet/nm-gconf-wso-wpa-psk.c | 8 ++++---- src/nm-ap-security-wpa-psk.c | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 923bd626f8..090fe7956d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-01-08 Dan Williams + + * gnome/applet/nm-gconf-wso-wpa-psk.c + - (nm_gconf_wso_wpa_psk_new_deserialize_dbus): feed + correct arguments to nmu_security_deserialize_wpa_psk() + + * src/nm-ap-security-wpa-psk.c + - (nm_ap_security_wpa_psk_new_deserialize): feed correct + arguments to nmu_security_deserialize_wpa_psk() + 2006-01-08 Dan Williams * gnome/applet/wso-wpa-psk-hex.c diff --git a/gnome/applet/nm-gconf-wso-wpa-psk.c b/gnome/applet/nm-gconf-wso-wpa-psk.c index 433078f17f..8b0cf13f07 100644 --- a/gnome/applet/nm-gconf-wso-wpa-psk.c +++ b/gnome/applet/nm-gconf-wso-wpa-psk.c @@ -47,10 +47,10 @@ NMGConfWSOWPA_PSK * nm_gconf_wso_wpa_psk_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher) { NMGConfWSOWPA_PSK * security = NULL; - char * key; - int key_len; - int wpa_version; - int key_mgt; + char * key = NULL; + int key_len; + int wpa_version; + int key_mgt; g_return_val_if_fail (iter != NULL, NULL); g_return_val_if_fail ((we_cipher == IW_AUTH_CIPHER_TKIP) || (we_cipher == IW_AUTH_CIPHER_CCMP), NULL); diff --git a/src/nm-ap-security-wpa-psk.c b/src/nm-ap-security-wpa-psk.c index 762b62659f..09f9ad09ef 100644 --- a/src/nm-ap-security-wpa-psk.c +++ b/src/nm-ap-security-wpa-psk.c @@ -53,7 +53,7 @@ NMAPSecurityWPA_PSK * nm_ap_security_wpa_psk_new_deserialize (DBusMessageIter *iter, int we_cipher) { NMAPSecurityWPA_PSK * security = NULL; - char * key; + char * key = NULL; int key_len; int wpa_version; int key_mgt;