* New upstream release.

  * Rescan icon theme if icon can't be loaded

9 files changed, 56 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 78e2e5e..cd27c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 # Generated by Makefile. Do not edit.
 
+2011-08-11  Ted Gould  <ted@gould.cx>
+
+	0.3.93
+
+2011-08-10  Ted Gould  <ted@gould.cx>
+
+	Check a reload of the icon theme if needed
+
+2011-08-02  Aurelien Gateau  <aurelien.gateau@canonical.com>
+
+	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.
+
+2011-07-29  Ted Gould  <ted@gould.cx>
+
+	Don't make a new include directory based on GTK version
+
+2011-07-21  Ted Gould  <ted@gould.cx>
+
+	Making sure the lib builds before the tests or tools
+
 2011-07-21  Ted Gould  <ted@gould.cx>
 
 	0.3.92
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 = \
diff --git a/Makefile.in b/Makefile.in
index c2dcb01..2aeb899 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -746,6 +746,10 @@ uninstall-am:
 	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
+tests: libindicator
+
+tools: libindicator
+
 dist-hook:
 	@if test -d "$(top_srcdir)/.bzr"; \
 		then \
diff --git a/configure b/configure
index ee9eedf..3df0617 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libindicator 0.3.92.
+# Generated by GNU Autoconf 2.68 for libindicator 0.3.93.
 #
 # Report bugs to <http://bugs.launchpad.net/libindicator>.
 #
@@ -709,8 +709,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libindicator'
 PACKAGE_TARNAME='libindicator'
-PACKAGE_VERSION='0.3.92'
-PACKAGE_STRING='libindicator 0.3.92'
+PACKAGE_VERSION='0.3.93'
+PACKAGE_STRING='libindicator 0.3.93'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator'
 PACKAGE_URL='http://launchpad.net/libindicator'
 
@@ -1451,7 +1451,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libindicator 0.3.92 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.3.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1521,7 +1521,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libindicator 0.3.92:";;
+     short | recursive ) echo "Configuration of libindicator 0.3.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1637,7 +1637,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libindicator configure 0.3.92
+libindicator configure 0.3.93
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1915,7 +1915,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libindicator $as_me 0.3.92, which was
+It was created by libindicator $as_me 0.3.93, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2737,7 +2737,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libindicator'
- VERSION='0.3.92'
+ VERSION='0.3.93'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11730,7 +11730,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libindicator $as_me 0.3.92, which was
+This file was extended by libindicator $as_me 0.3.93, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11797,7 +11797,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libindicator config.status 0.3.92
+libindicator config.status 0.3.93
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
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])
diff --git a/debian/changelog b/debian/changelog
index d3b913f..4ca78f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libindicator (0.3.93-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    * Rescan icon theme if icon can't be loaded
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 11 Aug 2011 09:42:45 -0500
+
 libindicator (0.3.92-0ubuntu1~ppa1) oneiric; urgency=low
 
   * New upstream release.
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) {