[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libnm-qt] /: Slash is not a valid Dhcp*Config object path.
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2013-08-31 19:10:38
Message-ID: E1VFqZC-0002sN-6D () scm ! kde ! org
[Download RAW message or body]

Git commit 43a0be0d2b33f042746e57e1d63cbc81ed48658c by Lamarque V. Souza.
Committed on 31/08/2013 at 16:09.
Pushed by lvsouza into branch 'master'.

Slash is not a valid Dhcp*Config object path.

M  +2    -2    device.cpp

http://commits.kde.org/libnm-qt/43a0be0d2b33f042746e57e1d63cbc81ed48658c

diff --git a/device.cpp b/device.cpp
index 682a083..4b0d5ea 100644
--- a/device.cpp
+++ b/device.cpp
@@ -117,12 +117,12 @@ NetworkManager::DevicePrivate::DevicePrivate(const QString &path, NetworkManager
     }
 
     QDBusObjectPath dhcp4ConfigObjectPath = deviceIface.dhcp4Config();
-    if (!dhcp4ConfigObjectPath.path().isNull()) {
+    if (!dhcp4ConfigObjectPath.path().isNull() && dhcp4ConfigObjectPath.path() != QLatin1String("/")) {
         dhcp4ConfigPath = dhcp4ConfigObjectPath.path();
     }
 
     QDBusObjectPath dhcp6ConfigObjectPath = deviceIface.dhcp6Config();
-    if (!dhcp6ConfigObjectPath.path().isNull()) {
+    if (!dhcp6ConfigObjectPath.path().isNull() && dhcp6ConfigObjectPath.path() != QLatin1String("/")) {
         dhcp6ConfigPath = dhcp6ConfigObjectPath.path();
     }
 }

[prev in list] [next in list] [prev in thread] [next in thread]