[Pkg-mozext-commits] [firetray] 278/399: fix iconify-after-show trap

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit d81c0d51ac49ad03f6ee84a9d8c19fe7b109a043
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Tue Aug 21 15:40:40 2012 +0200

    fix iconify-after-show trap
---
 src/chrome/content/options.js        |    6 ------
 src/defaults/preferences/prefs.js    |    2 +-
 src/modules/linux/FiretrayWindow.jsm |   15 +++++----------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 71b80ed..96402cd 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -91,12 +91,6 @@ var firetrayUIOptions = {
     F.LOG("hides_on_close="+hides_on_close+", hides_on_minimize="+hides_on_minimize);
     document.getElementById('ui_hides_single_window').disabled =
       !(hides_on_close || hides_on_minimize);
-
-    let showActivates = document.getElementById('ui_show_activates');
-    if (hides_on_minimize)
-      showActivates.checked = showActivates.disabled = hides_on_minimize;
-    else
-      showActivates.disabled = hides_on_minimize;
   },
 
   updateScrollOptions: function() {
diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index 065e356..e02085b 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -8,7 +8,7 @@ pref("extensions.firetray.hides_on_close", true);
 pref("extensions.firetray.hides_on_minimize", true);
 pref("extensions.firetray.hides_single_window", true);
 pref("extensions.firetray.start_hidden", false);
-pref("extensions.firetray.show_activates", true);
+pref("extensions.firetray.show_activates", false);
 pref("extensions.firetray.remember_desktop", false);
 
 pref("extensions.firetray.app_icon_type", 0);
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index cabc832..ef23dc1 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -232,13 +232,7 @@ firetray.Window = {
 
     // after show
     firetray.Window.restoreDesktop(xid);
-    if (firetray.Utils.prefService.getBoolPref('show_activates') ||
-        /* hides_on_minimize is tricky: first we don't restore the window
-         minimized if hides_on_minimize is set, which is better than not
-         storing the minimized state at saveStates() (in case hides_on_minimize
-         is changed in between). But when restoring, we need to prevent the wm
-         to iconify the window, and we need to do it at a late stage */
-        firetray.Utils.prefService.getBoolPref('hides_on_minimize'))
+    if (firetray.Utils.prefService.getBoolPref('show_activates'))
       firetray.Window.activate(xid);
 
     firetray.PopupMenu.hideWindowItemAndSeparatorMaybe(xid);
@@ -312,12 +306,14 @@ firetray.Window = {
       F.LOG("restored maximized");
     }
 
-    let hides_on_minimize = firetray.Utils.prefService.getBoolPref('hides_on_minimize');
-    if ((winStates & FIRETRAY_XWINDOW_HIDDEN) && !hides_on_minimize) {
+    if (winStates & FIRETRAY_XWINDOW_HIDDEN) {
       firetray.Handler.windows[xid].chromeWin.minimize();
       F.LOG("restored minimized");
     }
 
+    if (firetray.Utils.prefService.getBoolPref('hides_on_minimize'))
+      firetray.Handler.windows[xid].chromeWin.restore();
+
     delete firetray.Handler.windows[xid].savedStates;
   },
 
@@ -541,7 +537,6 @@ firetray.Window = {
 
     return gdk.GDK_FILTER_CONTINUE;
   }
-
 }; // firetray.Window
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git