diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-11 09:42:37 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-11 09:42:37 -0500 |
| commit | 7b63153f899f53c72222a5c424dcbe7a300b900b (patch) | |
| tree | ea1e7930894b4326af58a44f4c4e4555e161dc19 /libindicator | |
| parent | 5d457c51b8589804278bc303af9483271193b6b8 (diff) | |
| parent | e2b7e82e89e0c85b1078fde531012ba2ea20e0bf (diff) | |
| download | libayatana-indicator-7b63153f899f53c72222a5c424dcbe7a300b900b.tar.gz libayatana-indicator-7b63153f899f53c72222a5c424dcbe7a300b900b.tar.bz2 libayatana-indicator-7b63153f899f53c72222a5c424dcbe7a300b900b.zip | |
Import upstream version 0.3.93
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/Makefile.am | 2 | ||||
| -rw-r--r-- | libindicator/Makefile.in | 2 | ||||
| -rw-r--r-- | libindicator/indicator-image-helper.c | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index f9fb011..53f9985 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -26,7 +26,7 @@ CLEANFILES += indicator$(VER)-0.$(INDICATOR_API_VERSION).pc include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator +libindicatorincludedir=$(includedir)/libindicator-0.$(INDICATOR_API_VERSION)/libindicator indicator_headers = \ indicator.h \ diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in index 6c80998..ca82011 100644 --- a/libindicator/Makefile.in +++ b/libindicator/Makefile.in @@ -311,7 +311,7 @@ INDICATOR_ABI_VERSION = 6 INDICATOR_API_VERSION = 4 marshal_h = $(glib_marshal_list:.list=.h) marshal_c = $(glib_marshal_list:.list=.c) -libindicatorincludedir = $(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator +libindicatorincludedir = $(includedir)/libindicator-0.$(INDICATOR_API_VERSION)/libindicator indicator_headers = \ indicator.h \ indicator-desktop-shortcuts.h \ diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index b404b8f..23b08d0 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -44,6 +44,11 @@ refresh_image (GtkImage * image) /* Look through the themes for that icon */ icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); if (icon_info == NULL) { + /* Maybe the icon was just added to the theme, see if a rescan helps */ + gtk_icon_theme_rescan_if_needed(default_theme); + icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); + } + if (icon_info == NULL) { /* Try using the second item in the names, which should be the original filename supplied */ const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON( icon_names )); if (names) { |