[network-manager-openvpn: 4/4] Merge changes for TUN/TAP device name and type

[Jiří Klimeš <jklimes src gnome org>]

commit cdbda3863e1fc5adf3f5763e6c5dff77ac5b4665
Merge: 6361073 bc17b47
Author: Jiří Klimeš <jklimes redhat com>
Date:   Fri May 9 09:35:07 2014 +0200

    Merge changes for TUN/TAP device name and type
    
    Now it is possible to specify custom virtual device names and set type
    explicitly.

 properties/auth-helpers.c                |  162 ++++++++++++++++++++++++++---
 properties/import-export.c               |   39 ++++++--
 properties/nm-openvpn-dialog.ui          |   78 +++++++++++++--
 properties/tests/conf/Makefile.am        |    4 +-
 properties/tests/conf/device-notype.ovpn |   26 +++++
 properties/tests/conf/device.ovpn        |   27 +++++
 properties/tests/test-import-export.c    |   89 +++++++++++++++--
 src/nm-openvpn-service.c                 |   29 +++++-
 src/nm-openvpn-service.h                 |    2 +
 9 files changed, 410 insertions(+), 46 deletions(-)
---