From 4f39c588183f2e665b92befe36b87c21d62c5c81 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 12 Jan 2016 12:12:07 -0500 Subject: [PATCH] Deskbar: Get rid of the "Restart Tracker" menu item. Now that launch_daemon automatically restarts Tracker and Deskbar when they crash, this is not needed anymore. --- src/apps/deskbar/BarApp.cpp | 7 ------- src/apps/deskbar/BarApp.h | 1 - src/apps/deskbar/DeskbarMenu.cpp | 7 ------- 3 files changed, 15 deletions(-) diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp index ed1c6f22bb..d196bd8e04 100644 --- a/src/apps/deskbar/BarApp.cpp +++ b/src/apps/deskbar/BarApp.cpp @@ -643,13 +643,6 @@ TBarApp::MessageReceived(BMessage* message) run_be_about(); break; - case kRestartTracker: - { - BRoster roster; - roster.Launch(kTrackerSignature); - break; - } - case B_LOCALE_CHANGED: { BLocaleRoster::Default()->Refresh(); diff --git a/src/apps/deskbar/BarApp.h b/src/apps/deskbar/BarApp.h index 5a1465770f..362b62db0b 100644 --- a/src/apps/deskbar/BarApp.h +++ b/src/apps/deskbar/BarApp.h @@ -60,7 +60,6 @@ const uint32 kAddTeam = 'AdTm'; const uint32 kRemoveTeam = 'RmTm'; const uint32 kRestart = 'Rtrt'; const uint32 kShutDown = 'ShDn'; -const uint32 kRestartTracker = 'Trak'; // from roster_private.h const uint32 kShutdownSystem = 301; diff --git a/src/apps/deskbar/DeskbarMenu.cpp b/src/apps/deskbar/DeskbarMenu.cpp index c8587f1a8d..a360c7557b 100644 --- a/src/apps/deskbar/DeskbarMenu.cpp +++ b/src/apps/deskbar/DeskbarMenu.cpp @@ -236,13 +236,6 @@ TDeskbarMenu::AddStandardDeskbarMenuItems() dragging = fBarView->Dragging(); BMenuItem* item; - BRoster roster; - if (!roster.IsRunning(kTrackerSignature)) { - item = new BMenuItem(B_TRANSLATE("Restart Tracker"), - new BMessage(kRestartTracker)); - AddItem(item); - AddSeparatorItem(); - } // One of them is used if HAIKU_DISTRO_COMPATIBILITY_OFFICIAL, and the other if // not. However, we want both of them to end up in the catalog, so we have to