Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22965

1 files changed, 20 insertions, 26 deletions

diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 28bc66bd54..aceff667c2 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -95,7 +95,6 @@ cal_comp_util_compare_event_timezones (CalComponent *comp,
 				       CalClient *client,
 				       icaltimezone *zone)
 {
-	CalClientGetStatus status;
 	CalComponentDateTime start_datetime, end_datetime;
 	const char *tzid;
 	gboolean retval = FALSE;
@@ -143,10 +142,8 @@ cal_comp_util_compare_event_timezones (CalComponent *comp,
 		/* If the TZIDs differ, we have to compare the UTC offsets
 		   of the start and end times, using their own timezones and
 		   the given timezone. */
-		status = cal_client_get_timezone (client,
-						  start_datetime.tzid,
-						  &start_zone);
-		if (status != CAL_CLIENT_GET_SUCCESS)
+		if (!cal_client_get_timezone (client, start_datetime.tzid,
+					      &start_zone, NULL))
 			goto out;
 
 		if (start_datetime.value) {
@@ -160,10 +157,8 @@ cal_comp_util_compare_event_timezones (CalComponent *comp,
 				goto out;
 		}
 
-		status = cal_client_get_timezone (client,
-						  end_datetime.tzid,
-						  &end_zone);
-		if (status != CAL_CLIENT_GET_SUCCESS)
+		if (!cal_client_get_timezone (client, end_datetime.tzid,
+					      &end_zone, NULL))
 			goto out;
 
 		if (end_datetime.value) {
@@ -210,8 +205,8 @@ gboolean
 cal_comp_is_on_server (CalComponent *comp, CalClient *client)
 {
 	const char *uid;
-	CalClientGetStatus status;
 	icalcomponent *icalcomp;
+	GError *error = NULL;
 
 	g_return_val_if_fail (comp != NULL, FALSE);
 	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
@@ -226,24 +221,15 @@ cal_comp_is_on_server (CalComponent *comp, CalClient *client)
 	 */
 	cal_component_get_uid (comp, &uid);
 
-	status = cal_client_get_object (client, uid, &icalcomp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
+	if (cal_client_get_object (client, uid, NULL, &icalcomp, &error)) {
 		icalcomponent_free (icalcomp);
-		return TRUE;
 
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("confirm_delete_empty_appointment(): Syntax error when getting "
-			   "object `%s'",
-			   uid);
 		return TRUE;
+	}
 
-	case CAL_CLIENT_GET_NOT_FOUND:
-		return FALSE;
-
-	default:
-		g_assert_not_reached ();
+	if (error) {
+		g_warning ("cal_comp_is_on_server(): %s", error->message);
+		g_error_free (error);
 	}
 	
 	return FALSE;
@@ -268,7 +254,7 @@ cal_comp_event_new_with_defaults (CalClient *client)
 	icalproperty *icalprop;
 	CalAlarmTrigger trigger;
 
-	if (cal_client_get_default_object (client, CALOBJ_TYPE_EVENT, &icalcomp) != CAL_CLIENT_GET_SUCCESS)
+	if (!cal_client_get_default_object (client, &icalcomp, NULL))
 		return NULL;
 
 	comp = cal_component_new ();
@@ -334,8 +320,16 @@ cal_comp_task_new_with_defaults (CalClient *client)
 	CalComponent *comp;
 	icalcomponent *icalcomp;
 
-	if (cal_client_get_default_object (client, CALOBJ_TYPE_TODO, &icalcomp) != CAL_CLIENT_GET_SUCCESS)
+	if (!cal_client_get_default_object (client, &icalcomp, NULL))
+		return NULL;
+
+	comp = cal_component_new ();
+	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
+		g_object_unref (comp);
+		icalcomponent_free (icalcomp);
+
 		return NULL;
+	}
 
 	comp = cal_component_new ();
 	if (!cal_component_set_icalcomponent (comp, icalcomp)) {