Attachment #142439 for bug #216063

View | Details | Raw Unified | Return to bug 216063
Collapse All | Expand All

Lines 40-45 Link Here

(-)branches/network-manager-applet-0-6/src/nm-gconf-wso-wpa-eap.c (-2 / +16 lines)
40	{	40	{
41	int eap_method;	41	int eap_method;
42	int key_type;	42	int key_type;
		43	int phase2_type;
43	int wpa_version;	44	int wpa_version;
44	int key_mgmt;	45	int key_mgmt;
45	const char * identity;	46	const char * identity;
Lines 80-87 Link Here
80	if (private_key_passwd && strlen (private_key_passwd) > 0)	81	if (private_key_passwd && strlen (private_key_passwd) > 0)
81	nm_gconf_wso_set_key (NM_GCONF_WSO (security), private_key_passwd, strlen (private_key_passwd));	82	nm_gconf_wso_set_key (NM_GCONF_WSO (security), private_key_passwd, strlen (private_key_passwd));
82	security->priv->wpa_version = wpa_version;	83	security->priv->wpa_version = wpa_version;
83	security->priv->eap_method = eap_method;
84	security->priv->key_type = key_type;	84	security->priv->key_type = key_type;
		85	security->priv->eap_method = NM_EAP_TO_EAP_METHOD (eap_method);
		86	security->priv->phase2_type = NM_EAP_TO_PHASE2_METHOD (eap_method);
85	security->priv->key_mgmt = IW_AUTH_KEY_MGMT_802_1X;	87	security->priv->key_mgmt = IW_AUTH_KEY_MGMT_802_1X;
86	security->priv->identity = g_strdup (identity);	88	security->priv->identity = g_strdup (identity);
87	security->priv->passwd = g_strdup (passwd);	89	security->priv->passwd = g_strdup (passwd);
Lines 108-113 Link Here
108	int wpa_version = 0;	110	int wpa_version = 0;
109	int eap_method = 0;	111	int eap_method = 0;
110	int key_type = 0;	112	int key_type = 0;
		113	int phase2_type = 0;
111	int key_mgmt = 0;	114	int key_mgmt = 0;
112		115
113	g_return_val_if_fail (client != NULL, NULL);	116	g_return_val_if_fail (client != NULL, NULL);
Lines 128-133 Link Here
128		131
129	nm_gconf_get_int_helper (client,	132	nm_gconf_get_int_helper (client,
130	GCONF_PATH_WIRELESS_NETWORKS,	133	GCONF_PATH_WIRELESS_NETWORKS,
		134	WPA_EAP_PREFIX"phase2_type",
		135	network,
		136	&phase2_type);
		137
		138	nm_gconf_get_int_helper (client,
		139	GCONF_PATH_WIRELESS_NETWORKS,
131	WPA_EAP_PREFIX"wpa_version",	140	WPA_EAP_PREFIX"wpa_version",
132	network,	141	network,
133	&wpa_version);	142	&wpa_version);
Lines 180-185 Link Here
180	security->priv->wpa_version = wpa_version;	189	security->priv->wpa_version = wpa_version;
181	security->priv->eap_method = eap_method;	190	security->priv->eap_method = eap_method;
182	security->priv->key_type = key_type;	191	security->priv->key_type = key_type;
		192	security->priv->phase2_type = phase2_type;
183	security->priv->key_mgmt = IW_AUTH_KEY_MGMT_802_1X;	193	security->priv->key_mgmt = IW_AUTH_KEY_MGMT_802_1X;
184	security->priv->identity = g_strdup (identity);	194	security->priv->identity = g_strdup (identity);
185	security->priv->passwd = g_strdup (passwd);	195	security->priv->passwd = g_strdup (passwd);
Lines 205-211 Link Here
205	NMGConfWSOWPA_EAP * self = NM_GCONF_WSO_WPA_EAP (instance);	215	NMGConfWSOWPA_EAP * self = NM_GCONF_WSO_WPA_EAP (instance);
206		216
207	if (!nmu_security_serialize_wpa_eap (iter,	217	if (!nmu_security_serialize_wpa_eap (iter,
208	self->priv->eap_method,	218	self->priv->eap_method \| self->priv->phase2_type,
209	self->priv->key_type,	219	self->priv->key_type,
210	self->priv->identity ? : "",	220	self->priv->identity ? : "",
211	self->priv->passwd ? : "",	221	self->priv->passwd ? : "",
Lines 233-238 Link Here
233	gconf_client_set_int (client, key, self->priv->key_type, NULL);	243	gconf_client_set_int (client, key, self->priv->key_type, NULL);
234	g_free (key);	244	g_free (key);
235		245
		246	key = g_strdup_printf ("%s/%s/%sphase2_type", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
		247	gconf_client_set_int (client, key, self->priv->phase2_type, NULL);
		248	g_free (key);
		249
236	key = g_strdup_printf ("%s/%s/%swpa_version", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);	250	key = g_strdup_printf ("%s/%s/%swpa_version", GCONF_PATH_WIRELESS_NETWORKS, network, WPA_EAP_PREFIX);
237	gconf_client_set_int (client, key, self->priv->wpa_version, NULL);	251	gconf_client_set_int (client, key, self->priv->wpa_version, NULL);
238	g_free (key);	252	g_free (key);




	*num_added = num;
	return GTK_TREE_MODEL (model);
}

GtkTreeModel *
wso_wpa_create_phase2_type_model (int capabilities, gboolean wpa_eap, int *num_added)
{
	GtkListStore *	model;
	GtkTreeIter	iter;
	const char *	name;

	g_return_val_if_fail (num_added != NULL, NULL);

	model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);

	name = _("None (Default)");
	gtk_list_store_append (model, &iter);
	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
					WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_NONE, -1);

	name = _("PAP");
	gtk_list_store_append (model, &iter);
	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
					WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_PAP, -1);

	name = _("MSCHAP");
	gtk_list_store_append (model, &iter);
	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
					WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_MSCHAP, -1);

	name = _("MSCHAPV2");
	gtk_list_store_append (model, &iter);
	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
					WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_MSCHAPV2, -1);

	name = _("GTC");
	gtk_list_store_append (model, &iter);
	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
					WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_GTC, -1);

	*num_added = 4;
	return GTK_TREE_MODEL (model);
}


