releasing version 0.3.94-0ubuntu1

13 files changed, 252 insertions, 160 deletions

diff --git a/ChangeLog b/ChangeLog
index 06d28f5..4a10106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 # Generated by Makefile. Do not edit.
 
+2012-04-04  Charles Kerr  <charles.kerr@canonical.com>
+
+	0.3.94
+
+2012-04-03  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~allanlesage/indicator-datetime/TDD to remove a dependency on gcovr, move gcov targets to their own makefile, and clean up .gcno files.
+
+2012-03-27  Allan LeSage  <allanlesage@gmail.com>
+
+	Removed gcovr dependency, moved coverage targets to own makefile, cleaning up *.gcno.
+
+2012-04-02  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~charlesk/indicator-datetime/fiz-tz-offset to fix a timezone sorting issue reported by seb128 and diagnosed by desrt.
+
+2012-04-02  Charles Kerr  <charles.kerr@canonical.com>
+
+	fix timezone sorting issue reported by seb128 and diagnosed by desrt
+
+2012-04-02  Charles Kerr  <charles.kerr@canonical.com>
+
+	clicking the systems settings window shouldn't close the Locations dialog.
+
+2012-03-29  Charles Kerr  <charles.kerr@canonical.com>
+
+	clicking the systems settings window shouldn't close the 'Locations' dialog.
+
 2012-03-28  Charles Kerr  <charles.kerr@canonical.com>
 
 	0.3.93
diff --git a/Makefile.am b/Makefile.am
index fee212b..224ec45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,38 +36,4 @@ dist-hook:
 			echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
 
-
-# Coverage targets
-
-.PHONY: clean-gcda
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-
-.PHONY: coverage-html generate-coverage-html clean-coverage-html
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
-
-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
-coverage-xml: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
-
-generate-coverage-xml:
-	@echo Generating coverage XML report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-
-clean-coverage-xml: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
-
-clean-local: clean-coverage-html clean-coverage-xml
+include $(top_srcdir)/Makefile.am.coverage
diff --git a/Makefile.am.coverage b/Makefile.am.coverage
new file mode 100644
index 0000000..fb97747
--- /dev/null
+++ b/Makefile.am.coverage
@@ -0,0 +1,48 @@
+
+# Coverage targets
+
+.PHONY: clean-gcno clean-gcda \
+	coverage-html generate-coverage-html clean-coverage-html \
+	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
+
+if HAVE_GCOV
+
+clean-gcno:
+	@echo Removing old coverage instrumentation
+	-find -name '*.gcno' -print | xargs -r rm
+
+clean-gcda:
+	@echo Removing old coverage results
+	-find -name '*.gcda' -print | xargs -r rm
+  
+coverage-html: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+  
+generate-coverage-html:
+	@echo Collecting coverage data
+	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+  
+clean-coverage-html: clean-gcda
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf coverage.info coveragereport
+
+if HAVE_GCOVR
+
+coverage-gcovr: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
+	
+generate-coverage-gcovr:
+	@echo Generating coverage GCOVR report
+	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
+	
+clean-coverage-gcovr: clean-gcda
+	-rm -rf $(top_builddir)/coverage.xml
+
+endif # HAVE_GCOVR
+
+endif # HAVE_GCOV
diff --git a/Makefile.in b/Makefile.in
index e243fc4..1a8cf47 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,8 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+# Coverage targets
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -33,13 +35,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	build-aux/compile build-aux/config.guess build-aux/config.sub \
-	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
-	build-aux/missing build-aux/mkinstalldirs
+	$(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \
+	AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \
+	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
+	build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
+	build-aux/mkinstalldirs
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -133,7 +136,6 @@ CCDEPMODE = @CCDEPMODE@
 CCPANELDIR = @CCPANELDIR@
 CFLAGS = @CFLAGS@
 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -304,7 +306,7 @@ all: config.h
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -327,6 +329,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/Makefile.am.coverage:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -841,40 +844,43 @@ dist-hook:
 			echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
 
-# Coverage targets
+.PHONY: clean-gcno clean-gcda \
+	coverage-html generate-coverage-html clean-coverage-html \
+	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
+
+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
 
-.PHONY: clean-gcda
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
+@HAVE_GCOV_TRUE@clean-gcno:
+@HAVE_GCOV_TRUE@	@echo Removing old coverage instrumentation
+@HAVE_GCOV_TRUE@	-find -name '*.gcno' -print | xargs -r rm
 
-.PHONY: coverage-html generate-coverage-html clean-coverage-html
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+@HAVE_GCOV_TRUE@clean-gcda:
+@HAVE_GCOV_TRUE@	@echo Removing old coverage results
+@HAVE_GCOV_TRUE@	-find -name '*.gcda' -print | xargs -r rm
 
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+@HAVE_GCOV_TRUE@coverage-html: clean-gcda
+@HAVE_GCOV_TRUE@	-$(MAKE) $(AM_MAKEFLAGS) -k check
+@HAVE_GCOV_TRUE@	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
 
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
+@HAVE_GCOV_TRUE@generate-coverage-html:
+@HAVE_GCOV_TRUE@	@echo Collecting coverage data
+@HAVE_GCOV_TRUE@	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+@HAVE_GCOV_TRUE@	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
 
-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
-coverage-xml: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
+@HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda
+@HAVE_GCOV_TRUE@	-$(LCOV) --directory $(top_builddir) -z
+@HAVE_GCOV_TRUE@	-rm -rf coverage.info coveragereport
 
-generate-coverage-xml:
-	@echo Generating coverage XML report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	-$(MAKE) $(AM_MAKEFLAGS) -k check
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
 
-clean-coverage-xml: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr:
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	@echo Generating coverage GCOVR report
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
 
-clean-local: clean-coverage-html clean-coverage-xml
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda
+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@	-rm -rf $(top_builddir)/coverage.xml
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/configure b/configure
index 366d21a..ef830fc 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 indicator-datetime 0.3.93.
+# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.94.
 #
 # Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
 #
@@ -572,8 +572,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-datetime'
 PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.3.93'
-PACKAGE_STRING='indicator-datetime 0.3.93'
+PACKAGE_VERSION='0.3.94'
+PACKAGE_STRING='indicator-datetime 0.3.94'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
 PACKAGE_URL='http://launchpad.net/indicator-datetime'
 
@@ -672,8 +672,13 @@ CCPANELDIR
 INDICATORICONSDIR
 INDICATORDIR
 COVERAGE_LDFLAGS
-COVERAGE_CXXFLAGS
 COVERAGE_CFLAGS
+HAVE_GCOVR_FALSE
+HAVE_GCOVR_TRUE
+HAVE_LCOV_FALSE
+HAVE_LCOV_TRUE
+HAVE_GCOV_FALSE
+HAVE_GCOV_TRUE
 GCOVR
 GENHTML
 LCOV
@@ -1395,7 +1400,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 indicator-datetime 0.3.93 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.3.94 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1466,7 +1471,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-datetime 0.3.93:";;
+     short | recursive ) echo "Configuration of indicator-datetime 0.3.94:";;
    esac
   cat <<\_ACEOF
 
