Merge lp:~mvo/libappindicator/fix-820080 into lp:libappindicator

[Michael Vogt]

This checks for the long item name before using it to ensure that apps that do not provide a "-panel" fallback icon still work.

This probably needs a additional check for "icon_theme_path" to ensure its catching custom icon theme paths, I'm happy to add this once I get approval for the general approach.

(this is against the right branch this time)

[Javier Jardón (jjardon)]

Tested in several configurations: XFce, GNOME Classic, Ubuntu and seems to work ok.

[Ted Gould (ted)]

The approach is fine. The problem is you pulled out the distinction in the case between get_icon() and get_attention_icon(). So the attention icon won't work. But I think the test is a good idea.

review: Needs Fixing

[Michael Vogt (mvo)]

Oh, indeed, a rather silly bug, I fix this right away.

[lp:~mvo/libappindicator/fix-820080]

222. By Michael Vogt on 2011-09-30

unbreak attention_icon

223. By Michael Vogt on 2011-09-30

src/app-indicator.c: honor icon_theme_path in the fallback

[Michael Vogt (mvo)]

Thanks for the review, the attention icon issue is fixed now plus it should honor the custom_icon_path now too.
Please double check if the g_object_unref() at the end if good enough for not leaking the custom GtkIconTheme.

review: Needs Resubmitting

[lp:~mvo/libappindicator/fix-820080]

224. By Michael Vogt on 2011-09-30

simplify

225. By Michael Vogt on 2011-09-30

src/app-indicator.c: do not add the same icon_theme_path again, gtk3 apparently does not check this

[Michael Vogt (mvo)]

I updated this again to avoid adding the same path multiple times. Gtk itself does not care it seems:

>>> theme = Gtk.IconTheme.get_default()
>>> print theme.get_search_path()
['/home/egon/.icons', '/home/egon/.local/share/icons', '/usr/share/ubuntu/icons', '/usr/share/gnome/icons', '/usr/local/share/icons', '/usr/share/icons', '/usr/share/ubuntu/pixmaps', '/usr/share/gnome/pixmaps', '/usr/local/share/pixmaps', '/usr/share/pixmaps']
>>> theme.append_search_path("foo")
>>> theme.append_search_path("foo")
>>> theme.append_search_path("foo")
>>> print theme.get_search_path()
['/home/egon/.icons', '/home/egon/.local/share/icons', '/usr/share/ubuntu/icons', '/usr/share/gnome/icons', '/usr/local/share/icons', '/usr/share/icons', '/usr/share/ubuntu/pixmaps', '/usr/share/gnome/pixmaps', '/usr/local/share/pixmaps', '/usr/share/pixmaps', 'foo', 'foo', 'foo']

[lp:~mvo/libappindicator/fix-820080]

226. By Michael Vogt on 2011-09-30

src/app-indicator.c: hide first in passive mode and add comment about it

[Ted Gould (ted)]

review: Approve

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2011-07-22 19:04:23 +0000
+++ src/app-indicator.c	2011-09-30 16:17:26 +0000
@@ -1523,20 +1523,52 @@
 	GtkStatusIcon * icon = GTK_STATUS_ICON(data);
 	gchar *longname = NULL;
 
+        /* add the icon_theme_path once if needed */
+        GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
+        if (self->priv->icon_theme_path != NULL)
+        {
+                gchar **path;
+                gint n_elements, i;
+                gboolean found=FALSE;
+                gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
+                for (i=0; i< n_elements || path[i] == NULL; i++)
+                {
+                        if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0)
+                        {
+                                found=TRUE;
+                                break;
+                        }
+                }
+                if(!found) 
+                        gtk_icon_theme_append_search_path(icon_theme, self->priv->icon_theme_path);
+                g_strfreev (path);
+        }
+
 	switch (app_indicator_get_status(self)) {
 	case APP_INDICATOR_STATUS_PASSIVE:
-		longname = append_panel_icon_suffix(app_indicator_get_icon(self));
-		gtk_status_icon_set_visible(icon, FALSE);
-		gtk_status_icon_set_from_icon_name(icon, longname);
+                /* hide first to avoid that the change is visible to the user */
+                gtk_status_icon_set_visible(icon, FALSE);
+                longname = append_panel_icon_suffix(app_indicator_get_icon(self));
+                if (gtk_icon_theme_has_icon (icon_theme, longname))
+                         gtk_status_icon_set_from_icon_name(icon, longname);
+                else
+                         gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self));
 		break;
 	case APP_INDICATOR_STATUS_ACTIVE:
-		longname = append_panel_icon_suffix(app_indicator_get_icon(self));
-		gtk_status_icon_set_from_icon_name(icon, longname);
+                longname = append_panel_icon_suffix(app_indicator_get_icon(self));
+                if (gtk_icon_theme_has_icon (icon_theme, longname))
+                         gtk_status_icon_set_from_icon_name(icon, longname);
+                else
+                         gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self));
 		gtk_status_icon_set_visible(icon, TRUE);
 		break;
 	case APP_INDICATOR_STATUS_ATTENTION:
-		longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self));
-		gtk_status_icon_set_from_icon_name(icon, longname);
+                /* get the _attention_ icon here */
+                longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self));
+                if (gtk_icon_theme_has_icon (icon_theme, longname))
+                         gtk_status_icon_set_from_icon_name(icon, longname);
+                else
+                         gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self));
 		gtk_status_icon_set_visible(icon, TRUE);
 		break;
 	};