From 93edf62036e1b42b3a61bb7b67bee06bb4aeb615 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 28 Jul 2011 01:32:25 -0400
Subject: [PATCH] Make teledactyl not explode yay.

---
 teledactyl/bootstrap.js           |  1 +
 teledactyl/content/addressbook.js |  2 +-
 teledactyl/content/config.js      | 12 +++++++++---
 teledactyl/content/mail.js        |  2 +-
 teledactyl/install.rdf            |  8 ++++----
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 120000 teledactyl/bootstrap.js

diff --git a/teledactyl/bootstrap.js b/teledactyl/bootstrap.js
new file mode 120000
index 00000000..ff1024d5
--- /dev/null
+++ b/teledactyl/bootstrap.js
@@ -0,0 +1 @@
+../common/bootstrap.js
\ No newline at end of file
diff --git a/teledactyl/content/addressbook.js b/teledactyl/content/addressbook.js
index 53b60b19..ecc5524c 100644
--- a/teledactyl/content/addressbook.js
+++ b/teledactyl/content/addressbook.js
@@ -4,7 +4,7 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const Addressbook = Module("addressbook", {
+var Addressbook = Module("addressbook", {
     init: function () {
     },
 
diff --git a/teledactyl/content/config.js b/teledactyl/content/config.js
index 054ab0a4..3a883ae9 100644
--- a/teledactyl/content/config.js
+++ b/teledactyl/content/config.js
@@ -4,7 +4,7 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const Config = Module("config", ConfigBase, {
+var Config = Module("config", ConfigBase, {
     name: "teledactyl",
     appName: "Teledactyl",
     idName: "TELEDACTYL",
@@ -16,12 +16,16 @@ const Config = Module("config", ConfigBase, {
         init: function init() {
             init.superapply(this, arguments);
 
-            modules.__defineGetter__("content", function () window.content);
+            if (!("content" in modules))
+                modules.__defineGetter__("content", function () window.content);
 
             util.overlayWindow(window, { append: <><hbox id="statusTextBox" flex=""/></> });
         },
 
-        get browser() window.getBrowser(),
+        get browser()
+            let (tabmail = document.getElementById('tabmail'))
+                tabmail && tabmail.tabInfo.length ? tabmail.getBrowserForSelectedTab()
+                                                  : document.getElementById("messagepane"),
 
         get commandContainer() document.documentElement.id,
 
@@ -33,6 +37,8 @@ const Config = Module("config", ConfigBase, {
             get mStrip() this.tabStrip,
             get browsers() [browser for (browser in Iterator(this.mTabs))],
 
+            removeTab: function removeTab(tab) this.closeTab(tab),
+
             loadOneTab: function loadOneTab(uri) {
                 return this.openTab("contentTab", { contentPage: uri });
             },
diff --git a/teledactyl/content/mail.js b/teledactyl/content/mail.js
index 15b72005..3b67b450 100644
--- a/teledactyl/content/mail.js
+++ b/teledactyl/content/mail.js
@@ -4,7 +4,7 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const Mail = Module("mail", {
+var Mail = Module("mail", {
     init: function init() {
         // used for asynchronously selecting messages after wrapping folders
         this._selectMessageKeys = [];
diff --git a/teledactyl/install.rdf b/teledactyl/install.rdf
index d68eb62e..ae822069 100644
--- a/teledactyl/install.rdf
+++ b/teledactyl/install.rdf
@@ -5,17 +5,17 @@
         em:id="teledactyl@dactyl.googlecode.com"
         em:type="2"
         em:name="Teledactyl"
-        em:version="0.5b1pre"
+        em:version="0.6"
         em:description="Thunderbird for Mutt and Vim addicts"
         em:creator="Kris Maglione"
         em:homepageURL="http://dactyl.sf.net/Teledactyl"
         em:iconURL="chrome://teledactyl/skin/icon.png"
-        em:optionsURL="chrome://dactyl/content/preferences.xul">
+        em:bootstrap="true">
         <em:targetApplication>
             <Description>
                 <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-                <em:minVersion>3.0b3</em:minVersion>
-                <em:maxVersion>3.2</em:maxVersion>
+                <em:minVersion>5.0</em:minVersion>
+                <em:maxVersion>8.*</em:maxVersion>
             </Description>
         </em:targetApplication>
     </Description>