[Pkg-mozext-commits] [firetray] 24/33: Fix missing app icon with appindicator by adding icon path.

[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 70335fa7acc46994d1440fc031f4f6709050d244
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Mon Sep 7 23:49:49 2015 +0200

    Fix missing app icon with appindicator by adding icon path.
---
 src/modules/ctypes/linux/gtk2/appindicator.jsm |  3 +++
 src/modules/ctypes/linux/gtk3/appindicator.jsm |  3 +++
 src/modules/linux/FiretrayAppIndicator.jsm     | 21 ++++++++++++++-------
 src/modules/linux/FiretrayGtkIcons.jsm         |  3 +--
 src/modules/linux/FiretrayStatusIcon.jsm       |  2 ++
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/modules/ctypes/linux/gtk2/appindicator.jsm b/src/modules/ctypes/linux/gtk2/appindicator.jsm
index 0a943e3..b421be4 100644
--- a/src/modules/ctypes/linux/gtk2/appindicator.jsm
+++ b/src/modules/ctypes/linux/gtk2/appindicator.jsm
@@ -40,10 +40,13 @@ function appindicator_defines(lib) {
   this.APP_INDICATOR_STATUS_ATTENTION = 2; /*< nick=NeedsAttention >*/
 
   lib.lazy_bind("app_indicator_new", this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr, this.AppIndicatorCategory);
+  lib.lazy_bind("app_indicator_new_with_path", this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr, this.AppIndicatorCategory, gobject.gchar.ptr);
+  lib.lazy_bind("app_indicator_set_icon_theme_path", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_status", ctypes.void_t, this.AppIndicator.ptr, this.AppIndicatorStatus);
   lib.lazy_bind("app_indicator_get_status", this.AppIndicatorStatus, this.AppIndicator.ptr);
   lib.lazy_bind("app_indicator_set_menu", ctypes.void_t, this.AppIndicator.ptr, gtk.GtkMenu.ptr);
   lib.lazy_bind("app_indicator_set_icon", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr);
+  lib.lazy_bind("app_indicator_set_icon_full", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_attention_icon", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_label", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_secondary_activate_target", ctypes.void_t, this.AppIndicator.ptr, gtk.GtkWidget.ptr);
diff --git a/src/modules/ctypes/linux/gtk3/appindicator.jsm b/src/modules/ctypes/linux/gtk3/appindicator.jsm
index 0a8679a..4e0980e 100644
--- a/src/modules/ctypes/linux/gtk3/appindicator.jsm
+++ b/src/modules/ctypes/linux/gtk3/appindicator.jsm
@@ -40,10 +40,13 @@ function appindicator_defines(lib) {
   this.APP_INDICATOR_STATUS_ATTENTION = 2; /*< nick=NeedsAttention >*/
 
   lib.lazy_bind("app_indicator_new", this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr, this.AppIndicatorCategory);
+  lib.lazy_bind("app_indicator_new_with_path", this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr, this.AppIndicatorCategory, gobject.gchar.ptr);
+  lib.lazy_bind("app_indicator_set_icon_theme_path", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_status", ctypes.void_t, this.AppIndicator.ptr, this.AppIndicatorStatus);
   lib.lazy_bind("app_indicator_get_status", this.AppIndicatorStatus, this.AppIndicator.ptr);
   lib.lazy_bind("app_indicator_set_menu", ctypes.void_t, this.AppIndicator.ptr, gtk.GtkMenu.ptr);
   lib.lazy_bind("app_indicator_set_icon", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr);
+  lib.lazy_bind("app_indicator_set_icon_full", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_attention_icon", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_label", ctypes.void_t, this.AppIndicator.ptr, gobject.gchar.ptr, gobject.gchar.ptr);
   lib.lazy_bind("app_indicator_set_secondary_activate_target", ctypes.void_t, this.AppIndicator.ptr, gtk.GtkWidget.ptr);
diff --git a/src/modules/linux/FiretrayAppIndicator.jsm b/src/modules/linux/FiretrayAppIndicator.jsm
index ba687da..6b42751 100644
--- a/src/modules/linux/FiretrayAppIndicator.jsm
+++ b/src/modules/linux/FiretrayAppIndicator.jsm
@@ -32,10 +32,12 @@ firetray.AppIndicator = {
       firetray.StatusIcon.defaultAppIconName,
       appind.APP_INDICATOR_CATEGORY_COMMUNICATIONS
     );
+    appind.app_indicator_set_icon_theme_path(
+      this.indicator, firetray.StatusIcon.THEME_ICON_PATH);
     appind.app_indicator_set_status(this.indicator,
-                                     appind.APP_INDICATOR_STATUS_ACTIVE);
+                                    appind.APP_INDICATOR_STATUS_ACTIVE);
     appind.app_indicator_set_menu(this.indicator,
-                                   firetray.PopupMenu.menu); // mandatory
+                                  firetray.PopupMenu.menu); // mandatory
     log.debug("indicator="+this.indicator);
 
     this.addCallbacks();
@@ -108,14 +110,17 @@ firetray.StatusIcon.shutdownImpl =
 
 firetray.Handler.setIconImageDefault = function() {
   log.debug("setIconImageDefault");
-  appind.app_indicator_set_icon(firetray.AppIndicator.indicator,
-                                 firetray.StatusIcon.defaultAppIconName);
+  appind.app_indicator_set_icon_full(firetray.AppIndicator.indicator,
+                                     firetray.StatusIcon.defaultAppIconName,
+                                     firetray.Handler.app.name);
 };
 
 firetray.Handler.setIconImageNewMail = function() {
   log.debug("setIconImageNewMail");
-  appind.app_indicator_set_icon(firetray.AppIndicator.indicator,
-                                 firetray.StatusIcon.defaultNewMailIconName);
+  appind.app_indicator_set_icon_full(
+    firetray.AppIndicator.indicator,
+    firetray.StatusIcon.defaultNewMailIconName,
+    firetray.Handler.app.name);
 };
 
 firetray.Handler.setIconImageCustom = function(prefname) {
@@ -123,7 +128,9 @@ firetray.Handler.setIconImageCustom = function(prefname) {
   // Undocumented: ok to pass a *path* instead of an icon name! Otherwise we
   // should be changing the default icons (which is maybe a better
   // implementation anyway)...
-  appind.app_indicator_set_icon(firetray.AppIndicator.indicator, prefCustomIconPath);
+  appind.app_indicator_set_icon_full(
+    firetray.AppIndicator.indicator, prefCustomIconPath,
+    firetray.Handler.app.name);
 };
 
 // No tooltips in AppIndicator
diff --git a/src/modules/linux/FiretrayGtkIcons.jsm b/src/modules/linux/FiretrayGtkIcons.jsm
index 429ec87..2e61b8d 100644
--- a/src/modules/linux/FiretrayGtkIcons.jsm
+++ b/src/modules/linux/FiretrayGtkIcons.jsm
@@ -40,8 +40,7 @@ firetray.GtkIcons = {
   },
 
   appendSearchPath: function() {
-    this.GTK_THEME_ICON_PATH = firetray.Utils.chromeToPath("chrome://firetray/skin/icons/linux");
-    log.debug(this.GTK_THEME_ICON_PATH);
+    log.debug(firetray.StatusIcon.THEME_ICON_PATH);
     let gtkIconTheme = gtk.gtk_icon_theme_get_default();
     log.debug("gtkIconTheme="+gtkIconTheme);
     gtk.gtk_icon_theme_append_search_path(gtkIconTheme, this.GTK_THEME_ICON_PATH);
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index be13004..2ab094f 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -29,6 +29,8 @@ firetray.StatusIcon = {
   prefNewMailIconNames: null,
   defaultAppIconName: null,
   defaultNewMailIconName: null,
+  THEME_ICON_PATH: (function(){return firetray.Utils.chromeToPath(
+    "chrome://firetray/skin/icons/linux");})(),
 
   init: function() {
     this.defineIconNames();

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