Merge lp:~indicator-applet-developers/indicator-datetime/ubuntu into lp:~ubuntu-desktop/indicator-datetime/ubuntu

[Ted Gould]

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-29 20:38:31 +0000
+++ ChangeLog	2011-10-13 18:44:23 +0000
@@ -1,5 +1,37 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.1
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing unused libunique
+
[phone]  Javier Jardón  <[e-mail]>
+
+	Remove libunique dependency as Its not needed anymore
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking to see if the timezones match
+
[phone]  Ted Gould  <[e-mail]>
+
+	Check to see if we're in the same timezone as default
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing icon from window.
+
[phone]  Javier Jardón  <[e-mail]>
+
+	Remove use of window icon
+	
+	Its not showed by default anyway
+	
+	Fixes https://bugs.launchpad.net/indicator-datetime/+bug/746176
+
 2011-09-29  Ted Gould  <[e-mail]>
 
 	0.3.0

=== modified file 'configure'
--- configure	2011-09-29 20:38:31 +0000
+++ configure	2011-10-13 18:44:23 +0000
@@ -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.0.
+# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.1.
 #
 # Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
 #
@@ -572,8 +572,8 @@
 # Identity of this package.
 PACKAGE_NAME='indicator-datetime'
 PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.3.0'
-PACKAGE_STRING='indicator-datetime 0.3.0'
+PACKAGE_VERSION='0.3.1'
+PACKAGE_STRING='indicator-datetime 0.3.1'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
 PACKAGE_URL='http://launchpad.net/indicator-datetime'
 
@@ -1375,7 +1375,7 @@
   # 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.0 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1446,7 +1446,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-datetime 0.3.0:";;
+     short | recursive ) echo "Configuration of indicator-datetime 0.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1578,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-datetime configure 0.3.0
+indicator-datetime configure 0.3.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1949,7 +1949,7 @@
 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.0, which was
+It was created by indicator-datetime $as_me 0.3.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2773,7 +2773,7 @@
 
 # Define the identity of the package.
  PACKAGE='indicator-datetime'
- VERSION='0.3.0'
+ VERSION='0.3.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12282,13 +12282,11 @@
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1") 2>&5
@@ -12297,7 +12295,6 @@
   test $ac_status = 0; }; then
   pkg_cv_PREF_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1" 2>/dev/null`
@@ -12314,13 +12311,11 @@
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1") 2>&5
@@ -12329,7 +12324,6 @@
   test $ac_status = 0; }; then
   pkg_cv_PREF_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1" 2>/dev/null`
@@ -12355,14 +12349,12 @@
         if test $_pkg_short_errors_supported = yes; then
 	        PREF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1" 2>&1`
         else
 	        PREF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1" 2>&1`
@@ -12372,7 +12364,6 @@
 
 	as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1) were not met:
@@ -14654,7 +14645,7 @@
 # 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.0, which was
+This file was extended by indicator-datetime $as_me 0.3.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14721,7 +14712,7 @@
 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.0
+indicator-datetime config.status 0.3.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-09-29 20:38:31 +0000
+++ configure.ac	2011-10-13 18:44:23 +0000
@@ -1,5 +1,5 @@
 AC_INIT([indicator-datetime],
-        [0.3.0],
+        [0.3.1],
         [http://bugs.launchpad.net/indicator-datetime],
         [indicator-datetime],
         [http://launchpad.net/indicator-datetime])
@@ -105,7 +105,6 @@
 
 PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION
 	                      gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-	                      unique-3.0
 	                      json-glib-1.0
 	                      libgnome-control-center
 	                      polkit-gobject-1)

=== modified file 'data/datetime-dialog.ui'
--- data/datetime-dialog.ui	2011-08-17 19:30:53 +0000
+++ data/datetime-dialog.ui	2011-10-13 18:44:23 +0000
@@ -13,7 +13,6 @@
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <property name="destroy_with_parent">True</property>
-    <property name="icon_name">time-admin</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-05 19:04:17 +0000
+++ debian/changelog	2011-10-13 18:44:23 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 indicator-datetime (0.3.0-0ubuntu2) oneiric-proposed; urgency=low
 
   * debian/patches/lp_844741.patch
@@ -6,6 +7,19 @@
  -- Ken VanDine <[e-mail]>  Wed, 05 Oct 2011 11:59:21 -0400
 
 indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low
+=======
+indicator-datetime (0.3.1-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Drop an unused icon (LP: #746176)
+    * Fix showing a timezone that we're currently set to (LP: #833337)
+    * Remove check for libunique as it's unused
+  * debian/control: Drop libunique requirements
+
+ -- Ted Gould <[e-mail]>  Thu, 13 Oct 2011 13:40:21 -0500
+
+indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low
+>>>>>>> MERGE-SOURCE
 
   [ Ken VanDine ]
   * debian/control

=== modified file 'debian/control'
--- debian/control	2011-09-29 20:29:20 +0000
+++ debian/control	2011-10-13 18:44:23 +0000
@@ -14,7 +14,6 @@
                libglib2.0-dev (>= 2.29.19),
                libido-0.1-dev (>= 0.2.2),
                libido3-0.1-dev (>= 0.2.90),
-               libunique-3.0-dev,
                libgeoclue-dev (>= 0.12.0),
                libecal1.2-dev (>= 2.30),
                libical-dev (>= 0.44),
@@ -22,7 +21,6 @@
                libgtk-3-dev (>= 3.1.4),
                libcairo2-dev (>= 1.10),
                libjson-glib-dev,
-               libunique-dev,
                libpolkit-gtk-1-dev,
                libedataserver1.2-dev (>= 2.30),
                libedataserverui-3.0-dev,

=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c	2011-09-09 09:47:20 +0000
+++ src/datetime-prefs.c	2011-10-13 18:44:23 +0000
@@ -32,7 +32,6 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <unique/unique.h>
 #include <polkit/polkit.h>
 #include <libgnome-control-center/cc-panel.h>
 

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-09-29 20:38:31 +0000
+++ src/datetime-service.c	2011-10-13 18:44:23 +0000
@@ -581,8 +581,8 @@
 	offset = dbusmenu_menuitem_get_position (current_location, root)+1;
 	for (i = 0; i < len; i++) {
 		// Iterate over configured places and add any which aren't already listed
-		if (g_strcmp0(locations[i], current_timezone) != 0 &&
-		    g_strcmp0(locations[i], geo_timezone) != 0) {
+		if ((current_timezone == NULL || !g_str_has_prefix(locations[i], current_timezone)) &&
+		    (geo_timezone == NULL || !g_str_has_prefix(locations[i], geo_timezone))) {
 			g_debug("Adding timezone in update_timezones %s", locations[i]);
 			item = dbusmenu_menuitem_new();
 			dbusmenu_menuitem_property_set      (item, DBUSMENU_MENUITEM_PROP_TYPE, TIMEZONE_MENUITEM_TYPE);