[Pkg-mozext-commits] [nostalgy] 80/252: *** empty log message ***

[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 2756b7a357fa53f8731ed3e79b6a72b56077c008
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Wed May 16 08:55:04 2007 +0000

    *** empty log message ***
---
 CHANGES                        |  4 ++++
 content/folders.js             |  3 +++
 content/messageOverlay.xul     |  8 ++++----
 content/nostalgy.js            | 19 +++++++++----------
 content/thunderbirdOverlay.xul | 12 ++++++------
 files                          | 14 +++++++-------
 6 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/CHANGES b/CHANGES
index d4787ee..76417f0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Since 0.2.10
+  - bug fix: Virtual Folder were not found under some circumstances
+  - bug fix: internal naming conflict with the Habu extension
+
 0.2.10
   - bug fix: custom shortcuts did not work in mode "restrict to current
     server"
diff --git a/content/folders.js b/content/folders.js
index fe59648..c973c33 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -278,11 +278,14 @@ function FirstCompletion(uri) {
 function FindFolderExact(uri) {
  var ret = null;
  var u = mayLowerCase(uri);
+ var save_req = nostalgy_search_folder_options.require_file;
+ nostalgy_search_folder_options.require_file = false;
  try {
   IterateFoldersAllServers(function (folder) {
    if (mayLowerCase(full_folder_name(folder)) == u) { ret = folder; throw(0); }
   });
  } catch (ex) { }
+ nostalgy_search_folder_options.require_file = save_req;
  return ret;
 }
 
diff --git a/content/messageOverlay.xul b/content/messageOverlay.xul
index b9d2a06..07b7fcc 100644
--- a/content/messageOverlay.xul
+++ b/content/messageOverlay.xul
@@ -8,13 +8,13 @@
 
  <keyset id="mailKeys">
   <key key="S" id = "nostalgy_key_save"
-       oncommand="NostalgyCmd('&nostalgy.move-memo;', MoveToFolder, true);"/>
+       oncommand="NostalgyCmd('&nostalgy.move-memo;', NostalgyMoveToFolder, true);"/>
   <key key="S" modifiers="shift" id = "nostalgy_key_save_suggest"
-       oncommand="NostalgySuggested('&nostalgy.move-memo;',MoveToFolder);"/>
+       oncommand="NostalgySuggested('&nostalgy.move-memo;',NostalgyMoveToFolder);"/>
   <key key="C" id = "nostalgy_key_copy"
-       oncommand="NostalgyCmd('&nostalgy.copy-memo;', CopyToFolder, true);"/>
+       oncommand="NostalgyCmd('&nostalgy.copy-memo;', NostalgyCopyToFolder, true);"/>
   <key key="C" modifiers="shift" id = "nostalgy_key_copy_suggest"
-       oncommand="NostalgySuggested('&nostalgy.copy-memo;',CopyToFolder);"/>
+       oncommand="NostalgySuggested('&nostalgy.copy-memo;',NostalgyCopyToFolder);"/>
  </keyset>
 
  <commandset id="tasksCommands">
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 818e48c..ec5bce9 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -141,8 +141,6 @@ var NostalgyRules =
     var rules = this.rules;
     var i = 0;
     var current_folder = full_folder_name(gDBView.msgFolder);
-    var save_req = nostalgy_search_folder_options.require_file;
-    nostalgy_search_folder_options.require_file = true;
     for (i = 0; (i < rules.length) && (!folder); i++) {
       var r = rules[i];
       if (((r.subject && match_contains(subject,r.contains))
@@ -153,7 +151,6 @@ var NostalgyRules =
         folder = FindFolderExact(r.folder);
       }
     }
-    nostalgy_search_folder_options.require_file = save_req;
     return folder;
   }
 }
@@ -320,7 +317,7 @@ function NostalgyRunCommand() {
   NostalgyHide();
   var s = nostalgy_folderBox.value;
   var f = NostalgyResolveFolder(s);
-  if (f) nostalgy_command(f); 
+  if (f) { alert(f); alert(nostalgy_command); nostalgy_command(f); }
   else { 
     if (s.substr(0,1) == ":" && s != ":") {
       var name;
@@ -443,7 +440,7 @@ function NostalgySelectLastMsg() {
   }
 }
 
-function ShowFolder(folder) {
+function NostalgyShowFolder(folder) {
   if (folder.tag) {
     ViewChange(kViewTagMarker + folder.key, folder.tag);
     return;
@@ -489,14 +486,16 @@ function NostalgyToggleMessageTag(tag) {
   ToggleMessageTag(tag.key,addKey);
 }
 
-function MoveToFolder(folder) {
+function NostalgyMoveToFolder(folder) {
+ alert("xxx");
  register_folder(folder);
+ alert("yyy");
  if (folder.tag) NostalgyToggleMessageTag(folder);
  else gDBView.doCommandWithFolder(nsMsgViewCommandType.moveMessages,folder);
  SetNextMessageAfterDelete();
 }
 
-function CopyToFolder(folder) {
+function NostalgyCopyToFolder(folder) {
  register_folder(folder);
  if (folder.tag) NostalgyToggleMessageTag(folder);
  else gDBView.doCommandWithFolder(nsMsgViewCommandType.copyMessages,folder);
@@ -623,9 +622,9 @@ function ParseCommand(k) {
   var folder = FindFolderExact(spl[2]);
   if (!folder) { alert("Cannot find folder " + spl[2]); return; }
   switch (spl[1]) {
-   case "Go": ShowFolder(folder); break;
-   case "Save": MoveToFolder(folder); break;
-   case "Copy": CopyToFolder(folder); break;
+   case "Go": NostalgyShowFolder(folder); break;
+   case "Save": NostalgyMoveToFolder(folder); break;
+   case "Copy": NostalgyCopyToFolder(folder); break;
    default: alert("Unknown command " + spl[1]); return;
   }
 }
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index 3a8e686..feb60c2 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -20,22 +20,22 @@
  <keyset id="mailKeys">
   <key id="nostalgy_key_go"
        key="G" 
-       oncommand="NostalgyCmd('&nostalgy.go-memo;', ShowFolder, false);"/>
+       oncommand="NostalgyCmd('&nostalgy.go-memo;', NostalgyShowFolder, false);"/>
   <key id="nostalgy_key_go_suggest"
        key="G" modifiers="shift" 
-       oncommand="NostalgySuggested('&nostalgy.go-memo;', ShowFolder);"/>
+       oncommand="NostalgySuggested('&nostalgy.go-memo;', NostalgyShowFolder);"/>
   <key id = "nostalgy_key_save"
        key="S" 
-       oncommand="NostalgyCmd('&nostalgy.move-memo;', MoveToFolder, true);"/>
+       oncommand="NostalgyCmd('&nostalgy.move-memo;', NostalgyMoveToFolder, true);"/>
   <key id = "nostalgy_key_save_suggest"
        key="S" modifiers="shift" 
-       oncommand="NostalgySuggested('&nostalgy.move-memo;',MoveToFolder);"/>
+       oncommand="NostalgySuggested('&nostalgy.move-memo;',NostalgyMoveToFolder);"/>
   <key id = "nostalgy_key_copy"
        key="C" 
-       oncommand="NostalgyCmd('&nostalgy.copy-memo;', CopyToFolder, true);"/>
+       oncommand="NostalgyCmd('&nostalgy.copy-memo;', NostalgyCopyToFolder, true);"/>
   <key id = "nostalgy_key_copy_suggest"
        key="C" modifiers="shift" 
-       oncommand="NostalgySuggested('&nostalgy.copy-memo;',CopyToFolder);"/>
+       oncommand="NostalgySuggested('&nostalgy.copy-memo;',NostalgyCopyToFolder);"/>
   <key id = "nostalgy_key_hide_folders"
        key="L" 
        oncommand="NostalgyCollapseFolderPane();"/>
diff --git a/files b/files
index d30c5b8..8b27024 100644
--- a/files
+++ b/files
@@ -1,15 +1,15 @@
-content/about.xhtml
 content/about.xul
-content/composer.js
-content/composerOverlay.xul
-content/edit_prefs.js
 content/edit_prefs.xul
-content/edit_rule.js
+content/thunderbirdOverlay.xul
+content/composer.js
+content/messageOverlay.xul
+content/about.xhtml
 content/edit_rule.xul
 content/folders.js
-content/messageOverlay.xul
+content/edit_rule.js
+content/composerOverlay.xul
+content/edit_prefs.js
 content/nostalgy.js
-content/thunderbirdOverlay.xul
 locale/en-US/nostalgy.dtd
 locale/en-US/nostalgy.properties
 defaults/preferences/nostalgy.js

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