Merge lp:~karl-qdh/indicator-datetime/alwaysshowcalendar into lp:indicator-datetime/0.3

Proposed by Karl Lattimer on 2011-03-28
Status: Merged
Merged at revision: 82
Proposed branch: lp:~karl-qdh/indicator-datetime/alwaysshowcalendar
Merge into: lp:indicator-datetime/0.3
Diff against target: 20 lines (+4/-3)
1 file modified
src/datetime-service.c (+4/-3)
To merge this branch: bzr merge lp:~karl-qdh/indicator-datetime/alwaysshowcalendar
Reviewer Review Type Date Requested Status
Ted Gould 2011-03-28 Pending
Review via email: mp+55116@code.launchpad.net

Description of the change

Don't make showing the calendar conditional on evolution being installed. The calendar will not be hooked up to any event handlers and therefore will do nothing.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/datetime-service.c'
2--- src/datetime-service.c 2011-03-23 12:03:21 +0000
3+++ src/datetime-service.c 2011-03-28 10:24:23 +0000
4@@ -364,12 +364,13 @@
5 check_for_calendar (gpointer user_data)
6 {
7 g_return_val_if_fail (calendar != NULL, FALSE);
8-
9+ // Always enable the calendar even if it does nothing
10+ dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
11+ dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
12+
13 gchar *evo = g_find_program_in_path("evolution");
14 if (evo != NULL) {
15 g_debug("Found the calendar application: %s", evo);
16- dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
17- dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
18
19 dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
20 g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,

Subscribers

People subscribed via source and target branches