diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-02-22 21:34:13 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-02-22 21:34:13 +0900 |
| commit | de38d1a24d766f231642aff903ae3856bc707256 (patch) | |
| tree | bf1ddd8643b21ec268098a72d1997d03cce777e3 /tdenetworkmanager/src/tdenetman-wired_device_tray.cpp | |
| parent | a2dede9fe65e96ce38a6bc379079c95664c25cf3 (diff) | |
| download | tdenetworkmanager-de38d1a24d766f231642aff903ae3856bc707256.tar.gz tdenetworkmanager-de38d1a24d766f231642aff903ae3856bc707256.zip | |
Unmanaged devices cannot be controlled by TDENetworkManager. This refers to bug 2929.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdenetworkmanager/src/tdenetman-wired_device_tray.cpp')
| -rw-r--r-- | tdenetworkmanager/src/tdenetman-wired_device_tray.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp index e59b173..3527f92 100644 --- a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp +++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp @@ -80,18 +80,19 @@ void WiredDeviceTray::addMenuItems(TDEPopupMenu* menu) Subhead* subhead = new Subhead (menu, "subhead", TQString("Wired Connection (%1)").arg(dev->deviceNode()), SmallIcon("wired", TQIconSet::Automatic)); menu->insertItem (subhead, -1, -1); - // bolding subhead instead - //menu->insertSeparator(); - TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); - if (deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::LinkUnavailable) { + if (!deviceConnMan->deviceInformation().managed) { + // device is not managed by NM -> do not show any connections + subhead = new Subhead(menu, "subhead2", i18n("Not managed"), SmallIcon("no", TQIconSet::Automatic)); + menu->insertItem(subhead, -1, -1); + } + else if (deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::LinkUnavailable) { // no carrier -> do not show any connections subhead = new Subhead(menu, "subhead2", i18n("Cable disconnected"), SmallIcon("no", TQIconSet::Automatic)); menu->insertItem(subhead, -1, -1); } else { TDEGlobalNetworkManager* nm = TDEGlobal::networkManager(); - TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnection* active_conn = NULL; if ((!(deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::Disconnected)) && (!(deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::Invalid))) { @@ -131,8 +132,8 @@ void WiredDeviceTray::addMenuItems(TDEPopupMenu* menu) if (deactivate) { deactivate->plug(menu); } - } + menu->insertSeparator(); } WiredDeviceTray::WiredDeviceTray (TQString dev, KSystemTray * parent, const char * name ) |