From ec38fd46d91fc141eaa608b4c58fb9814ff006e1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 1 Jul 2008 03:17:20 +0000 Subject: [PATCH] 2008-06-30 Dan Williams * properties/auth-helpers.c - (tls_default_filter, tls_file_chooser_filter_new): accept .crt and .key too git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3791 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/openvpn/ChangeLog | 6 ++++++ vpn-daemons/openvpn/properties/auth-helpers.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog index e2104b4e3f..e969f2c1c3 100644 --- a/vpn-daemons/openvpn/ChangeLog +++ b/vpn-daemons/openvpn/ChangeLog @@ -1,3 +1,9 @@ +2008-06-30 Dan Williams + + * properties/auth-helpers.c + - (tls_default_filter, tls_file_chooser_filter_new): accept .crt and + .key too + 2008-06-30 Dan Williams * properties/import-export.c diff --git a/vpn-daemons/openvpn/properties/auth-helpers.c b/vpn-daemons/openvpn/properties/auth-helpers.c index 1c429ec31b..381596ef86 100644 --- a/vpn-daemons/openvpn/properties/auth-helpers.c +++ b/vpn-daemons/openvpn/properties/auth-helpers.c @@ -474,7 +474,7 @@ tls_default_filter (const GtkFileFilterInfo *filter_info, gpointer data) ext = g_ascii_strdown (p, -1); if (!ext) return FALSE; - if (strcmp (ext, ".pem")) { + if (strcmp (ext, ".pem") && strcmp (ext, ".crt") && strcmp (ext, ".key")) { g_free (ext); return FALSE; } @@ -517,7 +517,7 @@ tls_file_chooser_filter_new (void) filter = gtk_file_filter_new (); gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, tls_default_filter, NULL, NULL); - gtk_file_filter_set_name (filter, _("PEM certificates (*.pem)")); + gtk_file_filter_set_name (filter, _("PEM certificates (*.pem, *.crt, *.key)")); return filter; }