[Pkg-mozext-commits] [firetray] 26/33: Fix setting custom icons in winnt.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firetray.

commit 998e6b8253a73a5417a28c5364508d03f586f656
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sat Sep 12 22:24:43 2015 +0200

    Fix setting custom icons in winnt.
---
 src/chrome/content/options.js            | 2 +-
 src/modules/FiretrayHandler.jsm          | 2 ++
 src/modules/winnt/FiretrayStatusIcon.jsm | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 72fa986..a1342f6 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -397,7 +397,7 @@ var firetrayUIOptions = {
 
   chooseAppIconFile: function() {
     let updateIcon = firetray.Handler.setIconImageDefault.bind(firetray.Handler);
-    this._chooseIconFile("app_icon_custom_filename");
+    this._chooseIconFile("app_icon_custom_filename", updateIcon);
   },
 
   chooseMailIconFile: function() {
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index f25dede..1a15bf8 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -340,6 +340,7 @@ firetray.Handler = {
 
   // these get overridden in OS-specific Icon/Window handlers
   loadIcons: function() {},
+  loadImageCustom: function(prefname) {},
   setIconImageDefault: function() {},
   setIconImageNewMail: function() {},
   setIconImageCustom: function(prefname) {},
@@ -611,6 +612,7 @@ firetray.PrefListener = new PrefListener(
       firetray.Handler.loadIcons(); // linux
     case 'app_icon_custom':
     case 'mail_icon_custom':
+      firetray.Handler.loadImageCustom(name); // winnt
       firetray.Handler.setIconImageCustom(name);
     case 'app_icon_type':
       firetray.Handler.setIconImageDefault();
diff --git a/src/modules/winnt/FiretrayStatusIcon.jsm b/src/modules/winnt/FiretrayStatusIcon.jsm
index f4a9f39..a9390d2 100644
--- a/src/modules/winnt/FiretrayStatusIcon.jsm
+++ b/src/modules/winnt/FiretrayStatusIcon.jsm
@@ -463,6 +463,8 @@ firetray.StatusIcon = {
 
 }; // firetray.StatusIcon
 
+firetray.Handler.loadImageCustom = firetray.StatusIcon.loadImageCustom
+  .bind(firetray.StatusIcon);
 
 firetray.Handler.setIconImageDefault = function() {
   log.debug("setIconImageDefault");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git