Lines 41-46 Link Here

(-)branches/network-manager-applet-0-6/src/wso-wpa-eap.c (-1 / +16 lines)
41	{	41	{
42	int eap_method;	42	int eap_method;
43	int key_type;	43	int key_type;
		44	int phase2_type;
44	const char * identity;	45	const char * identity;
45	const char * passwd;	46	const char * passwd;
46	const char * anon_identity;	47	const char * anon_identity;
Lines 176-181 Link Here
176	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (entry), &tree_iter);	177	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (entry), &tree_iter);
177	gtk_tree_model_get (model, &tree_iter, WPA_KEY_TYPE_CIPHER_COL, &opt->data->key_type, -1);	178	gtk_tree_model_get (model, &tree_iter, WPA_KEY_TYPE_CIPHER_COL, &opt->data->key_type, -1);
178		179
		180	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_phase2_type_combo");
		181	model = gtk_combo_box_get_model (GTK_COMBO_BOX (entry));
		182	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (entry), &tree_iter);
		183	gtk_tree_model_get (model, &tree_iter, WPA_KEY_TYPE_CIPHER_COL, &opt->data->phase2_type, -1);
		184
179	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_identity_entry");	185	entry = glade_xml_get_widget (opt->uixml, "wpa_eap_identity_entry");
180	opt->data->identity = gtk_entry_get_text (GTK_ENTRY (entry)) ? : "";	186	opt->data->identity = gtk_entry_get_text (GTK_ENTRY (entry)) ? : "";
181		187
Lines 200-206 Link Here
200	dbus_message_iter_init_append (message, &dbus_iter);	206	dbus_message_iter_init_append (message, &dbus_iter);
201		207
202	nmu_security_serialize_wpa_eap_with_cipher (&dbus_iter,	208	nmu_security_serialize_wpa_eap_with_cipher (&dbus_iter,
203	opt->data->eap_method,	209	opt->data->eap_method \| opt->data->phase2_type,
204	opt->data->key_type,	210	opt->data->key_type,
205	opt->data->identity,	211	opt->data->identity,
206	opt->data->passwd,	212	opt->data->passwd,
Lines 224-229 Link Here
224	OptData * data = NULL;	230	OptData * data = NULL;
225	GtkWidget * eap_method_combo;	231	GtkWidget * eap_method_combo;
226	GtkWidget * key_type_combo;	232	GtkWidget * key_type_combo;
		233	GtkWidget * phase2_type_combo;
227	GtkListStore * model;	234	GtkListStore * model;
228	GtkTreeModel * tree_model;	235	GtkTreeModel * tree_model;
229	GtkTreeIter iter;	236	GtkTreeIter iter;
Lines 285-294 Link Here
285	if (num_added == 1)	292	if (num_added == 1)
286	gtk_widget_set_sensitive (key_type_combo, FALSE);	293	gtk_widget_set_sensitive (key_type_combo, FALSE);
287		294
		295	phase2_type_combo = glade_xml_get_widget (opt->uixml, "wpa_eap_phase2_type_combo");
		296	tree_model = wso_wpa_create_phase2_type_model (capabilities, TRUE, &num_added);
		297	gtk_combo_box_set_model (GTK_COMBO_BOX (phase2_type_combo), tree_model);
		298	gtk_tree_model_get_iter_first (tree_model, &iter);
		299	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (phase2_type_combo), &iter);
		300
288	/* FIXME: Why do we need this here but not in the same place in wso-wpa-psk.c ? */	301	/* FIXME: Why do we need this here but not in the same place in wso-wpa-psk.c ? */
289	renderer = gtk_cell_renderer_text_new ();	302	renderer = gtk_cell_renderer_text_new ();
290	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (key_type_combo), renderer, TRUE);	303	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (key_type_combo), renderer, TRUE);
291	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (key_type_combo), renderer, "text", 0, NULL);	304	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (key_type_combo), renderer, "text", 0, NULL);
		305	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (phase2_type_combo), renderer, TRUE);
		306	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (phase2_type_combo), renderer, "text", 0, NULL);
