From e27e7f65e712753ec989325d49a08dcd7d4a77d4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 21 Jul 2011 10:04:21 -0500 Subject: Making sure the lib builds before the tests or tools --- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index cdd5b8d..3bd312e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,10 @@ SUBDIRS = \ tests \ tools +tests: libindicator + +tools: libindicator + DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations DISTCLEANFILES = \ -- cgit v1.2.3 From a51845f9aaed2a951eab8afba1aad685b3361f37 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 29 Jul 2011 09:13:48 -0500 Subject: Don't make a new include directory based on GTK version --- libindicator/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \ -- cgit v1.2.3 From 1790510cc8db70c5adb3c2b3f25382d39db1a99f Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Tue, 2 Aug 2011 15:37:50 +0200 Subject: Ask GTK to rescan the icon theme if the wanted icon cannot be found. This is necessary at least with sni-qt, which generates icon on the fly in a custom theme dir. --- libindicator/indicator-image-helper.c | 5 +++++ 1 file changed, 5 insertions(+) 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 @@ -43,6 +43,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 )); -- cgit v1.2.3 From e2b7e82e89e0c85b1078fde531012ba2ea20e0bf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Aug 2011 09:17:29 -0500 Subject: 0.3.93 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c8e5b27..4a36dda 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [0.3.92], + [0.3.93], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) -- cgit v1.2.3