aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-09-11 12:12:10 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-09-11 12:12:10 -0500
commit9233c969e7fe1de9442b233258a183466b5f068a (patch)
treebc92cad29c4df656f975ea3efd9eaf0fb54fcd47
parent06d21070a78bdcaac4b1b23384ae5791f8d0f5ff (diff)
downloadayatana-indicator-datetime-9233c969e7fe1de9442b233258a183466b5f068a.tar.gz
ayatana-indicator-datetime-9233c969e7fe1de9442b233258a183466b5f068a.tar.bz2
ayatana-indicator-datetime-9233c969e7fe1de9442b233258a183466b5f068a.zip
in the phone profile, move the day-of-week entry from the first menuitem to the header action state's title as per the spec
-rw-r--r--src/service.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/service.c b/src/service.c
index 3ba1c24..ce8139f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -491,7 +491,7 @@ create_phone_header_state (IndicatorDatetimeService * self)
gchar * label;
gboolean has_alarms;
gchar * a11y;
- const gchar * title = _("Date and Time");
+ gchar * title;
g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
@@ -518,9 +518,12 @@ create_phone_header_state (IndicatorDatetimeService * self)
g_variant_new_take_string (a11y));
g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE));
- g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title));
g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label));
+ /* title is day-of-week */
+ title = g_date_time_format (now, _("%A"));
+ g_variant_builder_add (&b, "{sv}", "title", g_variant_new_take_string (title));
+
/* cleanup */
g_date_time_unref (now);
return g_variant_builder_end (&b);
@@ -651,9 +654,6 @@ create_phone_calendar_section (IndicatorDatetimeService * self)
{
GMenu * menu = g_menu_new ();
- /* strftime(3) format string to show day of week */
- add_localtime_menuitem (menu, self, _("%A"), NULL);
-
/* strftime(3) format string to show date */
add_localtime_menuitem (menu, self, _("%e %B %Y"), "calendar");