[network-manager-openvpn] properties: revert the NAME/DESC change



commit ed1041f32c714218a0b152add571ad2992a0523b
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Aug 21 13:05:25 2015 +0200

    properties: revert the NAME/DESC change
    
    We decided to keep the original behavior and fix libnm asserting
    that NAME == SERVICE_NAME instead.

 properties/nm-openvpn.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/properties/nm-openvpn.c b/properties/nm-openvpn.c
index 7ecfa21..ec5a056 100644
--- a/properties/nm-openvpn.c
+++ b/properties/nm-openvpn.c
@@ -44,9 +44,6 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-ip4-config.h>
 
-#define OPENVPN_PLUGIN_NAME    _("OpenVPN")
-#define OPENVPN_PLUGIN_DESC    _("Compatible with the OpenVPN server.")
-
 #define OPENVPN_EDITOR_PLUGIN_ERROR                     NM_SETTING_VPN_ERROR
 #define OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_SETTING_VPN_ERROR_INVALID_PROPERTY
 #define OPENVPN_EDITOR_PLUGIN_ERROR_MISSING_PROPERTY    NM_SETTING_VPN_ERROR_MISSING_PROPERTY
@@ -57,9 +54,6 @@
 
 #include <NetworkManager.h>
 
-#define OPENVPN_PLUGIN_NAME    _("openvpn")
-#define OPENVPN_PLUGIN_DESC    _("OpenVPN")
-
 #define OPENVPN_EDITOR_PLUGIN_ERROR                     NM_CONNECTION_ERROR
 #define OPENVPN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_CONNECTION_ERROR_INVALID_PROPERTY
 #define OPENVPN_EDITOR_PLUGIN_ERROR_MISSING_PROPERTY    NM_CONNECTION_ERROR_MISSING_PROPERTY
@@ -72,6 +66,8 @@
 #include "auth-helpers.h"
 #include "import-export.h"
 
+#define OPENVPN_PLUGIN_NAME    _("OpenVPN")
+#define OPENVPN_PLUGIN_DESC    _("Compatible with the OpenVPN server.")
 
 /************** plugin class **************/
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]