From 6feb13e7e242be08b87815218066e85a795cae13 Mon Sep 17 00:00:00 2001
From: foudfou <foudil.newbie+git@gmail.com>
Date: Sun, 9 Nov 2014 15:30:44 +0100
Subject: [PATCH] Linux: fix click on menuitems (bug introduced in 0cfe58e4).

---
 src/modules/linux/FiretrayPopupMenu.jsm | 2 +-
 src/modules/linux/FiretrayWindow.jsm    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/linux/FiretrayPopupMenu.jsm b/src/modules/linux/FiretrayPopupMenu.jsm
index b7d0a96..eace46a 100644
--- a/src/modules/linux/FiretrayPopupMenu.jsm
+++ b/src/modules/linux/FiretrayPopupMenu.jsm
@@ -121,7 +121,7 @@ firetray.PopupMenu = {
     this.setWindowItemLabel(menuItemWindow, xid.toString()); // default to xid
 
     let callback = gobject.GCallback_t(
-      function(){firetray.Handler.showWindow(xid);}, null, FIRETRAY_CB_SENTINEL); // void return, no sentinel
+      function(){firetray.Handler.showWindow(xid);}); // void return, no sentinel
     this.callbacks.menuItemWindowActivate[xid] = callback,
     gobject.g_signal_connect(menuItemWindow, "activate", callback, null);
 
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 814188f..8e6147f 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -593,10 +593,10 @@ firetray.Window.attachOnFocusInCallback = function(xid) {
   let callback = gtk.GCallbackWidgetFocusEvent_t(
     firetray.Window.onFocusIn, null, FIRETRAY_CB_SENTINEL);
   this.signals['focus-in'].callback[xid] = callback;
-  let rv = gobject.g_signal_connect(
+  let handlerId = gobject.g_signal_connect(
     firetray.Handler.gtkWindows.get(xid), "focus-in-event", callback, null);
-  log.debug("focus-in handler="+rv);
-  this.signals['focus-in'].handler[xid] = rv;
+  log.debug("focus-in handler="+handlerId);
+  this.signals['focus-in'].handler[xid] = handlerId;
 };
 
 firetray.Window.detachOnFocusInCallback = function(xid) {