[network-manager-applet: 7/7] merge: branch 'lr/wifi-dialog-fixes'

[Lubomir Rintel <lkundrak src gnome org>]

commit 07cefeb20128262810652bb53ea028edb2665b7e
Merge: f7b8588c 0081a5cf
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Nov 26 15:01:00 2018 +0100

    merge: branch 'lr/wifi-dialog-fixes'
    
    https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/30

 src/libnma/nma-cert-chooser-private.h   |  1 +
 src/libnma/nma-pkcs11-cert-chooser.c    | 28 +++++++++++++-----
 src/libnma/nma-wifi-dialog.c            | 50 +++++++++++++--------------------
 src/wireless-security/eap-method-peap.c |  7 +++--
 src/wireless-security/eap-method-tls.c  |  7 +++--
 src/wireless-security/eap-method-ttls.c |  7 +++--
 6 files changed, 56 insertions(+), 44 deletions(-)
---