From d06ad331c8b1490550c9e8d50115e7eac6b61fb4 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Mon, 10 Aug 2009 10:06:47 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=96=E3=83=83=E3=82=AF=E3=83=9E=E3=83=BC?=
 =?UTF-8?q?=E3=82=AF=E3=82=B0=E3=83=AB=E3=83=BC=E3=83=97=E3=81=AE=E5=88=B6?=
 =?UTF-8?q?=E5=BE=A1=E3=81=A8=E5=90=8C=E3=81=98=E6=8C=99=E5=8B=95=E3=82=92?=
 =?UTF-8?q?=E5=B1=A5=E6=AD=B4=E3=82=B5=E3=82=A4=E3=83=89=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=83=91=E3=83=8D=E3=83=AB=E3=81=AB=E3=82=82=E9=81=A9=E7=94=A8?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@4919 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 chrome.manifest                           | 1 +
 content/treestyletab/bookmarksOverlay.js  | 4 +++-
 content/treestyletab/bookmarksOverlay.xul | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/chrome.manifest b/chrome.manifest
index e9cf9c36..62a64d85 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -4,6 +4,7 @@ overlay	chrome://browser/content/browser.xul	chrome://treestyletab/content/trees
 
 overlay	chrome://browser/content/bookmarks/bookmarksPanel.xul	chrome://treestyletab/content/bookmarksOverlay.xul
 overlay	chrome://browser/content/places/editBookmarkOverlay.xul	chrome://treestyletab/content/editBookmarkOverlay.xul
+overlay	chrome://browser/content/history/history-panel.xul	chrome://treestyletab/content/bookmarksOverlay.xul
 
 overlay	chrome://multipletab/content/config.xul	chrome://treestyletab/content/multipletabConfigOverlay.xul
 
diff --git a/content/treestyletab/bookmarksOverlay.js b/content/treestyletab/bookmarksOverlay.js
index 1aa5e8bb..69b5b2ca 100644
--- a/content/treestyletab/bookmarksOverlay.js
+++ b/content/treestyletab/bookmarksOverlay.js
@@ -126,7 +126,7 @@ var TreeStyleTabBookmarksService = {
 	getItemIdsForContainerNode : function(aNode) 
 	{
 		var ids = [];
-		if (!PlacesUtils.nodeIsContainer(aNode)) return ids;
+		if (!aNode || !PlacesUtils.nodeIsContainer(aNode)) return ids;
 
 		var root = aNode;
 		if ('getContainerNodeWithOptions' in PlacesUtils) { // Firefox 3.5 or later
@@ -155,6 +155,8 @@ var TreeStyleTabBookmarksService = {
 	{
 		window.removeEventListener('load', this, false);
 
+		if (!('PlacesUIUtils' in window)) return;
+
 		eval('PlacesUIUtils._openTabset = '+
 			PlacesUIUtils._openTabset.toSource().replace(
 				/(function[^\(]*\([^\)]+)(\))/,
diff --git a/content/treestyletab/bookmarksOverlay.xul b/content/treestyletab/bookmarksOverlay.xul
index ff5df89a..5696f8b6 100644
--- a/content/treestyletab/bookmarksOverlay.xul
+++ b/content/treestyletab/bookmarksOverlay.xul
@@ -6,6 +6,10 @@
 <script src="treestyletab.js" type="application/x-javascript; version=1.7"/>
 <script src="bookmarksOverlay.js" type="application/x-javascript; version=1.7"/>
 
+<page id="history-panel">
+	<stringbundleset id="placesStringSet"/>
+</page>
+
 <stringbundleset id="placesStringSet">
 	<stringbundle id="treestyletab-stringbundle"
 		src="chrome://treestyletab/locale/treestyletab.properties"/>