mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 20:28:15 +02:00
2006-01-08 Dan Williams <dcbw@redhat.com>
* 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
This commit is contained in:
parent
46d05f9ab7
commit
9b602d8151
3 changed files with 15 additions and 5 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
||||||
|
2006-01-08 Dan Williams <dcbw@redhat.com>
|
||||||
|
|
||||||
|
* 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 <dcbw@redhat.com>
|
2006-01-08 Dan Williams <dcbw@redhat.com>
|
||||||
|
|
||||||
* gnome/applet/wso-wpa-psk-hex.c
|
* gnome/applet/wso-wpa-psk-hex.c
|
||||||
|
|
|
||||||
|
|
@ -47,10 +47,10 @@ NMGConfWSOWPA_PSK *
|
||||||
nm_gconf_wso_wpa_psk_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
|
nm_gconf_wso_wpa_psk_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
|
||||||
{
|
{
|
||||||
NMGConfWSOWPA_PSK * security = NULL;
|
NMGConfWSOWPA_PSK * security = NULL;
|
||||||
char * key;
|
char * key = NULL;
|
||||||
int key_len;
|
int key_len;
|
||||||
int wpa_version;
|
int wpa_version;
|
||||||
int key_mgt;
|
int key_mgt;
|
||||||
|
|
||||||
g_return_val_if_fail (iter != NULL, NULL);
|
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);
|
g_return_val_if_fail ((we_cipher == IW_AUTH_CIPHER_TKIP) || (we_cipher == IW_AUTH_CIPHER_CCMP), NULL);
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ NMAPSecurityWPA_PSK *
|
||||||
nm_ap_security_wpa_psk_new_deserialize (DBusMessageIter *iter, int we_cipher)
|
nm_ap_security_wpa_psk_new_deserialize (DBusMessageIter *iter, int we_cipher)
|
||||||
{
|
{
|
||||||
NMAPSecurityWPA_PSK * security = NULL;
|
NMAPSecurityWPA_PSK * security = NULL;
|
||||||
char * key;
|
char * key = NULL;
|
||||||
int key_len;
|
int key_len;
|
||||||
int wpa_version;
|
int wpa_version;
|
||||||
int key_mgt;
|
int key_mgt;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue