Merge branch 'master' of kmaglione@git.vimperator.org:/git/vimperator/liberator

.gitignore

@@ -22,6 +22,10 @@
 ## For rejects
 *.orig
 *.rej
+*.ancestor
+*.current
+*.patched
 
 ## Generated by StGit
 patches-*
+.stgit-edit.txt

common/content/events.js

@@ -769,8 +769,11 @@ function Events() //{{{
             // removeEventListeners() to avoid mem leaks
             liberator.dump("TODO: remove all eventlisteners");
 
-            if (typeof getBrowser != "undefined")
+            try
+            {
                 getBrowser().removeProgressListener(this.progressListener);
+            }
+            catch (e) {}
 
             window.removeEventListener("popupshown", enterPopupMode, true);
             window.removeEventListener("popuphidden", exitPopupMode, true);

muttator/content/mail.js

@@ -89,9 +89,9 @@ function Mail() //{{{
     var notifyFlags = nsIFolderListener.intPropertyChanged | nsIFolderListener.event;
     mailSession.AddFolderListener(folderListener, notifyFlags);
 
-    function getFolderCompletions(filter)
+    function getFolderCompletions(context)
     {
-        let folders = mail.getFolders(filter);
+        let folders = mail.getFolders(context.filter);
         context.completions = folders.map(function (folder)
                 [folder.server.prettyName + ": " + folder.name,
                  "Unread: " + folder.getNumUnread(false)]);

vimperator/Donors

@@ -1,4 +1,7 @@
 2009:
+* InspireFocus
+* Michael Fremont
+* Kamil Dworakowski
 * Jonathan Austin
 * Steven Romanow