From e47a592dbbe2ba75d9ef76e8e20044a4204fc115 Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Sat, 8 Nov 2008 00:34:35 +0000
Subject: [PATCH] fixed xpi generation; made dumpStack() more readable by NOT
 removing \n

---
 Makefile.common      | 4 ++--
 content/liberator.js | 3 ++-
 content/mail.js      | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index a89b68a3..33f7990b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -8,7 +8,7 @@ DOC_SRC_FILES = $(wildcard locale/*/*.txt)
 DOC_FILES     = ${DOC_SRC_FILES:%.txt=%.html}
 
 # TODO: specify source files manually?
-JAR_TXT_FILES = ${shell find -L content skin locale	\
+JAR_TXT_FILES = ${shell find -L content skin locale	components \
 			-type f			\
 			-a ! -path '*CVS*'	\
 			-a \(			\
@@ -37,7 +37,7 @@ XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators NEWS License.t
 			-a -path '*.jsm'	\
 		}
 XPI_DIRS      = $(foreach f,${XPI_FILES},$(dir $f))
-XPI_BIN_FILES = ${JAR} Makefile.common Makefile components/*
+XPI_BIN_FILES = ${JAR} Makefile.common Makefile
 XPI_FILES     = ${XPI_BIN_FILES} ${XPI_TXT_FILES}
 XPI_NAME      = ${NAME}_${VERSION}.xpi
 XPI           = ../downloads/${XPI_NAME}
diff --git a/content/liberator.js b/content/liberator.js
index a0534e1a..a4eaaa50 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -660,7 +660,8 @@ const liberator = (function () //{{{
 
         dumpStack: function (msg)
         {
-            liberator.dump((msg || "") + (new Error()).stack.replace(/.*\n/, ""));
+            //liberator.dump((msg || "") + (new Error()).stack.replace(/.*\n/, ""));
+            liberator.dump((msg || "") + (new Error()).stack);
         },
 
         eval: function (str)
diff --git a/content/mail.js b/content/mail.js
index a6f8d182..30db882e 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -92,7 +92,7 @@ function Mail() //{{{
     function getFolderCompletions(filter)
     {
         var completions = [];
-        var folders = mail.getFolders();
+        var folders = mail.getFolders(filter);
 
         for (let folder = 0; folder < folders.length; folder++)
         {
@@ -101,7 +101,8 @@ function Mail() //{{{
                              "Unread: " + folders[folder].getNumUnread(false)]);
         }
 
-        return [0, completion.filter(completions, filter)];
+        //return [0, completion.filter(completions, filter)];
+        return [0, completions];
     }
 
     function getRSSUrl()