[Pkg-mozext-commits] [nostalgy] 163/235: Fix bug with predicition when using tags.

[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 a288a2887f332dfd6b8585d0e9137176c20ef57c
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Fri Jun 26 23:34:26 2009 +0000

    Fix bug with predicition when using tags.
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@163 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 content/nfpredict.js |   14 ++++++--------
 content/nostalgy.js  |   18 ++++++++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/content/nfpredict.js b/content/nfpredict.js
index 4282656..a34d5e2 100644
--- a/content/nfpredict.js
+++ b/content/nfpredict.js
@@ -143,13 +143,12 @@ var NostalgyPredict =
     },
 
     find_generic_id: function (value,insertQ,selectQ) {
-        while ( true ) {
-            var myArray1 = $sqlite.select(this.getDBFile(),selectQ,value);
-            if ( myArray1.length >= 1 )
-                return myArray1[0]['id'];
-            else
-                $sqlite.cmd(this.getDBFile(),insertQ,value);
-        }
+        var myArray1 = $sqlite.select(this.getDBFile(),selectQ,value);
+        if ( myArray1.length >= 1 ) return myArray1[0]['id'];
+        $sqlite.cmd(this.getDBFile(),insertQ,value);
+        myArray1 = $sqlite.select(this.getDBFile(),selectQ,value);
+        if ( myArray1.length >= 1 ) return myArray1[0]['id'];
+        throw "find_generic_id: failure";
     },
 
     find_folder_id: function find_folder_id(folder) {
@@ -181,7 +180,6 @@ var NostalgyPredict =
         var hdr = gDBView.hdrForFirstSelectedMessage;
         var addresses = (hdr.author + " " + hdr.recipients + " " + hdr.ccList).toLowerCase();
 
-
         var folder_id=this.find_folder_id(folder);
 
         email_re = /(([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+)/;
diff --git a/content/nostalgy.js b/content/nostalgy.js
index 58aeac4..53aa510 100644
--- a/content/nostalgy.js
+++ b/content/nostalgy.js
@@ -690,20 +690,24 @@ function NostalgyToggleMessageTag(tag) {
 
 function NostalgyMoveToFolder(folder) {
  register_folder(folder);
- NostalgyPredict.update_folder(folder);
  if (window.SetNextMessageAfterDelete) SetNextMessageAfterDelete();
  else gFolderDisplay.hintAboutToDeleteMessages();
  if (folder.tag) NostalgyToggleMessageTag(folder);
- else gDBView.doCommandWithFolder(nsMsgViewCommandType.moveMessages,folder);
+ else {
+     NostalgyPredict.update_folder(folder);
+     gDBView.doCommandWithFolder(nsMsgViewCommandType.moveMessages,folder);
+ }
  return true;
 }
 
 function NostalgyMoveToFolderAndGo(folder) {
  register_folder(folder);
- NostalgyPredict.update_folder(folder);
  var sel = NostalgySaveSelection();
  if (folder.tag) NostalgyToggleMessageTag(folder);
- else gDBView.doCommandWithFolder(nsMsgViewCommandType.moveMessages,folder);
+ else {
+     NostalgyPredict.update_folder(folder);
+     gDBView.doCommandWithFolder(nsMsgViewCommandType.moveMessages,folder);
+ }
  NostalgyShowFolder(folder);
  nostalgy_selection_saved = null;
  nostalgy_on_move_completed = function() { nostalgy_selection_saved = sel; };
@@ -715,9 +719,11 @@ function NostalgyMoveToFolderAndGo(folder) {
 
 function NostalgyCopyToFolder(folder) {
  register_folder(folder);
- NostalgyPredict.update_folder(folder);
  if (folder.tag) NostalgyToggleMessageTag(folder);
- else gDBView.doCommandWithFolder(nsMsgViewCommandType.copyMessages,folder);
+ else {
+     NostalgyPredict.update_folder(folder);
+     gDBView.doCommandWithFolder(nsMsgViewCommandType.copyMessages,folder);
+ }
  return true;
 }
 

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