From e2e09a93a273b5b8cd4ce4648af6130f2ebd1180 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Fri, 18 Dec 2009 02:08:24 +0000
Subject: [PATCH] =?UTF-8?q?Session=20Manager=20(https://addons.mozilla.org?=
 =?UTF-8?q?/firefox/addon/2324)=E3=81=A7=E3=81=AE=E3=82=BB=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E5=BE=A9=E5=85=83=E6=99=82=E3=81=AB?=
 =?UTF-8?q?=E3=81=8A=E3=81=84=E3=81=A6=20*=20=E3=81=99=E3=81=B9=E3=81=A6?=
 =?UTF-8?q?=E3=81=AE=E3=83=84=E3=83=AA=E3=83=BC=E3=81=8C=E5=B8=B8=E3=81=AB?=
 =?UTF-8?q?=E5=B1=95=E9=96=8B=E3=81=95=E3=82=8C=E3=81=9F=E7=8A=B6=E6=85=8B?=
 =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20*=20=E6=8A=98=E3=82=8A=E7=95=B3?=
 =?UTF-8?q?=E3=81=BE=E3=82=8C=E3=81=9F=E3=83=84=E3=83=AA=E3=83=BC=E3=81=8C?=
 =?UTF-8?q?=E3=81=82=E3=82=8B=E3=81=A8=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E5=BE=A9=E5=85=83=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
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@5542 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/hacks.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index 065fc4fc..81f0ea3b 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -176,13 +176,23 @@ TreeStyleTabService.overrideExtensionsPreInit = function() {
 	// Session Manager
 	// https://addons.mozilla.org/firefox/addon/2324
 	// We need to initialize TST before Session Manager restores the last session anyway!
-	if ('gSessionManager' in window &&
-		'onLoad_proxy' in gSessionManager &&
-		'onLoad' in gSessionManager) {
-		eval('gSessionManager.onLoad = '+gSessionManager.onLoad.toSource().replace(
-			'{',
-			'{ TreeStyleTabService.init();'
-		));
+	if ('gSessionManager' in window) {
+		if ('onLoad_proxy' in gSessionManager &&
+			'onLoad' in gSessionManager) {
+			eval('gSessionManager.onLoad = '+gSessionManager.onLoad.toSource().replace(
+				'{',
+				'{ TreeStyleTabService.init();'
+			));
+		}
+		if ('load' in gSessionManager) {
+			eval('gSessionManager.load = '+gSessionManager.load.toSource().replace(
+				'var tabcount = ',
+				<![CDATA[
+					gBrowser.treeStyleTab.collapseExpandAllSubtree(false, true);
+					TreeStyleTabService.restoringWindow = true;
+				$&]]>
+			));
+		}
 	}
 
 	// FullerScreen