[Pkg-mozext-commits] [nostalgy] 195/252: Allow commands to work in search results.

[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 587cfbdcdb2eda100d5b38af49ea0dedd0633d39
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Tue Jun 29 09:00:28 2010 +0000

    Allow commands to work in search results.
---
 content/nostalgy.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/nostalgy.js b/content/nostalgy.js
index 23417db..5ccc05f 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -131,12 +131,12 @@ var NostalgyRules =
     }
   },
 
-  apply: function(sender,subject,recipients)
+  apply: function(sender,subject,recipients,cfolder)
   {
     var folder = null;
     var rules = this.rules;
     var i = 0;
-    var current_folder = full_folder_name(gDBView.msgFolder);
+    var current_folder = full_folder_name(cfolder);
     for (i = 0; (i < rules.length) && (!folder); i++) {
       var r = rules[i];
       if (((r.subject && match_contains(subject,r.contains))
@@ -470,15 +470,15 @@ function MailSubject() {
 function register_folder(folder) {
 // last_folder_author[MailAuthor()] = folder;
 // last_folder_subject[MailSubject()] = folder;
-  last_folder_server[gDBView.msgFolder.server.key] = folder;
-  last_folder = folder
+  last_folder_server[gDBView.hdrForFirstSelectedMessage.folder] = folder;
+  last_folder = folder;
 }
 
 function NostalgySuggest() {
  var r = null;
  if (!gDBView) return;
  try {
-     r = NostalgyRules.apply(MailAuthor(), MailSubject(), MailRecipients());
+     r = NostalgyRules.apply(MailAuthor(), MailSubject(), MailRecipients(), gDBView.hdrForFirstSelectedMessage.folder);
      if (r) { return(r); }
  } catch (ex) { NostalgyDebug("ex1:" + ex);  }
 
@@ -496,7 +496,7 @@ function NostalgySuggest() {
 // if (r) { return(r); }
 
  if (nostalgy_completion_options.restrict_to_current_server) {
-     return(last_folder_server[gDBView.msgFolder.server.key]);
+     return(last_folder_server[gDBView.hdrForFirstSelectedMessage.folder.server.key]);
  } else {
      return(last_folder);
  }

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