[Pkg-mozext-commits] [firetray] 331/399: add -firetrayPresent command-line switch

[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 7d0a22364c7ea537752d4f00dd3ada559c6216eb
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Thu Dec 13 19:55:30 2012 +0100

    add -firetrayPresent command-line switch
---
 src/components/firetray-clhandler.js     |    8 +++++++-
 src/modules/FiretrayHandler.jsm          |    2 +-
 src/modules/linux/FiretrayStatusIcon.jsm |    2 +-
 src/modules/linux/FiretrayWindow.jsm     |   24 +++++++++++++++---------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/components/firetray-clhandler.js b/src/components/firetray-clhandler.js
index 064a107..53bd2a4 100644
--- a/src/components/firetray-clhandler.js
+++ b/src/components/firetray-clhandler.js
@@ -28,9 +28,15 @@ firetayCommandLineHandler.prototype = {
   handle: function clh_handle(cmdLine)
   {
     if (cmdLine.handleFlag("firetrayShowHide", false)) {
-      log.debug("*** CmdLine call ***");
+      log.debug("*** CmdLine call -firetrayShowHide ***");
       firetray.Handler.showHideAllWindows();
       cmdLine.preventDefault = true;
+
+    } else if (cmdLine.handleFlag("firetrayPresent", false)) {
+      log.debug("*** CmdLine call -firetrayPresent ***");
+      firetray.Handler.showAllWindowsAndActivate();
+      cmdLine.preventDefault = true;
+
     }
   },
 
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index a2e4a40..cd75bdc 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -241,7 +241,7 @@ firetray.Handler = {
   hideWindow: function(winId) {},
   showWindow: function(winId) {},
   showHideAllWindows: function() {},
-  activateLastWindow: function(gtkStatusIcon, gdkEvent, userData) {},
+  activateLastWindowCb: function(gtkStatusIcon, gdkEvent, userData) {},
   findActiveWindow: function() {},
 
   showAllWindows: function() {
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index 10395ec..05a745a 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -140,7 +140,7 @@ firetray.StatusIcon = {
     log.debug("g_connect activate="+handlerId);
 
     this.callbacks.iconMiddleClick = gtk.GCallbackStatusIconMiddleClick_t(
-      firetray.Handler.activateLastWindow);
+      firetray.Handler.activateLastWindowCb);
     handlerId = gobject.g_signal_connect(firetray.StatusIcon.trayIcon,
       "button-press-event", firetray.StatusIcon.callbacks.iconMiddleClick, null);
     log.debug("g_connect middleClick="+handlerId);
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 06b4556..69e41d6 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -553,8 +553,19 @@ firetray.Window = {
     }
 
     return gdk.GDK_FILTER_CONTINUE;
+  },
+
+  showAllWindowsAndActivate: function() {
+    let visibilityRate = firetray.Handler.visibleWindowsCount/firetray.Handler.windowsCount;
+    log.debug("visibilityRate="+visibilityRate);
+    if (visibilityRate < 1)
+      firetray.Handler.showAllWindows();
+
+    for(var key in firetray.Handler.windows);
+    firetray.Window.activate(key);
   }
 
+
 }; // firetray.Window
 
 
@@ -646,20 +657,15 @@ firetray.Handler.showHideAllWindows = function(gtkStatusIcon, userData) {
   return stopPropagation;
 };
 
-firetray.Handler.activateLastWindow = function(gtkStatusIcon, gdkEvent, userData) {
-  log.debug("activateLastWindow");
+firetray.Handler.showAllWindowsAndActivate = firetray.Window.showAllWindowsAndActivate;
+firetray.Handler.activateLastWindowCb = function(gtkStatusIcon, gdkEvent, userData) {
+  log.debug("activateLastWindowCb");
 
   let gdkEventButton = ctypes.cast(gdkEvent, gdk.GdkEventButton.ptr);
   if (gdkEventButton.contents.button === 2 && gdkEventButton.contents.type === gdk.GDK_BUTTON_PRESS) {
     log.debug("MIDDLE CLICK");
 
-    let visibilityRate = firetray.Handler.visibleWindowsCount/firetray.Handler.windowsCount;
-    log.debug("visibilityRate="+visibilityRate);
-    if (visibilityRate < 1)
-      firetray.Handler.showAllWindows();
-
-    for(var key in firetray.Handler.windows);
-    firetray.Window.activate(key);
+    firetray.Window.showAllWindowsAndActivate();
   }
 
   let stopPropagation = false;

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