[Pkg-mozext-commits] [firetray] 13/33: Minor refactoring.
David Prévot
taffit at moszumanska.debian.org
Fri Oct 23 21:35:11 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 6e628dfbff591b62209a4ed12645f56598783d3e
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Fri Jul 31 01:17:22 2015 +0200
Minor refactoring.
---
src/chrome/content/options.js | 4 +-
src/modules/FiretrayHandler.jsm | 75 +++++++++++++++-------------
src/modules/FiretrayWindow.jsm | 2 +-
src/modules/ctypes/ctypes-utils.jsm | 2 +-
src/modules/linux/FiretrayChatStatusIcon.jsm | 3 +-
src/modules/linux/FiretrayStatusIcon.jsm | 6 +--
src/modules/linux/FiretrayWindow.jsm | 2 +-
src/modules/logging.jsm | 2 +-
src/modules/winnt/FiretrayStatusIcon.jsm | 4 +-
src/modules/winnt/FiretrayWindow.jsm | 2 +-
10 files changed, 54 insertions(+), 48 deletions(-)
diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index b909585..9d8e8c3 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -40,7 +40,7 @@ var firetrayUIOptions = {
if (firetray.Handler.isChatProvided() &&
firetray.Handler.support['chat'] &&
!firetray.AppIndicator) {
- Cu.import("resource://firetray/"+firetray.Handler.runtimeOS+"/FiretrayChat.jsm");
+ Cu.import("resource://firetray/"+firetray.Handler.app.OS+"/FiretrayChat.jsm");
this.initChatControls();
} else {
this.hidePrefPane("pref-pane-chat");
@@ -415,7 +415,7 @@ var firetrayUIOptions = {
}};
filePicker.init(window, "Select Icon", nsIFilePicker.modeOpen); // FIXME: i18n
- if (firetray.Handler.runtimeOS === "winnt")
+ if (firetray.Handler.app.OS === "winnt")
filePicker.appendFilter("Icon", "*.bmp; *.ico"); // TODO: support more formats ?
else
filePicker.appendFilters(nsIFilePicker.filterImages);
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 78edf1c..96feef5 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -50,11 +50,15 @@ firetray.Handler = {
observedTopics: {},
ctypesLibs: {}, // {"lib1": lib1, "lib2": lib2}
- appId: (function(){return Services.appinfo.ID;})(),
- appName: (function(){return Services.appinfo.name;})(),
- xulVer: (function(){return Services.appinfo.platformVersion;})(), // Services.vc.compare(xulVer,"2.0a")>=0
- runtimeABI: (function(){return Services.appinfo.XPCOMABI;})(),
- runtimeOS: (function(){return Services.appinfo.OS.toLowerCase();})(), // "WINNT", "Linux", "Darwin"
+ app: (function(){return {
+ id: Services.appinfo.ID,
+ name: Services.appinfo.name,
+ // Services.vc.compare(version,"2.0a")>=0
+ version: Services.appinfo.platformVersion,
+ ABI: Services.appinfo.XPCOMABI,
+ OS: Services.appinfo.OS.toLowerCase(), // "WINNT", "Linux", "Darwin"
+ widgetTk: Services.appinfo.widgetToolkit,
+ };})(),
addonRootDir: (function(){
let uri = Services.io.newURI(Components.stack.filename, null, null);
if (uri instanceof Ci.nsIFileURL) {
@@ -69,38 +73,41 @@ firetray.Handler = {
firetray.PrefListener.register(false);
firetray.MailChatPrefListener.register(false);
- log.info("OS=" + this.runtimeOS + ", ABI=" + this.runtimeABI + ", XULrunner=" + this.xulVer);
- if (FIRETRAY_OS_SUPPORT.indexOf(this.runtimeOS) < 0) {
+ log.info("OS=" + this.app.OS +
+ ", ABI=" + this.app.ABI +
+ ", platformVersion=" + this.app.version +
+ ", widgetToolkit=" + this.app.widgetTk);
+ if (FIRETRAY_OS_SUPPORT.indexOf(this.app.OS) < 0) {
let platforms = FIRETRAY_OS_SUPPORT.join(", ");
log.error("Only "+platforms+" platform(s) supported at this time. Firetray not loaded");
return false;
- } else if (this.runtimeOS == "winnt" &&
- Services.vc.compare(this.xulVer,"27.0") < 0) {
+ } else if (this.app.OS == "winnt" &&
+ Services.vc.compare(this.app.version,"27.0") < 0) {
log.error("FireTray needs Gecko 27 and above on Windows.");
return false;
- } else if (this.runtimeOS == "freebsd") {
- this.runtimeOS = "linux";
+ } else if (this.app.OS == "freebsd") {
+ this.app.OS = "linux";
}
- Cu.import("resource://firetray/"+this.runtimeOS+"/FiretrayStatusIcon.jsm");
- log.debug("FiretrayStatusIcon "+this.runtimeOS+" imported");
+ Cu.import("resource://firetray/"+this.app.OS+"/FiretrayStatusIcon.jsm");
+ log.debug("FiretrayStatusIcon "+this.app.OS+" imported");
log.info("useAppind="+firetray.Handler.useAppind);
- Cu.import("resource://firetray/"+this.runtimeOS+"/FiretrayWindow.jsm");
- log.debug("FiretrayWindow "+this.runtimeOS+" imported");
+ Cu.import("resource://firetray/"+this.app.OS+"/FiretrayWindow.jsm");
+ log.debug("FiretrayWindow "+this.app.OS+" imported");
this.support['chat'] =
- ['linux'].indexOf(this.runtimeOS) > -1 && !this.useAppind;
+ ['linux'].indexOf(this.app.OS) > -1 && !this.useAppind;
this.support['winnt'] =
- ['winnt'].indexOf(firetray.Handler.runtimeOS) > -1;
+ ['winnt'].indexOf(firetray.Handler.app.OS) > -1;
- if (this.appId === FIRETRAY_APP_DB['thunderbird']['id'] ||
- this.appId === FIRETRAY_APP_DB['seamonkey']['id'])
+ if (this.app.id === FIRETRAY_APP_DB['thunderbird']['id'] ||
+ this.app.id === FIRETRAY_APP_DB['seamonkey']['id'])
this.inMailApp = true;
- if (this.appId === FIRETRAY_APP_DB['firefox']['id'] ||
- this.appId === FIRETRAY_APP_DB['seamonkey']['id'])
+ if (this.app.id === FIRETRAY_APP_DB['firefox']['id'] ||
+ this.app.id === FIRETRAY_APP_DB['seamonkey']['id'])
this.inBrowserApp = true;
- if (this.appId === FIRETRAY_APP_DB['thunderbird']['id'] &&
- Services.vc.compare(this.xulVer,"15.0")>=0)
+ if (this.app.id === FIRETRAY_APP_DB['thunderbird']['id'] &&
+ Services.vc.compare(this.app.version,"15.0")>=0)
this.appHasChat = true;
log.info('inMailApp='+this.inMailApp+', inBrowserApp='+this.inBrowserApp+
', appHasChat='+this.appHasChat);
@@ -129,7 +136,7 @@ firetray.Handler = {
if (chatIsProvided) {
if (this.support['chat']) {
Cu.import("resource://firetray/FiretrayMessaging.jsm"); // needed for existsChatAccount
- Cu.import("resource://firetray/"+this.runtimeOS+"/FiretrayChat.jsm");
+ Cu.import("resource://firetray/"+this.app.OS+"/FiretrayChat.jsm");
firetray.Utils.addObservers(firetray.Handler, [
"account-added", "account-removed"]);
if (firetray.Utils.prefService.getBoolPref("chat_icon_enable") &&
@@ -142,10 +149,10 @@ firetray.Handler = {
firetray.Utils.addObservers(firetray.Handler,
[ "xpcom-will-shutdown", "profile-change-teardown" ]);
- if (this.appId === FIRETRAY_APP_DB['firefox']['id'] ||
- this.appId === FIRETRAY_APP_DB['seamonkey']['id']) {
+ if (this.app.id === FIRETRAY_APP_DB['firefox']['id'] ||
+ this.app.id === FIRETRAY_APP_DB['seamonkey']['id']) {
firetray.Utils.addObservers(firetray.Handler, [ "sessionstore-windows-restored" ]);
- } else if (this.appId === FIRETRAY_APP_DB['thunderbird']['id']) {
+ } else if (this.app.id === FIRETRAY_APP_DB['thunderbird']['id']) {
this.restoredWindowsCount = this.readTBRestoreWindowsCount();
log.info("restoredWindowsCount="+this.restoredWindowsCount);
if (!this.restoredWindowsCount) {
@@ -439,9 +446,9 @@ firetray.Handler = {
},
_getBrowserProperties: function() {
- if (firetray.Handler.appId === FIRETRAY_APP_DB['firefox']['id'])
+ if (firetray.Handler.app.id === FIRETRAY_APP_DB['firefox']['id'])
return "chrome://branding/locale/browserconfig.properties";
- else if (firetray.Handler.appId === FIRETRAY_APP_DB['seamonkey']['id'])
+ else if (firetray.Handler.app.id === FIRETRAY_APP_DB['seamonkey']['id'])
return "chrome://navigator-region/locale/region.properties";
else return null;
},
@@ -674,15 +681,15 @@ firetray.VersionChangeHandler = {
},
openTab: function(url) {
- log.info("appId="+firetray.Handler.appId);
- if (firetray.Handler.appId === FIRETRAY_APP_DB['thunderbird']['id'])
+ log.info("app.id="+firetray.Handler.app.id);
+ if (firetray.Handler.app.id === FIRETRAY_APP_DB['thunderbird']['id'])
this.openMailTab(url);
- else if (firetray.Handler.appId === FIRETRAY_APP_DB['firefox']['id'] ||
- firetray.Handler.appId === FIRETRAY_APP_DB['seamonkey']['id'])
+ else if (firetray.Handler.app.id === FIRETRAY_APP_DB['firefox']['id'] ||
+ firetray.Handler.app.id === FIRETRAY_APP_DB['seamonkey']['id'])
this.openBrowserTab(url);
- else if (firetray.Handler.appId === FIRETRAY_APP_DB['zotero']['id']) {
+ else if (firetray.Handler.app.id === FIRETRAY_APP_DB['zotero']['id']) {
let win = null;
if (win = Services.wm.getMostRecentWindow("zotero:basicViewer")) {
win.loadURI(uri);
diff --git a/src/modules/FiretrayWindow.jsm b/src/modules/FiretrayWindow.jsm
index 3da2416..dd001f7 100644
--- a/src/modules/FiretrayWindow.jsm
+++ b/src/modules/FiretrayWindow.jsm
@@ -29,7 +29,7 @@ FiretrayWindow.prototype = {
log.debug("|baseWin.title="+title+"|");
// FIXME: we should be able to compute the base title from the XUL window
// attributes.
- const kTailRe = " (-|\u2014) ((Mozilla )?"+firetray.Handler.appName+"|Nightly)";
+ const kTailRe = " (-|\u2014) ((Mozilla )?"+firetray.Handler.app.name+"|Nightly)";
let tailIndex = title.search(kTailRe);
if (tailIndex !== -1)
return title.substring(0, tailIndex);
diff --git a/src/modules/ctypes/ctypes-utils.jsm b/src/modules/ctypes/ctypes-utils.jsm
index 913308e..f3df558 100644
--- a/src/modules/ctypes/ctypes-utils.jsm
+++ b/src/modules/ctypes/ctypes-utils.jsm
@@ -44,7 +44,7 @@ Cu.import("resource://gre/modules/ctypes.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://firetray/logging.jsm");
-const is64bit = ctypes.size_t.size == 8; // firetray.Handler.runtimeABI.indexOf('_64') > -1;
+const is64bit = ctypes.size_t.size == 8; // firetray.Handler.app.ABI.indexOf('_64') > -1;
const WinABI = is64bit ? ctypes.default_abi : ctypes.winapi_abi;
const WinCbABI = is64bit ? ctypes.default_abi : ctypes.stdcall_abi;
diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index b9a6a6a..541e830 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -35,7 +35,6 @@ firetray.ChatStatusIcon = {
initialized: false,
trayIcon: null,
- appId: (function(){return Services.appinfo.ID;})(),
themedIcons: (function(){let o = {};
o[FIRETRAY_IM_STATUS_AVAILABLE] = null;
o[FIRETRAY_IM_STATUS_AWAY] = null;
@@ -295,7 +294,7 @@ firetray.ChatStatusIcon = {
},
setIconTooltipDefault: function() {
- this.setIconTooltip(firetray.Handler.appName+" Chat");
+ this.setIconTooltip(firetray.Handler.app.name+" Chat");
}
// TODO: onclick/activate -> chatHandler.showCurrentConversation()
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index 7d6b341..3e7de15 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -70,7 +70,7 @@ firetray.StatusIcon = {
return "app_default_icon_names";
}
})();
- this.defaultAppIconName = firetray.Handler.appName.toLowerCase();
+ this.defaultAppIconName = firetray.Handler.app.name.toLowerCase();
this.prefNewMailIconNames = "new_mail_icon_names";
this.defaultNewMailIconName = "mail-unread";
@@ -216,9 +216,9 @@ firetray.StatusIcon = {
firetray.Handler.useAppind = firetray.StatusIcon.appindEnable();
firetray.Handler.setIconTooltipDefault = function() {
- if (!this.appName)
+ if (!this.app.name)
throw "application name not initialized";
- this.setIconTooltip(this.appName);
+ this.setIconTooltip(this.app.name);
};
firetray.Handler.setIconTooltip = function(toolTipStr) { };
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 7d3778b..f9d2427 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -658,7 +658,7 @@ firetray.Handler.registerWindow = function(win) {
if (x.name === "RangeError") // instanceof not working :-(
win.alert(x+"\n\nYou seem to have more than "+FIRETRAY_WINDOW_COUNT_MAX
+" windows open. This breaks FireTray and most probably "
- +firetray.Handler.appName+".");
+ +firetray.Handler.app.name+".");
}
log.debug("window "+xid+" registered");
// NOTE: shouldn't be necessary to gtk_widget_add_events(gtkWin, gdk.GDK_ALL_EVENTS_MASK);
diff --git a/src/modules/logging.jsm b/src/modules/logging.jsm
index 3a83a97..06a5c1a 100644
--- a/src/modules/logging.jsm
+++ b/src/modules/logging.jsm
@@ -8,7 +8,7 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm");
-const FIRETRAY_LOG_LEVEL = "Warn"; // "All" for debugging
+const FIRETRAY_LOG_LEVEL = "All"; // "All" for debugging
const COLOR_NORMAL = "";
const COLOR_RESET = "\033[m";
diff --git a/src/modules/winnt/FiretrayStatusIcon.jsm b/src/modules/winnt/FiretrayStatusIcon.jsm
index dea844f..f4a9f39 100644
--- a/src/modules/winnt/FiretrayStatusIcon.jsm
+++ b/src/modules/winnt/FiretrayStatusIcon.jsm
@@ -182,7 +182,7 @@ firetray.StatusIcon = {
nid = new shell32.NOTIFYICONDATAW();
nid.cbSize = shell32.NOTIFYICONDATAW_SIZE();
log.debug("SIZE="+nid.cbSize);
- nid.szTip = firetray.Handler.appName;
+ nid.szTip = firetray.Handler.app.name;
nid.hIcon = this.icons.get('app');
nid.hWnd = hwnd_hidden;
nid.uCallbackMessage = firetray.Win32.WM_TRAYMESSAGE;
@@ -494,7 +494,7 @@ firetray.Handler.setIconTooltip = function(toolTipStr) {
firetray.Handler.setIconTooltipDefault = function() {
log.debug("setIconTooltipDefault");
- firetray.StatusIcon.setIcon({tip:this.appName});
+ firetray.StatusIcon.setIcon({tip:this.app.name});
};
firetray.Handler.setIconText = function(text, color) {
diff --git a/src/modules/winnt/FiretrayWindow.jsm b/src/modules/winnt/FiretrayWindow.jsm
index 3d63355..809fef3 100644
--- a/src/modules/winnt/FiretrayWindow.jsm
+++ b/src/modules/winnt/FiretrayWindow.jsm
@@ -147,7 +147,7 @@ firetray.Window.attachWndProc = function(procInfo) {
if (x.name === "RangeError") { // instanceof not working :-(
let msg = x+"\n\nYou seem to have more than "+FIRETRAY_WINDOW_COUNT_MAX
+" windows open. This breaks FireTray and most probably "
- +firetray.Handler.appName+".";
+ +firetray.Handler.app.name+".";
log.error(msg);
Cu.reportError(msg);
}else {
--
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