From a26cf893d052d34f753eda341e2d7feabc74657a Mon Sep 17 00:00:00 2001 From: Ryan Leavengood Date: Wed, 13 Dec 2006 00:43:13 +0000 Subject: [PATCH] This removes some of the accidental submissions from my last commit. For those wondering "mark_as" is the directory for the MarkAsRead and MarkAsNew Tracker add-ons I'm planning to add (for email.) If anyone is violently opposed to this idea, speak now. The WorkspacesLayer change was mostly an update to existing and ifdef 0'd code so it would compile under ifdef 1. I left those changes and just set the ifdef back to 0 here. The other changes below were debugging and build changes that definitely were not needed in the repository. The undocumented changes in the last submission include some new keyboard shortcuts in ShowImage as well as various changes to the input server and roster as part of my ongoing work on those. I will clean this up some more and make another submission in a few hours. Note to self: never submit from a high-level directory... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19480 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/tracker/Jamfile | 1 - src/kits/mail/Jamfile | 2 +- src/servers/app/WorkspacesLayer.cpp | 2 +- src/servers/mail/deskbarview.cpp | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/add-ons/tracker/Jamfile b/src/add-ons/tracker/Jamfile index b798bc2301..dddbcdee38 100644 --- a/src/add-ons/tracker/Jamfile +++ b/src/add-ons/tracker/Jamfile @@ -2,5 +2,4 @@ SubDir HAIKU_TOP src add-ons tracker ; SubInclude HAIKU_TOP src add-ons tracker zipomatic ; SubInclude HAIKU_TOP src add-ons tracker filetype ; -SubInclude HAIKU_TOP src add-ons tracker mark_as ; diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile index 050fb93aad..44e0b22dfd 100644 --- a/src/kits/mail/Jamfile +++ b/src/kits/mail/Jamfile @@ -48,7 +48,7 @@ SharedLibrary libmail.so : tracker $(TARGET_LIBSTDC++) $(NETWORK_LIBS) -# $(SELECT_UNAME_ETC_LIB) + $(SELECT_UNAME_ETC_LIB) ; Package haiku-maildaemon-cvs : diff --git a/src/servers/app/WorkspacesLayer.cpp b/src/servers/app/WorkspacesLayer.cpp index b6f7cd1b3d..6e198c9231 100644 --- a/src/servers/app/WorkspacesLayer.cpp +++ b/src/servers/app/WorkspacesLayer.cpp @@ -216,7 +216,7 @@ WorkspacesLayer::_DrawWindow(DrawingEngine* drawingEngine, const BRect& workspac // so that it has only to be recalculated on demand. With double buffered // windows, this would also open up the door to have a more detailed // preview. -#if 1 +#if 0 BString title(window->Title()); ServerFont font = fDrawState->Font(); diff --git a/src/servers/mail/deskbarview.cpp b/src/servers/mail/deskbarview.cpp index 6e0ab0494d..5920459040 100644 --- a/src/servers/mail/deskbarview.cpp +++ b/src/servers/mail/deskbarview.cpp @@ -68,7 +68,6 @@ status_t our_image(image_info* image) BView* instantiate_deskbar_item(void) { - printf("Ryan was here!\n"); return new DeskbarView(BRect(0, 0, 15, 15)); } @@ -228,11 +227,9 @@ DeskbarView::MessageReceived(BMessage *message) switch (what) { case B_ENTRY_CREATED: fNewMessages++; - printf("B_QUERY_UPDATE::B_ENTRY_CREATED, fNewMessages = %d\n", fNewMessages); break; case B_ENTRY_REMOVED: fNewMessages--; - printf("B_QUERY_UPDATE::B_ENTRY_REMOVED, fNewMessages = %d\n", fNewMessages); break; } ChangeIcon((fNewMessages > 0) ? NEW_MAIL : NO_MAIL);