summaryrefslogtreecommitdiffstats
path: root/tdenetworkmanager/src/tdenetman-tray.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-06-03 23:33:18 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-06-03 23:33:18 -0500
commit73618d03cf0d84c06a77672617d1e40438c2523f (patch)
treec66648b30564cf1c361f17f2ddca521e37997476 /tdenetworkmanager/src/tdenetman-tray.cpp
parentc5ff9d998aefdd9d16cfcd337a8de448cbbe4cb1 (diff)
downloadtdenetworkmanager-73618d03cf0d84c06a77672617d1e40438c2523f.tar.gz
tdenetworkmanager-73618d03cf0d84c06a77672617d1e40438c2523f.zip
Fix network-manager OpenVPN settings interface
This resolves Bug 1530 Ensure that a device tray component is always shown
Diffstat (limited to 'tdenetworkmanager/src/tdenetman-tray.cpp')
-rw-r--r--tdenetworkmanager/src/tdenetman-tray.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index 04f26fc..f139454 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -440,7 +440,7 @@ void Tray::slotRemoveDeviceTrayComponent(TQString dev)
if (dev_comp->device() == dev)
{
if (d->foregroundTrayComponent && dev_comp->device() == d->foregroundTrayComponent->device() ) {
- d->foregroundTrayComponent = 0;
+ d->foregroundTrayComponent = NULL;
}
// remove the appropriate action
@@ -666,6 +666,9 @@ void Tray::trayComponentNeedsCenterStage(TrayComponent *component, bool needsIt)
updateTrayDeviceManagerState();
}
}
+
+ // Make sure a relevant foregroundTrayComponent is shown at all times...
+ showActiveDeviceTray();
}
}
}