Fix multiple event notifications

pull/1/head
Timothy Pearson 12 years ago
parent 11835f424e
commit f73ccdb661

@ -152,10 +152,10 @@ void InterfaceIcon::updateMenu()
void InterfaceIcon::resizeIcon() void InterfaceIcon::resizeIcon()
{ {
updateTrayStatus(0); updateTrayStatus(0, false);
} }
void InterfaceIcon::updateTrayStatus( int previousState ) void InterfaceIcon::updateTrayStatus( int previousState, bool notify )
{ {
bool interfaceExists = mInterface->getData().existing; bool interfaceExists = mInterface->getData().existing;
bool interfaceAvailable = mInterface->getData().available; bool interfaceAvailable = mInterface->getData().available;
@ -164,7 +164,7 @@ void InterfaceIcon::updateTrayStatus( int previousState )
// notification 'interface not available' // notification 'interface not available'
if ( !interfaceAvailable && mTray != 0L && if ( !interfaceAvailable && mTray != 0L &&
previousState == Interface::AVAILABLE ) previousState == Interface::AVAILABLE && notify )
{ {
/* When KNemo is starting we don't show the change in connection /* When KNemo is starting we don't show the change in connection
* status as this would be annoying when KDE starts. * status as this would be annoying when KDE starts.
@ -186,7 +186,7 @@ void InterfaceIcon::updateTrayStatus( int previousState )
// notification 'interface not existing' // notification 'interface not existing'
if ( !interfaceExists && mTray != 0L && if ( !interfaceExists && mTray != 0L &&
previousState != Interface::UNKNOWN_STATE ) previousState != Interface::UNKNOWN_STATE && notify )
{ {
/* When KNemo is starting we don't show the change in connection /* When KNemo is starting we don't show the change in connection
* status as this would be annoying when KDE starts. * status as this would be annoying when KDE starts.
@ -252,7 +252,7 @@ void InterfaceIcon::updateTrayStatus( int previousState )
// notification 'interface available' // notification 'interface available'
if ( interfaceAvailable && mTray != 0L && if ( interfaceAvailable && mTray != 0L &&
previousState != Interface::UNKNOWN_STATE ) previousState != Interface::UNKNOWN_STATE && notify )
{ {
/* When KNemo is starting we don't show the change in connection /* When KNemo is starting we don't show the change in connection
* status as this would be annoying when KDE starts. * status as this would be annoying when KDE starts.

@ -73,7 +73,7 @@ public slots:
/* /*
* Creates or deletes the tray icon * Creates or deletes the tray icon
*/ */
void updateTrayStatus( int previousState ); void updateTrayStatus( int previousState, bool notify=true );
/* /*
* Resizes the tray icon * Resizes the tray icon

Loading…
Cancel
Save