292		307
293	/* Option-specific data */	308	/* Option-specific data */
294	opt->data = data = g_malloc0 (sizeof (OptData));	309	opt->data = data = g_malloc0 (sizeof (OptData));




	<widget class="GtkTable" id="wpa_eap_table">
	  <property name="border_width">8</property>
	  <property name="visible">True</property>
	  <property name="n_rows">11</property>
	  <property name="n_columns">2</property>
	  <property name="homogeneous">False</property>
	  <property name="row_spacing">6</property>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">7</property>
	      <property name="bottom_attach">8</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">8</property>
	      <property name="bottom_attach">9</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">7</property>
	      <property name="bottom_attach">8</property>
	      <property name="x_options">fill</property>
	      <property name="y_options">fill</property>
	    </packing>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">8</property>
	      <property name="bottom_attach">9</property>
	      <property name="x_options">fill</property>
	      <property name="y_options">fill</property>
	    </packing>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">9</property>
	      <property name="bottom_attach">10</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">9</property>
	      <property name="bottom_attach">10</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">6</property>
	      <property name="bottom_attach">7</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">6</property>
	      <property name="bottom_attach">7</property>
	      <property name="x_options">fill</property>
	      <property name="y_options">fill</property>
	    </packing>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">3</property>
	      <property name="bottom_attach">4</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">4</property>
	      <property name="bottom_attach">5</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">5</property>
	      <property name="bottom_attach">6</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">3</property>
	      <property name="bottom_attach">4</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">4</property>
	      <property name="bottom_attach">5</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">5</property>
	      <property name="bottom_attach">6</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">10</property>
	      <property name="bottom_attach">11</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">10</property>
	      <property name="bottom_attach">11</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>

	      <property name="y_options">fill</property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkComboBox" id="wpa_eap_phase2_type_combo">
	      <property name="visible">True</property>
	      <property name="add_tearoffs">False</property>
	      <property name="focus_on_click">True</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="x_options">fill</property>
	      <property name="y_options">fill</property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="wpa_eap_phase2_type_label">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Phase2 Type:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">0</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
	      <property name="width_chars">-1</property>
	      <property name="single_line_mode">False</property>
	      <property name="angle">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="tab_expand">False</property>

