[network-manager-applet: 19/19] merge: branch 'lr/pkcs11'

[Lubomir Rintel <lkundrak src gnome org>]

commit 5703459fba52053b00073fd7ff1c76c4332d633e
Merge: de2514b 569bf45
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Sun Mar 19 21:07:26 2017 +0100

    merge: branch 'lr/pkcs11'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=779231

 .gitignore                                   |    1 +
 Makefile.am                                  |   68 ++-
 configure.ac                                 |  106 +++-
 libnma-docs.xml                              |    6 +
 po/POTFILES.in                               |    7 +
 src/connection-editor/ce-page.c              |   62 ++-
 src/connection-editor/page-master.c          |    2 +-
 src/libnm-gtk/libnm-gtk.ver                  |   28 +
 src/libnm-gtk/nm-cert-chooser.h              |  216 +++++++
 src/libnma/libnma.ver                        |   26 +
 src/libnma/nma-cert-chooser-button.c         |  479 +++++++++++++++
 src/libnma/nma-cert-chooser-button.h         |   73 +++
 src/libnma/nma-cert-chooser-private.h        |  156 +++++
 src/libnma/nma-cert-chooser.c                |  820 ++++++++++++++++++++++++++
 src/libnma/nma-cert-chooser.h                |  165 ++++++
 src/libnma/nma-file-cert-chooser.c           |  406 +++++++++++++
 src/libnma/nma-pkcs11-cert-chooser-dialog.c  |  657 +++++++++++++++++++++
 src/libnma/nma-pkcs11-cert-chooser-dialog.h  |   63 ++
 src/libnma/nma-pkcs11-cert-chooser-dialog.ui |  153 +++++
 src/libnma/nma-pkcs11-cert-chooser.c         |  539 +++++++++++++++++
 src/libnma/nma-pkcs11-token-login-dialog.c   |  250 ++++++++
 src/libnma/nma-pkcs11-token-login-dialog.h   |   57 ++
 src/libnma/nma-pkcs11-token-login-dialog.ui  |  111 ++++
 src/libnma/nma-ui-utils.c                    |    2 +-
 src/libnma/nma-version.h.in                  |  120 ++++
 src/libnma/nma-wifi-dialog.h                 |   10 +-
 src/libnma/nma.gresource.xml                 |    2 +
 src/utils/utils.c                            |   57 ++
 src/utils/utils.h                            |    5 +-
 src/wireless-security/eap-method-fast.c      |    7 +-
 src/wireless-security/eap-method-leap.c      |   11 +-
 src/wireless-security/eap-method-peap.c      |    7 +-
 src/wireless-security/eap-method-simple.c    |    9 +-
 src/wireless-security/eap-method-tls.c       |  699 ++++++++++++----------
 src/wireless-security/eap-method-tls.ui      |  161 +-----
 src/wireless-security/eap-method-ttls.c      |    7 +-
 src/wireless-security/eap-method.c           |   77 +---
 src/wireless-security/eap-method.h           |    6 +-
 src/wireless-security/wireless-security.c    |   10 +-
 39 files changed, 5010 insertions(+), 631 deletions(-)
---