Remove get-vtype check from the completed-tasks query (and don't leak the

	* gui/e-tasks.c (e_tasks_delete_completed): Remove get-vtype check
	from the completed-tasks query (and don't leak the sexp string).

	* gui/e-cal-model.c (update_e_cal_view_for_client): Don't adjust
	the sexp to use get-vtype.

	* gui/gnome-cal.c (adjust_e_cal_view_sexp, gnome_calendar_purge):
	Remove get-vtype check from queries

svn path=/trunk/; revision=23263

1 files changed, 3 insertions, 15 deletions

diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index a5b9eac4e8..6a73b14455 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -929,19 +929,6 @@ e_tasks_delete_selected (ETasks *tasks)
 	set_status_message (tasks, NULL);
 }
 
-static char *
-create_sexp (void)
-{
-	char *sexp;
-
-	sexp = g_strdup ("(and (= (get-vtype) \"VTODO\") (is-completed?))");
-#if 0
-	g_print ("Calendar model sexp:\n%s\n", sexp);
-#endif
-
-	return sexp;
-}
-
 /**
  * e_tasks_expunge:
  * @tasks: A tasks control widget
@@ -962,16 +949,17 @@ e_tasks_delete_completed (ETasks *tasks)
 
 	/* FIXME Confirm expunge */
 
-	sexp = create_sexp ();
-
 	set_status_message (tasks, _("Expunging"));
 	
+	sexp = g_strdup ("(is-completed?)");
 	if (!e_cal_get_object_list (priv->client, sexp, &objects, NULL)) {
 		set_status_message (tasks, NULL);
+		g_free (sexp);
 		g_warning (G_STRLOC ": Could not get the objects");
 
 		return;
 	}
+	g_free (sexp);
 	
 	for (l = objects; l; l = l->next) {
 		/* FIXME Better error handling */