[Pkg-mozext-commits] [firetray] 167/399: revert detection inexisting file in setIconImage()

David Prévot taffit at alioth.debian.org
Tue Oct 29 18:23:36 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 35463b302cf9d154214fdd1d29ac1dc4894a067d
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Tue Feb 7 18:50:54 2012 +0100

    revert detection inexisting file in setIconImage()
    
    we want the user to know that the path he provided is wrong.
---
 src/modules/gtk2/FiretrayStatusIcon.jsm |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/modules/gtk2/FiretrayStatusIcon.jsm b/src/modules/gtk2/FiretrayStatusIcon.jsm
index 6253ed8..337d2cc 100644
--- a/src/modules/gtk2/FiretrayStatusIcon.jsm
+++ b/src/modules/gtk2/FiretrayStatusIcon.jsm
@@ -111,12 +111,9 @@ firetray.Handler.setIconImage = function(filename) {
     return false;
   LOG(filename);
 
-  let pixbuf = gdk.gdk_pixbuf_new_from_file(filename, null);
-  if (strEquals(pixbuf, gdk.GdkPixbuf.ptr(null)))
-    return false;
-
   try {
-    gtk.gtk_status_icon_set_from_pixbuf(firetray.StatusIcon.trayIcon, pixbuf);
+    gtk.gtk_status_icon_set_from_file(firetray.StatusIcon.trayIcon,
+                                      filename);
   } catch (x) {
     ERROR(x);
     return false;

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