Merge lp:~charlesk/indicator-datetime/lp-1223635 into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 257
Merged at revision: 256
Proposed branch: lp:~charlesk/indicator-datetime/lp-1223635
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 47 lines (+7/-3)
1 file modified
src/service.c (+7/-3)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/lp-1223635
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+185108@code.launchpad.net

Description of the change

Adds a title in the header's action state

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/service.c'
--- src/service.c 2013-09-08 20:17:44 +0000
+++ src/service.c 2013-09-11 17:21:29 +0000
@@ -453,6 +453,7 @@
453 gchar * str;453 gchar * str;
454 gboolean visible;454 gboolean visible;
455 GDateTime * now;455 GDateTime * now;
456 const gchar * title = _("Date and Time");
456457
457 visible = g_settings_get_boolean (self->priv->settings, SETTINGS_SHOW_CLOCK_S);458 visible = g_settings_get_boolean (self->priv->settings, SETTINGS_SHOW_CLOCK_S);
458459
@@ -469,6 +470,7 @@
469 g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);470 g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
470 g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_string (str));471 g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_string (str));
471 g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (str));472 g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (str));
473 g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title));
472 g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (visible));474 g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (visible));
473475
474 /* cleanup */476 /* cleanup */
@@ -489,6 +491,7 @@
489 gchar * label;491 gchar * label;
490 gboolean has_alarms;492 gboolean has_alarms;
491 gchar * a11y;493 gchar * a11y;
494 gchar * title;
492495
493 g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);496 g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
494497
@@ -517,6 +520,10 @@
517 g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE));520 g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE));
518 g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label));521 g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label));
519522
523 /* title is day-of-week */
524 title = g_date_time_format (now, _("%A"));
525 g_variant_builder_add (&b, "{sv}", "title", g_variant_new_take_string (title));
526
520 /* cleanup */527 /* cleanup */
521 g_date_time_unref (now);528 g_date_time_unref (now);
522 return g_variant_builder_end (&b);529 return g_variant_builder_end (&b);
@@ -647,9 +654,6 @@
647{654{
648 GMenu * menu = g_menu_new ();655 GMenu * menu = g_menu_new ();
649656
650 /* strftime(3) format string to show day of week */
651 add_localtime_menuitem (menu, self, _("%A"), NULL);
652
653 /* strftime(3) format string to show date */657 /* strftime(3) format string to show date */
654 add_localtime_menuitem (menu, self, _("%e %B %Y"), "calendar");658 add_localtime_menuitem (menu, self, _("%e %B %Y"), "calendar");
655659

Subscribers

People subscribed via source and target branches