[Pkg-mozext-commits] [nostalgy] 78/235: *** empty log message ***
David Prévot
taffit at alioth.debian.org
Tue Oct 8 20:41:46 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository nostalgy.
commit edc915802ac1dbd532b48f48e428a1d60226b0e0
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date: Mon May 14 14:05:54 2007 +0000
*** empty log message ***
git-svn-id: http://nostalgy.googlecode.com/svn/trunk@78 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
CHANGES | 6 ++++++
content/folders.js | 2 +-
content/nostalgy.js | 40 +++++++++++++++++++++++++---------------
files | 14 +++++++-------
4 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/CHANGES b/CHANGES
index 895f918..1f3cade 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
Since 0.2.9
- bug fix: custom shortcuts did not work in mode "restrict to current
server"
+ - bug fix: the folder cache was invalidated when messages were added to
+ or deleted from an imap folder
+ - bug fix: the folder listener was not unloaded, causing "ClearNostalgyCache
+ is not defined" messages in the Error Console
+ - bug fix: "G"oing to a Virtual Folder did not work
+ - bug fix: Virtual Folders could not be selected for custom shortcuts
0.2.9
- the user can define custom shortcuts (Go/Save/Copy to some specific folder)
diff --git a/content/folders.js b/content/folders.js
index bfc01fa..fe59648 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -344,7 +344,7 @@ var sorted_subfolders = new Array();
// ugly: should be passed as argument to IterateFolders-like functions
var nostalgy_search_folder_options = {
- require_file: true, // do we want only folder to which we can copy/move
+ require_file: false, // do we want only folder to which we can copy/move
// messages to? (excludes saved search folder)
do_tags: false
};
diff --git a/content/nostalgy.js b/content/nostalgy.js
index cea9f27..818e48c 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -141,6 +141,7 @@ 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];
@@ -152,6 +153,7 @@ var NostalgyRules =
folder = FindFolderExact(r.folder);
}
}
+ nostalgy_search_folder_options.require_file = save_req;
return folder;
}
}
@@ -175,8 +177,15 @@ function onNostalgyResize() {
}
var NostalgyFolderListener = {
- OnItemAdded: function(parentItem, item) { ClearNostalgyCache(); },
- OnItemRemoved: function(parentItem, item) { ClearNostalgyCache(); },
+ OnItemAdded: function(parentItem, item) {
+ try { var i = item.QueryInterface(Components.interfaces.nsIMsgFolder);
+ ClearNostalgyCache();
+ } catch (ex) { } },
+ OnItemRemoved: function(parentItem, item) {
+ try { var i = item.QueryInterface(Components.interfaces.nsIMsgFolder);
+ ClearNostalgyCache();
+ } catch (ex) { } },
+
OnItemPropertyChanged: function(item, property, oldValue, newValue) { },
OnItemIntPropertyChanged: function(item, property, oldValue, newValue) { },
OnItemBoolPropertyChanged: function(item, property, oldValue, newValue) { },
@@ -185,6 +194,12 @@ var NostalgyFolderListener = {
OnItemEvent: function(folder, event) { }
}
+function NostalgyMailSession() {
+ var mSession = Components.classes[mailSessionContractID].getService();
+ if (!mSession) return mSessions;
+ return mSession.QueryInterface(Components.interfaces.nsIMsgMailSession);
+}
+
function onNostalgyLoad() {
NostalgyRules.register_keys();
@@ -213,22 +228,16 @@ function onNostalgyLoad() {
// Don't know why, but the blur event does not seem to be fired properly...
- var mSession = Components.classes[mailSessionContractID].getService(Components.interfaces.nsIMsgMailSession);
+ var mSession = NostalgyMailSession();
var nsIFolderListener = Components.interfaces.nsIFolderListener;
- var notifyFlags = nsIFolderListener.added | nsIFolderListener.removed;
- mSession.AddFolderListener(NostalgyFolderListener, notifyFlags);
-
- // NostalgyKeys();
+ if (mSession)
+ mSession.AddFolderListener(NostalgyFolderListener,
+ nsIFolderListener.added | nsIFolderListener.removed);
}
-function NostalgyKeys() {
- var nodes = this.document.getElementsByTagName("key");
- for (i = 0, l = nodes.length; i < l; i++)
- if (nodes[i].getAttribute("nostalgy_key")) {
- alert(nodes[i].getAttribute("nostalgy_key") + " = " +
- nodes[i].getAttribute("key"));
- nodes[i].setAttribute("key","O");
- }
+function onNostalgyUnload() {
+ var mSession = NostalgyMailSession();
+ if (mSession) mSession.RemoveFolderListener(NostalgyFolderListener);
}
function NostalgyHideIfBlurred() {
@@ -623,6 +632,7 @@ function ParseCommand(k) {
window.addEventListener("load", onNostalgyLoad, false);
window.addEventListener("resize", onNostalgyResize, false);
+window.addEventListener("unload", onNostalgyUnload, false);
if (!in_message_window) {
window.addEventListener("keypress", onNostalgyKeyPress, false);
}
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
More information about the Pkg-mozext-commits
mailing list