From 6daf73fe44e4b4b2e2408e608334f8051b8861de Mon Sep 17 00:00:00 2001 From: foudfou Date: Thu, 9 Feb 2012 15:39:33 +0100 Subject: [PATCH] reorganize and clean --- src/Makefile | 3 ++- src/modules/FiretrayHandler.jsm | 10 ++++---- ...etrayPrefListener.jsm => PrefListener.jsm} | 0 src/modules/ctypes/{ => linux}/cairo.jsm | 0 src/modules/ctypes/{ => linux}/gdk.jsm | 8 +++---- src/modules/ctypes/{ => linux}/glib.jsm | 0 src/modules/ctypes/{ => linux}/gobject.jsm | 2 +- src/modules/ctypes/{ => linux}/gtk.jsm | 6 ++--- src/modules/ctypes/{ => linux}/libc.jsm | 0 src/modules/ctypes/{ => linux}/pango.jsm | 4 ++-- src/modules/ctypes/{ => linux}/pangocairo.jsm | 6 ++--- src/modules/ctypes/{ => linux}/x11.jsm | 0 src/modules/ctypes/xinerama.jsm | 23 ------------------- .../{gtk2 => linux}/FiretrayPopupMenu.jsm | 4 ++-- .../{gtk2 => linux}/FiretrayStatusIcon.jsm | 14 +++++------ .../{gtk2 => linux}/FiretrayWindow.jsm | 10 ++++---- 16 files changed, 34 insertions(+), 56 deletions(-) rename src/modules/{FiretrayPrefListener.jsm => PrefListener.jsm} (100%) rename src/modules/ctypes/{ => linux}/cairo.jsm (100%) rename src/modules/ctypes/{ => linux}/gdk.jsm (98%) rename src/modules/ctypes/{ => linux}/glib.jsm (100%) rename src/modules/ctypes/{ => linux}/gobject.jsm (99%) rename src/modules/ctypes/{ => linux}/gtk.jsm (97%) rename src/modules/ctypes/{ => linux}/libc.jsm (100%) rename src/modules/ctypes/{ => linux}/pango.jsm (94%) rename src/modules/ctypes/{ => linux}/pangocairo.jsm (78%) rename src/modules/ctypes/{ => linux}/x11.jsm (100%) delete mode 100644 src/modules/ctypes/xinerama.jsm rename src/modules/{gtk2 => linux}/FiretrayPopupMenu.jsm (98%) rename src/modules/{gtk2 => linux}/FiretrayStatusIcon.jsm (95%) rename src/modules/{gtk2 => linux}/FiretrayWindow.jsm (98%) diff --git a/src/Makefile b/src/Makefile index 4e491e0..54a09df 100755 --- a/src/Makefile +++ b/src/Makefile @@ -87,7 +87,8 @@ modules_dir := modules modules_sources := $(wildcard $(modules_dir)/*.js) \ $(wildcard $(modules_dir)/*.jsm) \ $(wildcard $(modules_dir)/ctypes/*.jsm) \ - $(wildcard $(modules_dir)/gtk2/*.jsm) + $(wildcard $(modules_dir)/ctypes/linux/*.jsm) \ + $(wildcard $(modules_dir)/linux/*.jsm) # The sources for the XPI file. Uses variables defined in the included # Makefiles. diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm index 5f2dc66..2ffe97f 100644 --- a/src/modules/FiretrayHandler.jsm +++ b/src/modules/FiretrayHandler.jsm @@ -8,10 +8,10 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/ctypes.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); -Cu.import("resource://firetray/ctypes/gtk.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/gtk.jsm"); Cu.import("resource://firetray/commons.js"); -Cu.import("resource://firetray/FiretrayPrefListener.jsm"); +Cu.import("resource://firetray/PrefListener.jsm"); Cu.import("resource://firetray/FiretrayVersionChange.jsm"); /** @@ -63,9 +63,9 @@ firetray.Handler = { LOG("OS=" + this.runtimeOS + ", ABI=" + this.runtimeABI + ", XULrunner=" + xulVer); switch (this.runtimeOS) { case "Linux": - Cu.import("resource://firetray/gtk2/FiretrayStatusIcon.jsm"); + Cu.import("resource://firetray/linux/FiretrayStatusIcon.jsm"); LOG('FiretrayStatusIcon imported'); - Cu.import("resource://firetray/gtk2/FiretrayWindow.jsm"); + Cu.import("resource://firetray/linux/FiretrayWindow.jsm"); LOG('FiretrayWindow imported'); break; default: diff --git a/src/modules/FiretrayPrefListener.jsm b/src/modules/PrefListener.jsm similarity index 100% rename from src/modules/FiretrayPrefListener.jsm rename to src/modules/PrefListener.jsm diff --git a/src/modules/ctypes/cairo.jsm b/src/modules/ctypes/linux/cairo.jsm similarity index 100% rename from src/modules/ctypes/cairo.jsm rename to src/modules/ctypes/linux/cairo.jsm diff --git a/src/modules/ctypes/gdk.jsm b/src/modules/ctypes/linux/gdk.jsm similarity index 98% rename from src/modules/ctypes/gdk.jsm rename to src/modules/ctypes/linux/gdk.jsm index a7194d9..855c643 100644 --- a/src/modules/ctypes/gdk.jsm +++ b/src/modules/ctypes/linux/gdk.jsm @@ -48,10 +48,10 @@ const Ci = Components.interfaces; Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); -Cu.import("resource://firetray/ctypes/cairo.jsm"); -Cu.import("resource://firetray/ctypes/glib.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); -Cu.import("resource://firetray/ctypes/x11.jsm"); +Cu.import("resource://firetray/ctypes/linux/cairo.jsm"); +Cu.import("resource://firetray/ctypes/linux/glib.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/x11.jsm"); function gdk_defines(lib) { this.GdkInterpType = ctypes.int; // enum diff --git a/src/modules/ctypes/glib.jsm b/src/modules/ctypes/linux/glib.jsm similarity index 100% rename from src/modules/ctypes/glib.jsm rename to src/modules/ctypes/linux/glib.jsm diff --git a/src/modules/ctypes/gobject.jsm b/src/modules/ctypes/linux/gobject.jsm similarity index 99% rename from src/modules/ctypes/gobject.jsm rename to src/modules/ctypes/linux/gobject.jsm index 542e6ba..82d82f1 100644 --- a/src/modules/ctypes/gobject.jsm +++ b/src/modules/ctypes/linux/gobject.jsm @@ -48,7 +48,7 @@ const Ci = Components.interfaces; Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); -Cu.import("resource://firetray/ctypes/glib.jsm"); +Cu.import("resource://firetray/ctypes/linux/glib.jsm"); function gobject_defines(lib) { diff --git a/src/modules/ctypes/gtk.jsm b/src/modules/ctypes/linux/gtk.jsm similarity index 97% rename from src/modules/ctypes/gtk.jsm rename to src/modules/ctypes/linux/gtk.jsm index 8dad3cd..c71bafd 100644 --- a/src/modules/ctypes/gtk.jsm +++ b/src/modules/ctypes/linux/gtk.jsm @@ -11,9 +11,9 @@ const Ci = Components.interfaces; Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); -Cu.import("resource://firetray/ctypes/gdk.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); -Cu.import("resource://firetray/ctypes/pango.jsm"); +Cu.import("resource://firetray/ctypes/linux/gdk.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/pango.jsm"); function gtk_defines(lib) { this.GTK_ICON_SIZE_MENU = 1; // enum GtkIconSize diff --git a/src/modules/ctypes/libc.jsm b/src/modules/ctypes/linux/libc.jsm similarity index 100% rename from src/modules/ctypes/libc.jsm rename to src/modules/ctypes/linux/libc.jsm diff --git a/src/modules/ctypes/pango.jsm b/src/modules/ctypes/linux/pango.jsm similarity index 94% rename from src/modules/ctypes/pango.jsm rename to src/modules/ctypes/linux/pango.jsm index 0ed5622..a19a755 100644 --- a/src/modules/ctypes/pango.jsm +++ b/src/modules/ctypes/linux/pango.jsm @@ -11,8 +11,8 @@ const Ci = Components.interfaces; Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); -Cu.import("resource://firetray/ctypes/cairo.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/cairo.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); function pango_defines(lib) { this.PANGO_WEIGHT_THIN = 100; diff --git a/src/modules/ctypes/pangocairo.jsm b/src/modules/ctypes/linux/pangocairo.jsm similarity index 78% rename from src/modules/ctypes/pangocairo.jsm rename to src/modules/ctypes/linux/pangocairo.jsm index b62fa9a..e763951 100644 --- a/src/modules/ctypes/pangocairo.jsm +++ b/src/modules/ctypes/linux/pangocairo.jsm @@ -11,9 +11,9 @@ const Ci = Components.interfaces; Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); -Cu.import("resource://firetray/ctypes/cairo.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); -Cu.import("resource://firetray/ctypes/pango.jsm"); +Cu.import("resource://firetray/ctypes/linux/cairo.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/pango.jsm"); function pangocairo_defines(lib) { lib.lazy_bind("pango_cairo_show_layout", ctypes.void_t, cairo.cairo_t.ptr, pango.PangoLayout.ptr); diff --git a/src/modules/ctypes/x11.jsm b/src/modules/ctypes/linux/x11.jsm similarity index 100% rename from src/modules/ctypes/x11.jsm rename to src/modules/ctypes/linux/x11.jsm diff --git a/src/modules/ctypes/xinerama.jsm b/src/modules/ctypes/xinerama.jsm deleted file mode 100644 index 0d37b7a..0000000 --- a/src/modules/ctypes/xinerama.jsm +++ /dev/null @@ -1,23 +0,0 @@ -/* -*- Mode: javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ - -var EXPORTED_SYMBOLS = [ "xinerama" ]; - -const XINERAMA_LIBNAME = "Xinerama"; -const XINERAMA_ABIS = [ 1 ]; - -const Cu = Components.utils; -const Cc = Components.classes; -const Ci = Components.interfaces; - -Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/ctypes.jsm"); -Cu.import("resource://firetray/ctypes/ctypes-utils.jsm"); -Cu.import("resource://firetray/logging.jsm"); -Cu.import("resource://firetray/ctypes/x11.jsm"); - - -function xinerama_defines(lib) { - lib.lazy_bind("XineramaIsActive", x11.Bool, x11.Display.ptr); -} - -new ctypes_library(XINERAMA_LIBNAME, XINERAMA_ABIS, xinerama_defines, this); diff --git a/src/modules/gtk2/FiretrayPopupMenu.jsm b/src/modules/linux/FiretrayPopupMenu.jsm similarity index 98% rename from src/modules/gtk2/FiretrayPopupMenu.jsm rename to src/modules/linux/FiretrayPopupMenu.jsm index 04b4f6c..829c03a 100644 --- a/src/modules/gtk2/FiretrayPopupMenu.jsm +++ b/src/modules/linux/FiretrayPopupMenu.jsm @@ -9,8 +9,8 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/ctypes.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); -Cu.import("resource://firetray/ctypes/gtk.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/gtk.jsm"); Cu.import("resource://firetray/commons.js"); if ("undefined" == typeof(firetray.StatusIcon)) diff --git a/src/modules/gtk2/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm similarity index 95% rename from src/modules/gtk2/FiretrayStatusIcon.jsm rename to src/modules/linux/FiretrayStatusIcon.jsm index 337d2cc..d3a7a1a 100644 --- a/src/modules/gtk2/FiretrayStatusIcon.jsm +++ b/src/modules/linux/FiretrayStatusIcon.jsm @@ -9,12 +9,12 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/ctypes.jsm"); -Cu.import("resource://firetray/ctypes/cairo.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); -Cu.import("resource://firetray/ctypes/gdk.jsm"); -Cu.import("resource://firetray/ctypes/gtk.jsm"); -Cu.import("resource://firetray/ctypes/pango.jsm"); -Cu.import("resource://firetray/ctypes/pangocairo.jsm"); +Cu.import("resource://firetray/ctypes/linux/cairo.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/gdk.jsm"); +Cu.import("resource://firetray/ctypes/linux/gtk.jsm"); +Cu.import("resource://firetray/ctypes/linux/pango.jsm"); +Cu.import("resource://firetray/ctypes/linux/pangocairo.jsm"); Cu.import("resource://firetray/commons.js"); if ("undefined" == typeof(firetray.Handler)) @@ -40,7 +40,7 @@ firetray.StatusIcon = { firetray.Handler.setIconTooltipDefault(); - Cu.import("resource://firetray/gtk2/FiretrayPopupMenu.jsm"); + Cu.import("resource://firetray/linux/FiretrayPopupMenu.jsm"); if (!firetray.PopupMenu.init()) return false; diff --git a/src/modules/gtk2/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm similarity index 98% rename from src/modules/gtk2/FiretrayWindow.jsm rename to src/modules/linux/FiretrayWindow.jsm index 2b6cbd6..a20cb9c 100644 --- a/src/modules/gtk2/FiretrayWindow.jsm +++ b/src/modules/linux/FiretrayWindow.jsm @@ -17,11 +17,11 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://firetray/ctypes/ctypesMap.jsm"); -Cu.import("resource://firetray/ctypes/gobject.jsm"); -Cu.import("resource://firetray/ctypes/gdk.jsm"); -Cu.import("resource://firetray/ctypes/gtk.jsm"); -Cu.import("resource://firetray/ctypes/libc.jsm"); -Cu.import("resource://firetray/ctypes/x11.jsm"); +Cu.import("resource://firetray/ctypes/linux/gobject.jsm"); +Cu.import("resource://firetray/ctypes/linux/gdk.jsm"); +Cu.import("resource://firetray/ctypes/linux/gtk.jsm"); +Cu.import("resource://firetray/ctypes/linux/libc.jsm"); +Cu.import("resource://firetray/ctypes/linux/x11.jsm"); Cu.import("resource://firetray/commons.js"); if ("undefined" == typeof(firetray.Handler))