heuristic to avoid exporting Firefox Places menubar

1 files changed, 19 insertions, 5 deletions

diff --git a/bootstrap.js b/bootstrap.js
index 080d98c..967c2e8 100644
--- a/bootstrap.js
+++ b/bootstrap.js
@@ -8,7 +8,13 @@ function loadIntoWindow(window) {
 	if (!window)
 		return;
 
-	window.topmenuProxy = TopMenuService.createWindowProxy(window);
+	var log = Log4Moz.repository.getLogger("topmenu.Bootstrap");
+
+	try {
+		window.topmenuProxy = TopMenuService.createWindowProxy(window);
+	} catch (ex) {
+		log.warn("Could not create window proxy: " + ex);
+	}
 }
 
 function unloadFromWindow(window) {
@@ -17,8 +23,16 @@ function unloadFromWindow(window) {
 	if (!window.topmenuProxy)
 		return;
 
-	window.topmenuProxy.unload();
-	window.topmenuProxy.dispose();
+	var log = Log4Moz.repository.getLogger("topmenu.Bootstrap");
+
+	try {
+		window.topmenuProxy.unload();
+		window.topmenuProxy.dispose();
+	} catch (ex) {
+		log.warn("Could not unload window proxy: " + ex);
+		log.debug(ex.stack);
+	}
+
 	window.topmenuProxy = null;
 }
 
@@ -45,10 +59,10 @@ function startup(data, reason) {
 	Cu.import("chrome://topmenu/content/log4moz.js");
 	var formatter = new Log4Moz.BasicFormatter();
 	var root = Log4Moz.repository.rootLogger;
-	root.level = Log4Moz.Level.Debug;
+	root.level = Log4Moz.Level.Warn;
 
 	var capp = new Log4Moz.ConsoleAppender(formatter);
-	capp.level = Log4Moz.Level.Debug;
+	capp.level = Log4Moz.Level.Warn;
     root.addAppender(capp);
 
 	var log = Log4Moz.repository.getLogger("topmenu.Bootstrap");