From 9b16f7b4f772aec7d35303bfc776e6f66df91cd1 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Mon, 8 Dec 2008 12:35:21 +0100
Subject: [PATCH] fixed muttator focus handling

---
 common/content/liberator.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index fb30f917..181f623e 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -856,7 +856,6 @@ const liberator = (function () //{{{
             command.execute(args, special, count, modifiers);
         },
 
-        // TODO: move to buffer.focus()?
         // after pressing Escape, put focus on a non-input field of the browser document
         // if clearFocusedElement, also blur a focused link
         focusContent: function (clearFocusedElement)
@@ -870,15 +869,14 @@ const liberator = (function () //{{{
             // TODO: make more generic
             try
             {
-                if (liberator.has("mail") && clearFocusedElement && !config.isComposeWindow)
+                if (this.has("mail") && !config.isComposeWindow)
                 {
                     let i = gDBView.selection.currentIndex;
                     if (i == -1 && gDBView.rowCount >= 0)
                         i = 0;
                     gDBView.selection.select(i);
                 }
-
-                if (this.has("tabs"))
+                else if (this.has("tabs"))
                 {
                     let frame = tabs.localStore.focusedFrame;
                     if (frame && frame.top == window.content)