aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2013-03-26 21:09:29 +0100
committerSebastien Bacher <seb128@ubuntu.com>2013-03-26 21:09:29 +0100
commitc43592ae00c733645b7b21ed3f16c66531f406f0 (patch)
tree6ed3c093a294039e3319e29b223496623a1e56ba
parentda37d3e2d4c214313d68a7efd56fad5f58dacf4b (diff)
parent139717ed246434a8e32b75453266c8d321d119b7 (diff)
downloadayatana-indicator-datetime-c43592ae00c733645b7b21ed3f16c66531f406f0.tar.gz
ayatana-indicator-datetime-c43592ae00c733645b7b21ed3f16c66531f406f0.tar.bz2
ayatana-indicator-datetime-c43592ae00c733645b7b21ed3f16c66531f406f0.zip
Port to timedated instead of gnome-settings-daemon datetime mechanism
-rw-r--r--debian/changelog23
-rw-r--r--src/datetime-prefs.c5
-rw-r--r--tests/Makefile.am1
3 files changed, 27 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 76a8a12..a330828 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,31 @@
-indicator-datetime (12.10.3daily13.02.06-0ubuntu2) UNRELEASED; urgency=low
+indicator-datetime (12.10.3daily13.03.07-0ubuntu2) UNRELEASED; urgency=low
* Use systemd's service backend, ffe lp: #1153567
* debian/control: depends on systemd-services and systemd-shim
-- Sebastien Bacher <seb128@ubuntu.com> Tue, 26 Mar 2013 19:53:55 +0100
+indicator-datetime (12.10.3daily13.03.07-0ubuntu1) raring; urgency=low
+
+ [ Michael Terry ]
+ * Manually editing date field results in bogus date (LP: #1149696)
+
+ [ Automatic PS uploader ]
+ * Automatic snapshot from revision 210
+
+ -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Thu, 07 Mar 2013 02:01:22 +0000
+
+indicator-datetime (12.10.3daily13.03.06-0ubuntu1) raring; urgency=low
+
+ [ Mathieu Trudel-Lapierre ]
+ * Jenkins build failure on gtest "undefined reference to symbol
+ 'pthread_key_delete@@GLIBC_2.2.5'" (LP: #1126362)
+
+ [ Automatic PS uploader ]
+ * Automatic snapshot from revision 208
+
+ -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Wed, 06 Mar 2013 02:01:48 +0000
+
indicator-datetime (12.10.3daily13.02.06-0ubuntu1) raring; urgency=low
[ Colin Watson ]
diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c
index ddcc43f..d7f0def 100644
--- a/src/datetime-prefs.c
+++ b/src/datetime-prefs.c
@@ -470,7 +470,10 @@ format_time_text (GtkWidget * spinner, gpointer user_data)
}
}
else {
- format = "%x";
+ // This is intentionally not "%x". See https://launchpad.net/bugs/1149696
+ // If you are willing to do the hard work of writing a locale-sensitive
+ // date parser, there is an open bug: https://launchpad.net/bugs/729056
+ format = "%Y-%m-%d";
}
GDateTime * datetime = g_date_time_new_from_unix_local (gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinner)));
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f6387a0..8ca0cbc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,6 +26,7 @@ TEST_LIBS = \
$(top_builddir)/src/.libs/libdatetime.so \
$(INDICATOR_LIBS) \
$(COVERAGE_LDFLAGS) \
+ $(XORG_GTEST_LDFLAGS) \
libgtest.a
TEST_CPPFLAGS = \