Merge branch 'master' of github.com:Webconverger/iceweasel-webconverger

Webconverger · Mar 23, 2012 · 1a131f9 · 1a131f9
2 parents 25a30cb + e224894
commit 1a131f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/chrome.manifest b/chrome.manifest
@@ -3,15 +3,18 @@ overlay chrome://browser/content/browser.xul    chrome://webconverger/content/wc
 style chrome://browser/content/browser.xul chrome://webconverger/content/wc.css
 style chrome://global/content/config.xul chrome://webconverger/content/blank.css
 style about:config chrome://webconverger/content/blank.css
+style chrome://browser/content/safeMode.xul chrome://webconverger/content/blank.css
+style about:addons chrome://webconverger/content/blank.css
+style chrome://mozapps/content/extensions/extensions.xul chrome://webconverger/content/blank.css
 override chrome://mozapps/content/downloads/downloads.xul chrome://webconverger/content/downloads.xul
 override chrome://mozapps/content/downloads/unknownContentType.xul chrome://webconverger/content/unknownContentType.xul
-override chrome://mozapps/content/xpinstall/xpinstallConfirm.xul about:blank
-override chrome://mozapps/content/xpinstall/xpistatus.xul about:blank
-override chrome://global/content/filepicker.xul about:blank
-override chrome://mozapps/content/downloads/editAction.xul about:blank
-override chrome://global/content/nsHelperAppDlg.xul about:blank
-override chrome://mozapps/content/extensions/finalize.xul about:blank
-override chrome://mozapps/content/update/update.xul about:blank
+#override chrome://mozapps/content/xpinstall/xpinstallConfirm.xul about:blank
+#override chrome://mozapps/content/xpinstall/xpistatus.xul about:blank
+#override chrome://global/content/filepicker.xul about:blank
+#override chrome://mozapps/content/downloads/editAction.xul about:blank
+#override chrome://global/content/nsHelperAppDlg.xul about:blank
+#override chrome://mozapps/content/extensions/finalize.xul about:blank
+#override chrome://mozapps/content/update/update.xul about:blank
 component {be1472ad-6f60-4dc1-bc62-9145fe220879} components/noHelperAppDlg.js
 contract @mozilla.org/helperapplauncherdialog;1 {be1472ad-6f60-4dc1-bc62-9145fe220879}
 override chrome://global/content/netError.xhtml chrome://webconverger/content/netError.xhtml

diff --git a/src/webconverger.js b/src/webconverger.js
@@ -19,7 +19,9 @@ if (typeof webc == 'undefined') { (function() {
 		function init() {
 			// Add close tab listener, gBrowser has not been initiated by this point
 			getBrowser().tabContainer.addEventListener("TabClose", tabRemoved, false);
-			getBrowser().tabContainer.addEventListener("DisableDownload", onDownloadStateChange, false);
+			try {
+				getBrowser().tabContainer.addEventListener("DisableDownload", onDownloadStateChange, false);
+			} catch (ex) {}
 			var pbs = Components.classes["@mozilla.org/privatebrowsing;1"].getService(Components.interfaces.nsIPrivateBrowsingService);
 			pbs.privateBrowsingEnabled = true;
 		}