[network-manager-iodine/lr/multiple-vpn: 12/17] all: rename some defines

[Lubomir Rintel <lkundrak src gnome org>]

commit 9bebc046ac115ec5623f21f91265eb9f82704046
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Oct 13 19:27:51 2015 +0200

    all: rename some defines
    
    Don't mix up service name with a bus name. They're technically distinct
    and soon will become possibly different.

 properties/nm-iodine.c          |    6 +++---
 src/nm-iodine-service-defines.h |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/properties/nm-iodine.c b/properties/nm-iodine.c
index a0a51de..95c868b 100644
--- a/properties/nm-iodine.c
+++ b/properties/nm-iodine.c
@@ -59,7 +59,7 @@
 
 #define IODINE_PLUGIN_NAME    _("Iodine DNS Tunnel")
 #define IODINE_PLUGIN_DESC    _("Tunnel connections via DNS.")
-#define IODINE_PLUGIN_SERVICE NM_DBUS_SERVICE_IODINE
+#define IODINE_PLUGIN_SERVICE NM_VPN_SERVICE_TYPE_IODINE
 
 #define PW_TYPE_SAVE   0
 #define PW_TYPE_ASK    1
@@ -145,7 +145,7 @@ import (NMVpnEditorPlugin *iface, const char *path, GError **error)
        s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ());
        g_object_set (s_vpn,
                      NM_SETTING_VPN_SERVICE_TYPE,
-                     NM_DBUS_SERVICE_IODINE,
+                     NM_VPN_SERVICE_TYPE_IODINE,
                      NULL);
        nm_connection_add_setting (connection, NM_SETTING (s_vpn));
 
@@ -543,7 +543,7 @@ update_connection (NMVpnEditor *iface,
 
        s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ());
        g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE,
-                     NM_DBUS_SERVICE_IODINE,
+                     NM_VPN_SERVICE_TYPE_IODINE,
                      NULL);
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "topdomain_entry"));
diff --git a/src/nm-iodine-service-defines.h b/src/nm-iodine-service-defines.h
index 2663cbf..bee6705 100644
--- a/src/nm-iodine-service-defines.h
+++ b/src/nm-iodine-service-defines.h
@@ -21,6 +21,8 @@
 #ifndef NM_IODINE_SERVICE_DEFINES_H
 #define NM_IODINE_SERVICE_DEFINES_H
 
+#define NM_VPN_SERVICE_TYPE_IODINE    "org.freedesktop.NetworkManager.iodine"
+
 #define NM_DBUS_SERVICE_IODINE    "org.freedesktop.NetworkManager.iodine"
 #define NM_DBUS_INTERFACE_IODINE  "org.freedesktop.NetworkManager.iodine"
 #define NM_DBUS_PATH_IODINE       "/org/freedesktop/NetworkManager/iodine"