aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog289
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog21
-rwxr-xr-xltmain.sh4
-rw-r--r--src/indicator-datetime.c2
6 files changed, 312 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index f985eff..d0304e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,294 @@
# Generated by Makefile. Do not edit.
+2011-03-31 Ted Gould <ted@gould.cx>
+
+ 0.2.1
+
+2011-03-31 Ted Gould <ted@gould.cx>
+
+ Switching to using SystemIdleHintChanged
+
+2011-03-31 karl-qdh <karl@qdh.org.uk>
+
+ Switched to using SystemIdleHintChanged from ActiveState, appears ConsoleKit might have changed recently.
+
+2011-03-31 karl-qdh <karl@qdh.org.uk>
+
+ Merged back with head
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Fix up icons and give them tool tips
+
+2011-03-30 Michael Terry <mike@mterry.name>
+
+ add error icon to main timezone entry
+
+2011-03-30 Michael Terry <mike@mterry.name>
+
+ add tooltip to error icon
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Fix marking and clean up event handling in the indicator and service
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Removing a warning that will occur on the default GTK properties
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Be a bit smarter about handling the the locale
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Syncing with Karl's branch
+
+2011-03-30 karl-qdh <karl@qdh.org.uk>
+
+ Might not like that signal notation
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Setting the default _WITH_DAY to be 12_WITH_DAY
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Changing code to recycle the appointment menu items for a cleaner switching of days
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Disable the appointments on date or month change to make it show that they're being updated and aren't currently valid
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Ensure that the marks get cleared on day changes that go across monthly boundries as well
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Protecting against the widgets being NULL at startup
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Check for the signal name in the handler
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Moving the registration of the type handlers into the init so that they'll not execute more than once.
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Update the appointments in the idle loop so we can get those signals returned promptly!
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Clear marks on month changes
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Protecting against NULL values
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Cleaning up debug output
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Making the right size group more real to remove an annoying error
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Making sure to get the inital values of the calendar properties
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Some debugging info
+
+2011-03-30 Ted Gould <ted@gould.cx>
+
+ Switching to one variable with all the marks in it
+
+2011-03-30 karl-qdh <karl@qdh.org.uk>
+
+ Potential fix for suspend issue suggested by njpatel
+
+2011-03-30 karl-qdh <karl@qdh.org.uk>
+
+ Move start timer into an idle so we have a chance to actually create the menu items
+
+2011-03-30 karl-qdh <karl@qdh.org.uk>
+
+ Made marking work when you change month, still needs more work to get it to do it on startup properly.
+
+2011-03-29 karl-qdh <karl@qdh.org.uk>
+
+ Adding tedg's suggested change to the property sending, no change in signals being received by the other side.
+
+2011-03-25 karl-qdh <karl@qdh.org.uk>
+
+ Try splitting the function see if that works
+
+2011-03-25 karl-qdh <karl@qdh.org.uk>
+
+ Merged
+
+2011-03-23 karl-qdh <karl@qdh.org.uk>
+
+ merged back with sniffles branch and added some changes to the resetdate, which also effects the marked days.
+
+2011-03-23 karl-qdh <karl@qdh.org.uk>
+
+ changes for bug #649800 - requires dbusmenu to be released
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Adding a preferences for prefered timezone
+
+2011-03-29 Michael Terry <mike@mterry.name>
+
+ remember user's preferred location name for main timezone
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Adding a error icon
+
+2011-03-29 Michael Terry <mike@mterry.name>
+
+ show error icon if user focuses out of location entry when it has an non-location value
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Protect against not having an entry
+
+2011-03-29 Michael Terry <mike@mterry.name>
+
+ don't call complete() unless we have an entry
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Handle enter on the default case by selecting the first entry instead of entering a blank item.
+
+2011-03-28 Michael Terry <mike@mterry.name>
+
+ Don't allow enter presses to leave non-timezone content in the model
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ A11y text
+
+2011-03-28 Michael Terry <mike@mterry.name>
+
+ add missing a11y descriptions
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Make the locations dialog non-modal but resurface when needed.
+
+2011-03-29 Michael Terry <mike@mterry.name>
+
+ treat locations dialog not as a modal dialog, but rather one that can be dismissed by interacting with the main dialog
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Fix crash with GVariantBuilder, unref a timedate and ensure that we always have a separator
+
+2011-03-24 Michael Terry <mike@mterry.name>
+
+ fix memory leak that also prevented us noticing when the timezone got updated
+
+2011-03-24 Michael Terry <mike@mterry.name>
+
+ show location separator even if no locations (since we always have the current location
+
+2011-03-24 Michael Terry <mike@mterry.name>
+
+ fix crash when emptying location list
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Put in timeouts to save settings on idle
+
+2011-03-24 Michael Terry <mike@mterry.name>
+
+ update locations gsettings as soon as changes as made, not just when the dialog is closed
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Update to map to make it lovely and UTC fixes
+
+2011-03-29 Michael Terry <mike@mterry.name>
+
+ use background color for insensitive map
+
+2011-03-24 Michael Terry <mike@mterry.name>
+
+ make map look insensitive if it is
+
+2011-03-24 Michael Terry <mike@mterry.name>
+
+ drop debugging line and update times when user selects a zone
+
+2011-03-23 Michael Terry <mike@mterry.name>
+
+ add utc to relevant results
+
+2011-03-23 Michael Terry <mike@mterry.name>
+
+ add bevel above location buttons
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Protect our privates when being cancelled
+
+2011-03-24 Michael Terry <mike@mterry.name>
+
+ don't access priv pointer if we've cancelled an async operation
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Fix case statement brackets
+
+2011-03-28 karl-qdh <karl@qdh.org.uk>
+
+ Make switch statement more consistent might fix bug #743394 seems to be a weirdness in C related to;
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37231
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Ensure calendar is always shown
+
+2011-03-28 karl-qdh <karl@qdh.org.uk>
+
+ Show calendar widget always
+
+2011-03-29 Ted Gould <ted@gould.cx>
+
+ Adjusting the timer so it appears more consistent
+
+2011-03-24 karl-qdh <karl@qdh.org.uk>
+
+ Change timer to 999ms
+
+2011-03-24 karl-qdh <karl@qdh.org.uk>
+
+ Merged mterry's changes
+
+2011-03-28 Ted Gould <ted@gould.cx>
+
+ Clean up tree model usage and sort the items in the popup list
+
+2011-03-23 Michael Terry <mike@mterry.name>
+
+ cleanup another instance of GValue
+
+2011-03-23 Michael Terry <mike@mterry.name>
+
+ sort locations by name, starting with prefixes
+
+2011-03-23 Michael Terry <mike@mterry.name>
+
+ cleanup locations dialog column usage
+
2011-03-23 Ted Gould <ted@gould.cx>
0.2.0
diff --git a/configure b/configure
index bd49efa..c788536 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.67 for indicator-datetime 0.2.0.
+# Generated by GNU Autoconf 2.67 for indicator-datetime 0.2.1.
#
# Report bugs to <ted@canonical.com>.
#
@@ -703,8 +703,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-datetime'
PACKAGE_TARNAME='indicator-datetime'
-PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='indicator-datetime 0.2.0'
+PACKAGE_VERSION='0.2.1'
+PACKAGE_STRING='indicator-datetime 0.2.1'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1502,7 +1502,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.2.0 to adapt to many kinds of systems.
+\`configure' configures indicator-datetime 0.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1573,7 +1573,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-datetime 0.2.0:";;
+ short | recursive ) echo "Configuration of indicator-datetime 0.2.1:";;
esac
cat <<\_ACEOF
@@ -1701,7 +1701,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-datetime configure 0.2.0
+indicator-datetime configure 0.2.1
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2072,7 +2072,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.2.0, which was
+It was created by indicator-datetime $as_me 0.2.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2893,7 +2893,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-datetime
- VERSION=0.2.0
+ VERSION=0.2.1
cat >>confdefs.h <<_ACEOF
@@ -14945,7 +14945,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.2.0, which was
+This file was extended by indicator-datetime $as_me 0.2.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15011,7 +15011,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.2.0
+indicator-datetime config.status 0.2.1
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ef49e53..d1de2be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-datetime, 0.2.0, ted@canonical.com)
+AC_INIT(indicator-datetime, 0.2.1, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.2.0)
+AM_INIT_AUTOMAKE(indicator-datetime, 0.2.1)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 164975b..25dcf3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,6 @@
-indicator-datetime (0.2.0-0ubuntu2~ppa2) natty; urgency=low
+indicator-datetime (0.2.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
- * Upstream Merge
- * Add tooltips on the error icons
- * Fix marking to refresh as the calendar changes
- * Recycle old entries to make the refresh cleaner
- * Use day when timezone is set to 'locale'
-
- -- Ted Gould <ted@ubuntu.com> Wed, 30 Mar 2011 17:11:49 -0500
-
-indicator-datetime (0.2.0-0ubuntu2~ppa1) natty; urgency=low
-
- * Upstream Merge
+ * New upstream release.
* indicator-datetime-preferences crashed with SIGSEGV in
g_utf8_normalize() (LP: #727089)
* Uninstalling Evolution removes calendar from clock applet (LP: #691953)
@@ -31,8 +21,13 @@ indicator-datetime (0.2.0-0ubuntu2~ppa1) natty; urgency=low
g_atomic_int_exchange_and_add() (LP: #740978)
* inicator-datetime dosen't show corretly the time when changing from 24
hours format to 12 hours (LP: #743394)
+ * Add tooltips on the error icons
+ * Fix marking to refresh as the calendar changes
+ * Recycle old entries to make the refresh cleaner
+ * Use day when timezone is set to 'locale'
+ * Reset time when coming back from suspend (LP: #726053)
- -- Ted Gould <ted@ubuntu.com> Tue, 29 Mar 2011 20:55:14 -0500
+ -- Ted Gould <ted@ubuntu.com> Thu, 31 Mar 2011 14:29:37 -0500
indicator-datetime (0.2.0-0ubuntu1) natty; urgency=low
diff --git a/ltmain.sh b/ltmain.sh
index 6765090..fa4b1e1 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu2
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu2"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
TIMESTAMP=""
package_revision=1.3017
diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c
index ec08f92..a999f42 100644
--- a/src/indicator-datetime.c
+++ b/src/indicator-datetime.c
@@ -830,7 +830,7 @@ session_active_change_cb (GDBusProxy * proxy, gchar * sender_name, gchar * signa
{
// Just returned from suspend
IndicatorDatetime * self = INDICATOR_DATETIME(user_data);
- if (g_strcmp0(signal_name, "ActiveChanged") == 0) {
+ if (g_strcmp0(signal_name, "SystemIdleHintChanged") == 0 && g_variant_get_boolean(parameters) == FALSE) {
update_time(self);
}
return;