* fix .xpi packaging
* move ctypes related modules to modules/ctypes/
This commit is contained in:
parent
075131f46c
commit
90e8d8e852
2
TODO
2
TODO
|
@ -1,6 +1,8 @@
|
||||||
TODO
|
TODO
|
||||||
----
|
----
|
||||||
|
|
||||||
|
* use for (var i = 0; myArray[i++];) instead of i<myArray.length
|
||||||
|
|
||||||
* add entry to popup menu when registering
|
* add entry to popup menu when registering
|
||||||
|
|
||||||
WONTFIX
|
WONTFIX
|
||||||
|
|
|
@ -84,7 +84,10 @@ chrome_sources := $(chrome_sources_js) \
|
||||||
modules_dir := modules
|
modules_dir := modules
|
||||||
|
|
||||||
# The sources for the module files.
|
# The sources for the module files.
|
||||||
modules_sources := $(wildcard $(modules_dir)/*.js) $(wildcard $(modules_dir)/*.jsm)
|
modules_sources := $(wildcard $(modules_dir)/*.js) \
|
||||||
|
$(wildcard $(modules_dir)/*.jsm) \
|
||||||
|
$(wildcard $(modules_dir)/ctypes/*.jsm) \
|
||||||
|
$(wildcard $(modules_dir)/gtk2/*.jsm)
|
||||||
|
|
||||||
# The sources for the XPI file. Uses variables defined in the included
|
# The sources for the XPI file. Uses variables defined in the included
|
||||||
# Makefiles.
|
# Makefiles.
|
||||||
|
|
|
@ -382,7 +382,6 @@ var firetrayUIOptions = {
|
||||||
let accountOrServerTypeOrder = parseInt(
|
let accountOrServerTypeOrder = parseInt(
|
||||||
tree.view.getCellText(
|
tree.view.getCellText(
|
||||||
i, tree.columns.getNamedColumn("account_or_server_type_order")));
|
i, tree.columns.getNamedColumn("account_or_server_type_order")));
|
||||||
|
|
||||||
LOG("account: "+accountOrServerTypeName+", "+accountOrServerTypeExcluded);
|
LOG("account: "+accountOrServerTypeName+", "+accountOrServerTypeExcluded);
|
||||||
|
|
||||||
if (tree.view.getLevel(i) === TREELEVEL_SERVER_TYPES) {
|
if (tree.view.getLevel(i) === TREELEVEL_SERVER_TYPES) {
|
||||||
|
|
|
@ -8,8 +8,8 @@ const Cu = Components.utils;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/gobject.jsm");
|
Cu.import("resource://firetray/ctypes/gobject.jsm");
|
||||||
Cu.import("resource://firetray/gtk.jsm");
|
Cu.import("resource://firetray/ctypes/gtk.jsm");
|
||||||
Cu.import("resource://firetray/commons.js");
|
Cu.import("resource://firetray/commons.js");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -8,7 +8,6 @@ const Cu = Components.utils;
|
||||||
|
|
||||||
Cu.import("resource:///modules/mailServices.js");
|
Cu.import("resource:///modules/mailServices.js");
|
||||||
Cu.import("resource://gre/modules/PluralForm.jsm");
|
Cu.import("resource://gre/modules/PluralForm.jsm");
|
||||||
// Cu.import("resource://firetray/FiretrayHandler.jsm");
|
|
||||||
Cu.import("resource://firetray/commons.js");
|
Cu.import("resource://firetray/commons.js");
|
||||||
|
|
||||||
const FLDRS_UNINTERESTING = {
|
const FLDRS_UNINTERESTING = {
|
||||||
|
@ -35,7 +34,7 @@ firetray.Messaging = {
|
||||||
|
|
||||||
init: function() {
|
init: function() {
|
||||||
if (this.initialized) {
|
if (this.initialized) {
|
||||||
LOG("Messaging already initialized");
|
WARN("Messaging already initialized");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LOG("Enabling Messaging");
|
LOG("Enabling Messaging");
|
||||||
|
|
|
@ -68,11 +68,10 @@ firetray.Utils = {
|
||||||
},
|
},
|
||||||
|
|
||||||
QueryInterfaces: function(obj) {
|
QueryInterfaces: function(obj) {
|
||||||
for each (i in Components.interfaces) {
|
for each (i in Components.interfaces)
|
||||||
try {
|
try {
|
||||||
if (obj instanceof i) { LOG(i); }
|
if (obj instanceof i) LOG (i);
|
||||||
} catch (x) {}
|
} catch(x) {}
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
// adapted from http://forums.mozillazine.org/viewtopic.php?p=921150#921150
|
// adapted from http://forums.mozillazine.org/viewtopic.php?p=921150#921150
|
||||||
|
|
|
@ -10,7 +10,7 @@ const Cc = Components.classes;
|
||||||
const Ci = Components.interfaces;
|
const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
|
|
||||||
function cairo_defines(lib) {
|
function cairo_defines(lib) {
|
||||||
this.cairo_t = ctypes.StructType("cairo_t");
|
this.cairo_t = ctypes.StructType("cairo_t");
|
|
@ -47,11 +47,11 @@ const Cc = Components.classes;
|
||||||
const Ci = Components.interfaces;
|
const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
Cu.import("resource://firetray/cairo.jsm");
|
Cu.import("resource://firetray/ctypes/cairo.jsm");
|
||||||
Cu.import("resource://firetray/glib.jsm");
|
Cu.import("resource://firetray/ctypes/glib.jsm");
|
||||||
Cu.import("resource://firetray/gobject.jsm");
|
Cu.import("resource://firetray/ctypes/gobject.jsm");
|
||||||
Cu.import("resource://firetray/x11.jsm");
|
Cu.import("resource://firetray/ctypes/x11.jsm");
|
||||||
|
|
||||||
function gdk_defines(lib) {
|
function gdk_defines(lib) {
|
||||||
this.GdkInterpType = ctypes.int; // enum
|
this.GdkInterpType = ctypes.int; // enum
|
|
@ -10,7 +10,7 @@ const Cc = Components.classes;
|
||||||
const Ci = Components.interfaces;
|
const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
|
|
||||||
function glib_defines(lib) {
|
function glib_defines(lib) {
|
||||||
/* mutual inclusion not possible */
|
/* mutual inclusion not possible */
|
|
@ -47,8 +47,8 @@ const Cc = Components.classes;
|
||||||
const Ci = Components.interfaces;
|
const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
Cu.import("resource://firetray/glib.jsm");
|
Cu.import("resource://firetray/ctypes/glib.jsm");
|
||||||
|
|
||||||
function gobject_defines(lib) {
|
function gobject_defines(lib) {
|
||||||
|
|
|
@ -10,10 +10,10 @@ const Cc = Components.classes;
|
||||||
const Ci = Components.interfaces;
|
const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
Cu.import("resource://firetray/gdk.jsm");
|
Cu.import("resource://firetray/ctypes/gdk.jsm");
|
||||||
Cu.import("resource://firetray/gobject.jsm");
|
Cu.import("resource://firetray/ctypes/gobject.jsm");
|
||||||
Cu.import("resource://firetray/pango.jsm");
|
Cu.import("resource://firetray/ctypes/pango.jsm");
|
||||||
|
|
||||||
function gtk_defines(lib) {
|
function gtk_defines(lib) {
|
||||||
this.GTK_ICON_SIZE_MENU = 1; // enum GtkIconSize
|
this.GTK_ICON_SIZE_MENU = 1; // enum GtkIconSize
|
|
@ -10,7 +10,7 @@ const Cc = Components.classes;
|
||||||
const Ci = Components.interfaces;
|
const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
|
|
||||||
function libc_defines(lib) {
|
function libc_defines(lib) {
|
||||||
this.FILE = ctypes.StructType("FILE");
|
this.FILE = ctypes.StructType("FILE");
|
|
@ -12,9 +12,9 @@ const Cc = Components.classes;
|
||||||
const Ci = Components.interfaces;
|
const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
Cu.import("resource://firetray/cairo.jsm");
|
Cu.import("resource://firetray/ctypes/cairo.jsm");
|
||||||
Cu.import("resource://firetray/gobject.jsm");
|
Cu.import("resource://firetray/ctypes/gobject.jsm");
|
||||||
|
|
||||||
function pango_defines(lib) {
|
function pango_defines(lib) {
|
||||||
this.PANGO_WEIGHT_THIN = 100;
|
this.PANGO_WEIGHT_THIN = 100;
|
|
@ -15,7 +15,7 @@ const Ci = Components.interfaces;
|
||||||
|
|
||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypes-utils.jsm");
|
Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
|
||||||
Cu.import("resource://firetray/logging.jsm");
|
Cu.import("resource://firetray/logging.jsm");
|
||||||
|
|
||||||
const XATOMS_ICCCM = [ "WM_DELETE_WINDOW", "WM_STATE", "WM_CHANGE_STATE" ];
|
const XATOMS_ICCCM = [ "WM_DELETE_WINDOW", "WM_STATE", "WM_CHANGE_STATE" ];
|
|
@ -9,12 +9,12 @@ const Cu = Components.utils;
|
||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/cairo.jsm");
|
Cu.import("resource://firetray/ctypes/cairo.jsm");
|
||||||
Cu.import("resource://firetray/gobject.jsm");
|
Cu.import("resource://firetray/ctypes/gobject.jsm");
|
||||||
Cu.import("resource://firetray/gdk.jsm");
|
Cu.import("resource://firetray/ctypes/gdk.jsm");
|
||||||
Cu.import("resource://firetray/gtk.jsm");
|
Cu.import("resource://firetray/ctypes/gtk.jsm");
|
||||||
Cu.import("resource://firetray/libc.jsm");
|
Cu.import("resource://firetray/ctypes/libc.jsm");
|
||||||
Cu.import("resource://firetray/pango.jsm");
|
Cu.import("resource://firetray/ctypes/pango.jsm");
|
||||||
Cu.import("resource://firetray/commons.js");
|
Cu.import("resource://firetray/commons.js");
|
||||||
|
|
||||||
if ("undefined" == typeof(firetray.Handler))
|
if ("undefined" == typeof(firetray.Handler))
|
||||||
|
|
|
@ -16,12 +16,12 @@ const Cu = Components.utils;
|
||||||
Cu.import("resource://gre/modules/Services.jsm");
|
Cu.import("resource://gre/modules/Services.jsm");
|
||||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||||
Cu.import("resource://gre/modules/ctypes.jsm");
|
Cu.import("resource://gre/modules/ctypes.jsm");
|
||||||
Cu.import("resource://firetray/ctypesMap.jsm");
|
Cu.import("resource://firetray/ctypes/ctypesMap.jsm");
|
||||||
Cu.import("resource://firetray/gobject.jsm");
|
Cu.import("resource://firetray/ctypes/gobject.jsm");
|
||||||
Cu.import("resource://firetray/gdk.jsm");
|
Cu.import("resource://firetray/ctypes/gdk.jsm");
|
||||||
Cu.import("resource://firetray/gtk.jsm");
|
Cu.import("resource://firetray/ctypes/gtk.jsm");
|
||||||
Cu.import("resource://firetray/libc.jsm");
|
Cu.import("resource://firetray/ctypes/libc.jsm");
|
||||||
Cu.import("resource://firetray/x11.jsm");
|
Cu.import("resource://firetray/ctypes/x11.jsm");
|
||||||
Cu.import("resource://firetray/commons.js");
|
Cu.import("resource://firetray/commons.js");
|
||||||
|
|
||||||
const Services2 = {};
|
const Services2 = {};
|
||||||
|
@ -98,11 +98,8 @@ firetray.Window = {
|
||||||
* @param userData: _find_data_t
|
* @param userData: _find_data_t
|
||||||
*/
|
*/
|
||||||
_findGtkWindowByTitle: function(gtkWidget, userData) {
|
_findGtkWindowByTitle: function(gtkWidget, userData) {
|
||||||
// LOG("GTK Window: "+gtkWidget+", "+userData);
|
|
||||||
|
|
||||||
let data = ctypes.cast(userData, _find_data_t.ptr);
|
let data = ctypes.cast(userData, _find_data_t.ptr);
|
||||||
let inTitle = data.contents.inTitle;
|
let inTitle = data.contents.inTitle;
|
||||||
// LOG("inTitle="+inTitle.readString());
|
|
||||||
|
|
||||||
let gtkWin = ctypes.cast(gtkWidget, gtk.GtkWindow.ptr);
|
let gtkWin = ctypes.cast(gtkWidget, gtk.GtkWindow.ptr);
|
||||||
let winTitle = gtk.gtk_window_get_title(gtkWin);
|
let winTitle = gtk.gtk_window_get_title(gtkWin);
|
||||||
|
@ -332,8 +329,7 @@ firetray.Handler.gdkWindows = new ctypesMap(gdk.GdkWindow.ptr),
|
||||||
/** debug facility */
|
/** debug facility */
|
||||||
firetray.Handler.dumpWindows = function() {
|
firetray.Handler.dumpWindows = function() {
|
||||||
LOG(firetray.Handler.windowsCount);
|
LOG(firetray.Handler.windowsCount);
|
||||||
for (let winId in firetray.Handler.windows)
|
for (let winId in firetray.Handler.windows) LOG(winId+"="+firetray.Handler.gtkWindows.get(winId));
|
||||||
LOG(winId+"="+firetray.Handler.gtkWindows.get(winId));
|
|
||||||
};
|
};
|
||||||
|
|
||||||
firetray.Handler.registerWindow = function(win) {
|
firetray.Handler.registerWindow = function(win) {
|
||||||
|
|
Loading…
Reference in New Issue