1 files changed, 21 insertions, 23 deletions

diff --git a/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp
index 5956e85..dd7fc81 100644
--- a/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp
@@ -45,32 +45,29 @@
 #include <kiconloader.h>
 #include <kconfig.h>
 #include <kmessagebox.h>
-#include <NetworkManager.h>
-
-#include <tqdbusobjectpath.h>
-#include <tqdbuserror.h>
 
 #include "knetworkmanager-wireless_menuitem.h"
 #include "knetworkmanager-wireless_network.h"
 #include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-wireless_connection.h"
-#include "knetworkmanager-nm_proxy.h"
 
 using namespace ConnectionSettings;
 
 void WirelessNetworkItem::slotActivate()
 {
-	NMProxy* nm = NMProxy::getInstance();
-	int id;
-	TQT_DBusError err;
+
+	TDENetworkConnectionManager* deviceConnMan = _dev->connectionManager();
+
 	printf("slotActivate\n\r");
-	if (_dev && nm)
+	if (_dev && deviceConnMan)
 	{
 		if ( _conn )
 		{
-			kdDebug() << "Activate Connection " << _conn->getObjectPath().data() << " on Device " << _dev->getObjectPath().ascii() << endl;
-			if (!nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", _conn->getObjectPath(), TQT_DBusObjectPath(QCString(_dev->getObjectPath())), _conn->getObjectPath(), err))
+			kdDebug() << "Activate Connection " << _conn->UUID.ascii() << " on Device " << _dev->deviceNode().ascii() << endl;
+			TDENetworkConnectionStatus::TDENetworkConnectionStatus result = deviceConnMan->initiateConnection(_conn->UUID);
+			if ((result == TDENetworkConnectionStatus::Disconnected)
+				|| (result == TDENetworkConnectionStatus::Invalid)) {
 				kdDebug() << "ActivateDevice failed" << endl;
+			}
 
 		}
 		else
@@ -85,21 +82,22 @@ void WirelessNetworkItem::slotActivate()
 TQString WirelessNetworkItem::getDisplayText()
 {
 	TQString security = "";
-	if (_net.getWpaFlags() != NM_802_11_AP_SEC_NONE && _net.getRsnFlags() != NM_802_11_AP_SEC_NONE)
+	if (((_net.getWpaFlags() & TDENetworkWiFiAPFlags::EncryptionFlagsMask) != TDENetworkWiFiAPFlags::None) && ((_net.getRsnFlags() & TDENetworkWiFiAPFlags::EncryptionFlagsMask) != TDENetworkWiFiAPFlags::None)) {
 		security = TQString("(%1/%2)").arg(i18n("WPA")).arg(i18n("RSN"));
-	else if (_net.getWpaFlags() != NM_802_11_AP_SEC_NONE)
+	}
+	else if ((_net.getWpaFlags() & TDENetworkWiFiAPFlags::EncryptionFlagsMask) != TDENetworkWiFiAPFlags::None) {
 		security = TQString("(%1)").arg(i18n("WPA"));
-	else if (_net.getRsnFlags() != NM_802_11_AP_SEC_NONE)
+	}
+	else if ((_net.getRsnFlags() & TDENetworkWiFiAPFlags::EncryptionFlagsMask) != TDENetworkWiFiAPFlags::None) {
 		security = TQString("(%2)").arg(i18n("RSN"));
+	}
 
-	Info* info = NULL;
-	if (_conn)
-		info = _conn->getInfoSetting();
-
-	if (info && info->getName() != _net.getDisplaySsid())
-		return TQString("%2/%1 %3").arg(TQString::fromUtf8(_net.getDisplaySsid())).arg(info->getName()).arg(security);
-	else
+	if (_conn && (_conn->friendlyName != _net.getDisplaySsid())) {
+		return TQString("%2/%1 %3").arg(TQString::fromUtf8(_net.getDisplaySsid())).arg(_conn->friendlyName).arg(security);
+	}
+	else {
 		return TQString("%1 %2").arg(TQString::fromUtf8(_net.getDisplaySsid())).arg(security);
+	}
 }
 
 void
@@ -140,7 +138,7 @@ WirelessNetworkItem::sizeHint ()
 	return TQSize (_width, _height);
 }
 
-WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TDENetworkDevice* dev, WirelessNetwork& net, WirelessConnection* conn, bool adhoc)
+WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TDENetworkDevice* dev, WirelessNetwork& net, TDEWiFiConnection* conn, bool adhoc)
 		       : NetworkMenuItem(dev, conn, 0, 0 ), TQCustomMenuItem ()
 {
 	parent       = p;