aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-10-13 13:34:55 -0500
committerTed Gould <ted@gould.cx>2011-10-13 13:34:55 -0500
commit09dcfec3e1305ed9ad26df78a9ff6c755ed08ece (patch)
tree79f452e561d34b158fd772a19e25ab04849ec194
parent4e2dc05c209906b1a0d01b1c9f12c26a8ce2cd6d (diff)
parentba87e5cb673992cee0fcb0bb3c90523974836a30 (diff)
downloadayatana-indicator-datetime-09dcfec3e1305ed9ad26df78a9ff6c755ed08ece.tar.gz
ayatana-indicator-datetime-09dcfec3e1305ed9ad26df78a9ff6c755ed08ece.tar.bz2
ayatana-indicator-datetime-09dcfec3e1305ed9ad26df78a9ff6c755ed08ece.zip
Import upstream version 0.3.1
-rw-r--r--ChangeLog32
-rwxr-xr-xconfigure29
-rw-r--r--configure.ac3
-rw-r--r--data/datetime-dialog.ui1
-rw-r--r--src/datetime-prefs.c1
-rw-r--r--src/datetime-service.c4
6 files changed, 45 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index ccbfabe..18b7a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
# Generated by Makefile. Do not edit.
+2011-10-13 Ted Gould <ted@gould.cx>
+
+ 0.3.1
+
+2011-10-13 Ted Gould <ted@gould.cx>
+
+ Removing unused libunique
+
+2011-10-05 Javier Jardón <javier.jardon@codethink.co.uk>
+
+ Remove libunique dependency as Its not needed anymore
+
+2011-10-13 Ted Gould <ted@gould.cx>
+
+ Checking to see if the timezones match
+
+2011-10-12 Ted Gould <ted@gould.cx>
+
+ Check to see if we're in the same timezone as default
+
+2011-10-11 Ted Gould <ted@gould.cx>
+
+ Removing icon from window.
+
+2011-10-06 Javier Jardón <javier.jardon@codethink.co.uk>
+
+ 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 <ted@gould.cx>
0.3.0
diff --git a/configure b/configure
index 0f368a9..20bb10a 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.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 @@ MAKEFLAGS=
# 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 @@ 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.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 @@ fi
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 @@ fi
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 @@ 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.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 @@ fi
# 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 "$PREF_CFLAGS"; then
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 @@ if test -n "$PREF_CFLAGS"; then
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 "$PREF_LIBS"; then
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 @@ if test -n "$PREF_LIBS"; then
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 @@ fi
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 @@ fi
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 @@ 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.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 @@ _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.0
+indicator-datetime config.status 0.3.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 144672f..07f52d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
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)
diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui
index 59d6753..f3110ec 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -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>
diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c
index 5ace8c4..1b7ddd2 100644
--- a/src/datetime-prefs.c
+++ b/src/datetime-prefs.c
@@ -32,7 +32,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#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>
diff --git a/src/datetime-service.c b/src/datetime-service.c
index 25572ee..ed8c8e3 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -581,8 +581,8 @@ update_timezone_menu_items(gpointer user_data) {
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);