hrev50020 adds 2 changesets to branch 'master'
old head: 90fd6af0b63f546c47d84121359cdc88cadc1caf
new head: 03b1819c0434960fe696b69b0172bbfbb2ad9b57
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=03b1819c0434+%5E90fd6af0b63f
----------------------------------------------------------------------------
4f39c588183f: 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.
03b1819c0434: 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.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
6 files changed, 1 insertion(+), 33 deletions(-)
src/apps/deskbar/BarApp.cpp | 7 -------
src/apps/deskbar/BarApp.h | 1 -
src/apps/deskbar/DeskbarMenu.cpp | 7 -------
src/kits/tracker/Commands.h | 1 -
src/kits/tracker/ContainerWindow.cpp | 9 +--------
src/kits/tracker/DeskWindow.cpp | 9 ---------
############################################################################
Commit: 4f39c588183f2e665b92befe36b87c21d62c5c81
URL: http://cgit.haiku-os.org/haiku/commit/?id=4f39c588183f
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Jan 12 17:12:07 2016 UTC
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.
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp
index ed1c6f2..d196bd8 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 5a14657..362b62d 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 c8587f1..a360c75 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
############################################################################
Revision: hrev50020
Commit: 03b1819c0434960fe696b69b0172bbfbb2ad9b57
URL: http://cgit.haiku-os.org/haiku/commit/?id=03b1819c0434
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Jan 12 17:19:31 2016 UTC
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.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Commands.h b/src/kits/tracker/Commands.h
index 1f4596e..664ee1d 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 4a7432a..4838140 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 40ff654..808211c 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"));
