[haiku-commits] r40572 - in haiku/trunk: build/jam src/servers/mail

  • From: clemens.zeidler@xxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 20 Feb 2011 07:08:27 +0100 (CET)

Author: czeidler
Date: 2011-02-20 07:08:26 +0100 (Sun, 20 Feb 2011)
New Revision: 40572
Changeset: http://dev.haiku-os.org/changeset/40572

Modified:
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/src/servers/mail/DeskbarView.cpp
Log:
Fix regression spotted by Humdinger. Try to open the entry in 
settings/Mail/mailbox first.
Add some more info to the self made query, not perfect yet.



Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage    2011-02-20 04:14:48 UTC (rev 40571)
+++ haiku/trunk/build/jam/HaikuImage    2011-02-20 06:08:26 UTC (rev 40572)
@@ -344,7 +344,6 @@
 AddDirectoryToHaikuImage home mail draft ;
 AddDirectoryToHaikuImage home mail in ;
 AddDirectoryToHaikuImage home mail out ;
-AddSymlinkToHaikuImage home config settings Mail : ../../../mail/in : mailbox ;
 
 # Deskbar Application links
 AddDirectoryToHaikuImage home config be Applications ;

Modified: haiku/trunk/src/servers/mail/DeskbarView.cpp
===================================================================
--- haiku/trunk/src/servers/mail/DeskbarView.cpp        2011-02-20 04:14:48 UTC 
(rev 40571)
+++ haiku/trunk/src/servers/mail/DeskbarView.cpp        2011-02-20 06:08:26 UTC 
(rev 40572)
@@ -359,13 +359,17 @@
 DeskbarView::MouseUp(BPoint pos)
 {
        if (fLastButtons & B_PRIMARY_MOUSE_BUTTON) {
-               entry_ref ref;
-               _GetNewQueryRef(ref);
+               if (OpenWithTracker(B_USER_SETTINGS_DIRECTORY, "Mail/mailbox")
+                       != B_OK) {
+                       entry_ref ref;
+                       _GetNewQueryRef(ref);
 
-               BMessenger trackerMessenger(kTrackerSignature);
-               BMessage message(B_REFS_RECEIVED);
-               message.AddRef("refs", &ref);
-               trackerMessenger.SendMessage(&message);
+                       BMessenger trackerMessenger(kTrackerSignature);
+                       BMessage message(B_REFS_RECEIVED);
+                       message.AddRef("refs", &ref);
+
+                       trackerMessenger.SendMessage(&message);
+               }
        }
 
        if (fLastButtons & B_TERTIARY_MOUSE_BUTTON)
@@ -444,6 +448,9 @@
        BString string("((" B_MAIL_ATTR_STATUS 
"==\"[nN][eE][wW]\")&&((BEOS:TYPE=="
                "\"text/x-email\")||(BEOS:TYPE==\"text/x-partial-email\")))");
        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";
        file.WriteAttrString("_trk/qryinitmime", &string);
        BNodeInfo(&file).SetType("application/x-vnd.Be-query");


Other related posts:

  • » [haiku-commits] r40572 - in haiku/trunk: build/jam src/servers/mail - clemens . zeidler