[Pkg-mozext-commits] [firetray] 234/399: when clicking on the tray icon, if all windows visible, activate last registered window

[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 97dcbc8ca51b81e8d0fbaf772d6f22dd7460fa19
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat May 12 16:36:51 2012 +0200

    when clicking on the tray icon, if all windows visible, activate last
    registered window
---
 src/modules/linux/FiretrayStatusIcon.jsm |    6 +++---
 src/modules/linux/FiretrayWindow.jsm     |   10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index 660c8a5..f6b6660 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -131,16 +131,16 @@ firetray.StatusIcon = {
      need to abandon 'this' in PopupMenu.popup() */
     this.callbacks.menuPopup = gtk.GCallbackMenuPopup_t(firetray.PopupMenu.popup);
     gobject.g_signal_connect(this.trayIcon, "popup-menu",
-                             firetray.StatusIcon.callbacks.menuPopup, firetray.PopupMenu.menu);
+      firetray.StatusIcon.callbacks.menuPopup, firetray.PopupMenu.menu);
     this.callbacks.onScroll = gtk.GCallbackOnScroll_t(firetray.StatusIcon.onScroll);
     gobject.g_signal_connect(this.trayIcon, "scroll-event",
-                             firetray.StatusIcon.callbacks.onScroll, null);
+      firetray.StatusIcon.callbacks.onScroll, null);
 
     F.LOG("showHideAllWindows: "+firetray.Handler.hasOwnProperty("showHideAllWindows"));
     this.callbacks.iconActivate = gtk.GCallbackStatusIconActivate_t(
       firetray.Handler.showHideAllWindows);
     let handlerId = gobject.g_signal_connect(firetray.StatusIcon.trayIcon,
-                                             "activate", firetray.StatusIcon.callbacks.iconActivate, null);
+      "activate", firetray.StatusIcon.callbacks.iconActivate, null);
     F.LOG("g_connect activate="+handlerId);
   },
 
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index f8319a8..53ae369 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -201,7 +201,8 @@ firetray.Window = {
 
     // after show
     firetray.Window.restoreDesktop(xid);
-    firetray.Window.activate(xid);
+    if (firetray.Utils.prefService.getBoolPref('show_activates'))
+      firetray.Window.activate(xid);
 
     firetray.PopupMenu.hideSingleWindowItemAndSeparatorMaybe(xid);
     firetray.Handler.showHideIcon();
@@ -330,8 +331,6 @@ firetray.Window = {
    * raises window on top and give focus.
    */
   activate: function(xid) {
-    if (!firetray.Utils.prefService.getBoolPref('show_activates'))
-      return;
     gtk.gtk_window_present(firetray.Handler.gtkWindows.get(xid));
     F.LOG("window raised");
   },
@@ -582,7 +581,10 @@ firetray.Handler.showHideAllWindows = function(gtkStatusIcon, userData) {
   F.LOG("windowsCount="+firetray.Handler.windowsCount);
   let visibilityRate = firetray.Handler.visibleWindowsCount/firetray.Handler.windowsCount;
   F.LOG("visibilityRate="+visibilityRate);
-  if ((0.5 < visibilityRate) && (visibilityRate < 1)
+  if (visibilityRate === 1) {
+    for(var key in firetray.Handler.windows);
+    firetray.Window.activate(key);
+  } else if ((0.5 < visibilityRate) && (visibilityRate < 1)
       || visibilityRate === 0) // TODO: should be configurable
     firetray.Handler.showAllWindows();
   else

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