|
|
|
@ -447,14 +447,15 @@ void Tray::slotRemoveDeviceTrayComponent(TQString dev)
|
|
|
|
|
|
|
|
|
|
// remove the appropriate action
|
|
|
|
|
TDENetworkDevice* dev_comp_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(dev_comp->device()));
|
|
|
|
|
TQString actionName = TQString("new_connection_%1").arg(dev_comp_dev->deviceNode());
|
|
|
|
|
TDEAction * deviceNewConnAction = actionCollection ()->action (actionName);
|
|
|
|
|
|
|
|
|
|
if (!deviceNewConnAction)
|
|
|
|
|
{
|
|
|
|
|
delete deviceNewConnAction;
|
|
|
|
|
deviceNewConnAction = NULL;
|
|
|
|
|
if (dev_comp_dev) {
|
|
|
|
|
TQString actionName = TQString("new_connection_%1").arg(dev_comp_dev->deviceNode());
|
|
|
|
|
TDEAction * deviceNewConnAction = actionCollection ()->action (actionName);
|
|
|
|
|
if (!deviceNewConnAction) {
|
|
|
|
|
delete deviceNewConnAction;
|
|
|
|
|
deviceNewConnAction = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// remove device_tray and delete it
|
|
|
|
|
d->trayComponents.remove(it);
|
|
|
|
|
delete dev_comp;
|
|
|
|
|