NetworkManager r4358 - in branches/NETWORKMANAGER_0_7/vpn-daemons/pptp: . properties

[dcbw svn gnome org]

Author: dcbw
Date: Sun Nov 30 03:13:57 2008
New Revision: 4358
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4358&view=rev

Log:
2008-11-29  Dan Williams  <dcbw redhat com>

	* properties/nm-pptp.c
		- (auth_methods_setup, advanced_dialog_new_hash_from_dialog): add EAP
			to the auth method list



Modified:
   branches/NETWORKMANAGER_0_7/vpn-daemons/pptp/ChangeLog
   branches/NETWORKMANAGER_0_7/vpn-daemons/pptp/properties/advanced-dialog.c

Modified: branches/NETWORKMANAGER_0_7/vpn-daemons/pptp/properties/advanced-dialog.c
==============================================================================
--- branches/NETWORKMANAGER_0_7/vpn-daemons/pptp/properties/advanced-dialog.c	(original)
+++ branches/NETWORKMANAGER_0_7/vpn-daemons/pptp/properties/advanced-dialog.c	Sun Nov 30 03:13:57 2008
@@ -46,10 +46,11 @@
 #define COL_VALUE 1
 #define COL_TAG 2
 
-#define TAG_PAP 0
-#define TAG_CHAP 1
-#define TAG_MSCHAP 2
+#define TAG_PAP      0
+#define TAG_CHAP     1
+#define TAG_MSCHAP   2
 #define TAG_MSCHAPV2 3
+#define TAG_EAP      4
 
 static const char *advanced_keys[] = {
 	NM_PPTP_KEY_REFUSE_EAP,
@@ -239,12 +240,18 @@
 	gtk_list_store_append (store, &iter);
 	gtk_list_store_set (store, &iter, COL_NAME, _("MSCHAP"), COL_VALUE, allowed, COL_TAG, TAG_MSCHAP, -1);
 
-	/* PAP */
+	/* MSCHAPv2 */
 	value = g_hash_table_lookup (hash, NM_PPTP_KEY_REFUSE_MSCHAPV2);
 	allowed = (value && !strcmp (value, "yes")) ? FALSE : TRUE;
 	gtk_list_store_append (store, &iter);
 	gtk_list_store_set (store, &iter, COL_NAME, _("MSCHAPv2"), COL_VALUE, allowed, COL_TAG, TAG_MSCHAPV2, -1);
 
+	/* EAP */
+	value = g_hash_table_lookup (hash, NM_PPTP_KEY_REFUSE_EAP);
+	allowed = (value && !strcmp (value, "yes")) ? FALSE : TRUE;
+	gtk_list_store_append (store, &iter);
+	gtk_list_store_set (store, &iter, COL_NAME, _("EAP"), COL_VALUE, allowed, COL_TAG, TAG_EAP, -1);
+
 	/* Set up the tree view */
 	widget = glade_xml_get_widget (xml, "ppp_auth_methods");
 	gtk_tree_view_set_model (GTK_TREE_VIEW (widget), GTK_TREE_MODEL (store));
@@ -296,7 +303,6 @@
 	g_object_set_data_full (G_OBJECT (dialog), "glade-xml",
 	                        xml, (GDestroyNotify) g_object_unref);
 
-
 	setup_security_combo (xml, hash);
 
 	widget = glade_xml_get_widget (xml, "ppp_use_mppe");
@@ -431,6 +437,10 @@
 			if (!allowed)
 				g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REFUSE_MSCHAPV2), g_strdup ("yes"));
 			break;
+		case TAG_EAP:
+			if (!allowed)
+				g_hash_table_insert (hash, g_strdup (NM_PPTP_KEY_REFUSE_EAP), g_strdup ("yes"));
+			break;
 		default:
 			break;
 		}