NetworkManager r4189 - in trunk/vpn-daemons/openvpn: . properties

[dcbw svn gnome org]

Author: dcbw
Date: Fri Oct 17 11:13:24 2008
New Revision: 4189
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4189&view=rev

Log:
2008-10-17  Dan Williams  <dcbw redhat com>

	* properties/auth-helpers.c
		- (advanced_dialog_new): The "Certificates (TLS)" tab should also be
			present for NM_OPENVPN_CONTYPE_PASSWORD



Modified:
   trunk/vpn-daemons/openvpn/ChangeLog
   trunk/vpn-daemons/openvpn/properties/auth-helpers.c

Modified: trunk/vpn-daemons/openvpn/properties/auth-helpers.c
==============================================================================
--- trunk/vpn-daemons/openvpn/properties/auth-helpers.c	(original)
+++ trunk/vpn-daemons/openvpn/properties/auth-helpers.c	Fri Oct 17 11:13:24 2008
@@ -968,10 +968,9 @@
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
 	}
 
-	if (strcmp (contype, NM_OPENVPN_CONTYPE_TLS) && strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
-		widget = glade_xml_get_widget (xml, "options_notebook");
-		gtk_notebook_remove_page (GTK_NOTEBOOK (widget), 1);
-	} else {
+	if (   !strcmp (contype, NM_OPENVPN_CONTYPE_TLS)
+	    || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)
+	    || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) {
 		GtkListStore *store;
 		GtkTreeIter iter;
 		int direction = -1, active = -1;
@@ -1020,6 +1019,9 @@
 			widget = glade_xml_get_widget (xml, "tls_auth_chooser");
 			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
 		}
+	} else {
+		widget = glade_xml_get_widget (xml, "options_notebook");
+		gtk_notebook_remove_page (GTK_NOTEBOOK (widget), 1);
 	}
 
 out: