moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2025-01-08 12:08:05 -05:00
Code Issues Releases Wiki Activity

Linux: fix click on menuitems (bug introduced in 0cfe58e4).

Browse Source
This commit is contained in:
foudfou 2014-11-09 15:30:44 +01:00
parent 233e442a09
commit 6feb13e7e2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/linux/FiretrayPopupMenu.jsm
View File

@ -121,7 +121,7 @@ firetray.PopupMenu = {
this.setWindowItemLabel(menuItemWindow, xid.toString()); // default to xid this.setWindowItemLabel(menuItemWindow, xid.toString()); // default to xid
let callback = gobject.GCallback_t( 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, this.callbacks.menuItemWindowActivate[xid] = callback,
gobject.g_signal_connect(menuItemWindow, "activate", callback, null); gobject.g_signal_connect(menuItemWindow, "activate", callback, null);

6
src/modules/linux/FiretrayWindow.jsm
View File

@ -593,10 +593,10 @@ firetray.Window.attachOnFocusInCallback = function(xid) {
let callback = gtk.GCallbackWidgetFocusEvent_t( let callback = gtk.GCallbackWidgetFocusEvent_t(
firetray.Window.onFocusIn, null, FIRETRAY_CB_SENTINEL); firetray.Window.onFocusIn, null, FIRETRAY_CB_SENTINEL);
this.signals['focus-in'].callback[xid] = callback; 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); firetray.Handler.gtkWindows.get(xid), "focus-in-event", callback, null);
log.debug("focus-in handler="+rv); log.debug("focus-in handler="+handlerId);
this.signals['focus-in'].handler[xid] = rv; this.signals['focus-in'].handler[xid] = handlerId;
}; };
firetray.Window.detachOnFocusInCallback = function(xid) { firetray.Window.detachOnFocusInCallback = function(xid) {