i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regression spotted by Humdinger. Try to open the entry in settings/Mail/mailbox first.

Browse Source 
Add some more info to the self made query, not perfect yet.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40572 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-02-20 06:08:26 +00:00
parent 20a1f87af2
commit df317863c8
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
-1
View File
@@ -344,7 +344,6 @@ AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
AddDirectoryToHaikuImage home mail draft ; AddDirectoryToHaikuImage home mail draft ;
AddDirectoryToHaikuImage home mail in ; AddDirectoryToHaikuImage home mail in ;
AddDirectoryToHaikuImage home mail out ; AddDirectoryToHaikuImage home mail out ;
AddSymlinkToHaikuImage home config settings Mail : ../../../mail/in : mailbox ;
# Deskbar Application links # Deskbar Application links
AddDirectoryToHaikuImage home config be Applications ; AddDirectoryToHaikuImage home config be Applications ;
src/servers/mail/DeskbarView.cpp
+7
View File
@@ -359,14 +359,18 @@ void
DeskbarView::MouseUp(BPoint pos) DeskbarView::MouseUp(BPoint pos)
{ {
if (fLastButtons & B_PRIMARY_MOUSE_BUTTON) { if (fLastButtons & B_PRIMARY_MOUSE_BUTTON) {
if (OpenWithTracker(B_USER_SETTINGS_DIRECTORY, "Mail/mailbox")
!= B_OK) {
entry_ref ref; entry_ref ref;
_GetNewQueryRef(ref); _GetNewQueryRef(ref);
BMessenger trackerMessenger(kTrackerSignature); BMessenger trackerMessenger(kTrackerSignature);
BMessage message(B_REFS_RECEIVED); BMessage message(B_REFS_RECEIVED);
message.AddRef("refs", &ref); message.AddRef("refs", &ref);
trackerMessenger.SendMessage(&message); trackerMessenger.SendMessage(&message);
} }
}
if (fLastButtons & B_TERTIARY_MOUSE_BUTTON) if (fLastButtons & B_TERTIARY_MOUSE_BUTTON)
BMailDaemon::CheckMail(); BMailDaemon::CheckMail();
@@ -444,6 +448,9 @@ DeskbarView::_CreateNewMailQuery(BEntry& query)
BString string("((" B_MAIL_ATTR_STATUS "==\"[nN][eE][wW]\")&&((BEOS:TYPE==" BString string("((" B_MAIL_ATTR_STATUS "==\"[nN][eE][wW]\")&&((BEOS:TYPE=="
"\"text/x-email\")||(BEOS:TYPE==\"text/x-partial-email\")))"); "\"text/x-email\")||(BEOS:TYPE==\"text/x-partial-email\")))");
file.WriteAttrString("_trk/qrystr", &string); file.WriteAttrString("_trk/qrystr", &string);
file.WriteAttrString("_trk/qryinitstr", &string);
int32 mode = 'Fbyq';
file.WriteAttr("_trk/qryinitmode", B_INT32_TYPE, 0, &mode, sizeof(int32));
string = "E-mail"; string = "E-mail";
file.WriteAttrString("_trk/qryinitmime", &string); file.WriteAttrString("_trk/qryinitmime", &string);
BNodeInfo(&file).SetType("application/x-vnd.Be-query"); BNodeInfo(&file).SetType("application/x-vnd.Be-query");