Lines 2559-2564 Link Here

(-)branches/network-manager-applet-0-6/src/applet.c (-3 / +3 lines)
2559	*/	2559	*/
2560	nma_compat_convert_oldformat_entries (applet->gconf_client);	2560	nma_compat_convert_oldformat_entries (applet->gconf_client);
2561		2561
		2562	/* Load pixmaps and create applet widgets */
		2563	nma_setup_widgets (applet);
		2564
2562	/* D-Bus init stuff */	2565	/* D-Bus init stuff */
2563	dbus_g_thread_init ();	2566	dbus_g_thread_init ();
2564	applet->nmi_methods = nmi_dbus_nmi_methods_setup ();	2567	applet->nmi_methods = nmi_dbus_nmi_methods_setup ();
Lines 2566-2574 Link Here
2566	if (!applet->connection)	2569	if (!applet->connection)
2567	nma_start_dbus_connection_watch (applet);	2570	nma_start_dbus_connection_watch (applet);
2568		2571
2569	/* Load pixmaps and create applet widgets */
2570	nma_setup_widgets (applet);
2571
2572	g_signal_connect (applet, "destroy", G_CALLBACK (nma_destroy), NULL);	2572	g_signal_connect (applet, "destroy", G_CALLBACK (nma_destroy), NULL);
2573	g_signal_connect (applet, "style-set", G_CALLBACK (nma_theme_change_cb), NULL);	2573	g_signal_connect (applet, "style-set", G_CALLBACK (nma_theme_change_cb), NULL);
2574		2574

Return to bug 216063

Lines 237-239 Link Here

(-)branches/network-manager-applet-0-6/src/wireless-security-option.c (+41 lines)
237	*num_added = num;	237	*num_added = num;
238	return GTK_TREE_MODEL (model);	238	return GTK_TREE_MODEL (model);
239	}	239	}
		240
		241	GtkTreeModel *
		242	wso_wpa_create_phase2_type_model (int capabilities, gboolean wpa_eap, int *num_added)
		243	{
		244	GtkListStore * model;
		245	GtkTreeIter iter;
		246	const char * name;
		247
		248	g_return_val_if_fail (num_added != NULL, NULL);
		249
		250	model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
		251
		252	name = _("None (Default)");
		253	gtk_list_store_append (model, &iter);
		254	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
		255	WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_NONE, -1);
		256
		257	name = _("PAP");
		258	gtk_list_store_append (model, &iter);
		259	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
		260	WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_PAP, -1);
		261
		262	name = _("MSCHAP");
		263	gtk_list_store_append (model, &iter);
		264	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
		265	WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_MSCHAP, -1);
		266
		267	name = _("MSCHAPV2");
		268	gtk_list_store_append (model, &iter);
		269	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
		270	WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_MSCHAPV2, -1);
		271
		272	name = _("GTC");
		273	gtk_list_store_append (model, &iter);
		274	gtk_list_store_set (model, &iter, WPA_KEY_TYPE_NAME_COL, name,
		275	WPA_KEY_TYPE_CIPHER_COL, NM_PHASE2_AUTH_GTC, -1);
		276
		277	*num_added = 4;
		278	return GTK_TREE_MODEL (model);
		279	}
		280

Lines 2462-2468 Link Here

