Merge lp:~larsu/indicator-datetime/reset-date into lp:indicator-datetime/14.04

[Lars Karlitski]

Set calendar to the current date when the menu is popped up

This makes use of the "submenu-action" attribute to get notified when the menu is popped up.

Charles, if your big refactoring-branch should land before this, do you mind adapting this patch for that? Thanks

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:296
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/39/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/159/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

The code looks fine and it works. Thanks larsu :)

review: Approve

[Sebastien Bacher (seb128)]

What happens if you run that code without the new libindicator version? (or asked differently, should we update the depends on libindicator?)

review: Needs Information

[Lars Karlitski (larsu)]

The old libindicator will simply ignore the new menu item attribute. I don't think we need to bump the dependency.

[Sebastien Bacher (seb128)]

Great, I just wanted to make sure, thanks

=== modified file 'src/service.c'
--- src/service.c	2014-01-21 21:47:02 +0000
+++ src/service.c	2014-01-29 13:32:47 +0000
@@ -1359,6 +1359,21 @@
   g_free (zone);
 }
 
+static void
+on_calendar_active_changed (GSimpleAction *action G_GNUC_UNUSED,
+                            GVariant      *state,
+                            gpointer       user_data)
+{
+  IndicatorDatetimeService *self = user_data;
+
+  /* reset the date when the menu is shown */
+  if (g_variant_get_boolean (state) && self->priv->calendar_date)
+    {
+      g_clear_pointer (&self->priv->calendar_date, g_date_time_unref);
+      update_calendar_action_state (self);
+    }
+}
+
 /***
 ****
 ***/
@@ -1431,6 +1446,7 @@
   g_menu_item_set_attribute (header, "x-canonical-type",
                              "s", "com.canonical.indicator.root");
   g_menu_item_set_submenu (header, G_MENU_MODEL (submenu));
+  g_menu_item_set_attribute (header, "submenu-action", "s", "indicator.calendar-active");
   g_object_unref (submenu);
 
   /* add header to the menu */
@@ -1586,7 +1602,8 @@
     { "activate-phone-clock-app", on_phone_clock_activated },
     { "activate-planner", on_activate_planner, "x", NULL },
     { "activate-appointment", on_activate_appointment, "s", NULL },
-    { "set-location", on_set_location, "s" }
+    { "set-location", on_set_location, "s" },
+    { "calendar-active", NULL, NULL, "false", on_calendar_active_changed }
   };
 
   p->actions = g_simple_action_group_new ();