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

Proposed by Charles Kerr on 2014-03-25
Status: Merged
Approved by: Ted Gould on 2014-03-26
Approved revision: 334
Merged at revision: 334
Proposed branch: lp:~charlesk/indicator-datetime/lp-1296233-workaround-gio-wakeups
Merge into: lp:indicator-datetime/14.04
Diff against target: 25 lines (+8/-0)
1 file modified
src/actions-live.cpp (+8/-0)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/lp-1296233-workaround-gio-wakeups
Reviewer Review Type Date Requested Status
Ted Gould (community) 2014-03-25 Approve on 2014-03-26
PS Jenkins bot (community) continuous-integration Approve on 2014-03-25
Review via email: mp+212728@code.launchpad.net

Commit message

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

Description of the change

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/actions-live.cpp'
2--- src/actions-live.cpp 2014-03-22 07:25:50 +0000
3+++ src/actions-live.cpp 2014-03-25 21:34:40 +0000
4@@ -84,6 +84,7 @@
5 {
6 inited = true;
7
8+#if 0
9 auto all = g_app_info_get_all_for_type ("text/calendar");
10 for(auto l=all; !have_calendar && l!=nullptr; l=l->next)
11 {
12@@ -94,6 +95,13 @@
13 }
14
15 g_list_free_full(all, (GDestroyNotify)g_object_unref);
16+#else
17+ /* Work around http://pad.lv/1296233 for Trusty...
18+ let's revert this when the GIO bug is fixed. */
19+ auto executable = g_find_program_in_path("evolution");
20+ have_calendar = executable != nullptr;
21+ g_free(executable);
22+#endif
23 }
24
25 return have_calendar;

Subscribers

People subscribed via source and target branches