system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-21 18:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-10-26 Dan Williams <dcbw@redhat.com>

Browse source 
* properties/nm-pptp.c
		- Update for setting accessor changes



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4225 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-10-27 03:29:09 +00:00
parent 1d8779d8e3
commit 9702d72d8d
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vpn-daemons/pptp/ChangeLog
View file

@ -1,3 +1,8 @@
2008-10-26 Dan Williams <dcbw@redhat.com>
* properties/nm-pptp.c
- Update for setting accessor changes
2008-10-24 Dan Williams <dcbw@redhat.com>
* src/nm-pptp-service.c

25
vpn-daemons/pptp/properties/nm-pptp.c
View file

@ -258,10 +258,11 @@ fill_password (GladeXML *xml,
} else {
NMSettingConnection *s_con = NULL;
gboolean unused;
const char *uuid;
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
password = keyring_helpers_lookup_secret (s_con->uuid,
uuid = nm_setting_connection_get_uuid (s_con);
password = keyring_helpers_lookup_secret (uuid,
password_type,
&unused);
}
@ -429,7 +430,7 @@ save_secrets (NMVpnPluginUiWidgetInterface *iface,
GnomeKeyringResult ret;
NMSettingConnection *s_con;
GtkWidget *widget;
const char *str;
const char *str, *uuid, *id;
s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
if (!s_con) {
@ -440,15 +441,18 @@ save_secrets (NMVpnPluginUiWidgetInterface *iface,
return FALSE;
}
id = nm_setting_connection_get_id (s_con);
uuid = nm_setting_connection_get_uuid (s_con);
widget = glade_xml_get_widget (priv->xml, "user_password_entry");
g_assert (widget);
str = gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str)) {
ret = keyring_helpers_save_secret (s_con->uuid, s_con->id, NULL, NM_PPTP_KEY_PASSWORD, str);
ret = keyring_helpers_save_secret (uuid, id, NULL, NM_PPTP_KEY_PASSWORD, str);
if (ret != GNOME_KEYRING_RESULT_OK)
g_warning ("%s: failed to save user password to keyring.", __func__);
} else
keyring_helpers_delete_secret (s_con->uuid, NM_PPTP_KEY_PASSWORD);
keyring_helpers_delete_secret (uuid, NM_PPTP_KEY_PASSWORD);
return TRUE;
}
@ -560,6 +564,7 @@ delete_connection (NMVpnPluginUiInterface *iface,
GError **error)
{
NMSettingConnection *s_con = NULL;
const char *uuid;
/* Remove any secrets in the keyring associated with this connection's UUID */
s_con = (NMSettingConnection *) nm_connection_get_setting (connection,
@ -572,7 +577,8 @@ delete_connection (NMVpnPluginUiInterface *iface,
return FALSE;
}
keyring_helpers_delete_secret (s_con->uuid, NM_PPTP_KEY_PASSWORD);
uuid = nm_setting_connection_get_uuid (s_con);
keyring_helpers_delete_secret (uuid, NM_PPTP_KEY_PASSWORD);
return TRUE;
}
@ -636,14 +642,17 @@ static char *
get_suggested_name (NMVpnPluginUiInterface *iface, NMConnection *connection)
{
NMSettingConnection *s_con;
const char *id;
g_return_val_if_fail (connection != NULL, NULL);
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
g_return_val_if_fail (s_con != NULL, NULL);
g_return_val_if_fail (s_con->id != NULL, NULL);
return g_strdup_printf ("%s (pptp).conf", s_con->id);
id = nm_setting_connection_get_id (s_con);
g_return_val_if_fail (id != NULL, NULL);
return g_strdup_printf ("%s (pptp).conf", id);
}
static guint32