[Pkg-mozext-commits] [nostalgy] 21/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 fce9b8652e96efff63312846e1bf65a4cf26ee54
Author: frisch <frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Wed Aug 30 18:38:33 2006 +0000

    *** empty log message ***
---
 content/edit_prefs.js          |  2 ++
 content/edit_prefs.xul         |  6 +++---
 content/messageOverlay.xul     |  2 +-
 content/thunderbirdOverlay.xul |  5 ++---
 files                          | 11 ++++++-----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/content/edit_prefs.js b/content/edit_prefs.js
index 4b6df42..bb53463 100644
--- a/content/edit_prefs.js
+++ b/content/edit_prefs.js
@@ -123,6 +123,7 @@ function onNostalgyLoad() {
   var prefs = Components.classes["@mozilla.org/preferences-service;1"].
                          getService(Components.interfaces.nsIPrefBranch);
 
+  try {
   var r = eval(prefs.getCharPref("extensions.nostalgy.rules"));
   var i;
   for (i = 0; i < r.length; i++) { 
@@ -130,6 +131,7 @@ function onNostalgyLoad() {
     r[i].contains = r[i].contains;
     CreateItem(r[i]); 
   }
+  } catch (ex) { }
 
  var b = false;
  try { b=prefs.getBoolPref("extensions.nostalgy.restrict_to_current_server"); }
diff --git a/content/edit_prefs.xul b/content/edit_prefs.xul
index 29efbf4..7ffc042 100644
--- a/content/edit_prefs.xul
+++ b/content/edit_prefs.xul
@@ -14,14 +14,14 @@
  <script src="folders.js"/>
  <script src="edit_prefs.js"/>
 
-<vbox style="width:800px" flex="1">
- <groupbox flex="1">
+<vbox style="width:800px">
+ <groupbox>
  <label>Rules associate folders to messages by looking for a 
 substring of the Sender or Subject (or both) headers. When a folder
 is selected for a given message, Nostalgy informs you in the status line.
 You can then use the Shift-S/Shift-C
 shortcuts to move/copy the message to this folder.</label>
- <listbox rows="15" id="rules">
+ <listbox id="rules">
   <listhead>
    <listheader label="Field"/>
    <listheader label="Contains"/>
diff --git a/content/messageOverlay.xul b/content/messageOverlay.xul
index 9dda315..13853b9 100644
--- a/content/messageOverlay.xul
+++ b/content/messageOverlay.xul
@@ -17,7 +17,7 @@
        oncommand="NostalgySuggested('&nostalgy.copy-memo;',CopyToFolder);"/>
  </keyset>
 
- <commandset id="globalCommandset">
+ <commandset id="tasksCommands">
    <command id="cmd_nostalgyconfig" label="Nostalgy rules..." 
      oncommand="openDialog('chrome://nostalgy/content/edit_prefs.xul', 'nostalgy', 'resizable');"/>
   </commandset>
diff --git a/content/thunderbirdOverlay.xul b/content/thunderbirdOverlay.xul
index 2d36e0c..a6dc1fa 100644
--- a/content/thunderbirdOverlay.xul
+++ b/content/thunderbirdOverlay.xul
@@ -6,14 +6,13 @@
  <script src="folders.js"/>
  <script src="nostalgy.js"/>
 
- <commandset id="globalCommandset">
+ <commandset id="tasksCommands">
    <command id="cmd_nostalgyconfig" label="Nostalgy..." 
      oncommand="openDialog('chrome://nostalgy/content/edit_prefs.xul', 'nostalgy', 'resizable');"/>
   </commandset>
 
  <menupopup id="taskPopup">
-  <menuitem id="nostalgy"  
-     command="cmd_nostalgyconfig" insertbefore="menu_preferences"/>
+  <menuitem id="nostalgy" command="cmd_nostalgyconfig"/>
  </menupopup>
 
 
diff --git a/files b/files
index 081b440..d899d58 100644
--- a/files
+++ b/files
@@ -1,12 +1,13 @@
-content/about.xul
-content/edit_prefs.xul
+content/.#nostalgy.js.1.3
 content/thunderbirdOverlay.xul
-content/messageOverlay.xul
 content/about.xhtml
+content/about.xul
+content/edit_prefs.js
+content/edit_prefs.xul
+content/edit_rule.js
 content/edit_rule.xul
 content/folders.js
-content/edit_rule.js
-content/edit_prefs.js
+content/messageOverlay.xul
 content/nostalgy.js
 locale/en-US/nostalgy.dtd
 locale/en-US/nostalgy.properties

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