← Back to branch summary

~superm1/network-manager/connection-sharing

« back to all changes in this revision

Viewing changes to vpn-daemons/openvpn/properties/auth-helpers.c

  • Committer: Alexander Sack
  • Date: 2008-10-20 14:19:01 UTC
  • mfrom: (2752.1.896)
  • Revision ID: asac@jwsdot.com-20081020141901-np0xvrxejch6gkgd
https://launchpad.net/bugs/280429
* new upstream snapshot Sat 2008-10-18 10:58:59 +0000 (rev 3648)
  from lp:~vcs-imports/network-manager/main. Includes:
  + (bzr3642) proper wireless capability detection
    - update src/nm-device-wifi.c
  + update translations nb
* Changes in upstream snapshot that don't affect directly produced binary
  packages:
  + (bzr3645) NA/openvpn: support .cer and .crt certificates for openvpn (related
    - update vpn-daemons/openvpn/properties/auth-helpers.c
  + (bzr3646) NA/openvpn: The "Certificates (TLS)" tab should also be
    present for NM_OPENVPN_CONTYPE_PASSWORD (LP: #280429)
    - update vpn-daemons/openvpn/properties/auth-helpers.c
  + updated vpn translations es, sv

Show diffs side-by-side

added added

removed removed

Lines of Context:
vpn-daemons/openvpn/properties/auth-helpers.c
611
611
        ext = g_ascii_strdown (p, -1);
612
612
        if (!ext)
613
613
                return FALSE;
614
 
        if (strcmp (ext, ".pem") && strcmp (ext, ".crt") && strcmp (ext, ".key")) {
 
614
        if (strcmp (ext, ".pem") && strcmp (ext, ".crt") && strcmp (ext, ".key") && strcmp (ext, ".cer")) {
615
615
                g_free (ext);
616
616
                return FALSE;
617
617
        }
657
657
 
658
658
        filter = gtk_file_filter_new ();
659
659
        gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, tls_default_filter, NULL, NULL);
660
 
        gtk_file_filter_set_name (filter, _("PEM certificates (*.pem, *.crt, *.key)"));
 
660
        gtk_file_filter_set_name (filter, _("PEM certificates (*.pem, *.crt, *.key, *.cer)"));
661
661
        return filter;
662
662
}
663
663
 
968
968
                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
969
969
        }
970
970
 
971
 
        if (strcmp (contype, NM_OPENVPN_CONTYPE_TLS) && strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
972
 
                widget = glade_xml_get_widget (xml, "options_notebook");
973
 
                gtk_notebook_remove_page (GTK_NOTEBOOK (widget), 1);
974
 
        } else {
 
971
        if (   !strcmp (contype, NM_OPENVPN_CONTYPE_TLS)
 
972
            || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)
 
973
            || !strcmp (contype, NM_OPENVPN_CONTYPE_PASSWORD)) {
975
974
                GtkListStore *store;
976
975
                GtkTreeIter iter;
977
976
                int direction = -1, active = -1;
1020
1019
                        widget = glade_xml_get_widget (xml, "tls_auth_chooser");
1021
1020
                        gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
1022
1021
                }
 
1022
        } else {
 
1023
                widget = glade_xml_get_widget (xml, "options_notebook");
 
1024
                gtk_notebook_remove_page (GTK_NOTEBOOK (widget), 1);
1023
1025
        }
1024
1026
 
1025
1027
out: