From 43c6828704aa3d0f358f47e18ccfb6dbb1e6fd47 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 3 Apr 2012 22:41:10 -0500 Subject: [PATCH] NetworkStatus: Simplify state change notification code --- src/apps/networkstatus/NetworkStatusView.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/apps/networkstatus/NetworkStatusView.cpp b/src/apps/networkstatus/NetworkStatusView.cpp index 5e5485d91f..94ce723882 100644 --- a/src/apps/networkstatus/NetworkStatusView.cpp +++ b/src/apps/networkstatus/NetworkStatusView.cpp @@ -566,17 +566,12 @@ NetworkStatusView::_Update(bool force) notification.SetTitle(interface.Name()); notification.SetMessageID(interface.Name()); notification.SetIcon(fNotifyIcons[fStatus]); - if (fStatus == kStatusConnecting) { - notification.SetContent(B_TRANSLATE("Connecting...")); - notification.Send(); - } else if (fStatus == kStatusReady && oldStatus == kStatusConnecting) { - notification.SetContent(B_TRANSLATE("Connection Established")); - notification.Send(); - } 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")); + if (fStatus == kStatusConnecting + || (fStatus == kStatusReady && oldStatus == kStatusConnecting) + || (fStatus == kStatusNoLink && oldStatus == kStatusReady) + || (fStatus == kStatusNoLink && oldStatus == kStatusConnecting)) { + // A significant state change, raise notification. + notification.SetContent(kStatusDescriptions[fStatus]); notification.Send(); }