Merge lp:~achiang/indicator-datetime/0.1-always-show-calendar into lp:indicator-datetime/0.1

[Alex Chiang]

  Always show the calendar, even if evolution is not installed.

  We can still connect the signal to try and launch evolution; this should
  be harmless even if evolution isn't installed.

  The two implementation details above allow us to completely remove the
  check for evolution, as we're unconditionally doing them now.

fixes bug(s): https://launchpad.net/bugs/691953

[Ted Gould (ted)]

Makes sense, thanks Alex!

review: Approve

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2010-10-06 13:28:50 +0000
+++ src/datetime-service.c	2011-06-14 17:07:26 +0000
@@ -87,27 +87,6 @@
 	}
 }
 
-/* Looks for the calendar application and enables the item if
-   we have one */
-static gboolean
-check_for_calendar (gpointer user_data)
-{
-	g_return_val_if_fail (calendar != NULL, FALSE);
-
-	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);
-		g_free(evo);
-	} else {
-		g_debug("Unable to find calendar app.");
-		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-	}
-
-	return FALSE;
-}
-
 /* Looks for the time and date admin application and enables the
    item we have one */
 static gboolean
@@ -147,13 +126,16 @@
 	if (calendar == NULL) {
 		calendar = dbusmenu_menuitem_new();
 		dbusmenu_menuitem_property_set (calendar, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CALENDAR_MENUITEM_TYPE);
-		/* insensitive until we check for available apps */
-		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
+
+		/* Always display calendar (LP: #691953) */
+		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+
+		/* Should be harmless to connect signal to potentially
+		   non-existent evo */
 		g_signal_connect (G_OBJECT(calendar), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
 						  G_CALLBACK (activate_cb), "evolution -c calendar");
 		dbusmenu_menuitem_child_append(root, calendar);
-
-		g_idle_add(check_for_calendar, NULL);
 	}
 
 	DbusmenuMenuitem * separator = dbusmenu_menuitem_new();