NetworkStatus: Simplify state change notification code

This commit is contained in:
Alexander von Gluck IV
2012-04-03 22:41:10 -05:00
parent 608826f578
commit 43c6828704
+6 -11
View File
@@ -566,17 +566,12 @@ NetworkStatusView::_Update(bool force)
notification.SetTitle(interface.Name()); notification.SetTitle(interface.Name());
notification.SetMessageID(interface.Name()); notification.SetMessageID(interface.Name());
notification.SetIcon(fNotifyIcons[fStatus]); notification.SetIcon(fNotifyIcons[fStatus]);
if (fStatus == kStatusConnecting) { if (fStatus == kStatusConnecting
notification.SetContent(B_TRANSLATE("Connecting...")); || (fStatus == kStatusReady && oldStatus == kStatusConnecting)
notification.Send(); || (fStatus == kStatusNoLink && oldStatus == kStatusReady)
} else if (fStatus == kStatusReady && oldStatus == kStatusConnecting) { || (fStatus == kStatusNoLink && oldStatus == kStatusConnecting)) {
notification.SetContent(B_TRANSLATE("Connection Established")); // A significant state change, raise notification.
notification.Send(); notification.SetContent(kStatusDescriptions[fStatus]);
} else if (fStatus == kStatusNoLink && oldStatus == kStatusConnecting) {
notification.SetContent(B_TRANSLATE("Connection Failed"));
notification.Send();
} else if (fStatus == kStatusNoLink && oldStatus == kStatusReady) {
notification.SetContent(B_TRANSLATE("Disconnected"));
notification.Send(); notification.Send();
} }