fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-07 15:40:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Yah, so, we don't want those dbus_free() calls.

Browse source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1522 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-02-28 20:47:44 +00:00
parent 0a0ec18e7b
commit 8a98f605bc
5 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnome/applet/nm-gconf-wso-wpa-eap.c
View file

@ -87,14 +87,6 @@ nm_gconf_wso_wpa_eap_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
security->priv->client_cert_file = g_strdup (client_cert_file);
security->priv->ca_cert_file = g_strdup (ca_cert_file);
dbus_free (identity);
dbus_free (passwd);
dbus_free (anon_identity);
dbus_free (private_key_passwd);
dbus_free (private_key_file);
dbus_free (client_cert_file);
dbus_free (ca_cert_file);
out:
return security;
}
@ -222,13 +214,13 @@ real_serialize_dbus (NMGConfWSO *instance, DBusMessageIter *iter)
if (!nmu_security_serialize_wpa_eap (iter,
self->priv->eap_method,
self->priv->identity,
self->priv->passwd,
self->priv->anon_identity,
self->priv->private_key_passwd,
self->priv->private_key_file,
self->priv->client_cert_file,
self->priv->ca_cert_file,
self->priv->identity ? : "",
self->priv->passwd ? : "",
self->priv->anon_identity ? : "",
self->priv->private_key_passwd ? : "",
self->priv->private_key_file ? : "",
self->priv->client_cert_file ? : "",
self->priv->ca_cert_file ? : "",
self->priv->wpa_version))
return FALSE;
return TRUE;

2
gnome/applet/nm-gconf-wso-wpa-psk.c
View file

@ -63,8 +63,6 @@ nm_gconf_wso_wpa_psk_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
security->priv->wpa_version = wpa_version;
security->priv->key_mgt = key_mgt;
dbus_free (key);
out:
return security;
}

10
gnome/applet/wso-wpa-eap.c
View file

@ -44,9 +44,9 @@ struct OptData
const char * passwd;
const char * anon_identity;
const char * private_key_passwd;
char * private_key_file;
char * client_cert_file;
char * ca_cert_file;
const char * private_key_file;
const char * client_cert_file;
const char * ca_cert_file;
gboolean wpa2;
};
@ -57,10 +57,6 @@ data_free_func (WirelessSecurityOption *opt)
g_return_if_fail (opt != NULL);
g_return_if_fail (opt->data != NULL);
g_free (opt->data->private_key_file);
g_free (opt->data->client_cert_file);
g_free (opt->data->ca_cert_file);
memset (opt->data, 0, sizeof (opt->data));
g_free (opt->data);
}

8
src/nm-ap-security-wpa-eap.c
View file

@ -91,14 +91,6 @@ nm_ap_security_wpa_eap_new_deserialize (DBusMessageIter *iter)
else
nm_ap_security_set_description (NM_AP_SECURITY (security), _("WPA Enterprise"));
dbus_free (identity);
dbus_free (passwd);
dbus_free (anon_identity);
dbus_free (private_key_passwd);
dbus_free (private_key_file);
dbus_free (client_cert_file);
dbus_free (ca_cert_file);
out:
return security;
}

3
src/nm-ap-security-wpa-psk.c
View file

@ -83,10 +83,7 @@ nm_ap_security_wpa_psk_new_deserialize (DBusMessageIter *iter, int we_cipher)
security = g_object_new (NM_TYPE_AP_SECURITY_WPA_PSK, NULL);
nm_ap_security_set_we_cipher (NM_AP_SECURITY (security), we_cipher);
if (key)
{
nm_ap_security_set_key (NM_AP_SECURITY (security), key, key_len);
dbus_free (key);
}
security->priv->wpa_version = wpa_version;
security->priv->key_mgt = key_mgt;