Attachment #2770 for bug #2748

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2748
Collapse All | Expand All

Lines 205-211 void DeviceTrayComponent::setPixmapForState(TDENetworkConnectionStatus::TDENetwo Link Here

(-)a/tdenetworkmanager/src/devicetraycomponent.cpp (-3 / +3 lines)
205	m_pixmaps[state] = pixmap;	205	m_pixmaps[state] = pixmap;
206	}	206	}
207		207
208	void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress)	208	void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString deviceNode)
209	{	209	{
210	lastKnownState = newState;	210	lastKnownState = newState;
211		211
Lines 213-220 void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetw Link Here
213	TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();	213	TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
214	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));	214	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
215		215
216	if (dev->macAddress() != hwAddress) {	216	if (dev->deviceNode() != deviceNode) {
217	kdDebug() << k_funcinfo << "WARNING: Got networkDeviceStateChanged signal for HW address '" << hwAddress << "', but my HW address is '" << dev->macAddress() << "'! Ignoring...";	217	kdDebug() << k_funcinfo << "WARNING: Got networkDeviceStateChanged signal for interface '" << deviceNode << "', but my interface is '" << dev->deviceNode() << "'! Ignoring...";
218	return;	218	return;
219	}	219	}
220		220

Lines 681-687 void Tray::slotUpdateDeviceState() Link Here

(-)a/tdenetworkmanager/src/tdenetman-tray.cpp (-1 / +1 lines)
681	// FIXME	681	// FIXME
682	}	682	}
683		683
684	void Tray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress)	684	void Tray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString deviceNode)
685	{	685	{
686	#ifdef DEBUG_STATE	686	#ifdef DEBUG_STATE
687	printf("Device state: 0x%08x was: 0x%08x\n", newState, prevState);	687	printf("Device state: 0x%08x was: 0x%08x\n", newState, prevState);

Lines 95-101 class Tray : public KSystemTray Link Here

(-)a/tdenetworkmanager/src/tdenetman-tray.h (-1 / +1 lines)
95	void slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags newState, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags prevState);	95	void slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags newState, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags prevState);
96		96
97	void slotUpdateDeviceState();	97	void slotUpdateDeviceState();
98	void slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress);	98	void slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString deviceNode);
99		99
100	void slotNewVPNConnection();	100	void slotNewVPNConnection();
101	void slotVPNBannerShow(const TQString& vpnbanner);	101	void slotVPNBannerShow(const TQString& vpnbanner);




	}
}

void WirelessDeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString deviceNode)
{
	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));

	if (dev->deviceNode() != deviceNode) {
		kdDebug() << k_funcinfo << "WARNING: Got networkDeviceStateChanged signal for interface '" << deviceNode << "', but my interface is '" << dev->deviceNode() << "'!  Ignoring...";
		return;
	}



		// force status update to ensure correct icon is shown on startup
		if ((dev) && (deviceConnMan)) {
			slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode());
		}
	}
}

Return to bug 2748

Lines 305-316 void WirelessDeviceTray::setPixmapForStates(TDENetworkConnectionStatus::TDENetwo Link Here

(-)a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp (-4 / +4 lines)
305	}	305	}
306	}	306	}
307		307
308	void WirelessDeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString hwAddress)	308	void WirelessDeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus newState, TDENetworkConnectionStatus::TDENetworkConnectionStatus prevState, TQString deviceNode)
309	{	309	{
310	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));	310	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
311		311
312	if (dev->macAddress() != hwAddress) {	312	if (dev->deviceNode() != deviceNode) {
313	kdDebug() << k_funcinfo << "WARNING: Got networkDeviceStateChanged signal for HW address '" << hwAddress << "', but my HW address is '" << dev->macAddress() << "'! Ignoring...";	313	kdDebug() << k_funcinfo << "WARNING: Got networkDeviceStateChanged signal for interface '" << deviceNode << "', but my interface is '" << dev->deviceNode() << "'! Ignoring...";
314	return;	314	return;
315	}	315	}
316		316
Lines 439-445 void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEv Link Here
439		439
440	// force status update to ensure correct icon is shown on startup	440	// force status update to ensure correct icon is shown on startup
441	if ((dev) && (deviceConnMan)) {	441	if ((dev) && (deviceConnMan)) {
442	slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->macAddress());	442	slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode());
443	}	443	}
444	}	444	}
445	}	445	}