* fix Makefile to include themable icons

* drop 32x32 application icons

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...

src/chrome/skin/linux/icons/hicolor/22x22/apps/chatzilla.png

@@ -0,0 +1 @@
+../../../../../chatzilla22.png

src/chrome/skin/linux/icons/hicolor/22x22/apps/seamonkey.png

@@ -0,0 +1 @@
+../../../../../seamonkey22.png

src/chrome/skin/linux/icons/hicolor/32x32/apps/firefox.png

@@ -1 +0,0 @@
-../../../../../firefox32.png

src/chrome/skin/linux/icons/hicolor/32x32/apps/thunderbird.png

@@ -1 +0,0 @@
-../../../../../thunderbird32.png

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)

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");

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);