* New upstream release.

  * Watching new services when the name switches

6 files changed, 94 insertions, 27 deletions

diff --git a/AUTHORS b/AUTHORS
index a533d8c..7b1c028 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@
  Michael Terry 
  Mikkel Kamstrup Erlandsen 
  Neil Jagdish Patel 
+ Robert Ancell 
  Robert Carr 
  Sebastien Bacher 
  Ted Gould 
diff --git a/ChangeLog b/ChangeLog
index 971ffc6..10ffc95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,81 @@
 # Generated by Makefile. Do not edit.
 
+2011-07-14  Ted Gould  <ted@gould.cx>
+
+	0.3.91
+
+2011-07-14  Ted Gould  <ted@gould.cx>
+
+	Fixing the libindicator test suite
+
+2011-07-11  Ted Gould  <ted@gould.cx>
+
+	Cleaning up removal of watchers as the string was getting free'd before it could get used to remove the entry from the hashtable.  Now using a destroy function as that is possible with GDBus but wasn't with dbus-glib
+
+2011-07-11  Ted Gould  <ted@gould.cx>
+
+	Define the bus well known type in the session.conf file
+
+2011-07-12  Ted Gould  <ted@gould.cx>
+
+	Adding an env variable to put a service in replace mode
+
+2011-07-12  Ted Gould  <ted@gould.cx>
+
+	Watching when we do name switches
+
+2011-07-12  Ted Gould  <ted@gould.cx>
+
+	Adding in the shutdown function
+
+2011-07-12  Ted Gould  <ted@gould.cx>
+
+	In replace mode we need to ask the other guy to shutdown and still wait for the name a bit.
+
+2011-07-12  Ted Gould  <ted@gould.cx>
+
+	Adding in a property for being in replace mode
+
+2011-07-11  Ted Gould  <ted@gould.cx>
+
+	Add the PC file instead of replace it
+
+2011-07-11  Ted Gould  <ted@gould.cx>
+
+	Handle NULL entries without crashing
+
+2011-07-07  Ted Gould  <ted@gould.cx>
+
+	Installing the debugging env entries in shared directory instead of the executable one.
+
+2011-07-07  Ken VanDine  <ken.vandine@canonical.com>
+
+	Make xsessiondir = $(pkgdatadir)
+
+2011-07-07  Ted Gould  <ted@gould.cx>
+
+	Fixing doc string
+
+2011-07-07  Ken VanDine  <ken.vandine@canonical.com>
+
+	Changed to help message for --with-gtk to reflect the new default
+
+2011-07-07  Ted Gould  <ted@gould.cx>
+
+	Anotating the get entires function properly.
+
+2011-07-08  Robert Ancell  <robert.ancell@canonical.com>
+
+	Annotate the return value of indicator_object_get_entries so that the type in the list is known, also fix typo in docstring
+
+2011-07-07  Ted Gould  <ted@gould.cx>
+
+	Making the box function conditional on GTK version
+
+2011-07-07  Ted Gould  <ted@gould.cx>
+
+	Handling the right box for the right version of GTK
+
 2011-07-06  Ted Gould  <ted@gould.cx>
 
 	0.3.90
diff --git a/configure b/configure
index 0e5b526..b4e35f4 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.90.
+# Generated by GNU Autoconf 2.68 for libindicator 0.3.91.
 #
 # 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.90'
-PACKAGE_STRING='libindicator 0.3.90'
+PACKAGE_VERSION='0.3.91'
+PACKAGE_STRING='libindicator 0.3.91'
 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.90 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.3.91 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.90:";;
+     short | recursive ) echo "Configuration of libindicator 0.3.91:";;
    esac
   cat <<\_ACEOF
 
@@ -1549,7 +1549,7 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-gtk              Which version of gtk to use [default=2]
+  --with-gtk              Which version of gtk to use [default=3]
 
 Some influential environment variables:
   CC          C compiler command
@@ -1637,7 +1637,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libindicator configure 0.3.90
+libindicator configure 0.3.91
 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.90, which was
+It was created by libindicator $as_me 0.3.91, 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.90'
+ VERSION='0.3.91'
 
 
 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.90, which was
+This file was extended by libindicator $as_me 0.3.91, 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.90
+libindicator config.status 0.3.91
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index bc11ce3..e8a162f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([libindicator],
-        [0.3.90],
+        [0.3.91],
         [http://bugs.launchpad.net/libindicator],
         [libindicator],
         [http://launchpad.net/libindicator])
diff --git a/debian/changelog b/debian/changelog
index 9fa82bd..57f496b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,15 @@
-libindicator (0.3.90-0ubuntu2~ppa2) oneiric; urgency=low
+libindicator (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low
 
-  * Upstream Merge
-    * Watching new services when the name switches
-
- -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jul 2011 14:36:43 -0500
-
-libindicator (0.3.90-0ubuntu2~ppa1) oneiric; urgency=low
-
-  * Upstream Merge
+  * New upstream release.
     * Fix signals with NULL entries in the loader
     * Adding a comment for setting up debugging options
     * Adding annotations for GIR files
     * Fixing watchers hashtable to detect when we have none
     * Fix testing so no tests are XFAIL anymore
     * Adding a replace mode for testing indicator services
+    * Watching new services when the name switches
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jul 2011 10:59:14 -0500
+ -- Ted Gould <ted@ubuntu.com>  Thu, 14 Jul 2011 13:34:01 -0500
 
 libindicator (0.3.90-0ubuntu1) oneiric; urgency=low
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e45b6f7..25e8106 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -34,6 +34,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+XFAIL_TESTS =
 check_PROGRAMS = test-loader$(EXEEXT) test-desktop-shortcuts$(EXEEXT) \
 	service-shutdown-timeout$(EXEEXT) \
 	service-manager-no-connect$(EXEEXT) \
@@ -447,11 +448,6 @@ DISTCLEANFILES = test-desktop-shortcuts-tester \
 	service-version-multiwatch-tester \
 	service-manager-connect-nostart-tester loader-tester \
 	$(XML_REPORT) $(HTML_REPORT)
-# Bug 806690
-# Bug 806691
-# Bug 806692
-XFAIL_TESTS = service-manager-connect-tester service-version-tester \
-	service-version-multiwatch-tester
 lib_LTLIBRARIES = \
 	libdummy-indicator-blank.la \
 	libdummy-indicator-null.la \