Merge lp:~mterry/indicator-datetime/no-evo-when-in-greeter into lp:indicator-datetime/0.3

Proposed by Michael Terry on 2011-08-31
Status: Merged
Merged at revision: 125
Proposed branch: lp:~mterry/indicator-datetime/no-evo-when-in-greeter
Merge into: lp:indicator-datetime/0.3
Diff against target: 12 lines (+1/-1)
1 file modified
src/datetime-service.c (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-datetime/no-evo-when-in-greeter
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2011-08-31 Pending
Review via email: mp+73533@code.launchpad.net
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-08-17 19:56:03 +0000
3+++ src/datetime-service.c 2011-08-31 13:45:15 +0000
4@@ -482,7 +482,7 @@
5 dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
6
7 gchar *evo = g_find_program_in_path("evolution");
8- if (evo != NULL) {
9+ if (!get_greeter_mode () && evo != NULL) {
10 g_debug("Found the calendar application: %s", evo);
11
12 g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,

Subscribers

People subscribed via source and target branches