1 files changed, 23 insertions, 28 deletions

diff --git a/tdenetworkmanager/src/knetworkmanager-menuitem.cpp b/tdenetworkmanager/src/knetworkmanager-menuitem.cpp
index f44ebfa..927f1ae 100644
--- a/tdenetworkmanager/src/knetworkmanager-menuitem.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-menuitem.cpp
@@ -49,10 +49,6 @@
 #include <kconfig.h>
 #include <kmessagebox.h>
 
-#include "knetworkmanager-connection.h"
-#include "knetworkmanager-device.h"
-#include "knetworkmanager-nm_proxy.h"
-
 using namespace ConnectionSettings;
 
 class NetworkMenuItemPrivate
@@ -71,48 +67,47 @@ class NetworkMenuItemPrivate
 
 void NetworkMenuItem::slotActivate()
 {
-	int id;
-	TQT_DBusError err;
 	kdDebug() << "NetworkMenuItem::slotActivate()" << endl;
-	NMProxy* nm = NMProxy::getInstance();
+
+	TDEGlobalNetworkManager* nm = KGlobal::networkManager();
 
 	if (d->dev && d->conn)
 	{
-		NMProxy* nm = NMProxy::getInstance();
-		if (nm)
+		TDENetworkConnectionManager* deviceConnMan = d->dev->connectionManager();
+		if (deviceConnMan)
 		{
-			kdDebug() << "Activate Connection " << d->conn->getObjectPath().data() << " on Device " << d->dev->getObjectPath().ascii() << endl;
-			printf("Activate Connection %s on Device %s\n\r", d->conn->getObjectPath().data(), d->dev->getObjectPath().ascii());
-
-#if NM_CHECK_VERSION(0,8,992)
-			if (nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", d->conn->getObjectPath(), TQT_DBusObjectPath(QCString(d->dev->getObjectPath())), d->conn->getObjectPath(), err))
-#else
-			if (nm->ActivateConnectionAsync(id, NM_DBUS_SERVICE_USER_SETTINGS, d->conn->getObjectPath(), TQT_DBusObjectPath(TQCString(d->dev->getObjectPath())), d->conn->getObjectPath(), err))
-#endif
-			{
+			kdDebug() << "Activate Connection " << d->conn->UUID.ascii() << " on Device " << d->dev->deviceNode().ascii() << endl;
+			printf("Activate Connection %s on Device %s\n\r", d->conn->UUID.ascii(), d->dev->deviceNode().ascii());
 
+			TDENetworkConnectionStatus::TDENetworkConnectionStatus result = deviceConnMan->initiateConnection(d->conn->UUID);
+			if ((result == TDENetworkConnectionStatus::Disconnected)
+				|| (result == TDENetworkConnectionStatus::Invalid)) {
+				//
 			}
-			else
+			else {
 				kdDebug() << "ActivateDevice failed" << endl;
+			}
 		}
 	}
 	else if (d->conn)
 	{
 		// no device given, just take the default device
-		printf("Activate Connection %s on default device\n\r", d->conn->getObjectPath().data());
-		TQT_DBusObjectPath act_conn = nm->getDefaultActiveConnection();
-		TQT_DBusObjectPath device   = nm->getDeviceForActiveConnection(act_conn);
-#if NM_CHECK_VERSION(0,8,992)
-		nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", d->conn->getObjectPath(), device, act_conn, err);
-#else
-		nm->ActivateConnectionAsync(id,NM_DBUS_SERVICE_USER_SETTINGS, d->conn->getObjectPath(), device, act_conn, err);
-#endif
+		printf("Activate Connection %s on default device\n\r", d->conn->UUID.ascii());
+
+		TDENetworkConnectionStatus::TDENetworkConnectionStatus result = nm->initiateConnection(d->conn->UUID);
+		if ((result == TDENetworkConnectionStatus::Disconnected)
+			|| (result == TDENetworkConnectionStatus::Invalid)) {
+			//
+		}
+		else {
+			kdDebug() << "ActivateConnection failed" << endl;
+		}
 	}
 	else
 		kdDebug() << "Device or Connection invalid" << endl;
 }
 
-NetworkMenuItem::NetworkMenuItem (Device* dev, Connection* conn, TQObject* parent, const char* name)
+NetworkMenuItem::NetworkMenuItem (TDENetworkDevice* dev, TDENetworkConnection* conn, TQObject* parent, const char* name)
 		       : TQObject(parent, name)
 {
 	d = new NetworkMenuItemPrivate(dev, conn);