[network-manager-fortisslvpn] all: split defines off nm-fortisslvpn-service.h

[Lubomir Rintel <lkundrak src gnome org>]

commit 7078180a9daa5149c50e3268dcd1fc2cdc38c6fc
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Sep 25 18:39:52 2015 +0200

    all: split defines off nm-fortisslvpn-service.h
    
    Separating parts that are dependent on libnm-glib will make it easier to port
    the rest.

 src/Makefile.am                      |    1 +
 src/nm-fortisslvpn-service-defines.h |   38 ++++++++++++++++++++++++++++++++++
 src/nm-fortisslvpn-service.h         |   32 +++++++++------------------
 3 files changed, 50 insertions(+), 21 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e25b93..19d3fe7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ libexec_PROGRAMS = nm-fortisslvpn-service
 
 nm_fortisslvpn_service_SOURCES =                               \
        nm-fortisslvpn-service.c                                \
+       nm-fortisslvpn-service-defines.h                        \
        nm-fortisslvpn-service.h
 
 nm-fortisslvpn-pppd-service-glue.h: $(top_srcdir)/src/nm-fortisslvpn-pppd-service.xml
diff --git a/src/nm-fortisslvpn-service-defines.h b/src/nm-fortisslvpn-service-defines.h
new file mode 100644
index 0000000..6a61e13
--- /dev/null
+++ b/src/nm-fortisslvpn-service-defines.h
@@ -0,0 +1,38 @@
+/* nm-fortisslvpn-service - SSLVPN integration with NetworkManager
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ * Dan Williams <dcbw redhat com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2008 Red Hat, Inc.
+ * (C) Copyright 2015 Lubomir Rintel
+ */
+
+#ifndef NM_FORTISSLVPN_SERVICE_DEFINES_H
+#define NM_FORTISSLVPN_SERVICE_DEFINES_H
+
+/* For the NM <-> VPN plugin service */
+#define NM_DBUS_SERVICE_FORTISSLVPN    "org.freedesktop.NetworkManager.fortisslvpn"
+#define NM_DBUS_INTERFACE_FORTISSLVPN  "org.freedesktop.NetworkManager.fortisslvpn"
+#define NM_DBUS_PATH_FORTISSLVPN       "/org/freedesktop/NetworkManager/fortisslvpn"
+
+#define NM_FORTISSLVPN_KEY_GATEWAY           "gateway"
+#define NM_FORTISSLVPN_KEY_USER              "user"
+#define NM_FORTISSLVPN_KEY_PASSWORD          "password"
+#define NM_FORTISSLVPN_KEY_CA                "ca"
+#define NM_FORTISSLVPN_KEY_TRUSTED_CERT      "trusted-cert"
+
+#endif /* NM_FORTISSLVPN_PLUGIN_H */
diff --git a/src/nm-fortisslvpn-service.h b/src/nm-fortisslvpn-service.h
index 8babfe6..c78b33f 100644
--- a/src/nm-fortisslvpn-service.h
+++ b/src/nm-fortisslvpn-service.h
@@ -21,38 +21,28 @@
  * (C) Copyright 2015 Lubomir Rintel
  */
 
-#ifndef NM_FORTISSLVPN_PLUGIN_H
-#define NM_FORTISSLVPN_PLUGIN_H
+#ifndef NM_FORTISSLVPN_SERVICE_H
+#define NM_FORTISSLVPN_SERVICE_H
 
 #include <glib.h>
 #include <glib-object.h>
 #include <nm-vpn-plugin.h>
 
-#define NM_TYPE_FORTISSLVPN_PLUGIN            (nm_fortisslvpn_plugin_get_type ())
-#define NM_FORTISSLVPN_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NM_TYPE_FORTISSLVPN_PLUGIN, NMFortisslvpnPlugin))
-#define NM_FORTISSLVPN_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_FORTISSLVPN_PLUGIN, 
NMFortisslvpnPluginClass))
-#define NM_IS_FORTISSLVPN_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NM_TYPE_FORTISSLVPN_PLUGIN))
-#define NM_IS_FORTISSLVPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_FORTISSLVPN_PLUGIN))
-#define NM_FORTISSLVPN_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_FORTISSLVPN_PLUGIN, 
NMFortisslvpnPluginClass))
+#include "nm-fortisslvpn-service-defines.h"
 
-/* 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))
 
+/* For the pppd plugin <-> VPN plugin service */
 #define NM_DBUS_SERVICE_FORTISSLVPN_PPP    "org.freedesktop.NetworkManager.fortisslvpn-ppp"
 #define NM_DBUS_PATH_FORTISSLVPN_PPP       "/org/freedesktop/NetworkManager/fortisslvpn/ppp"
 #define NM_DBUS_INTERFACE_FORTISSLVPN_PPP  "org.freedesktop.NetworkManager.fortisslvpn.ppp"
 
-
-/* For the NM <-> VPN plugin service */
-#define NM_DBUS_SERVICE_FORTISSLVPN    "org.freedesktop.NetworkManager.fortisslvpn"
-#define NM_DBUS_INTERFACE_FORTISSLVPN  "org.freedesktop.NetworkManager.fortisslvpn"
-#define NM_DBUS_PATH_FORTISSLVPN       "/org/freedesktop/NetworkManager/fortisslvpn"
-
-#define NM_FORTISSLVPN_KEY_GATEWAY           "gateway"
-#define NM_FORTISSLVPN_KEY_USER              "user"
-#define NM_FORTISSLVPN_KEY_PASSWORD          "password"
-#define NM_FORTISSLVPN_KEY_CA                "ca"
-#define NM_FORTISSLVPN_KEY_TRUSTED_CERT      "trusted-cert"
+#define NM_TYPE_FORTISSLVPN_PLUGIN            (nm_fortisslvpn_plugin_get_type ())
+#define NM_FORTISSLVPN_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
NM_TYPE_FORTISSLVPN_PLUGIN, NMFortisslvpnPlugin))
+#define NM_FORTISSLVPN_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_FORTISSLVPN_PLUGIN, 
NMFortisslvpnPluginClass))
+#define NM_IS_FORTISSLVPN_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
NM_TYPE_FORTISSLVPN_PLUGIN))
+#define NM_IS_FORTISSLVPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_FORTISSLVPN_PLUGIN))
+#define NM_FORTISSLVPN_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_FORTISSLVPN_PLUGIN, 
NMFortisslvpnPluginClass))
 
 typedef struct {
        NMVPNPlugin parent;
@@ -66,4 +56,4 @@ GType nm_fortisslvpn_plugin_get_type (void);
 
 NMFortisslvpnPlugin *nm_fortisslvpn_plugin_new (void);
 
-#endif /* NM_FORTISSLVPN_PLUGIN_H */
+#endif /* NM_FORTISSLVPN_SERVICE_H */