* $(HAIKU_LOCALE_LIBS) must be linked before "tracker", or else the wrong CatalogStub is used by the deskbar.

* Also fix some style problems and fix the build with APM-aware deskbar (was missing a B_TRANSLATE but did feature the closing parenthesis for it).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37596 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/deskbar/BeMenu.cpp

@@ -67,7 +67,7 @@ class DeskbarMountMenu : public BPrivate::MountMenu {
 
 #endif
 
-//#define SHOW_RECENT_FIND_ITEMS
+// #define SHOW_RECENT_FIND_ITEMS
 
 namespace BPrivate {
 	BMenu* TrackerBuildRecentFindItemsMenu(const char*);
@@ -257,8 +257,8 @@ TBeMenu::AddStandardBeMenuItems()
 	item->SetEnabled(!dragging);
 	AddItem(item);
 
-	static const char* kFindMenuItemStr =
-		B_TRANSLATE_MARK("Find" B_UTF8_ELLIPSIS);
+	static const char* kFindMenuItemStr
+		= B_TRANSLATE_MARK("Find" B_UTF8_ELLIPSIS);
 
 #ifdef SHOW_RECENT_FIND_ITEMS
 	item = new BMenuItem(
@@ -304,7 +304,8 @@ TBeMenu::AddStandardBeMenuItems()
 
 #ifdef APM_SUPPORT
 	if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) {
-		item = new BMenuItem(kSuspendMenuItemStr), new BMessage(kSuspendSystem));
+		item = new BMenuItem(B_TRANSLATE(kSuspendMenuItemStr),
+			new BMessage(kSuspendSystem));
 		item->SetEnabled(!dragging);
 		shutdownMenu->AddItem(item);
 	}

src/apps/deskbar/Jamfile

@@ -39,7 +39,7 @@ Application Deskbar :
 	ResourceSet.cpp
 	Switcher.cpp
 	$(targetSource)
-	: be tracker $(HAIKU_LOCALE_LIBS) $(targetLib) $(TARGET_LIBSUPC++)
+	: be $(HAIKU_LOCALE_LIBS) tracker $(targetLib) $(TARGET_LIBSUPC++)
 	;
 
 DoCatalogs Deskbar :