[Pkg-mozext-commits] [firetray] 31/38: Clean middle_click callbacks.
David Prévot
taffit at moszumanska.debian.org
Mon Apr 6 15:58:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository firetray.
commit d12248993591258db6f8c43959649a1e4bb0916b
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Mon Mar 30 14:40:16 2015 +0200
Clean middle_click callbacks.
---
src/modules/FiretrayHandler.jsm | 4 ----
src/modules/linux/FiretrayAppIndicator.jsm | 7 +------
src/modules/linux/FiretrayGtkStatusIcon.jsm | 31 ++++++-----------------------
3 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index ea6daf4..08a79a6 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -606,10 +606,6 @@ firetray.PrefListener = new PrefListener(
firetray.Messaging.updateMsgCountWithCb();
break;
- case 'middle_click':
- firetray.StatusIcon.middleClickActionChanged();
- break;
-
case 'chat_icon_enable':
firetray.Handler.toggleChat(firetray.Handler.isChatEnabled());
break;
diff --git a/src/modules/linux/FiretrayAppIndicator.jsm b/src/modules/linux/FiretrayAppIndicator.jsm
index b07311c..d703707 100644
--- a/src/modules/linux/FiretrayAppIndicator.jsm
+++ b/src/modules/linux/FiretrayAppIndicator.jsm
@@ -69,7 +69,7 @@ firetray.AppIndicator = {
firetray.AppIndicator.callbacks.onScroll, null);
},
- attachMiddleClickCallback: function(pref) {
+ attachMiddleClickCallback: function() {
let pref = firetray.Utils.prefService.getIntPref("middle_click");
if (pref === FIRETRAY_MIDDLE_CLICK_ACTIVATE_LAST) {
item = firetray.PopupMenu.menuItem.activateLast;
@@ -105,11 +105,6 @@ firetray.StatusIcon.initImpl =
firetray.StatusIcon.shutdownImpl =
firetray.AppIndicator.shutdown.bind(firetray.AppIndicator);
-firetray.StatusIcon.middleClickActionChanged = function() {
- log.debug("middleClickActionChanged");
- firetray.AppIndicator.attachMiddleClickCallback();
-};
-
firetray.Handler.setIconImageDefault = function() {
log.debug("setIconImageDefault");
diff --git a/src/modules/linux/FiretrayGtkStatusIcon.jsm b/src/modules/linux/FiretrayGtkStatusIcon.jsm
index 6ba05eb..cf57847 100644
--- a/src/modules/linux/FiretrayGtkStatusIcon.jsm
+++ b/src/modules/linux/FiretrayGtkStatusIcon.jsm
@@ -104,29 +104,17 @@ firetray.GtkStatusIcon = {
"activate", firetray.GtkStatusIcon.callbacks.iconActivate, null);
log.debug("g_connect activate="+handlerId);
- let pref = firetray.Utils.prefService.getIntPref("middle_click");
- this.attachMiddleClickCallback(pref);
+ this.attachMiddleClickCallback();
},
- attachMiddleClickCallback: function(pref) {
- log.debug("attachMiddleClickCallback pref="+pref);
- let prefAsPtr = new gobject.gpointer(pref);
+ attachMiddleClickCallback: function() {
this.callbacks.iconMiddleClick = gtk.GCallbackStatusIconMiddleClick_t(
firetray.GtkStatusIcon.onButtonPressCb, null, FIRETRAY_CB_SENTINEL);
- this.callbacks.iconMiddleClickId = gobject.g_signal_connect(
+ let iconMiddleClickId = gobject.g_signal_connect(
firetray.GtkStatusIcon.trayIcon,
"button-press-event", firetray.GtkStatusIcon.callbacks.iconMiddleClick,
- prefAsPtr);
- log.debug("g_connect middleClick="+this.callbacks.iconMiddleClickId);
- },
-
- detachMiddleClickCallback: function() {
- log.debug("detachMiddleClickCallback");
- gobject.g_signal_handler_disconnect(
- firetray.GtkStatusIcon.trayIcon,
- gobject.gulong(this.callbacks.iconMiddleClickId)
- );
- delete this.callbacks.iconMiddleClickId;
+ null);
+ log.debug("g_connect middleClick="+iconMiddleClickId);
},
onScroll: function(icon, event, data) {
@@ -151,7 +139,7 @@ firetray.GtkStatusIcon = {
gdkEventButton.contents.type === gdk.GDK_BUTTON_PRESS)
{
log.debug("MIDDLE CLICK");
- let pref = ctypes.cast(data, ctypes.unsigned_int).value;
+ let pref = firetray.Utils.prefService.getIntPref("middle_click");
if (pref === FIRETRAY_MIDDLE_CLICK_ACTIVATE_LAST) {
firetray.Handler.showAllWindowsAndActivate();
} else if (pref === FIRETRAY_MIDDLE_CLICK_SHOW_HIDE) {
@@ -188,13 +176,6 @@ firetray.StatusIcon.initImpl =
firetray.StatusIcon.shutdownImpl =
firetray.GtkStatusIcon.shutdown.bind(firetray.GtkStatusIcon);
-firetray.StatusIcon.middleClickActionChanged = function() {
- log.debug("middleClickActionChanged");
- let pref = firetray.Utils.prefService.getIntPref("middle_click");
- firetray.GtkStatusIcon.detachMiddleClickCallback();
- firetray.GtkStatusIcon.attachMiddleClickCallback(pref);
-};
-
firetray.Handler.loadIcons = firetray.GtkStatusIcon.loadThemedIcons;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git
More information about the Pkg-mozext-commits
mailing list