File 0001-make-it-work-with-older-NM-versions.patch of Package libKF5NetworkManagerQt

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-make-it-work-with-older-NM-versions.patch of Package libKF5NetworkManagerQt (Revision 610918744bf8d3556dfb90ceeb7b65f8)

Currently displaying revision 610918744bf8d3556dfb90ceeb7b65f8 , Show latest

From 5f6d58672f7ac4a5bc392c817ac58b9ad0f7e64a Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <larrosa@kde.org>
Date: Wed, 16 Dec 2015 00:33:39 +0100
Subject: [PATCH] make it work with older NM versions

Added a couple of #ifdef NM_CHECK_VERSION(0, 9, 10) so it compiles
with older NM versions that don't have *ConfigPath variables
---
 src/activeconnection.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/activeconnection.cpp b/src/activeconnection.cpp
index 7a6c8dc..f29ca67 100644
--- a/src/activeconnection.cpp
+++ b/src/activeconnection.cpp
@@ -113,6 +113,7 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject
         Q_EMIT stateChanged(d->state);
     }
 
+#if NM_CHECK_VERSION(0, 9, 10)
     QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config();
     if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() != d->ipV4ConfigPath) {
         d->ipV4ConfigPath = ip4ConfigObjectPath.path();
@@ -136,6 +137,7 @@ NetworkManager::ActiveConnection::ActiveConnection(const QString &path, QObject
         d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path();
         Q_EMIT dhcp6ConfigChanged();
     }
+#endif
 }
 
 NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd, QObject *parent)
@@ -154,6 +156,7 @@ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd,
         Q_EMIT stateChanged(d->state);
     }
 
+#if NM_CHECK_VERSION(0, 9, 10)
     QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config();
     if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() != d->ipV4ConfigPath) {
         d->ipV4ConfigPath = ip4ConfigObjectPath.path();
@@ -177,6 +180,7 @@ NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate &dd,
         d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path();
         Q_EMIT dhcp6ConfigChanged();
     }
+#endif
 }
 
 NetworkManager::ActiveConnection::~ActiveConnection()
-- 
2.6.2

Places

File 0001-make-it-work-with-older-NM-versions.patch of Package libKF5NetworkManagerQt (Revision 610918744bf8d3556dfb90ceeb7b65f8)

Places