File Add-support-for-NetworkManager-1.0.0.patch of Package libNetworkManagerQt4
From eaa61c5989d617b7b15ea1c3d58841441d48d559 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Thu, 15 Jan 2015 12:14:35 +0100
Subject: Add support for NetworkManager 1.0.0
Since NM 1.0.0, there is new location for NM headers. While the old
location is still provided, it's not updated anymore and if we want
to use some new properties we have to include headers from the new
location. Also FindNetworkManager.cmake is improved to search for the
library when NM 1.0.0 is detected.
Added new connection property autoconnect-priority from NM 1.0.0
REVIEW:122070
---
tests/CMakeLists.txt | 18 ++-
tests/8021xsettingtest.cpp | 5 +
tests/adslsettingtest.cpp | 5 +
tests/bluetoothsettingtest.cpp | 5 +
tests/bondsettingtest.cpp | 14 ++-
tests/bridgeportsettingtest.cpp | 5 +
tests/bridgesettingtest.cpp | 9 ++
tests/cdmasettingtest.cpp | 5 +
tests/connectionsettingtest.cpp | 5 +
tests/gsmsettingtest.cpp | 12 +-
tests/infinibandsettingtest.cpp | 5 +
tests/ipv4settingtest.cpp | 48 ++++----
tests/ipv6settingtest.cpp | 44 ++++---
tests/olpcmeshsettingtest.cpp | 5 +
tests/pppoesettingtest.cpp | 5 +
tests/pppsettingtest.cpp | 5 +
tests/serialsettingtest.cpp | 5 +
tests/vlansettingtest.cpp | 9 ++
tests/wimaxsettingtest.cpp | 5 +
tests/wiredsettingtest.cpp | 5 +
tests/wirelesssecuritysettingtest.cpp | 6 +
tests/wirelesssettingtest.cpp | 9 ++
FindNetworkManager.cmake | 68 +++++++----
CMakeLists.txt | 9 ++
connection.cpp | 5 +
fakenetwork/CMakeLists.txt | 7 +-
ipconfig.h | 5 +
manager.cpp | 5 +
secretagent.cpp | 4 +
settings/adslsetting.cpp | 2 +
settings/bluetoothsetting.cpp | 2 +
settings/bondsetting.cpp | 20 +++-
settings/bondsetting.h | 1 +
settings/bridgeportsetting.cpp | 2 +
settings/bridgesetting.cpp | 20 +++-
settings/bridgesetting.h | 1 +
settings/cdmasetting.cpp | 2 +
settings/connectionsettings.cpp | 46 +++++++-
settings/connectionsettings.h | 10 ++
settings/connectionsettings_p.h | 3 +
settings/genericsetting.cpp | 2 +
settings/gsmsetting.cpp | 34 +++++-
settings/gsmsetting.h | 2 +
settings/infinibandsetting.cpp | 2 +
settings/infinibandsetting.h | 1 -
settings/infinibandsetting_p.h | 1 -
settings/ipv4setting.cpp | 131 +++++++++++----------
settings/ipv4setting.h | 44 +++++++
settings/ipv6setting.cpp | 115 +++++++++---------
settings/ipv6setting.h | 48 ++++++++
settings/olpcmeshsetting.cpp | 2 +
settings/pppoesetting.cpp | 2 +
settings/pppsetting.cpp | 2 +
settings/security8021xsetting.cpp | 2 +
settings/serialsetting.cpp | 2 +
settings/setting.cpp | 6 +-
settings/setting.h | 5 +
settings/teamsetting.cpp | 19 ++-
settings/teamsetting.h | 1 +
settings/vlansetting.cpp | 18 +++
settings/vlansetting.h | 1 +
settings/vpnsetting.cpp | 2 +
settings/wimaxsetting.cpp | 2 +
settings/wiredsetting.cpp | 2 +
settings/wirelesssecuritysetting.cpp | 2 +
settings/wirelesssetting.cpp | 18 +++
wirelessdevice.cpp | 5 +
67 files changed, 711 insertions(+), 206 deletions(-)
diff --git a/cmake/FindNetworkManager.cmake b/cmake/FindNetworkManager.cmake
index 89c55e4..ece8835 100644
--- a/FindNetworkManager.cmake
+++ b/FindNetworkManager.cmake
@@ -9,38 +9,54 @@
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
# Copyright (c) 2007, Will Stephenson, <wstephenson@kde.org>
-#
+# Copyright (c) 2015, Jan Grulich, <jgrulich@redhat.com>
+
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-IF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS)
- # in cache already
- SET(NetworkManager_FIND_QUIETLY TRUE)
-ENDIF (NETWORKMANAGER_INCLUDE_DIRS AND NM-UTIL_INCLUDE_DIRS)
+IF (NETWORKMANAGER_INCLUDE_DIRS AND (NM-UTIL_INCLUDE_DIRS OR NM-CORE_INCLUDE_DIRS))
+ # in cache already
+ SET(NetworkManager_FIND_QUIETLY TRUE)
+ENDIF (NETWORKMANAGER_INCLUDE_DIRS AND (NM-UTIL_INCLUDE_DIRS OR NM-CORE_INCLUDE_DIRS))
IF (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager )
- PKG_SEARCH_MODULE( NM-UTIL libnm-util )
- PKG_SEARCH_MODULE( NM-GLIB libnm-glib )
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+ PKG_SEARCH_MODULE( NETWORKMANAGER NetworkManager )
+
+ IF (NETWORKMANAGER_FOUND)
+ IF (NetworkManager_FIND_VERSION AND ("${NETWORKMANAGER_VERSION}" VERSION_LESS "${NetworkManager_FIND_VERSION}"))
+ MESSAGE(FATAL_ERROR "NetworkManager ${NETWORKMANAGER_VERSION} is too old, need at least ${NetworkManager_FIND_VERSION}")
+ ELSE ()
+ # Since NetworkManager 1.0.0 we need to find different libraries
+ IF (NetworkManager_FIND_VERSION AND ("${NETWORKMANAGER_VERSION}" VERSION_LESS "1.0.0"))
+ PKG_SEARCH_MODULE( NM-UTIL libnm-util )
+ PKG_SEARCH_MODULE( NM-GLIB libnm-glib )
+ IF (NM-UTIL_FOUND AND NM-GLIB_FOUND)
+ IF (NOT NetworkManager_FIND_QUIETLY)
+ MESSAGE(STATUS "Found libnm-util: ${NM-UTIL_LIBRARY_DIRS}")
+ MESSAGE(STATUS "Found libnm-glib: ${NM-GLIB_LIBRARY_DIRS}")
+ ENDIF ()
+ ELSE ()
+ MESSAGE(FATAL_ERROR "Could NOT find libnm-util or libnm-glib, check FindPkgConfig output above!")
+ ENDIF ()
+ ELSE ()
+ PKG_SEARCH_MODULE( NM-CORE libnm )
+ IF (NM-CORE_FOUND)
+ IF (NOT NetworkManager_FIND_QUIETLY)
+ MESSAGE(STATUS "Found libnm-core: ${NM-CORE_LIBRARY_DIRS}")
+ ENDIF ()
+ ELSE ()
+ MESSAGE(FATAL_ERROR "Could NOT find libnm-core, check FindPkgConfig output above!")
+ ENDIF ()
+ ENDIF ()
+ ENDIF ()
+ ELSE ()
+ MESSAGE(FATAL_ERROR "Could NOT find NetworkManager, check FindPkgConfig output above!")
+ ENDIF ()
ENDIF (NOT WIN32)
-IF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND AND NM-GLIB_FOUND)
- IF (NetworkManager_FIND_VERSION AND ("${NETWORKMANAGER_VERSION}" VERSION_LESS "${NetworkManager_FIND_VERSION}"))
- MESSAGE(FATAL_ERROR "NetworkManager ${NETWORKMANAGER_VERSION} is too old, need at least ${NetworkManager_FIND_VERSION}")
- ELSEIF (NOT NetworkManager_FIND_QUIETLY)
- MESSAGE(STATUS "Found NetworkManager ${NETWORKMANAGER_VERSION}: ${NETWORKMANAGER_LIBRARY_DIRS}")
- MESSAGE(STATUS "Found libnm-util: ${NM-UTIL_LIBRARY_DIRS}")
- MESSAGE(STATUS "Found libnm-glib: ${NM-GLIB_LIBRARY_DIRS}")
- ENDIF()
-ELSE (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND AND NM-GLIB_FOUND)
- IF (NetworkManager_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could NOT find NetworkManager, libnm-util or libnm-glib, check FindPkgConfig output above!")
- ENDIF (NetworkManager_FIND_REQUIRED)
-ENDIF (NETWORKMANAGER_FOUND AND NM-UTIL_FOUND AND NM-GLIB_FOUND)
-
-MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS)
+MARK_AS_ADVANCED(NETWORKMANAGER_INCLUDE_DIRS NM-UTIL_INCLUDE_DIRS NM-GLIB_INCLUDE_DIRS NM-CORE_INCLUDE_DIRS)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7abff4..f7b0c17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +46,11 @@
${NM-UTIL_INCLUDE_DIRS}
${NM-GLIB_INCLUDE_DIRS}
)
+if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.0.0 OR ${NETWORKMANAGER_VERSION} VERSION_GREATER 1.0.0)
+include_directories(
+ ${NM-CORE_INCLUDE_DIRS}
+)
+endif()
if (MODEMMANAGERQT_FOUND)
include_directories(
${MODEMMANAGERQT_INCLUDE_DIRS}
diff --git a/connection.cpp b/connection.cpp
index 3137c05..03d4c55 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -23,6 +23,10 @@
#include "connection.h"
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
#include <NetworkManager.h>
#include <nm-setting-cdma.h>
#include <nm-setting-connection.h>
@@ -34,6 +38,7 @@
#include <nm-setting-wireless.h>
#include <nm-setting-wimax.h>
#include <nm-setting-olpc-mesh.h>
+#endif
#include <QDBusConnection>
#include <QDBusPendingReply>
diff --git a/ipconfig.h b/ipconfig.h
index cc85fc5..5eb0227 100644
--- a/ipconfig.h
+++ b/ipconfig.h
@@ -26,6 +26,13 @@
#include "ipaddress.h"
#include "iproute.h"
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
+#include <NetworkManager.h>
+#endif
+
#include <QtCore/QStringList>
#include <QNetworkAddressEntry>
diff --git a/manager.cpp b/manager.cpp
index b0dfe00..7ca1859 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -26,7 +26,12 @@
#include "macros.h"
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
#include <NetworkManager.h>
+#endif
#include "wireddevice.h"
#include "wirelessdevice.h"
diff --git a/secretagent.cpp b/secretagent.cpp
index 55da800..ae1f19f 100644
--- a/secretagent.cpp
+++ b/secretagent.cpp
@@ -22,7 +22,11 @@
#include "secretagent_p.h"
#include "manager_p.h"
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
#include <NetworkManager.h>
+#endif
#include <QDBusArgument>
#include <QDBusConnection>
diff --git a/settings/adslsetting.cpp b/settings/adslsetting.cpp
index a6a9831..dcf123e 100644
--- a/settings/adslsetting.cpp
+++ b/settings/adslsetting.cpp
@@ -21,7 +21,9 @@
#include "adslsetting.h"
#include "adslsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-adsl.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/bluetoothsetting.cpp b/settings/bluetoothsetting.cpp
index 4a7d566..5b22d2a 100644
--- a/settings/bluetoothsetting.cpp
+++ b/settings/bluetoothsetting.cpp
@@ -21,7 +21,9 @@
#include "bluetoothsetting.h"
#include "bluetoothsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-bluetooth.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/bondsetting.cpp b/settings/bondsetting.cpp
index 3a20d8f..3d52611 100644
--- a/settings/bondsetting.cpp
+++ b/settings/bondsetting.cpp
@@ -21,7 +21,9 @@
#include "bondsetting.h"
#include "bondsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-bond.h>
+#endif
#include <QtCore/QDebug>
@@ -91,9 +93,15 @@ NMStringMap NetworkManager::BondSetting::options() const
void NetworkManager::BondSetting::fromMap(const QVariantMap &setting)
{
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (setting.contains(QLatin1String("interface-name"))) {
+ setInterfaceName(setting.value(QLatin1String("interface-name")).toString());
+ }
+#else
if (setting.contains(QLatin1String(NM_SETTING_BOND_INTERFACE_NAME))) {
setInterfaceName(setting.value(QLatin1String(NM_SETTING_BOND_INTERFACE_NAME)).toString());
}
+#endif
if (setting.contains(QLatin1String(NM_SETTING_BOND_OPTIONS))) {
setOptions(qdbus_cast<NMStringMap>(setting.value(QLatin1String(NM_SETTING_BOND_OPTIONS))));
@@ -103,11 +111,15 @@ void NetworkManager::BondSetting::fromMap(const QVariantMap &setting)
QVariantMap NetworkManager::BondSetting::toMap() const
{
QVariantMap setting;
-
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (!interfaceName().isEmpty()) {
+ setting.insert(QLatin1String("interface-name"), interfaceName());
+ }
+#else
if (!interfaceName().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_BOND_INTERFACE_NAME), interfaceName());
}
-
+#endif
if (!options().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_BOND_OPTIONS), QVariant::fromValue<NMStringMap>(options()));
}
@@ -120,7 +132,11 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::BondSetting
dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
+#if NM_CHECK_VERSION(1, 0, 0)
+ dbg.nospace() << "interface-name" << ": " << setting.interfaceName() << '\n';
+#else
dbg.nospace() << NM_SETTING_BOND_INTERFACE_NAME << ": " << setting.interfaceName() << '\n';
+#endif
dbg.nospace() << NM_SETTING_BOND_OPTIONS << ": " << setting.options() << '\n';
return dbg.maybeSpace();
diff --git a/settings/bondsetting.h b/settings/bondsetting.h
index 8c3cb68..f3ae1ec 100644
--- a/settings/bondsetting.h
+++ b/settings/bondsetting.h
@@ -49,6 +49,7 @@ public:
QString name() const;
+ // Deprecated in favor of connection.interface-name in NM 1.0.0
void setInterfaceName(const QString &name);
QString interfaceName() const;
diff --git a/settings/bridgeportsetting.cpp b/settings/bridgeportsetting.cpp
index bce2575..ed9fd66 100644
--- a/settings/bridgeportsetting.cpp
+++ b/settings/bridgeportsetting.cpp
@@ -21,7 +21,9 @@
#include "bridgeportsetting.h"
#include "bridgeportsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-bridge-port.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/bridgesetting.cpp b/settings/bridgesetting.cpp
index 45c6d91..05ce74c 100644
--- a/settings/bridgesetting.cpp
+++ b/settings/bridgesetting.cpp
@@ -21,7 +21,9 @@
#include "bridgesetting.h"
#include "bridgesetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-bridge.h>
+#endif
#include <QtCore/QDebug>
@@ -165,10 +167,15 @@ quint32 NetworkManager::BridgeSetting::agingTime() const
void NetworkManager::BridgeSetting::fromMap(const QVariantMap &setting)
{
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (setting.contains(QLatin1String("interface-name"))) {
+ setInterfaceName(setting.value(QLatin1String("interface-name")).toString());
+ }
+#else
if (setting.contains(QLatin1String(NM_SETTING_BRIDGE_INTERFACE_NAME))) {
setInterfaceName(setting.value(QLatin1String(NM_SETTING_BRIDGE_INTERFACE_NAME)).toString());
}
-
+#endif
if (setting.contains(QLatin1String(NM_SETTING_BRIDGE_STP))) {
setStp(setting.value(QLatin1String(NM_SETTING_BRIDGE_STP)).toBool());
}
@@ -198,10 +205,15 @@ QVariantMap NetworkManager::BridgeSetting::toMap() const
{
QVariantMap setting;
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (!interfaceName().isEmpty()) {
+ setting.insert(QLatin1String("interface-name"), interfaceName());
+ }
+#else
if (!interfaceName().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_BRIDGE_INTERFACE_NAME), interfaceName());
}
-
+#endif
if (!stp()) {
setting.insert(QLatin1String(NM_SETTING_BRIDGE_STP), stp());
}
@@ -234,7 +246,11 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::BridgeSetti
dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
+#if NM_CHECK_VERSION(1, 0, 0)
+ dbg.nospace() << "interface-name" << ": " << setting.interfaceName() << '\n';
+#else
dbg.nospace() << NM_SETTING_BRIDGE_INTERFACE_NAME << ": " << setting.interfaceName() << '\n';
+#endif
dbg.nospace() << NM_SETTING_BRIDGE_STP << ": " << setting.stp() << '\n';
dbg.nospace() << NM_SETTING_BRIDGE_PRIORITY << ": " << setting.priority() << '\n';
dbg.nospace() << NM_SETTING_BRIDGE_FORWARD_DELAY << ": " << setting.forwardDelay() << '\n';
diff --git a/settings/bridgesetting.h b/settings/bridgesetting.h
index 67105c6..4628cf5 100644
--- a/settings/bridgesetting.h
+++ b/settings/bridgesetting.h
@@ -41,6 +41,7 @@ public:
QString name() const;
+ // Deprecated in favor of connection.interface-name in NM 1.0.0
void setInterfaceName(const QString &name);
QString interfaceName() const;
diff --git a/settings/cdmasetting.cpp b/settings/cdmasetting.cpp
index af6fc43..80a0a2c 100644
--- a/settings/cdmasetting.cpp
+++ b/settings/cdmasetting.cpp
@@ -21,7 +21,9 @@
#include "cdmasetting.h"
#include "cdmasetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-cdma.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/connectionsettings.cpp b/settings/connectionsettings.cpp
index bf491e5..3bd3e19 100644
--- a/settings/connectionsettings.cpp
+++ b/settings/connectionsettings.cpp
@@ -44,6 +44,9 @@
#include "vpnsetting.h"
#include "wimaxsetting.h"
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
#include <nm-setting-adsl.h>
#include <nm-setting-bond.h>
#include <nm-setting-bluetooth.h>
@@ -61,6 +64,7 @@
#include <nm-setting-wimax.h>
#include <nm-setting-wired.h>
#include <nm-setting-wireless.h>
+#endif
#include <QtCore/QUuid>
@@ -83,6 +83,7 @@ NetworkManager::ConnectionSettingsPrivate::ConnectionSettingsPrivate(ConnectionS
, type(ConnectionSettings::Wired)
, autoconnect(true)
, readOnly(false)
+ , autoconnectPriority(0)
, q_ptr(q)
{ }
@@ -433,6 +441,9 @@ NetworkManager::ConnectionSettings::ConnectionSettings(const NetworkManager::Con
setConnectionType(other->connectionType());
setPermissions(other->permissions());
setAutoconnect(other->autoconnect());
+#if NM_CHECK_VERSION(1, 0, 0)
+ setAutoconnectPriority(other->autoconnectPriority());
+#endif
setTimestamp(other->timestamp());
setReadOnly(other->readOnly());
setZone(other->zone());
@@ -482,6 +493,12 @@ void NetworkManager::ConnectionSettings::fromMap(const NMVariantMapMap &map)
setAutoconnect(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_AUTOCONNECT)).toBool());
}
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY))) {
+ setAutoconnectPriority(connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY)).toInt());
+ }
+#endif
+
if (connectionSettings.contains(QLatin1String(NM_SETTING_CONNECTION_TIMESTAMP))) {
const int timestamp = connectionSettings.value(QLatin1String(NM_SETTING_CONNECTION_TIMESTAMP)).toInt();
QDateTime dateTime;
@@ -565,6 +582,12 @@ NMVariantMapMap NetworkManager::ConnectionSettings::toMap() const
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_AUTOCONNECT), autoconnect());
}
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (autoconnectPriority()) {
+ connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY), autoconnectPriority());
+ }
+#endif
+
if (timestamp().isValid()) {
connectionSetting.insert(QLatin1String(NM_SETTING_CONNECTION_TIMESTAMP), timestamp().toTime_t());
}
@@ -707,6 +730,22 @@ bool NetworkManager::ConnectionSettings::autoconnect() const
return d->autoconnect;
}
+#if NM_CHECK_VERSION(1, 0, 0)
+void NetworkManager::ConnectionSettings::setAutoconnectPriority(int priority)
+{
+ Q_D(ConnectionSettings);
+
+ d->autoconnectPriority = priority;
+}
+
+int NetworkManager::ConnectionSettings::autoconnectPriority() const
+{
+ Q_D(const ConnectionSettings);
+
+ return d->autoconnectPriority;
+}
+#endif
+
void NetworkManager::ConnectionSettings::setTimestamp(const QDateTime ×tamp)
{
Q_D(ConnectionSettings);
@@ -850,6 +889,9 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::ConnectionS
dbg.nospace() << NM_SETTING_CONNECTION_TYPE << ": " << setting.typeAsString(setting.connectionType()) << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_PERMISSIONS << ": " << setting.permissions() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_AUTOCONNECT << ": " << setting.autoconnect() << '\n';
+#if NM_CHECK_VERSION(1, 0, 0)
+ dbg.nospace() << NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY << ": " << setting.autoconnectPriority() << '\n';
+#endif
dbg.nospace() << NM_SETTING_CONNECTION_TIMESTAMP << ": " << setting.timestamp().toTime_t() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_READ_ONLY << ": " << setting.readOnly() << '\n';
dbg.nospace() << NM_SETTING_CONNECTION_ZONE << ": " << setting.zone() << '\n';
diff --git a/settings/connectionsettings.h b/settings/connectionsettings.h
index ee06384..252f8e9 100644
--- a/settings/connectionsettings.h
+++ b/settings/connectionsettings.h
@@ -25,7 +25,12 @@
#include "../NetworkManagerQt-export.h"
#include "setting.h"
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
#include <NetworkManager.h>
+#endif
#include <QtCore/QString>
#include <QtCore/QDateTime>
@@ -104,6 +109,11 @@ public:
void setAutoconnect(bool autoconnect);
bool autoconnect() const;
+#if NM_CHECK_VERSION(1, 0, 0)
+ void setAutoconnectPriority(int priority);
+ int autoconnectPriority() const;
+#endif
+
void setTimestamp(const QDateTime ×tamp);
QDateTime timestamp() const;
diff --git a/settings/connectionsettings_p.h b/settings/connectionsettings_p.h
index 82ccb50..d337c99 100644
--- a/settings/connectionsettings_p.h
+++ b/settings/connectionsettings_p.h
@@ -55,6 +55,9 @@ public:
QString master;
QString slaveType;
QStringList secondaries;
+#if NM_CHECK_VERSION(1, 0, 0)
+ int autoconnectPriority;
+#endif
Setting::List settings;
ConnectionSettings *q_ptr;
--- a/settings/gsmsetting.cpp
+++ b/settings/gsmsetting.cpp
@@ -21,7 +21,9 @@
#include "gsmsetting.h"
#include "gsmsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-gsm.h>
+#endif
#include <QtCore/QDebug>
@@ -290,9 +292,15 @@ void NetworkManager::GsmSetting::fromMap(const QVariantMap &setting)
setNetworkId(setting.value(QLatin1String(NM_SETTING_GSM_NETWORK_ID)).toString());
}
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (setting.contains(QLatin1String("network-type"))) {
+ setNetworkType((NetworkType)setting.value(QLatin1String("network-type")).toInt());
+ }
+#else
if (setting.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
setNetworkType((NetworkType)setting.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).toInt());
}
+#endif
// Secrets
if (setting.contains(QLatin1String(NM_SETTING_GSM_PIN))) {
@@ -303,10 +311,15 @@ void NetworkManager::GsmSetting::fromMap(const QVariantMap &setting)
setPinFlags((SecretFlags)setting.value(QLatin1String(NM_SETTING_GSM_PIN_FLAGS)).toInt());
}
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (setting.contains(QLatin1String("allowed-bands"))) {
+ setAllowedBand(setting.value(QLatin1String("allowed-bands")).toUInt());
+ }
+#else
if (setting.contains(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS))) {
setAllowedBand(setting.value(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS)).toUInt());
}
-
+#endif
if (setting.contains(QLatin1String(NM_SETTING_GSM_HOME_ONLY))) {
setHomeOnly(setting.value(QLatin1String(NM_SETTING_GSM_HOME_ONLY)).toBool());
}
@@ -339,10 +352,15 @@ QVariantMap NetworkManager::GsmSetting::toMap() const
setting.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), networkId());
}
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (networkType() != -1) {
+ setting.insert(QLatin1String("network-type"), networkType());
+ }
+#else
if (networkType() != -1) {
setting.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), networkType());
}
-
+#endif
// Secrets
if (!pin().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_GSM_PIN), pin());
@@ -350,10 +368,15 @@ QVariantMap NetworkManager::GsmSetting::toMap() const
setting.insert(QLatin1String(NM_SETTING_GSM_PIN_FLAGS), (int)pinFlags());
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (allowedBand() != 1) {
+ setting.insert(QLatin1String("allowed-bands"), allowedBand());
+ }
+#else
if (allowedBand() != 1) {
setting.insert(QLatin1String(NM_SETTING_GSM_ALLOWED_BANDS), allowedBand());
}
-
+#endif
if (homeOnly()) {
setting.insert(QLatin1String(NM_SETTING_GSM_HOME_ONLY), homeOnly());
}
@@ -372,8 +395,13 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::GsmSetting
dbg.nospace() << NM_SETTING_GSM_PASSWORD_FLAGS << ": " << setting.passwordFlags() << '\n';
dbg.nospace() << NM_SETTING_GSM_APN << ": " << setting.apn() << '\n';
dbg.nospace() << NM_SETTING_GSM_NETWORK_ID << ": " << setting.networkId() << '\n';
+#if NM_CHECK_VERSION(1, 0, 0)
+ dbg.nospace() << "network-type" << ": " << setting.networkType() << '\n';
+ dbg.nospace() << "allowed-bands" << ": " << setting.allowedBand() << '\n';
+#else
dbg.nospace() << NM_SETTING_GSM_NETWORK_TYPE << ": " << setting.networkType() << '\n';
dbg.nospace() << NM_SETTING_GSM_ALLOWED_BANDS << ": " << setting.allowedBand() << '\n';
+#endif
dbg.nospace() << NM_SETTING_GSM_PIN << ": " << setting.pin() << '\n';
dbg.nospace() << NM_SETTING_GSM_PIN_FLAGS << ": " << setting.pinFlags() << '\n';
dbg.nospace() << NM_SETTING_GSM_HOME_ONLY << ": " << setting.homeOnly() << '\n';
diff --git a/settings/gsmsetting.h b/settings/gsmsetting.h
index 8c33daf..1a152b2 100644
--- a/settings/gsmsetting.h
+++ b/settings/gsmsetting.h
@@ -65,6 +65,7 @@ public:
void setNetworkId(const QString &id);
QString networkId() const;
+ // Deprecated since NM 1.0.0
void setNetworkType(NetworkType type);
NetworkType networkType() const;
@@ -74,6 +75,7 @@ public:
void setPinFlags(SecretFlags flags);
SecretFlags pinFlags() const;
+ // Deprecated since NM 1.0.0
void setAllowedBand(quint32 band);
quint32 allowedBand() const;
diff --git a/settings/infinibandsetting.cpp b/settings/infinibandsetting.cpp
index 84707ca..6ced9b1 100644
--- a/settings/infinibandsetting.cpp
+++ b/settings/infinibandsetting.cpp
@@ -21,7 +21,9 @@
#include "infinibandsetting.h"
#include "infinibandsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-infiniband.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/ipv4setting.cpp b/settings/ipv4setting.cpp
index 1dc2568..bcd3dec 100644
--- a/settings/ipv4setting.cpp
+++ b/settings/ipv4setting.cpp
@@ -25,12 +25,15 @@
#include "generic-types.h"
#include <arpa/inet.h>
+
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-ip4-config.h>
+#endif
#include <QtCore/QDebug>
NetworkManager::Ipv4SettingPrivate::Ipv4SettingPrivate():
- name(NM_SETTING_IP4_CONFIG_SETTING_NAME),
+ name(NMQT_SETTING_IP4_CONFIG_SETTING_NAME),
method(NetworkManager::Ipv4Setting::Automatic),
ignoreAutoRoutes(false),
ignoreAutoDns(false),
@@ -244,32 +247,32 @@ bool NetworkManager::Ipv4Setting::mayFail() const
void NetworkManager::Ipv4Setting::fromMap(const QVariantMap &setting)
{
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD))) {
- const QString methodType = setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD)).toString();
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD))) {
+ const QString methodType = setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD)).toString();
- if (methodType.toLower() == QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_AUTO)) {
+ if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_AUTO)) {
setMethod(Automatic);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL)) {
setMethod(LinkLocal);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
setMethod(Manual);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_SHARED)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_SHARED)) {
setMethod(Shared);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED)) {
setMethod(Disabled);
} else {
setMethod(Automatic);
}
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DNS))) {
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS))) {
QList<QHostAddress> dbusDns;
QList<uint> temp;
- if (setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS)).canConvert<QDBusArgument>()) {
- QDBusArgument dnsArg = setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS)).value<QDBusArgument>();
+ if (setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS)).canConvert<QDBusArgument>()) {
+ QDBusArgument dnsArg = setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS)).value<QDBusArgument>();
temp = qdbus_cast<QList<uint> >(dnsArg);
} else {
- temp = setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS)).value<QList<uint> >();
+ temp = setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS)).value<QList<uint> >();
}
foreach (const uint utmp, temp) {
@@ -280,18 +283,18 @@ void NetworkManager::Ipv4Setting::fromMap(const QVariantMap &setting)
setDns(dbusDns);
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DNS_SEARCH))) {
- setDnsSearch(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_DNS_SEARCH)).toStringList());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_SEARCH))) {
+ setDnsSearch(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_SEARCH)).toStringList());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES))) {
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES))) {
QList<NetworkManager::IpAddress> addresses;
QList<QList<uint> > temp;
- if (setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES)).canConvert< QDBusArgument>()) {
- QDBusArgument addressArg = setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES)).value<QDBusArgument>();
+ if (setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES)).canConvert< QDBusArgument>()) {
+ QDBusArgument addressArg = setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES)).value<QDBusArgument>();
temp = qdbus_cast<QList<QList<uint> > >(addressArg);
} else {
- temp = setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES)).value<QList<QList<uint> > >();
+ temp = setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES)).value<QList<QList<uint> > >();
}
foreach (const QList<uint> &uintList, temp) {
@@ -313,14 +316,14 @@ void NetworkManager::Ipv4Setting::fromMap(const QVariantMap &setting)
setAddresses(addresses);
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES))) {
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES))) {
QList<NetworkManager::IpRoute> routes;
QList<QList<uint> > temp;
- if (setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES)).canConvert< QDBusArgument>()) {
- QDBusArgument routeArg = setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES)).value<QDBusArgument>();
+ if (setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).canConvert< QDBusArgument>()) {
+ QDBusArgument routeArg = setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).value<QDBusArgument>();
temp = qdbus_cast<QList<QList<uint> > >(routeArg);
} else {
- temp = setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES)).value<QList<QList<uint> > >();
+ temp = setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).value<QList<QList<uint> > >();
}
foreach (const QList<uint> &uintList, temp) {
@@ -344,32 +347,32 @@ void NetworkManager::Ipv4Setting::fromMap(const QVariantMap &setting)
}
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES))) {
- setIgnoreAutoRoutes(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES))) {
+ setIgnoreAutoRoutes(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS))) {
- setIgnoreAutoDns(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS))) {
+ setIgnoreAutoDns(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID))) {
- setDhcpClientId(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID)).toString());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID))) {
+ setDhcpClientId(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID)).toString());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME))) {
- setDhcpSendHostname(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME))) {
+ setDhcpSendHostname(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME))) {
- setDhcpHostname(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME)).toString());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME))) {
+ setDhcpHostname(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME)).toString());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT))) {
- setNeverDefault(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT))) {
+ setNeverDefault(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP4_CONFIG_MAY_FAIL))) {
- setMayFail(setting.value(QLatin1String(NM_SETTING_IP4_CONFIG_MAY_FAIL)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL))) {
+ setMayFail(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL)).toBool());
}
}
@@ -378,15 +381,15 @@ QVariantMap NetworkManager::Ipv4Setting::toMap() const
QVariantMap setting;
if (method() == Automatic) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_AUTO));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_AUTO));
} else if (method() == LinkLocal) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL));
} else if (method() == Manual) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_MANUAL));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL));
} else if (method() == Shared) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_SHARED));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_SHARED));
} else if (method() == Disabled) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_METHOD), QLatin1String(NM_SETTING_IP4_CONFIG_METHOD_DISABLED));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED));
}
if (!dns().isEmpty()) {
@@ -395,11 +398,11 @@ QVariantMap NetworkManager::Ipv4Setting::toMap() const
dbusDns << htonl(dns.toIPv4Address());
}
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DNS), QVariant::fromValue(dbusDns));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS), QVariant::fromValue(dbusDns));
}
if (!dnsSearch().isEmpty()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DNS_SEARCH), dnsSearch());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_SEARCH), dnsSearch());
}
if (!addresses().isEmpty()) {
@@ -412,7 +415,7 @@ QVariantMap NetworkManager::Ipv4Setting::toMap() const
dbusAddresses << dbusAddress;
}
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
}
if (!routes().isEmpty()) {
@@ -426,35 +429,35 @@ QVariantMap NetworkManager::Ipv4Setting::toMap() const
dbusRoutes << dbusRoute;
}
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
}
if (ignoreAutoRoutes()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES), ignoreAutoRoutes());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES), ignoreAutoRoutes());
}
if (ignoreAutoDns()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS), ignoreAutoDns());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS), ignoreAutoDns());
}
if (!dhcpClientId().isEmpty()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID), dhcpClientId());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID), dhcpClientId());
}
if (!dhcpSendHostname()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME), dhcpSendHostname());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME), dhcpSendHostname());
}
if (!dhcpHostname().isEmpty()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME), dhcpHostname());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME), dhcpHostname());
}
if (neverDefault()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_NEVER_DEFAULT), neverDefault());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT), neverDefault());
}
if (!mayFail()) {
- setting.insert(QLatin1String(NM_SETTING_IP4_CONFIG_MAY_FAIL), mayFail());
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL), mayFail());
}
return setting;
@@ -465,27 +468,27 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::Ipv4Setting
dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_METHOD << ": " << setting.method() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_DNS << ":\n";
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_METHOD << ": " << setting.method() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS << ":\n";
foreach (const QHostAddress &address, setting.dns()) {
dbg.nospace() << address.toString() << '\n';
}
- dbg.nospace() << NM_SETTING_IP4_CONFIG_DNS_SEARCH << ": " << setting.dnsSearch() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_ADDRESSES << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS_SEARCH << ": " << setting.dnsSearch() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ADDRESSES << '\n';
foreach (const NetworkManager::IpAddress &address, setting.addresses()) {
dbg.nospace() << address.ip() << ": " << address.gateway() << ": " << address.netmask() << '\n';
}
- dbg.nospace() << NM_SETTING_IP4_CONFIG_ROUTES << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ROUTES << '\n';
foreach (const NetworkManager::IpRoute &route, setting.routes()) {
dbg.nospace() << route.ip() << ": " << route.netmask() << ": " << route.nextHop() << ": " << route.metric() << '\n';
}
- dbg.nospace() << NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES << ": " << setting.ignoreAutoRoutes() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS << ": " << setting.ignoreAutoDns() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID << ": " << setting.dhcpClientId() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME << ": " << setting.dhcpSendHostname() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME << ": " << setting.dhcpHostname() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_NEVER_DEFAULT << ": " << setting.neverDefault() << '\n';
- dbg.nospace() << NM_SETTING_IP4_CONFIG_MAY_FAIL << ": " << setting.mayFail() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES << ": " << setting.ignoreAutoRoutes() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS << ": " << setting.ignoreAutoDns() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID << ": " << setting.dhcpClientId() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME << ": " << setting.dhcpSendHostname() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME << ": " << setting.dhcpHostname() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT << ": " << setting.neverDefault() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_MAY_FAIL << ": " << setting.mayFail() << '\n';
return dbg.maybeSpace();
}
diff --git a/settings/ipv4setting.h b/settings/ipv4setting.h
index f913eab..bdfcc58 100644
--- a/settings/ipv4setting.h
+++ b/settings/ipv4setting.h
@@ -28,6 +28,50 @@
#include <QtCore/QStringList>
#include <QtNetwork/QHostAddress>
+#if NM_CHECK_VERSION(1, 0, 0)
+#define NMQT_SETTING_IP4_CONFIG_SETTING_NAME NM_SETTING_IP4_CONFIG_SETTING_NAME
+#define NMQT_SETTING_IP4_CONFIG_METHOD NM_SETTING_IP_CONFIG_METHOD
+#define NMQT_SETTING_IP4_CONFIG_DNS NM_SETTING_IP_CONFIG_DNS
+#define NMQT_SETTING_IP4_CONFIG_DNS_SEARCH NM_SETTING_IP_CONFIG_DNS_SEARCH
+#define NMQT_SETTING_IP4_CONFIG_ADDRESSES NM_SETTING_IP_CONFIG_ADDRESSES
+#define NMQT_SETTING_IP4_CONFIG_GATEWAY NM_SETTING_IP_CONFIG_GATEWAY
+#define NMQT_SETTING_IP4_CONFIG_ROUTES NM_SETTING_IP_CONFIG_ROUTES
+#define NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC NM_SETTING_IP_CONFIG_ROUTE_METRIC
+#define NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES
+#define NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS
+#define NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME NM_SETTING_IP_CONFIG_DHCP_HOSTNAME
+#define NMQT_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME
+#define NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT NM_SETTING_IP_CONFIG_NEVER_DEFAULT
+#define NMQT_SETTING_IP4_CONFIG_MAY_FAIL NM_SETTING_IP_CONFIG_MAY_FAIL
+#define NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
+#define NMQT_SETTING_IP4_CONFIG_METHOD_AUTO NM_SETTING_IP4_CONFIG_METHOD_AUTO
+#define NMQT_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
+#define NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL NM_SETTING_IP4_CONFIG_METHOD_MANUAL
+#define NMQT_SETTING_IP4_CONFIG_METHOD_SHARED NM_SETTING_IP4_CONFIG_METHOD_SHARED
+#define NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+#else
+#define NMQT_SETTING_IP4_CONFIG_SETTING_NAME NM_SETTING_IP4_CONFIG_SETTING_NAME
+#define NMQT_SETTING_IP4_CONFIG_METHOD NM_SETTING_IP4_CONFIG_METHOD
+#define NMQT_SETTING_IP4_CONFIG_DNS NM_SETTING_IP4_CONFIG_DNS
+#define NMQT_SETTING_IP4_CONFIG_DNS_SEARCH NM_SETTING_IP4_CONFIG_DNS_SEARCH
+#define NMQT_SETTING_IP4_CONFIG_ADDRESSES NM_SETTING_IP4_CONFIG_ADDRESSES
+#define NMQT_SETTING_IP4_CONFIG_GATEWAY NM_SETTING_IP4_CONFIG_GATEWAY
+#define NMQT_SETTING_IP4_CONFIG_ROUTES NM_SETTING_IP4_CONFIG_ROUTES
+#define NMQT_SETTING_IP4_CONFIG_ROUTE_METRIC NM_SETTING_IP4_CONFIG_ROUTE_METRIC
+#define NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
+#define NMQT_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+#define NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
+#define NMQT_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+#define NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
+#define NMQT_SETTING_IP4_CONFIG_MAY_FAIL NM_SETTING_IP4_CONFIG_MAY_FAIL
+#define NMQT_SETTING_IP4_CONFIG_DHCP_CLIENT_ID NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
+#define NMQT_SETTING_IP4_CONFIG_METHOD_AUTO NM_SETTING_IP4_CONFIG_METHOD_AUTO
+#define NMQT_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
+#define NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL NM_SETTING_IP4_CONFIG_METHOD_MANUAL
+#define NMQT_SETTING_IP4_CONFIG_METHOD_SHARED NM_SETTING_IP4_CONFIG_METHOD_SHARED
+#define NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+#endif
+
namespace NetworkManager
{
diff --git a/settings/ipv6setting.cpp b/settings/ipv6setting.cpp
index d69cdc0..9e84901 100644
--- a/settings/ipv6setting.cpp
+++ b/settings/ipv6setting.cpp
@@ -27,10 +27,13 @@
#include "../ipconfig.h"
#include <arpa/inet.h>
+
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-ip6-config.h>
+#endif
NetworkManager::Ipv6SettingPrivate::Ipv6SettingPrivate():
- name(NM_SETTING_IP6_CONFIG_SETTING_NAME),
+ name(NMQT_SETTING_IP6_CONFIG_SETTING_NAME),
method(NetworkManager::Ipv6Setting::Automatic),
ignoreAutoRoutes(false),
ignoreAutoDns(false),
@@ -213,32 +216,32 @@ NetworkManager::Ipv6Setting::IPv6Privacy NetworkManager::Ipv6Setting::privacy()
void NetworkManager::Ipv6Setting::fromMap(const QVariantMap &setting)
{
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD))) {
- const QString methodType = setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD)).toString();
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD))) {
+ const QString methodType = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD)).toString();
- if (methodType.toLower() == QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_AUTO)) {
+ if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_AUTO)) {
setMethod(Automatic);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_DHCP)) {
setMethod(Dhcp);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) {
setMethod(LinkLocal);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
setMethod(Manual);
- } else if (methodType.toLower() == QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
+ } else if (methodType.toLower() == QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
setMethod(Ignored);
} else {
setMethod(Automatic);
}
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_DNS))) {
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS))) {
QList<QHostAddress> dbusDns;
QList<QByteArray> temp;
- if (setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).canConvert<QDBusArgument>()) {
- QDBusArgument dnsArg = setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).value< QDBusArgument>();
+ if (setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS)).canConvert<QDBusArgument>()) {
+ QDBusArgument dnsArg = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS)).value< QDBusArgument>();
temp = qdbus_cast<QList<QByteArray> >(dnsArg);
} else {
- temp = setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).value<QList<QByteArray> >();
+ temp = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS)).value<QList<QByteArray> >();
}
foreach (const QByteArray &utmp, temp) {
@@ -248,17 +251,17 @@ void NetworkManager::Ipv6Setting::fromMap(const QVariantMap &setting)
setDns(dbusDns);
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_DNS_SEARCH))) {
- setDnsSearch(setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS_SEARCH)).toStringList());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_SEARCH))) {
+ setDnsSearch(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_SEARCH)).toStringList());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES))) {
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES))) {
QList<IpV6DBusAddress> temp;
- if (setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_DNS)).canConvert<QDBusArgument>()) {
- QDBusArgument addressArg = setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES)).value< QDBusArgument>();
+ if (setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS)).canConvert<QDBusArgument>()) {
+ QDBusArgument addressArg = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES)).value< QDBusArgument>();
temp = qdbus_cast<QList<IpV6DBusAddress> >(addressArg);
} else {
- temp = setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES)).value<QList<IpV6DBusAddress> >();
+ temp = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES)).value<QList<IpV6DBusAddress> >();
}
QList<NetworkManager::IpAddress> addresses;
@@ -281,13 +284,13 @@ void NetworkManager::Ipv6Setting::fromMap(const QVariantMap &setting)
setAddresses(addresses);
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES))) {
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES))) {
QList<IpV6DBusRoute> temp;
- if (setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES)).canConvert<QDBusArgument>()) {
- QDBusArgument routeArg = setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES)).value< QDBusArgument>();
+ if (setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES)).canConvert<QDBusArgument>()) {
+ QDBusArgument routeArg = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES)).value< QDBusArgument>();
temp = qdbus_cast<QList<IpV6DBusRoute> >(routeArg);
} else {
- temp = setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES)).value<QList<IpV6DBusRoute> >();
+ temp = setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES)).value<QList<IpV6DBusRoute> >();
}
QList<NetworkManager::IpRoute> routes;
@@ -310,24 +313,24 @@ void NetworkManager::Ipv6Setting::fromMap(const QVariantMap &setting)
setRoutes(routes);
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES))) {
- setIgnoreAutoRoutes(setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES))) {
+ setIgnoreAutoRoutes(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS))) {
- setIgnoreAutoDns(setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS))) {
+ setIgnoreAutoDns(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_NEVER_DEFAULT))) {
- setNeverDefault(setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_NEVER_DEFAULT)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT))) {
+ setNeverDefault(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_MAY_FAIL))) {
- setMayFail(setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_MAY_FAIL)).toBool());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_MAY_FAIL))) {
+ setMayFail(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_MAY_FAIL)).toBool());
}
- if (setting.contains(QLatin1String(NM_SETTING_IP6_CONFIG_IP6_PRIVACY))) {
- setPrivacy((IPv6Privacy)setting.value(QLatin1String(NM_SETTING_IP6_CONFIG_IP6_PRIVACY)).toUInt());
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY))) {
+ setPrivacy((IPv6Privacy)setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY)).toUInt());
}
}
@@ -336,15 +339,15 @@ QVariantMap NetworkManager::Ipv6Setting::toMap() const
QVariantMap setting;
if (method() == Automatic) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_AUTO));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_AUTO));
} else if (method() == Dhcp) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_DHCP));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_DHCP));
} else if (method() == LinkLocal) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL));
} else if (method() == Manual) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_MANUAL));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_MANUAL));
} else if (method() == Ignored) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_METHOD), QLatin1String(NM_SETTING_IP6_CONFIG_METHOD_IGNORE));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD), QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD_IGNORE));
}
if (!dns().isEmpty()) {
@@ -352,11 +355,11 @@ QVariantMap NetworkManager::Ipv6Setting::toMap() const
foreach (const QHostAddress &dns, dns()) {
dbusDns << Utils::ipv6AddressFromHostAddress(dns);
}
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_DNS), QVariant::fromValue(dbusDns));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS), QVariant::fromValue(dbusDns));
}
if (!dnsSearch().isEmpty()) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_DNS_SEARCH), dnsSearch());
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_SEARCH), dnsSearch());
}
if (!addresses().isEmpty()) {
@@ -369,7 +372,7 @@ QVariantMap NetworkManager::Ipv6Setting::toMap() const
dbusAddresses << dbusAddress;
}
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES), QVariant::fromValue(dbusAddresses));
}
if (!routes().isEmpty()) {
@@ -383,27 +386,27 @@ QVariantMap NetworkManager::Ipv6Setting::toMap() const
dbusRoutes << dbusRoute;
}
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES), QVariant::fromValue(dbusRoutes));
}
if (ignoreAutoRoutes()) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES), ignoreAutoRoutes());
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES), ignoreAutoRoutes());
}
if (ignoreAutoDns()) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS), ignoreAutoDns());
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS), ignoreAutoDns());
}
if (neverDefault()) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_NEVER_DEFAULT), neverDefault());
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT), neverDefault());
}
if (!mayFail()) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_MAY_FAIL), mayFail());
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_MAY_FAIL), mayFail());
}
if (privacy() != Unknown) {
- setting.insert(QLatin1String(NM_SETTING_IP6_CONFIG_IP6_PRIVACY), privacy());
+ setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY), privacy());
}
return setting;
@@ -414,25 +417,25 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::Ipv6Setting
dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
- dbg.nospace() << NM_SETTING_IP6_CONFIG_METHOD << ": " << setting.method() << '\n';
- dbg.nospace() << NM_SETTING_IP6_CONFIG_DNS << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_METHOD << ": " << setting.method() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DNS << '\n';
foreach (const QHostAddress &address, setting.dns()) {
dbg.nospace() << address.toString() << '\n';
}
- dbg.nospace() << NM_SETTING_IP6_CONFIG_DNS_SEARCH << ": " << setting.dnsSearch() << '\n';
- dbg.nospace() << NM_SETTING_IP6_CONFIG_ADDRESSES << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DNS_SEARCH << ": " << setting.dnsSearch() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ADDRESSES << '\n';
foreach (const NetworkManager::IpAddress &address, setting.addresses()) {
dbg.nospace() << address.ip().toString() << ": " << address.gateway().toString() << ": " << address.netmask() << '\n';
}
- dbg.nospace() << NM_SETTING_IP6_CONFIG_ROUTES << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ROUTES << '\n';
foreach (const NetworkManager::IpRoute &route, setting.routes()) {
dbg.nospace() << route.ip().toString() << ": " << route.metric() << ": " << route.nextHop().toString() << ": " << route.metric() << '\n';
}
- dbg.nospace() << NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES << ": " << setting.ignoreAutoRoutes() << '\n';
- dbg.nospace() << NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS << ": " << setting.ignoreAutoDns() << '\n';
- dbg.nospace() << NM_SETTING_IP6_CONFIG_NEVER_DEFAULT << ": " << setting.neverDefault() << '\n';
- dbg.nospace() << NM_SETTING_IP6_CONFIG_MAY_FAIL << ": " << setting.mayFail() << '\n';
- dbg.nospace() << NM_SETTING_IP6_CONFIG_IP6_PRIVACY << ": " << setting.privacy() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES << ": " << setting.ignoreAutoRoutes() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS << ": " << setting.ignoreAutoDns() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT << ": " << setting.neverDefault() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_MAY_FAIL << ": " << setting.mayFail() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY << ": " << setting.privacy() << '\n';
return dbg.maybeSpace();
}
diff --git a/settings/ipv6setting.h b/settings/ipv6setting.h
index bc60980..7e7ca9e 100644
--- a/settings/ipv6setting.h
+++ b/settings/ipv6setting.h
@@ -28,6 +28,54 @@
#include <QtCore/QStringList>
#include <QtNetwork/QHostAddress>
+#if NM_CHECK_VERSION(1, 0, 0)
+#define NMQT_SETTING_IP6_CONFIG_SETTING_NAME NM_SETTING_IP6_CONFIG_SETTING_NAME
+#define NMQT_SETTING_IP6_CONFIG_METHOD NM_SETTING_IP_CONFIG_METHOD
+#define NMQT_SETTING_IP6_CONFIG_DNS NM_SETTING_IP_CONFIG_DNS
+#define NMQT_SETTING_IP6_CONFIG_DNS_SEARCH NM_SETTING_IP_CONFIG_DNS_SEARCH
+#define NMQT_SETTING_IP6_CONFIG_ADDRESSES NM_SETTING_IP_CONFIG_ADDRESSES
+#define NMQT_SETTING_IP6_CONFIG_GATEWAY NM_SETTING_IP_CONFIG_GATEWAY
+#define NMQT_SETTING_IP6_CONFIG_ROUTES NM_SETTING_IP_CONFIG_ROUTES
+#define NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC NM_SETTING_IP_CONFIG_ROUTE_METRIC
+#define NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES
+#define NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS
+#define NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME NM_SETTING_IP_CONFIG_DHCP_HOSTNAME
+#define NMQT_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME
+#define NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT NM_SETTING_IP_CONFIG_NEVER_DEFAULT
+#define NMQT_SETTING_IP6_CONFIG_MAY_FAIL NM_SETTING_IP_CONFIG_MAY_FAIL
+#define NMQT_SETTING_IP6_CONFIG_DHCP_CLIENT_ID NM_SETTING_IP6_CONFIG_DHCP_CLIENT_ID
+#define NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+#define NMQT_SETTING_IP6_CONFIG_METHOD_IGNORE NM_SETTING_IP6_CONFIG_METHOD_IGNORE
+#define NMQT_SETTING_IP6_CONFIG_METHOD_AUTO NM_SETTING_IP6_CONFIG_METHOD_AUTO
+#define NMQT_SETTING_IP6_CONFIG_METHOD_DHCP NM_SETTING_IP6_CONFIG_METHOD_DHCP
+#define NMQT_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
+#define NMQT_SETTING_IP6_CONFIG_METHOD_MANUAL NM_SETTING_IP6_CONFIG_METHOD_MANUAL
+#define NMQT_SETTING_IP6_CONFIG_METHOD_SHARED NM_SETTING_IP6_CONFIG_METHOD_SHARED
+#else
+#define NMQT_SETTING_IP6_CONFIG_SETTING_NAME NM_SETTING_IP6_CONFIG_SETTING_NAME
+#define NMQT_SETTING_IP6_CONFIG_METHOD NM_SETTING_IP6_CONFIG_METHOD
+#define NMQT_SETTING_IP6_CONFIG_DNS NM_SETTING_IP6_CONFIG_DNS
+#define NMQT_SETTING_IP6_CONFIG_DNS_SEARCH NM_SETTING_IP6_CONFIG_DNS_SEARCH
+#define NMQT_SETTING_IP6_CONFIG_ADDRESSES NM_SETTING_IP6_CONFIG_ADDRESSES
+#define NMQT_SETTING_IP6_CONFIG_GATEWAY NM_SETTING_IP6_CONFIG_GATEWAY
+#define NMQT_SETTING_IP6_CONFIG_ROUTES NM_SETTING_IP6_CONFIG_ROUTES
+#define NMQT_SETTING_IP6_CONFIG_ROUTE_METRIC NM_SETTING_IP6_CONFIG_ROUTE_METRIC
+#define NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
+#define NMQT_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+#define NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+#define NMQT_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME
+#define NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
+#define NMQT_SETTING_IP6_CONFIG_MAY_FAIL NM_SETTING_IP6_CONFIG_MAY_FAIL
+#define NMQT_SETTING_IP6_CONFIG_DHCP_CLIENT_ID NM_SETTING_IP6_CONFIG_DHCP_CLIENT_ID
+#define NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+#define NMQT_SETTING_IP6_CONFIG_METHOD_IGNORE NM_SETTING_IP6_CONFIG_METHOD_IGNORE
+#define NMQT_SETTING_IP6_CONFIG_METHOD_AUTO NM_SETTING_IP6_CONFIG_METHOD_AUTO
+#define NMQT_SETTING_IP6_CONFIG_METHOD_DHCP NM_SETTING_IP6_CONFIG_METHOD_DHCP
+#define NMQT_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
+#define NMQT_SETTING_IP6_CONFIG_METHOD_MANUAL NM_SETTING_IP6_CONFIG_METHOD_MANUAL
+#define NMQT_SETTING_IP6_CONFIG_METHOD_SHARED NM_SETTING_IP6_CONFIG_METHOD_SHARED
+#endif
+
namespace NetworkManager
{
diff --git a/settings/olpcmeshsetting.cpp b/settings/olpcmeshsetting.cpp
index 2bdd23f..27634b2 100644
--- a/settings/olpcmeshsetting.cpp
+++ b/settings/olpcmeshsetting.cpp
@@ -21,7 +21,9 @@
#include "olpcmeshsetting.h"
#include "olpcmeshsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-olpc-mesh.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/pppoesetting.cpp b/settings/pppoesetting.cpp
index dbddd38..42f1058 100644
--- a/settings/pppoesetting.cpp
+++ b/settings/pppoesetting.cpp
@@ -21,7 +21,9 @@
#include "pppoesetting.h"
#include "pppoesetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-pppoe.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/pppsetting.cpp b/settings/pppsetting.cpp
index 4d4b870..0ed9d41 100644
--- a/settings/pppsetting.cpp
+++ b/settings/pppsetting.cpp
@@ -21,7 +21,9 @@
#include "pppsetting.h"
#include "pppsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-ppp.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/security8021xsetting.cpp b/settings/security8021xsetting.cpp
index aab4da3..83f3888 100644
--- a/settings/security8021xsetting.cpp
+++ b/settings/security8021xsetting.cpp
@@ -21,7 +21,9 @@
#include "security8021xsetting.h"
#include "security8021xsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-8021x.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/serialsetting.cpp b/settings/serialsetting.cpp
index f373402..2f45e89 100644
--- a/settings/serialsetting.cpp
+++ b/settings/serialsetting.cpp
@@ -21,7 +21,9 @@
#include "serialsetting.h"
#include "serialsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-serial.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/setting.cpp b/settings/setting.cpp
index a0b6c38..ba75623 100644
--- a/settings/setting.cpp
+++ b/settings/setting.cpp
@@ -20,6 +20,11 @@
#include "setting.h"
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
+#include <NetworkManager.h>
#include <nm-setting-bond.h>
#include <nm-setting-bridge.h>
#include <nm-setting-cdma.h>
@@ -45,6 +48,7 @@
#include <nm-setting-wireless.h>
#include <nm-setting-wireless-security.h>
#include <nm-setting-wimax.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/setting.h b/settings/setting.h
index b725118..86c6e83 100644
--- a/settings/setting.h
+++ b/settings/setting.h
@@ -29,6 +29,11 @@
#include "../generic-types.h"
#endif
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#endif
+
#include <QtCore/QVariantMap>
#include <QtCore/QStringList>
#include <QtCore/QFlags>
diff --git a/settings/vlansetting.cpp b/settings/vlansetting.cpp
index f3e89f6..5c39dc9 100644
--- a/settings/vlansetting.cpp
+++ b/settings/vlansetting.cpp
@@ -21,7 +21,9 @@
#include "vlansetting.h"
#include "vlansetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-vlan.h>
+#endif
#include <QtCore/QDebug>
@@ -146,9 +148,15 @@ QStringList NetworkManager::VlanSetting::egressPriorityMap() const
void NetworkManager::VlanSetting::fromMap(const QVariantMap &setting)
{
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (setting.contains(QLatin1String("interface-name"))) {
+ setInterfaceName(setting.value(QLatin1String("interface-name")).toString());
+ }
+#else
if (setting.contains(QLatin1String(NM_SETTING_VLAN_INTERFACE_NAME))) {
setInterfaceName(setting.value(QLatin1String(NM_SETTING_VLAN_INTERFACE_NAME)).toString());
}
+#endif
if (setting.contains(QLatin1String(NM_SETTING_VLAN_PARENT))) {
setParent(setting.value(QLatin1String(NM_SETTING_VLAN_PARENT)).toString());
@@ -175,9 +183,15 @@ QVariantMap NetworkManager::VlanSetting::toMap() const
{
QVariantMap setting;
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (!interfaceName().isEmpty()) {
+ setting.insert(QLatin1String("interface-name"), interfaceName());
+ }
+#else
if (!interfaceName().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_VLAN_INTERFACE_NAME), interfaceName());
}
+#endif
if (!parent().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_VLAN_PARENT), parent());
@@ -207,7 +221,11 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::VlanSetting
dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
+#if NM_CHECK_VERSION(1, 0, 0)
+ dbg.nospace() << "interface-name" << ": " << setting.interfaceName() << '\n';
+#else
dbg.nospace() << NM_SETTING_VLAN_INTERFACE_NAME << ": " << setting.interfaceName() << '\n';
+#endif
dbg.nospace() << NM_SETTING_VLAN_PARENT << ": " << setting.parent() << '\n';
dbg.nospace() << NM_SETTING_VLAN_ID << ": " << setting.id() << '\n';
dbg.nospace() << NM_SETTING_VLAN_FLAGS << ": " << setting.flags() << '\n';
diff --git a/settings/vlansetting.h b/settings/vlansetting.h
index 3157a68..8432eab 100644
--- a/settings/vlansetting.h
+++ b/settings/vlansetting.h
@@ -44,6 +44,7 @@ public:
QString name() const;
+ // Deprecated in favor of connection.interface-name in NM 1.0.0
void setInterfaceName(const QString &name);
QString interfaceName() const;
diff --git a/settings/vpnsetting.cpp b/settings/vpnsetting.cpp
index 210093b..dae8cd5 100644
--- a/settings/vpnsetting.cpp
+++ b/settings/vpnsetting.cpp
@@ -21,7 +21,9 @@
#include "vpnsetting.h"
#include "vpnsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-vpn.h>
+#endif
#include <QDebug>
diff --git a/settings/wimaxsetting.cpp b/settings/wimaxsetting.cpp
index 7c23daa..f66ece4 100644
--- a/settings/wimaxsetting.cpp
+++ b/settings/wimaxsetting.cpp
@@ -22,7 +22,9 @@
#include "wimaxsetting.h"
#include "wimaxsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-wimax.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/wiredsetting.cpp b/settings/wiredsetting.cpp
index b6bd11f..6c08558 100644
--- a/settings/wiredsetting.cpp
+++ b/settings/wiredsetting.cpp
@@ -21,7 +21,9 @@
#include "wiredsetting.h"
#include "wiredsetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-wired.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/wirelesssecuritysetting.cpp b/settings/wirelesssecuritysetting.cpp
index 9c2c30d..26d28db 100644
--- a/settings/wirelesssecuritysetting.cpp
+++ b/settings/wirelesssecuritysetting.cpp
@@ -21,7 +21,9 @@
#include "wirelesssecuritysetting.h"
#include "wirelesssecuritysetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-wireless-security.h>
+#endif
#include <QtCore/QDebug>
diff --git a/settings/wirelesssetting.cpp b/settings/wirelesssetting.cpp
index 1a94823..aa143c4 100644
--- a/settings/wirelesssetting.cpp
+++ b/settings/wirelesssetting.cpp
@@ -21,7 +21,9 @@
#include "wirelesssetting.h"
#include "wirelesssetting_p.h"
+#if !NM_CHECK_VERSION(1, 0, 0)
#include <nm-setting-wireless.h>
+#endif
#include <QtCore/QDebug>
@@ -331,9 +333,15 @@ void NetworkManager::WirelessSetting::fromMap(const QVariantMap &setting)
setSeenBssids(setting.value(QLatin1String(NM_SETTING_WIRELESS_SEEN_BSSIDS)).toStringList());
}
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (setting.contains(QLatin1String("security"))) {
+ setSecurity(setting.value(QLatin1String("security")).toString());
+ }
+#else
if (setting.contains(QLatin1String(NM_SETTING_WIRELESS_SEC))) {
setSecurity(setting.value(QLatin1String(NM_SETTING_WIRELESS_SEC)).toString());
}
+#endif
if (setting.contains(QLatin1String(NM_SETTING_WIRELESS_HIDDEN))) {
setHidden(setting.value(QLatin1String(NM_SETTING_WIRELESS_HIDDEN)).toBool());
@@ -400,9 +408,15 @@ QVariantMap NetworkManager::WirelessSetting::toMap() const
setting.insert(QLatin1String(NM_SETTING_WIRELESS_SEEN_BSSIDS), seenBssids());
}
+#if NM_CHECK_VERSION(1, 0, 0)
+ if (!security().isEmpty()) {
+ setting.insert(QLatin1String("security"), security());
+ }
+#else
if (!security().isEmpty()) {
setting.insert(QLatin1String(NM_SETTING_WIRELESS_SEC), security());
}
+#endif
if (hidden()) {
setting.insert(QLatin1String(NM_SETTING_WIRELESS_HIDDEN), hidden());
@@ -428,7 +442,11 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::WirelessSet
dbg.nospace() << NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST << ": " << setting.macAddressBlacklist() << '\n';
dbg.nospace() << NM_SETTING_WIRELESS_MTU << ": " << setting.mtu() << '\n';
dbg.nospace() << NM_SETTING_WIRELESS_SEEN_BSSIDS << ": " << setting.seenBssids() << '\n';
+#if NM_CHECK_VERSION(1, 0, 0)
+ dbg.nospace() << "security" << ": " << setting.security() << '\n';
+#else
dbg.nospace() << NM_SETTING_WIRELESS_SEC << ": " << setting.security() << '\n';
+#endif
dbg.nospace() << NM_SETTING_WIRELESS_HIDDEN << ": " << setting.hidden() << '\n';
return dbg.maybeSpace();
diff --git a/wirelessdevice.cpp b/wirelessdevice.cpp
index 434fea3..fec9a60 100644
--- a/wirelessdevice.cpp
+++ b/wirelessdevice.cpp
@@ -23,7 +23,12 @@
#include "wirelessdevice.h"
#include "wirelessdevice_p.h"
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
#include <libnm-glib/nm-device-wifi.h>
+#endif
#include "accesspoint.h"
#include "manager_p.h"
diff --git a/accesspoint.cpp b/accesspoint.cpp
index 2b16e9d..050a2dc 100644
--- a/accesspoint.cpp
+++ b/accesspoint.cpp
@@ -24,8 +24,6 @@
#include "dbus/nm-access-pointinterface.h"
#include "manager_p.h"
#include "wirelessdevice.h"
-
-#include <libnm-glib/nm-device-wifi.h>
#include "nmdebug.h"
--
cgit v1.1
