Fix network-manager OpenVPN settings interface

This resolves Bug 1530
Ensure that a device tray component is always shown

2 files changed, 9 insertions, 1 deletions

diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp
index ec2ce50..22fdbaf 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.cpp
@@ -129,9 +129,14 @@ VPNWidgetImpl::Init()
 		slotServiceComboActivated(0);
 	}
 
+#if 0
 	// update the username to the current one
 	KUser user;
 	_vpnsetting->lockedUserName = user.loginName();
+#else
+	// Not needed for NM 0.9 and above?
+	_vpnsetting->lockedUserName = TQString::null;
+#endif
 
 	// notification if VPN service is selected
 	connect(_mainWid->cboServices, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotServiceComboActivated(int)));
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();
 		}
 	}
 }