Global: Fix illegal dbus-service name (ipsec-l2tp -> ipsec_l2tp)

nm-ipsec-l2tp-service.conf

@@ -3,17 +3,17 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
 	<policy user="root">
-		<allow own="org.freedesktop.NetworkManager.ipsec-l2tp"/>
-		<allow send_destination="org.freedesktop.NetworkManager.ipsec-l2tp"/>
+		<allow own="org.freedesktop.NetworkManager.ipsec_l2tp"/>
+		<allow send_destination="org.freedesktop.NetworkManager.ipsec_l2tp"/>
 
-		<allow own="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
-		<allow send_destination="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
+		<allow own="org.freedesktop.NetworkManager.ipsec_l2tp-ppp"/>
+		<allow send_destination="org.freedesktop.NetworkManager.ipsec_l2tp-ppp"/>
 	</policy>
 	<policy context="default">
-		<deny own="org.freedesktop.NetworkManager.ipsec-l2tp"/>
-		<deny send_destination="org.freedesktop.NetworkManager.ipsec-l2tp"/>
+		<deny own="org.freedesktop.NetworkManager.ipsec_l2tp"/>
+		<deny send_destination="org.freedesktop.NetworkManager.ipsec_l2tp"/>
 
-		<deny own="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
-		<deny send_destination="org.freedesktop.NetworkManager.ipsec-l2tp-ppp"/>
+		<deny own="org.freedesktop.NetworkManager.ipsec_l2tp-ppp"/>
+		<deny send_destination="org.freedesktop.NetworkManager.ipsec_l2tp-ppp"/>
 	</policy>
 </busconfig>

nm-ipsec-l2tp-service.name.in

 [VPN Connection]
 name=ipsec-l2tp
-service=org.freedesktop.NetworkManager.ipsec-l2tp
+service=org.freedesktop.NetworkManager.ipsec_l2tp
 program=@LIBEXECDIR@/nm-ipsec-l2tp-service
 
 [GNOME]

nm-ipsec-l2tp.desktop.in

@@ -2,7 +2,7 @@
 _Name=IPSec-L2TP VPN Connection Manager
 _GenericName=IPSec-L2TP VPN Connection Manager
 _Comment=Add, Remove, and Edit IPSec-L2TP VPN Connections
-Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.ipsec-l2tp --import-file %f
+Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.ipsec_l2tp --import-file %f
 Icon=gnome-mime-application-x-ipsec-l2tp-settings
 Terminal=false
 Type=Application

src/nm-ipsec-l2tp-pppd-service.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 
 <node name="/">
-  <interface name="org.freedesktop.NetworkManager.ipsec-l2tp.ppp">
+  <interface name="org.freedesktop.NetworkManager.ipsec_l2tp.ppp">
     <method name="NeedSecrets">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ipsec_l2tp_service_need_secrets"/>
       <arg name="username" type="s" direction="out"/>

src/nm-ipsec-l2tp-service.h

@@ -37,15 +37,27 @@
 /* For the pppd plugin <-> VPN plugin service */
 #define DBUS_TYPE_G_MAP_OF_VARIANT (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
 
-#define NM_DBUS_SERVICE_IPSEC_L2TP_PPP    "org.freedesktop.NetworkManager.ipsec-l2tp-ppp"
-#define NM_DBUS_PATH_IPSEC_L2TP_PPP       "/org/freedesktop/NetworkManager/ipsec-l2tp/ppp"
-#define NM_DBUS_INTERFACE_IPSEC_L2TP_PPP  "org.freedesktop.NetworkManager.ipsec-l2tp.ppp"
+#define NM_DBUS_SERVICE_IPSEC_L2TP_PPP    "org.freedesktop.NetworkManager.ipsec_l2tp-ppp"
+#define NM_DBUS_PATH_IPSEC_L2TP_PPP       "/org/freedesktop/NetworkManager/ipsec_l2tp/ppp"
+#define NM_DBUS_INTERFACE_IPSEC_L2TP_PPP  "org.freedesktop.NetworkManager.ipsec_l2tp.ppp"
 
 
 /* For the NM <-> VPN plugin service */
-#define NM_DBUS_SERVICE_IPSEC_L2TP    "org.freedesktop.NetworkManager.ipsec-l2tp"
-#define NM_DBUS_INTERFACE_IPSEC_L2TP  "org.freedesktop.NetworkManager.ipsec-l2tp"
-#define NM_DBUS_PATH_IPSEC_L2TP       "/org/freedesktop/NetworkManager/ipsec-l2tp"
+#define NM_DBUS_SERVICE_IPSEC_L2TP    "org.freedesktop.NetworkManager.ipsec_l2tp"
+#define NM_DBUS_INTERFACE_IPSEC_L2TP  "org.freedesktop.NetworkManager.ipsec_l2tp"
+#define NM_DBUS_PATH_IPSEC_L2TP       "/org/freedesktop/NetworkManager/ipsec_l2tp"
+
+
+/*
+#define NM_DBUS_SERVICE_L2TP_PPP    "org.freedesktop.NetworkManager.l2tp-ppp"
+#define NM_DBUS_PATH_L2TP_PPP       "/org/freedesktop/NetworkManager/l2tp/ppp"
+#define NM_DBUS_INTERFACE_L2TP_PPP  "org.freedesktop.NetworkManager.l2tp.ppp"
+// For the NM <-> VPN plugin service
+#define NM_DBUS_SERVICE_L2TP    "org.freedesktop.NetworkManager.l2tp"
+#define NM_DBUS_INTERFACE_L2TP  "org.freedesktop.NetworkManager.l2tp"
+#define NM_DBUS_PATH_L2TP       "/org/freedesktop/NetworkManager/l2tp"
+*/
+
 
 #define NM_IPSEC_L2TP_KEY_GATEWAY           "gateway"
 #define NM_IPSEC_L2TP_KEY_USER              "user"