[Pkg-mozext-commits] [firetray] 05/33: Libappindicator: first step to replace GTK3 version with GTK2.
David Prévot
taffit at moszumanska.debian.org
Fri Oct 23 21:35:10 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 254560247b1ef9b86644b9fae1c223863883828c
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Sun Jun 14 22:18:09 2015 +0200
Libappindicator: first step to replace GTK3 version with GTK2.
---
src/modules/ctypes/linux/appindicator.jsm | 6 +++---
src/modules/linux/FiretrayAppIndicator.jsm | 30 +++++++++++++++---------------
src/modules/linux/FiretrayStatusIcon.jsm | 12 ++++++------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/modules/ctypes/linux/appindicator.jsm b/src/modules/ctypes/linux/appindicator.jsm
index ed7a10e..44dad81 100644
--- a/src/modules/ctypes/linux/appindicator.jsm
+++ b/src/modules/ctypes/linux/appindicator.jsm
@@ -1,8 +1,8 @@
/* -*- Mode: js2; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-var EXPORTED_SYMBOLS = [ "appind3" ];
+var EXPORTED_SYMBOLS = [ "appind" ];
-const APPINDICATOR_LIBNAME = "appindicator3";
+const APPINDICATOR_LIBNAME = "appindicator";
const APPINDICATOR_ABIS = [ 1 ];
const Cu = Components.utils;
@@ -55,4 +55,4 @@ function appindicator_defines(lib) {
ctypes.default_abi, ctypes.void_t, [this.AppIndicator.ptr, gobject.gint, gobject.guint, gobject.gpointer]).ptr;
};
-var appind3 = new ctypes_library(APPINDICATOR_LIBNAME, APPINDICATOR_ABIS, appindicator_defines, this);
+var appind = new ctypes_library(APPINDICATOR_LIBNAME, APPINDICATOR_ABIS, appindicator_defines, this);
diff --git a/src/modules/linux/FiretrayAppIndicator.jsm b/src/modules/linux/FiretrayAppIndicator.jsm
index d703707..90c41aa 100644
--- a/src/modules/linux/FiretrayAppIndicator.jsm
+++ b/src/modules/linux/FiretrayAppIndicator.jsm
@@ -7,7 +7,7 @@ const Ci = Components.interfaces;
const Cu = Components.utils;
Cu.import("resource://gre/modules/ctypes.jsm");
-// FIXME: can't subscribeLibsForClosing([appind3])
+// FIXME: can't subscribeLibsForClosing([appind])
// https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/1393256
Cu.import("resource://firetray/ctypes/linux/appindicator.jsm");
Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
@@ -27,14 +27,14 @@ firetray.AppIndicator = {
indicator: null,
init: function() {
- this.indicator = appind3.app_indicator_new(
+ this.indicator = appind.app_indicator_new(
FIRETRAY_APPINDICATOR_ID,
firetray.StatusIcon.defaultAppIconName,
- appind3.APP_INDICATOR_CATEGORY_COMMUNICATIONS
+ appind.APP_INDICATOR_CATEGORY_COMMUNICATIONS
);
- appind3.app_indicator_set_status(this.indicator,
- appind3.APP_INDICATOR_STATUS_ACTIVE);
- appind3.app_indicator_set_menu(this.indicator,
+ appind.app_indicator_set_status(this.indicator,
+ appind.APP_INDICATOR_STATUS_ACTIVE);
+ appind.app_indicator_set_menu(this.indicator,
firetray.PopupMenu.menu); // mandatory
log.debug("indicator="+this.indicator);
@@ -58,12 +58,12 @@ firetray.AppIndicator = {
},
addCallbacks: function() {
- this.callbacks.connChanged = appind3.ConnectionChangedCb_t(
+ this.callbacks.connChanged = appind.ConnectionChangedCb_t(
firetray.AppIndicator.onConnectionChanged); // void return, no sentinel
gobject.g_signal_connect(this.indicator, "connection-changed",
firetray.AppIndicator.callbacks.connChanged, null);
- this.callbacks.onScroll = appind3.OnScrollCb_t(
+ this.callbacks.onScroll = appind.OnScrollCb_t(
firetray.AppIndicator.onScroll); // void return, no sentinel
gobject.g_signal_connect(this.indicator, "scroll-event",
firetray.AppIndicator.callbacks.onScroll, null);
@@ -82,7 +82,7 @@ firetray.AppIndicator = {
return false;
}
let menuItemShowHideWidget = ctypes.cast(item, gtk.GtkWidget.ptr);
- appind3.app_indicator_set_secondary_activate_target(
+ appind.app_indicator_set_secondary_activate_target(
this.indicator, menuItemShowHideWidget);
return true;
},
@@ -108,13 +108,13 @@ firetray.StatusIcon.shutdownImpl =
firetray.Handler.setIconImageDefault = function() {
log.debug("setIconImageDefault");
- appind3.app_indicator_set_icon(firetray.AppIndicator.indicator,
+ appind.app_indicator_set_icon(firetray.AppIndicator.indicator,
firetray.StatusIcon.defaultAppIconName);
};
firetray.Handler.setIconImageNewMail = function() {
log.debug("setIconImageNewMail");
- appind3.app_indicator_set_icon(firetray.AppIndicator.indicator,
+ appind.app_indicator_set_icon(firetray.AppIndicator.indicator,
firetray.StatusIcon.defaultNewMailIconName);
};
@@ -123,7 +123,7 @@ firetray.Handler.setIconImageCustom = function(prefname) {
// Undocumented: ok to pass a *path* instead of an icon name! Otherwise we
// should be changing the default icons (which is maybe a better
// implementation anyway)...
- appind3.app_indicator_set_icon(firetray.AppIndicator.indicator, prefCustomIconPath);
+ appind.app_indicator_set_icon(firetray.AppIndicator.indicator, prefCustomIconPath);
};
// No tooltips in AppIndicator
@@ -145,8 +145,8 @@ firetray.Handler.setIconVisibility = function(visible) {
return false;
let status = visible ?
- appind3.APP_INDICATOR_STATUS_ACTIVE :
- appind3.APP_INDICATOR_STATUS_PASSIVE;
- appind3.app_indicator_set_status(firetray.AppIndicator.indicator, status);
+ appind.APP_INDICATOR_STATUS_ACTIVE :
+ appind.APP_INDICATOR_STATUS_PASSIVE;
+ appind.app_indicator_set_status(firetray.AppIndicator.indicator, status);
return true;
};
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index 7d6b341..c64e009 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -93,12 +93,12 @@ firetray.StatusIcon = {
appindEnable: function() {
Cu.import("resource://firetray/ctypes/linux/appindicator.jsm");
- /* FIXME: Ubuntu14.04/Unity: successfully closing appind3 crashes FF/TB
+ /* FIXME: Ubuntu14.04/Unity: successfully closing appind crashes FF/TB
during exit, in Ubuntu's unity-menubar.patch's code.
https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/1393256 */
- // firetray.Handler.subscribeLibsForClosing([appind3]);
+ // firetray.Handler.subscribeLibsForClosing([appind]);
let canAppIndicator =
- (appind3.available() && this.dbusNotificationWatcherReady());
+ (appind.available() && this.dbusNotificationWatcherReady());
/* We can't reliably detect if xembed tray icons are supported, because,
for instance, Unity/compiz falsely claims to have support for it through
_NET_SYSTEM_TRAY_Sn (compiz). So we end up using the desktop id as a
@@ -162,9 +162,9 @@ firetray.StatusIcon = {
gio.G_BUS_TYPE_SESSION,
flags,
null, /* GDBusInterfaceInfo */
- appind3.NOTIFICATION_WATCHER_DBUS_ADDR,
- appind3.NOTIFICATION_WATCHER_DBUS_OBJ,
- appind3.NOTIFICATION_WATCHER_DBUS_IFACE,
+ appind.NOTIFICATION_WATCHER_DBUS_ADDR,
+ appind.NOTIFICATION_WATCHER_DBUS_OBJ,
+ appind.NOTIFICATION_WATCHER_DBUS_IFACE,
null, /* GCancellable */
err.address());
if (error(err)) return watcherReady;
--
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