ayatana-commits team mailing list archive

[Karl Lattimer <karl@xxxxxxxxxx>]

Karl Lattimer has proposed merging lp:~karl-qdh/indicator-datetime/alwaysshowcalendar into lp:indicator-datetime.

Requested reviews:
  Ted Gould (ted)
Related bugs:
  Bug #691953 in Indicator Date and Time: "Uninstalling Evolution removes calendar from clock applet"
  https://bugs.launchpad.net/indicator-datetime/+bug/691953

For more details, see:
https://code.launchpad.net/~karl-qdh/indicator-datetime/alwaysshowcalendar/+merge/55116

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.
-- 
https://code.launchpad.net/~karl-qdh/indicator-datetime/alwaysshowcalendar/+merge/55116
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-03-23 12:03:21 +0000
+++ src/datetime-service.c	2011-03-28 10:24:23 +0000
@@ -364,12 +364,13 @@
 check_for_calendar (gpointer user_data)
 {
 	g_return_val_if_fail (calendar != NULL, FALSE);
-
+	// Always enable the calendar even if it does nothing
+	dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+	dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+	
 	gchar *evo = g_find_program_in_path("evolution");
 	if (evo != NULL) {
 		g_debug("Found the calendar application: %s", evo);
-		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
-		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
 
 		dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
 		g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,