summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-04-05 00:06:51 +0200
committerLubomir Rintel <lkundrak@v3.sk>2016-04-05 14:37:51 +0200
commit2c3c83370b80499b06984bf83837ac8d1c07c852 (patch)
tree8a7bafd43188e47e71941d4be202c38836d23453
parentccf1d5bd94f61a53f4a954693985957c1a08e6e4 (diff)
downloadNetworkManager-2c3c83370b80499b06984bf83837ac8d1c07c852.tar.gz
dbus: move NMWimaxNspNetworkType to nm-dbus-interface.h
It's an enum used on D-Bus.
-rw-r--r--libnm-core/nm-dbus-interface.h15
-rw-r--r--libnm/nm-wimax-nsp.h16
2 files changed, 15 insertions, 16 deletions
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index d576c703ab..84e080afdc 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -340,6 +340,21 @@ typedef enum { /*< flags >*/
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x00000008,
} NMDeviceModemCapabilities;
+/**
+ * NMWimaxNspNetworkType:
+ * @NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: unknown network type
+ * @NM_WIMAX_NSP_NETWORK_TYPE_HOME: home network
+ * @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: partner network
+ * @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: roaming partner network
+ *
+ * WiMAX network type.
+ */
+typedef enum {
+ NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0,
+ NM_WIMAX_NSP_NETWORK_TYPE_HOME = 1,
+ NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 2,
+ NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3
+} NMWimaxNspNetworkType;
/**
* NMDeviceState:
diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index cdc7b23665..5dd982efe7 100644
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.h
@@ -41,22 +41,6 @@ G_BEGIN_DECLS
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
#define NM_WIMAX_NSP_NETWORK_TYPE "network-type"
-/**
- * NMWimaxNspNetworkType:
- * @NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: unknown network type
- * @NM_WIMAX_NSP_NETWORK_TYPE_HOME: home network
- * @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: partner network
- * @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: roaming partner network
- *
- * WiMAX network type.
- */
-typedef enum {
- NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0,
- NM_WIMAX_NSP_NETWORK_TYPE_HOME = 1,
- NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 2,
- NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3
-} NMWimaxNspNetworkType;
-
struct _NMWimaxNsp {
NMObject parent;
};