@@ -1600,7 +1605,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-datetime configure 0.3.93
+indicator-datetime configure 0.3.94
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1971,7 +1976,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 indicator-datetime $as_me 0.3.93, which was
+It was created by indicator-datetime $as_me 0.3.94, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2795,7 +2800,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='indicator-datetime'
- VERSION='0.3.93'
+ VERSION='0.3.94'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12864,13 +12869,7 @@ endif
  # AC_TDD_GCOV
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5
-$as_echo_n "checking whether code coverage tools are available... " >&6; }
-if ${ac_cv_check_gcov+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# Check whether --enable-gcov was given.
+  # Check whether --enable-gcov was given.
 if test "${enable_gcov+set}" = set; then :
   enableval=$enable_gcov; use_gcov=$enableval
 else
@@ -13006,43 +13005,6 @@ $as_echo "no" >&6; }
 fi
 
 
-  # Extract the first word of "gcovr", so it can be a program name with args.
-set dummy gcovr; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GCOVR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GCOVR"; then
-  ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_GCOVR="gcovr"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-GCOVR=$ac_cv_prog_GCOVR
-if test -n "$GCOVR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
-$as_echo "$GCOVR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 
   if test "$LCOV"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5
@@ -13079,10 +13041,8 @@ $as_echo "$glib_cv_lcov_version" >&6; }
     as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5
   fi
 
-  if test -z "$GCOVR"; then
-    as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5
-  fi
-
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
 
   # Remove all optimization flags from CFLAGS
 
@@ -13094,11 +13054,75 @@ $as_echo "$glib_cv_lcov_version" >&6; }
   COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
   COVERAGE_LDFLAGS="-lgcov"
 
+  # Check availability of gcovr
+  # Extract the first word of "gcovr", so it can be a program name with args.
+set dummy gcovr; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_GCOVR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$GCOVR"; then
+  ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_GCOVR="gcovr"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+GCOVR=$ac_cv_prog_GCOVR
+if test -n "$GCOVR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
+$as_echo "$GCOVR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
+
+fi
+
+ if test "x$ac_cv_check_gcov" = xyes; then
+  HAVE_GCOV_TRUE=
+  HAVE_GCOV_FALSE='#'
+else
+  HAVE_GCOV_TRUE='#'
+  HAVE_GCOV_FALSE=
+fi
+
+ if test "x$ac_cv_check_lcov" = xyes; then
+  HAVE_LCOV_TRUE=
+  HAVE_LCOV_FALSE='#'
+else
+  HAVE_LCOV_TRUE='#'
+  HAVE_LCOV_FALSE=
 fi
 
