[Pkg-mozext-commits] [firetray] 193/399: * fix Makefile to include themable icons * drop 32x32 application icons
David Prévot
taffit at alioth.debian.org
Tue Oct 29 18:23:41 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch dfsg-clean
in repository firetray.
commit 9c39db6023638cbeb02147ee0ccf504e6227967c
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Mon Mar 5 14:54:28 2012 +0100
* fix Makefile to include themable icons
* drop 32x32 application icons
---
src/Makefile | 9 ++++++---
src/chrome/skin/chatzilla22.png | Bin 0 -> 1200 bytes
src/chrome/skin/chatzilla32.png | Bin 1950 -> 0 bytes
src/chrome/skin/firefox32.png | Bin 2912 -> 0 bytes
.../skin/linux/icons/hicolor/22x22/apps/chatzilla.png | 1 +
.../skin/linux/icons/hicolor/22x22/apps/seamonkey.png | 1 +
.../skin/linux/icons/hicolor/32x32/apps/firefox.png | 1 -
.../skin/linux/icons/hicolor/32x32/apps/thunderbird.png | 1 -
src/chrome/skin/seamonkey22.png | Bin 0 -> 1482 bytes
src/chrome/skin/seamonkey32.png | Bin 2015 -> 0 bytes
src/chrome/skin/thunderbird32.png | Bin 2884 -> 0 bytes
src/modules/FiretrayHandler.jsm | 15 ++++++---------
src/modules/FiretrayMessaging.jsm | 2 +-
src/modules/linux/FiretrayStatusIcon.jsm | 2 +-
14 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 54a09df..6cf6531 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,8 +31,9 @@ extension_name := firetray
# The name of the profile dir where the extension can be installed.
profile_id := mozilla-dev
-# The zip application to be used.
-ZIP := zip
+# The zip application to be used. NOTE: symlinks seem not supported in XPI
+# ("could not be installed because Firefox cannot modify the needed file")
+ZIP := zip # --symlinks
# The target location of the build and build files.
build_dir := ../build
@@ -77,6 +78,8 @@ chrome_sources := $(chrome_sources_js) \
$(wildcard $(chrome_source_root)/skin/*.css) \
$(wildcard $(chrome_source_root)/skin/*.png) \
$(wildcard $(chrome_source_root)/skin/*.gif) \
+ $(wildcard $(chrome_source_root)/skin/linux/icons/hicolor/22x22/apps/*.png) \
+ $(wildcard $(chrome_source_root)/skin/linux/icons/hicolor/32x32/apps/*.png) \
$(wildcard $(chrome_source_root)/locale/*/*.dtd) \
$(wildcard $(chrome_source_root)/locale/*/*.properties)
@@ -126,7 +129,7 @@ YES_RE := yes|y|Y|true|on
# called via $(build_includes)
$(build_dir)/%: %
@mkdir -p $(dir $@)
- @cp -f $< $@
+ @cp -f $< $@ # -d for symlinks
# Debug calls are removed for performance.
# NOTE: we could also use m4 for filtering source files...
diff --git a/src/chrome/skin/chatzilla22.png b/src/chrome/skin/chatzilla22.png
new file mode 100644
index 0000000..a6ee25f
Binary files /dev/null and b/src/chrome/skin/chatzilla22.png differ
diff --git a/src/chrome/skin/chatzilla32.png b/src/chrome/skin/chatzilla32.png
deleted file mode 100644
index 9bfc018..0000000
Binary files a/src/chrome/skin/chatzilla32.png and /dev/null differ
diff --git a/src/chrome/skin/firefox32.png b/src/chrome/skin/firefox32.png
deleted file mode 100644
index 0c4f681..0000000
Binary files a/src/chrome/skin/firefox32.png and /dev/null differ
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png
new file mode 120000
index 0000000..39401cb
--- /dev/null
+++ b/src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png
@@ -0,0 +1 @@
+../../../../../chatzilla22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png b/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png
new file mode 120000
index 0000000..bb3ac9d
--- /dev/null
+++ b/src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png
@@ -0,0 +1 @@
+../../../../../seamonkey22.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/32x32/apps/firefox.png b/src/chrome/skin/linux/icons/hicolor/32x32/apps/firefox.png
deleted file mode 120000
index c914b8d..0000000
--- a/src/chrome/skin/linux/icons/hicolor/32x32/apps/firefox.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../firefox32.png
\ No newline at end of file
diff --git a/src/chrome/skin/linux/icons/hicolor/32x32/apps/thunderbird.png b/src/chrome/skin/linux/icons/hicolor/32x32/apps/thunderbird.png
deleted file mode 120000
index a407d6b..0000000
--- a/src/chrome/skin/linux/icons/hicolor/32x32/apps/thunderbird.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../thunderbird32.png
\ No newline at end of file
diff --git a/src/chrome/skin/seamonkey22.png b/src/chrome/skin/seamonkey22.png
new file mode 100644
index 0000000..9ac906a
Binary files /dev/null and b/src/chrome/skin/seamonkey22.png differ
diff --git a/src/chrome/skin/seamonkey32.png b/src/chrome/skin/seamonkey32.png
deleted file mode 100644
index 644bed1..0000000
Binary files a/src/chrome/skin/seamonkey32.png and /dev/null differ
diff --git a/src/chrome/skin/thunderbird32.png b/src/chrome/skin/thunderbird32.png
deleted file mode 100644
index 0ea7046..0000000
Binary files a/src/chrome/skin/thunderbird32.png and /dev/null differ
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 9dfc4f6..7ee6f12 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -29,10 +29,9 @@ if ("undefined" == typeof(firetray)) {
// other global functions
// (https://developer.mozilla.org/en/XUL_School/JavaScript_Object_Management)
firetray.Handler = {
- FILENAME_DEFAULT: null,
- FILENAME_SUFFIX: "32.png",
- FILENAME_BLANK: null,
- FILENAME_NEWMAIL: null,
+ ICON_FILENAME_SUFFIX: "22.png",
+ ICON_FILENAME_BLANK: null,
+ ICON_FILENAME_NEWMAIL: null,
initialized: false,
appNameOriginal: null,
@@ -49,11 +48,9 @@ firetray.Handler = {
firetray.PrefListener.register(false);
this.appNameOriginal = Services.appinfo.name;
- this.FILENAME_DEFAULT = firetray.Utils.chromeToPath(
- "chrome://firetray/skin/" + this.appNameOriginal.toLowerCase() + this.FILENAME_SUFFIX);
- this.FILENAME_BLANK = firetray.Utils.chromeToPath(
+ this.ICON_FILENAME_BLANK = firetray.Utils.chromeToPath(
"chrome://firetray/skin/blank-icon.png");
- this.FILENAME_NEWMAIL = firetray.Utils.chromeToPath(
+ this.ICON_FILENAME_NEWMAIL = firetray.Utils.chromeToPath(
"chrome://firetray/skin/message-mail-new.png");
this.runtimeABI = Services.appinfo.XPCOMABI;
@@ -305,7 +302,7 @@ firetray.Handler = {
openBrowserTab: function(url) {
let win = Services.wm.getMostRecentWindow("navigator:browser");
- WARN("WIN="+win);
+ LOG("WIN="+win);
if (win) {
var mainWindow = win.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIWebNavigation)
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index c5c2678..2369f37 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -125,7 +125,7 @@ firetray.Messaging = {
firetray.Handler.setIconText(newMsgCount.toString(), prefIconTextColor);
break;
case FIRETRAY_NOTIFICATION_NEWMAIL_ICON:
- firetray.Handler.setIconImage(firetray.Handler.FILENAME_NEWMAIL);
+ firetray.Handler.setIconImage(firetray.Handler.ICON_FILENAME_NEWMAIL);
break;
case FIRETRAY_NOTIFICATION_CUSTOM_ICON:
let prefCustomIconPath = firetray.Utils.prefService.getCharPref("custom_mail_icon");
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index 3889558..9c6d34e 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -178,7 +178,7 @@ firetray.Handler.setIconText = function(text, color) { // FIXME: function too lo
try {
// build background from image
- let specialIcon = gdk.gdk_pixbuf_new_from_file(this.FILENAME_BLANK, null); // GError **error);
+ let specialIcon = gdk.gdk_pixbuf_new_from_file(this.ICON_FILENAME_BLANK, null); // GError **error);
let dest = gdk.gdk_pixbuf_copy(specialIcon);
let w = gdk.gdk_pixbuf_get_width(specialIcon);
let h = gdk.gdk_pixbuf_get_height(specialIcon);
--
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