From 03b1819c0434960fe696b69b0172bbfbb2ad9b57 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 12 Jan 2016 12:19:31 -0500
Subject: [PATCH] Tracker: Get rid of the "Restart Deskbar" menu item.

Now that launch_daemon automatically restarts Tracker and Deskbar
when they crash, this is not needed anymore.
---
 src/kits/tracker/Commands.h          | 1 -
 src/kits/tracker/ContainerWindow.cpp | 9 +--------
 src/kits/tracker/DeskWindow.cpp      | 9 ---------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/kits/tracker/Commands.h b/src/kits/tracker/Commands.h
index 1f4596e9ec..664ee1d04a 100644
--- a/src/kits/tracker/Commands.h
+++ b/src/kits/tracker/Commands.h
@@ -80,7 +80,6 @@ const uint32 kLoadAddOn = 'Tlda';
 const uint32 kEmptyTrash = 'Tetr';
 const uint32 kAddPrinter = 'Tadp';
 const uint32 kMakeActivePrinter = 'Tmap';
-const uint32 kRestartDeskbar = 'DBar';
 
 const uint32 kRunAutomounterSettings = 'Tram';
 
diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 4a7432aeea..4838140322 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -53,11 +53,11 @@ All rights reserved.
 #include <NodeMonitor.h>
 #include <Path.h>
 #include <PopUpMenu.h>
+#include <Roster.h>
 #include <Screen.h>
 #include <UnicodeChar.h>
 #include <Volume.h>
 #include <VolumeRoster.h>
-#include <Roster.h>
 
 #include <fs_attr.h>
 #include <image.h>
@@ -1480,13 +1480,6 @@ BContainerWindow::MessageReceived(BMessage* message)
 			(new FindWindow())->Show();
 			break;
 
-		case kRestartDeskbar:
-		{
-			BRoster roster;
-			roster.Launch(kDeskbarSignature);
-			break;
-		}
-
 		case kQuitTracker:
 			be_app->PostMessage(B_QUIT_REQUESTED);
 			break;
diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp
index 40ff654c2e..808211cbb2 100644
--- a/src/kits/tracker/DeskWindow.cpp
+++ b/src/kits/tracker/DeskWindow.cpp
@@ -46,12 +46,10 @@ All rights reserved.
 #include <PathMonitor.h>
 #include <PopUpMenu.h>
 #include <Resources.h>
-#include <Roster.h>
 #include <Screen.h>
 #include <String.h>
 #include <StringList.h>
 #include <Volume.h>
-#include <VolumeRoster.h>
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -440,13 +438,6 @@ BDeskWindow::CreatePoseView(Model* model)
 void
 BDeskWindow::AddWindowContextMenus(BMenu* menu)
 {
-	BRoster roster;
-	if (!roster.IsRunning(kDeskbarSignature)) {
-		menu->AddItem(new BMenuItem(B_TRANSLATE("Restart Deskbar"),
-			new BMessage(kRestartDeskbar)));
-		menu->AddSeparatorItem();
-	}
-
 	TemplatesMenu* tempateMenu = new TemplatesMenu(PoseView(),
 		B_TRANSLATE("New"));