[Pkg-mozext-commits] [nostalgy] 140/235: Fixes for TB3.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository nostalgy.

commit e99788a2c06db3af862110a8fee96dfeba5f42eb
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Thu Nov 13 22:48:14 2008 +0000

    Fixes for TB3.
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@140 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 content/nostalgy.js |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/content/nostalgy.js b/content/nostalgy.js
index 511bf99..2d4e565 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -220,7 +220,7 @@ function NostalgySelectMessageByNavigationType(type)
 }
 
 function NostalgyMailSession() {
- var mSession = Components.classes[mailSessionContractID].getService();
+ var mSession = Components.classes["@mozilla.org/messenger/services/session;1"].getService();
  if (!mSession) return mSessions;
  return mSession.QueryInterface(Components.interfaces.nsIMsgMailSession);
 }
@@ -978,18 +978,20 @@ function NostalgySaveAndGoSuggested() {
 }
 
 function onNostalgyKeyDown(ev) {
-  if ((ev.keyCode == KeyEvent.DOM_VK_ALT ||
-       ev.keyCode == KeyEvent.DOM_VK_CONTROL)
-      && nostalgy_search_focused) NostalgyShowSearchMode();
+    if (nostalgy_search_focused && gSearchInput.showingSearchCriteria)
+        gSearchInput.showingSearchCriteria = false;
+    if ((ev.keyCode == KeyEvent.DOM_VK_ALT ||
+         ev.keyCode == KeyEvent.DOM_VK_CONTROL)
+        && nostalgy_search_focused) NostalgyShowSearchMode();
 }
 function onNostalgyKeyUp(ev) {
-  if ((ev.keyCode == KeyEvent.DOM_VK_ALT ||
-       ev.keyCode == KeyEvent.DOM_VK_CONTROL)
-     && nostalgy_search_focused
-     && !nostalgy_completion_options.always_show_search_mode) {
-    var o = gEBI("quick-search-menupopup");
-    o.hidePopup();
-  }
+    if ((ev.keyCode == KeyEvent.DOM_VK_ALT ||
+         ev.keyCode == KeyEvent.DOM_VK_CONTROL)
+        && nostalgy_search_focused
+        && !nostalgy_completion_options.always_show_search_mode) {
+        var o = gEBI("quick-search-menupopup");
+        o.hidePopup();
+    }
 }
 
 window.addEventListener("load", onNostalgyLoad, false);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/nostalgy.git