diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-10-17 11:13:24 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-10-17 11:13:24 +0000 |
| commit | 4215802fd30431335362d258c936db4747e99867 (patch) | |
| tree | 37f12ca42e48552de0dc33aadee43bb17f5215eb /vpn-daemons | |
| parent | 7cfd2ea57b31696a6f1ef4ad6bc9819dcc83f6fc (diff) | |
| download | NetworkManager-4215802fd30431335362d258c936db4747e99867.tar.gz | |
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
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4189 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'vpn-daemons')
| -rw-r--r-- | vpn-daemons/openvpn/ChangeLog | 6 | ||||
| -rw-r--r-- | vpn-daemons/openvpn/properties/auth-helpers.c | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog index e607515bc1..7f1e6ef8a7 100644 --- a/vpn-daemons/openvpn/ChangeLog +++ b/vpn-daemons/openvpn/ChangeLog @@ -1,6 +1,12 @@ 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 + +2008-10-17 Dan Williams <dcbw@redhat.com> + + * properties/auth-helpers.c - (tls_default_filter, tls_file_chooser_filter_new): accept ".cer" extension too diff --git a/vpn-daemons/openvpn/properties/auth-helpers.c b/vpn-daemons/openvpn/properties/auth-helpers.c index c3f5d31351..c6f49f8e63 100644 --- a/vpn-daemons/openvpn/properties/auth-helpers.c +++ b/vpn-daemons/openvpn/properties/auth-helpers.c @@ -968,10 +968,9 @@ advanced_dialog_new (GHashTable *hash, const char *contype) 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 @@ advanced_dialog_new (GHashTable *hash, const char *contype) 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: |