+ if test "x$ac_cv_check_gcovr" = xyes; then
+  HAVE_GCOVR_TRUE=
+  HAVE_GCOVR_FALSE='#'
+else
+  HAVE_GCOVR_TRUE='#'
+  HAVE_GCOVR_FALSE=
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5
-$as_echo "$ac_cv_check_gcov" >&6; }
 
 
 
@@ -14630,6 +14654,18 @@ if test -z "${BUILD_CCPANEL_TRUE}" && test -z "${BUILD_CCPANEL_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_CCPANEL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_LCOV\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
   ac_config_commands="$ac_config_commands po/stamp-it"
 
@@ -15043,7 +15079,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 indicator-datetime $as_me 0.3.93, which was
+This file was extended by indicator-datetime $as_me 0.3.94, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15110,7 +15146,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="\\
-indicator-datetime config.status 0.3.93
+indicator-datetime config.status 0.3.94
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 0bd8b89..508fc9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([indicator-datetime],
-        [0.3.93],
+        [0.3.94],
         [http://bugs.launchpad.net/indicator-datetime],
         [indicator-datetime],
         [http://launchpad.net/indicator-datetime])
@@ -145,8 +145,10 @@ GLIB_GSETTINGS
 
 m4_include([m4/gcov.m4])
 AC_TDD_GCOV
+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
 AC_SUBST(COVERAGE_CFLAGS)
-AC_SUBST(COVERAGE_CXXFLAGS)
 AC_SUBST(COVERAGE_LDFLAGS)
 
 ###########################
diff --git a/data/Makefile.in b/data/Makefile.in
index 887ec42..d0f6e04 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -109,7 +109,6 @@ CCDEPMODE = @CCDEPMODE@
 CCPANELDIR = @CCPANELDIR@
 CFLAGS = @CFLAGS@
 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff --git a/debian/changelog b/debian/changelog
index 6931f1d..12fdb78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+indicator-datetime (0.3.94-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+    * Fix location timezone sorting issue.
+    * Clicking the systems settings window shouldn't close the
+      Locations dialog. (LP: #947315)
+    * Add gcov targets to autotools build for code-coverage reporting.
+
+ -- Charles Kerr <charles.kerr@canonical.com>  Wed, 04 Apr 2012 16:53:20 -0500
+
 indicator-datetime (0.3.93-0ubuntu1) precise; urgency=low
 
   * New upstream release.
diff --git a/m4/gcov.m4 b/m4/gcov.m4
index 1169573..3163584 100644
--- a/m4/gcov.m4
+++ b/m4/gcov.m4
@@ -5,11 +5,10 @@
 #  * gcovr
 # 
 # Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML. 
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
 AC_DEFUN([AC_TDD_GCOV],
-[AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov,
 [
-AC_ARG_ENABLE(gcov,
+  AC_ARG_ENABLE(gcov,
   AS_HELP_STRING([--enable-gcov],
 		 [enable coverage testing with gcov]),
   [use_gcov=$enableval], [use_gcov=no])
@@ -34,7 +33,6 @@ AC_ARG_ENABLE(gcov,
   lcov_version_list="1.6 1.7 1.8 1.9"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
 
   if test "$LCOV"; then
     AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
@@ -63,10 +61,8 @@ AC_ARG_ENABLE(gcov,
     AC_MSG_ERROR([Could not find genhtml from the lcov package])
   fi
 
-  if test -z "$GCOVR"; then
-    AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr])
-  fi
-
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
 
   # Remove all optimization flags from CFLAGS
   changequote({,})
@@ -78,6 +74,13 @@ AC_ARG_ENABLE(gcov,
   COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
   COVERAGE_LDFLAGS="-lgcov"
 
-fi
-])]) # AC_TDD_GCOV
+  # Check availability of gcovr
+  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
 
+fi
+]) # AC_TDD_GCOV
diff --git a/src/Makefile.in b/src/Makefile.in
index 83c5ec2..f06faba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -172,7 +172,6 @@ CCDEPMODE = @CCDEPMODE@
 CCPANELDIR = @CCPANELDIR@
 CFLAGS = @CFLAGS@
 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c
index fbb8ea1..0e2e99c 100644
--- a/src/datetime-prefs.c
+++ b/src/datetime-prefs.c
@@ -577,21 +577,14 @@ setup_time_spinners (IndicatorDatetimePanel * self, GtkWidget * time, GtkWidget
 }
 
 static void
-hide_locations (IndicatorDatetimePanel * self)
-{
-  if (self->priv->loc_dlg != NULL)
-    gtk_widget_destroy (self->priv->loc_dlg);
-}
-
-static void
 show_locations (IndicatorDatetimePanel * self)
 {
   if (self->priv->loc_dlg == NULL) {
     self->priv->loc_dlg = datetime_setup_locations_dialog (self->priv->tzmap);
     GtkWidget * dlg = gtk_widget_get_toplevel (GTK_WIDGET (self));
+    gtk_window_set_type_hint (GTK_WINDOW(self->priv->loc_dlg), GDK_WINDOW_TYPE_HINT_DIALOG);
     gtk_window_set_transient_for (GTK_WINDOW (self->priv->loc_dlg), GTK_WINDOW (dlg));
     g_signal_connect (self->priv->loc_dlg, "destroy", G_CALLBACK (gtk_widget_destroyed), &self->priv->loc_dlg);
-    g_signal_connect_swapped (dlg, "focus-in-event", G_CALLBACK (hide_locations), self);
     gtk_widget_show_all (self->priv->loc_dlg);
   }
   else {
diff --git a/src/datetime-service.c b/src/datetime-service.c
index fb95928..8ecef1c 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -108,7 +108,7 @@ struct comp_instance {
 };
 
 /**
- * A temp struct used by update_location_menu_items() for pruning duplicates.
+ * A temp struct used by update_location_menu_items() for pruning duplicates and sorting.
  */
 struct TimeLocation
 {
@@ -124,14 +124,16 @@ time_location_free (struct TimeLocation * loc)
 	g_free (loc);
 }
 static struct TimeLocation*
-time_location_new (const char * zone, const char * name)
+time_location_new (const char * zone, const char * name, time_t now)
 {
 	struct TimeLocation * loc = g_new (struct TimeLocation, 1);
 	GTimeZone * tz = g_time_zone_new (zone);
-	loc->offset = g_time_zone_get_offset (tz, 0);
+	gint interval = g_time_zone_find_interval (tz, G_TIME_TYPE_UNIVERSAL, now);
+	loc->offset = g_time_zone_get_offset (tz, interval);
 	loc->zone = g_strdup (zone);
 	loc->name = g_strdup (name);
 	g_time_zone_unref (tz);
+	g_debug ("%s zone '%s' name '%s' offset is %d", G_STRLOC, zone, name, (int)loc->offset);
 	return loc;
 }
 static int
@@ -146,9 +148,9 @@ time_location_compare (const struct TimeLocation * a, const struct TimeLocation
 	return ret;
 }
 static GSList*
-locations_add (GSList * locations, const char * zone, const char * name)
+locations_add (GSList * locations, const char * zone, const char * name, time_t now)
 {
-	struct TimeLocation * loc = time_location_new (zone, name);
+	struct TimeLocation * loc = time_location_new (zone, name, now);
 
 	if (g_slist_find_custom (locations, loc, (GCompareFunc)time_location_compare) == NULL) {
 		g_debug ("%s Adding zone '%s', name '%s'", G_STRLOC, zone, name);
@@ -182,18 +184,19 @@ update_location_menu_items (void)
 	***/
 
 	GSList * locations = NULL;
+	const time_t now = time(NULL);
 
 	/* maybe add geo_timezone */
 	if (geo_timezone != NULL) {
 		gchar * name = get_current_zone_name (geo_timezone);
-		locations = locations_add (locations, geo_timezone, name);
+		locations = locations_add (locations, geo_timezone, name, now);
 		g_free (name);
 	}
 
 	/* maybe add current_timezone */
 	if (current_timezone != NULL) {
 		gchar * name = get_current_zone_name (current_timezone);
-		locations = locations_add (locations, current_timezone, name);
+		locations = locations_add (locations, current_timezone, name, now);
 		g_free (name);
 	}
 
@@ -207,7 +210,7 @@ update_location_menu_items (void)
 			gchar * zone;
 			gchar * name;
 			split_settings_location (user_locations[i], &zone, &name);
-			locations = locations_add (locations, zone, name);
+			locations = locations_add (locations, zone, name, now);
 			g_free (name);
 			g_free (zone);
 		}
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 56227ec..d53bd96 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -72,7 +72,6 @@ CCDEPMODE = @CCDEPMODE@
 CCPANELDIR = @CCPANELDIR@
 CFLAGS = @CFLAGS@
 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@