(-)branches/network-manager-applet-0-6/src/applet.glade (-33 / +77 lines)
2462	<widget class="GtkTable" id="wpa_eap_table">	2462	<widget class="GtkTable" id="wpa_eap_table">
2463	<property name="border_width">8</property>	2463	<property name="border_width">8</property>
2464	<property name="visible">True</property>	2464	<property name="visible">True</property>
2465	<property name="n_rows">10</property>	2465	<property name="n_rows">11</property>
2466	<property name="n_columns">2</property>	2466	<property name="n_columns">2</property>
2467	<property name="homogeneous">False</property>	2467	<property name="homogeneous">False</property>
2468	<property name="row_spacing">6</property>	2468	<property name="row_spacing">6</property>
Lines 2489-2496 Link Here
2489	<packing>	2489	<packing>
2490	<property name="left_attach">0</property>	2490	<property name="left_attach">0</property>
2491	<property name="right_attach">1</property>	2491	<property name="right_attach">1</property>
2492	<property name="top_attach">6</property>	2492	<property name="top_attach">7</property>
2493	<property name="bottom_attach">7</property>	2493	<property name="bottom_attach">8</property>
2494	<property name="x_options">fill</property>	2494	<property name="x_options">fill</property>
2495	<property name="y_options"></property>	2495	<property name="y_options"></property>
2496	</packing>	2496	</packing>
Lines 2517-2524 Link Here
2517	<packing>	2517	<packing>
2518	<property name="left_attach">0</property>	2518	<property name="left_attach">0</property>
2519	<property name="right_attach">1</property>	2519	<property name="right_attach">1</property>
2520	<property name="top_attach">7</property>	2520	<property name="top_attach">8</property>
2521	<property name="bottom_attach">8</property>	2521	<property name="bottom_attach">9</property>
2522	<property name="x_options">fill</property>	2522	<property name="x_options">fill</property>
2523	<property name="y_options"></property>	2523	<property name="y_options"></property>
2524	</packing>	2524	</packing>
Lines 2537-2544 Link Here
2537	<packing>	2537	<packing>
2538	<property name="left_attach">1</property>	2538	<property name="left_attach">1</property>
2539	<property name="right_attach">2</property>	2539	<property name="right_attach">2</property>
2540	<property name="top_attach">6</property>	2540	<property name="top_attach">7</property>
2541	<property name="bottom_attach">7</property>	2541	<property name="bottom_attach">8</property>
2542	<property name="x_options">fill</property>	2542	<property name="x_options">fill</property>
2543	<property name="y_options">fill</property>	2543	<property name="y_options">fill</property>
2544	</packing>	2544	</packing>
Lines 2557-2564 Link Here
2557	<packing>	2557	<packing>
2558	<property name="left_attach">1</property>	2558	<property name="left_attach">1</property>
2559	<property name="right_attach">2</property>	2559	<property name="right_attach">2</property>
2560	<property name="top_attach">7</property>	2560	<property name="top_attach">8</property>
2561	<property name="bottom_attach">8</property>	2561	<property name="bottom_attach">9</property>
2562	<property name="x_options">fill</property>	2562	<property name="x_options">fill</property>
2563	<property name="y_options">fill</property>	2563	<property name="y_options">fill</property>
2564	</packing>	2564	</packing>
Lines 2585-2592 Link Here
2585	<packing>	2585	<packing>
2586	<property name="left_attach">0</property>	2586	<property name="left_attach">0</property>
2587	<property name="right_attach">1</property>	2587	<property name="right_attach">1</property>
2588	<property name="top_attach">8</property>	2588	<property name="top_attach">9</property>
2589	<property name="bottom_attach">9</property>	2589	<property name="bottom_attach">10</property>
2590	<property name="x_options">fill</property>	2590	<property name="x_options">fill</property>
2591	<property name="y_options"></property>	2591	<property name="y_options"></property>
2592	</packing>	2592	</packing>
Lines 2606-2613 Link Here
2606	<packing>	2606	<packing>
2607	<property name="left_attach">1</property>	2607	<property name="left_attach">1</property>
2608	<property name="right_attach">2</property>	2608	<property name="right_attach">2</property>
2609	<property name="top_attach">8</property>	2609	<property name="top_attach">9</property>
2610	<property name="bottom_attach">9</property>	2610	<property name="bottom_attach">10</property>
2611	<property name="y_options"></property>	2611	<property name="y_options"></property>
2612	</packing>	2612	</packing>
2613	</child>	2613	</child>
Lines 2633-2640 Link Here
2633	<packing>	2633	<packing>
2634	<property name="left_attach">0</property>	2634	<property name="left_attach">0</property>
2635	<property name="right_attach">1</property>	2635	<property name="right_attach">1</property>
2636	<property name="top_attach">5</property>	2636	<property name="top_attach">6</property>
2637	<property name="bottom_attach">6</property>	2637	<property name="bottom_attach">7</property>
2638	<property name="x_options">fill</property>	2638	<property name="x_options">fill</property>
2639	<property name="y_options"></property>	2639	<property name="y_options"></property>
2640	</packing>	2640	</packing>
Lines 2653-2660 Link Here
2653	<packing>	2653	<packing>
2654	<property name="left_attach">1</property>	2654	<property name="left_attach">1</property>
2655	<property name="right_attach">2</property>	2655	<property name="right_attach">2</property>
2656	<property name="top_attach">5</property>	2656	<property name="top_attach">6</property>
2657	<property name="bottom_attach">6</property>	2657	<property name="bottom_attach">7</property>
2658	<property name="x_options">fill</property>	2658	<property name="x_options">fill</property>
2659	<property name="y_options">fill</property>	2659	<property name="y_options">fill</property>
2660	</packing>	2660	</packing>
Lines 2681-2688 Link Here
2681	<packing>	2681	<packing>
2682	<property name="left_attach">0</property>	2682	<property name="left_attach">0</property>
2683	<property name="right_attach">1</property>	2683	<property name="right_attach">1</property>
2684	<property name="top_attach">2</property>	2684	<property name="top_attach">3</property>
2685	<property name="bottom_attach">3</property>	2685	<property name="bottom_attach">4</property>
2686	<property name="x_options">fill</property>	2686	<property name="x_options">fill</property>
2687	<property name="y_options"></property>	2687	<property name="y_options"></property>
2688	</packing>	2688	</packing>
Lines 2709-2716 Link Here
2709	<packing>	2709	<packing>
2710	<property name="left_attach">0</property>	2710	<property name="left_attach">0</property>
2711	<property name="right_attach">1</property>	2711	<property name="right_attach">1</property>
2712	<property name="top_attach">3</property>	2712	<property name="top_attach">4</property>
2713	<property name="bottom_attach">4</property>	2713	<property name="bottom_attach">5</property>
2714	<property name="x_options">fill</property>	2714	<property name="x_options">fill</property>
2715	<property name="y_options"></property>	2715	<property name="y_options"></property>
2716	</packing>	2716	</packing>
Lines 2737-2744 Link Here
2737	<packing>	2737	<packing>
2738	<property name="left_attach">0</property>	2738	<property name="left_attach">0</property>
2739	<property name="right_attach">1</property>	2739	<property name="right_attach">1</property>
2740	<property name="top_attach">4</property>	2740	<property name="top_attach">5</property>
2741	<property name="bottom_attach">5</property>	2741	<property name="bottom_attach">6</property>
2742	<property name="x_options">fill</property>	2742	<property name="x_options">fill</property>
2743	<property name="y_options"></property>	2743	<property name="y_options"></property>
2744	</packing>	2744	</packing>
Lines 2758-2765 Link Here
2758	<packing>	2758	<packing>
2759	<property name="left_attach">1</property>	2759	<property name="left_attach">1</property>
2760	<property name="right_attach">2</property>	2760	<property name="right_attach">2</property>
2761	<property name="top_attach">2</property>	2761	<property name="top_attach">3</property>
2762	<property name="bottom_attach">3</property>	2762	<property name="bottom_attach">4</property>
2763	<property name="y_options"></property>	2763	<property name="y_options"></property>
2764	</packing>	2764	</packing>
2765	</child>	2765	</child>
Lines 2778-2785 Link Here
2778	<packing>	2778	<packing>
2779	<property name="left_attach">1</property>	2779	<property name="left_attach">1</property>
2780	<property name="right_attach">2</property>	2780	<property name="right_attach">2</property>
2781	<property name="top_attach">3</property>	2781	<property name="top_attach">4</property>
2782	<property name="bottom_attach">4</property>	2782	<property name="bottom_attach">5</property>
2783	<property name="y_options"></property>	2783	<property name="y_options"></property>
2784	</packing>	2784	</packing>
2785	</child>	2785	</child>
Lines 2798-2805 Link Here
2798	<packing>	2798	<packing>
2799	<property name="left_attach">1</property>	2799	<property name="left_attach">1</property>
2800	<property name="right_attach">2</property>	2800	<property name="right_attach">2</property>
2801	<property name="top_attach">4</property>	2801	<property name="top_attach">5</property>
2802	<property name="bottom_attach">5</property>	2802	<property name="bottom_attach">6</property>
2803	<property name="y_options"></property>	2803	<property name="y_options"></property>
2804	</packing>	2804	</packing>
2805	</child>	2805	</child>
Lines 2869-2876 Link Here
2869	<packing>	2869	<packing>
2870	<property name="left_attach">0</property>	2870	<property name="left_attach">0</property>
2871	<property name="right_attach">1</property>	2871	<property name="right_attach">1</property>
2872	<property name="top_attach">9</property>	2872	<property name="top_attach">10</property>
2873	<property name="bottom_attach">10</property>	2873	<property name="bottom_attach">11</property>
2874	<property name="x_options">fill</property>	2874	<property name="x_options">fill</property>
2875	<property name="y_options"></property>	2875	<property name="y_options"></property>
2876	</packing>	2876	</packing>
Lines 2891-2898 Link Here
2891	<packing>	2891	<packing>
2892	<property name="left_attach">1</property>	2892	<property name="left_attach">1</property>
2893	<property name="right_attach">2</property>	2893	<property name="right_attach">2</property>
2894	<property name="top_attach">9</property>	2894	<property name="top_attach">10</property>
2895	<property name="bottom_attach">10</property>	2895	<property name="bottom_attach">11</property>
2896	<property name="x_options">fill</property>	2896	<property name="x_options">fill</property>
2897	<property name="y_options"></property>	2897	<property name="y_options"></property>
2898	</packing>	2898	</packing>
Lines 2941-2946 Link Here
2941	<property name="y_options">fill</property>	2941	<property name="y_options">fill</property>
2942	</packing>	2942	</packing>
2943	</child>	2943	</child>
		2944
		2945	<child>
		2946	<widget class="GtkComboBox" id="wpa_eap_phase2_type_combo">
		2947	<property name="visible">True</property>
		2948	<property name="add_tearoffs">False</property>
		2949	<property name="focus_on_click">True</property>
		2950	</widget>
		2951	<packing>
		2952	<property name="left_attach">1</property>
		2953	<property name="right_attach">2</property>
		2954	<property name="top_attach">2</property>
		2955	<property name="bottom_attach">3</property>
		2956	<property name="x_options">fill</property>
		2957	<property name="y_options">fill</property>
		2958	</packing>
		2959	</child>
		2960
		2961	<child>
		2962	<widget class="GtkLabel" id="wpa_eap_phase2_type_label">
		2963	<property name="visible">True</property>
		2964	<property name="label" translatable="yes">Phase2 Type:</property>
		2965	<property name="use_underline">False</property>
		2966	<property name="use_markup">False</property>
		2967	<property name="justify">GTK_JUSTIFY_LEFT</property>
		2968	<property name="wrap">False</property>
		2969	<property name="selectable">False</property>
		2970	<property name="xalign">0</property>
		2971	<property name="yalign">0.5</property>
		2972	<property name="xpad">0</property>
		2973	<property name="ypad">0</property>
		2974	<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
		2975	<property name="width_chars">-1</property>
		2976	<property name="single_line_mode">False</property>
		2977	<property name="angle">0</property>
		2978	</widget>
		2979	<packing>
		2980	<property name="left_attach">0</property>
		2981	<property name="right_attach">1</property>
		2982	<property name="top_attach">2</property>
		2983	<property name="bottom_attach">3</property>
		2984	<property name="x_options">fill</property>
		2985	<property name="y_options"></property>
		2986	</packing>
		2987	</child>
2944	</widget>	2988	</widget>
2945	<packing>	2989	<packing>
2946	<property name="tab_expand">False</property>	2990	<property name="tab_expand">False</property>