From 813e27b709a66e5198ed09236d6f8ca2342ae5e2 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Wed, 4 Jun 2008 03:06:34 +0000
Subject: [PATCH] changed some muttator bindings

---
 content/liberator.js |  1 +
 content/mail.js      | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/content/liberator.js b/content/liberator.js
index 496c43ca..f7dbabdb 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -473,6 +473,7 @@ const liberator = (function () //{{{
                                    getService(Components.interfaces.nsISound);
                 soundService.beep();
             }
+            return false; // so you can do: if (...) return liberator.beep();
         },
 
         // Execute an ex command like str=":zoom 300"
diff --git a/content/mail.js b/content/mail.js
index 6cc5ff8f..d4fda8ae 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -228,10 +228,8 @@ liberator.Mail = function () //{{{
 	    function ()
 	    {
 	    	if (gDBView && gDBView.selection.count < 1)
-	    	{
-	    		liberator.echoerr("Message is not selected");
-	    		return;
-	    	}
+	    		return liberator.beep();
+
 	    	MsgOpenNewTabForMessage();
 	    });
 
@@ -240,8 +238,7 @@ liberator.Mail = function () //{{{
         function () { return true; },
         { flags: liberator.Mappings.flags.ALLOW_EVENT_ROUTING });
 
-    // TODO: change to "t" probably
-    liberator.mappings.add(modes, ["x"],
+    liberator.mappings.add(modes, ["t"],
         "Select thread",
         function () { gDBView.ExpandAndSelectThreadByIndex(GetThreadTree().currentIndex, false); });
 
@@ -525,7 +522,7 @@ liberator.Mail = function () //{{{
         { flags: liberator.Mappings.flags.COUNT });
 
     // tagging messages
-    liberator.mappings.add(modes, ["tr"],
+    liberator.mappings.add(modes, ["lr"],
         "Toggle selected messages read",
         function ()
         {
@@ -537,16 +534,16 @@ liberator.Mail = function () //{{{
 
             MsgMarkMsgAsRead();
         });
-    liberator.mappings.add(modes, ["tR"],
+    /*liberator.mappings.add(modes, ["tR"],
         "Tag thread as read",
         function ()
         {
             // TODO: ensure thread or beep
 
             MsgMarkThreadAsRead();
-        });
+        });*/
 
-    liberator.mappings.add(modes, ["ts"],
+    liberator.mappings.add(modes, ["ls"],
         "Toggle selected messages starred",
         function ()
         {
@@ -559,6 +556,7 @@ liberator.Mail = function () //{{{
             MsgMarkMsgAsFlagged();
         });
 
+    // TODO: change binding?
     liberator.mappings.add(modes, ["T"],
         "Mark current folder as read",
         function ()