Merge lp:~charlesk/indicator-datetime/lp-1296233-workaround-gio-wakeups into lp:indicator-datetime/14.04

[Charles Kerr]

Short-term workaround for the GIO GAppInfo wakeup bug discussed in bug 1296233

Short-term workaround for the GIO GAppInfo wakeup bug described at <https://bugs.launchpad.net/indicator-datetime/+bug/1296233/comments/4> since Ryan says there's not time to fix that for Trusty.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/actions-live.cpp'
--- src/actions-live.cpp	2014-03-22 07:25:50 +0000
+++ src/actions-live.cpp	2014-03-25 21:34:40 +0000
@@ -84,6 +84,7 @@
     {
         inited = true;
 
+#if 0
         auto all = g_app_info_get_all_for_type ("text/calendar");
         for(auto l=all; !have_calendar && l!=nullptr; l=l->next)
         {
@@ -94,6 +95,13 @@
         }
 
         g_list_free_full(all, (GDestroyNotify)g_object_unref);
+#else
+        /* Work around http://pad.lv/1296233 for Trusty...
+           let's revert this when the GIO bug is fixed. */
+        auto executable = g_find_program_in_path("evolution");
+        have_calendar = executable != nullptr;
+        g_free(executable);
+#endif
     }
 
     return have_calendar;