From c622e61e9d6e4f34f5388dca82d7716b9e5b7614 Mon Sep 17 00:00:00 2001
From: foudfou <foudil.newbie+git@gmail.com>
Date: Mon, 10 Dec 2012 23:02:05 +0100
Subject: [PATCH] fix start_hidden again.

The wisest seems to let the window get fully realized, before hiding it.
---
 src/chrome/content/overlay.js        | 4 +++-
 src/modules/FiretrayHandler.jsm      | 2 +-
 src/modules/commons.js               | 2 ++
 src/modules/linux/FiretrayWindow.jsm | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/overlay.js b/src/chrome/content/overlay.js
index b2386e4..6eb726f 100644
--- a/src/chrome/content/overlay.js
+++ b/src/chrome/content/overlay.js
@@ -24,7 +24,9 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
 
     ftlog.debug("ONLOAD"); firetray.Handler.dumpWindows();
     this.winId = firetray.Handler.registerWindow(win);
-    win.setTimeout(firetrayChrome.startHiddenMaybe, 0, this.winId);
+    win.setTimeout(firetrayChrome.startHiddenMaybe,
+                   FIRETRAY_DELAY_STARTUP_HIDE_MILLISECONDS,
+                   this.winId);
 
     win.addEventListener('close', firetrayChrome.onClose, true);
 
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index ac53029..3f0b5bf 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -192,7 +192,7 @@ firetray.Handler = {
     switch (topic) {
     case "sessionstore-windows-restored":
     case "mail-startup-done":
-    case "final-ui-startup":
+    case "final-ui-startup":                   // subject=ChromeWindow
       if (firetray.Handler.appStarted) return; // second TB window issues "mail-startup-done"
       log.debug("RECEIVED: "+topic+", launching timer");
       // sessionstore-windows-restored does not come after the realization of
diff --git a/src/modules/commons.js b/src/modules/commons.js
index 7de2854..a15e7df 100644
--- a/src/modules/commons.js
+++ b/src/modules/commons.js
@@ -11,6 +11,7 @@ var EXPORTED_SYMBOLS =
     "FIRETRAY_IM_STATUS_AVAILABLE", "FIRETRAY_IM_STATUS_AWAY",
     "FIRETRAY_IM_STATUS_BUSY", "FIRETRAY_IM_STATUS_OFFLINE",
     "FIRETRAY_ACCOUNT_SERVER_TYPE_IM",
+    "FIRETRAY_DELAY_STARTUP_HIDE_MILLISECONDS",
     "FIRETRAY_DELAY_BROWSER_STARTUP_MILLISECONDS",
     "FIRETRAY_DELAY_NOWAIT_MILLISECONDS",
     "FIRETRAY_DELAY_PREF_CLEANING_MILLISECONDS",
@@ -48,6 +49,7 @@ const FIRETRAY_IM_STATUS_OFFLINE   = "user-offline";
 const FIRETRAY_ACCOUNT_SERVER_TYPE_IM = "im";
 
 const FIRETRAY_DELAY_BROWSER_STARTUP_MILLISECONDS = 500;
+const FIRETRAY_DELAY_STARTUP_HIDE_MILLISECONDS    = 400;
 const FIRETRAY_DELAY_NOWAIT_MILLISECONDS          = 0;
 const FIRETRAY_DELAY_PREF_CLEANING_MILLISECONDS   = 15*60*1000;
 
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 6028c52..a2b6e48 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -261,7 +261,7 @@ firetray.Window = {
     log.debug('startupHide: '+xid);
 
     firetray.Handler.windows[xid].baseWin.visibility = false;
-    this.updateVisibility(xid, false);
+    firetray.Window.updateVisibility(xid, false);
 
     firetray.PopupMenu.showWindowItem(xid);
     firetray.Handler.showHideIcon();