[evolution-ews] Moving to use calendar_item_accept_id instead of associated_calendar_item_id. I case Exchange does n

[Pavel Ocheretny <pocheretny src gnome org>]

commit 0f4fc524b783d679757394ddb5ac1b3d9fb7dcf5
Author: Pavel Ocheretny <pocheretny src gnome org>
Date:   Sun Jun 26 13:11:13 2011 +0300

    Moving to use calendar_item_accept_id instead of associated_calendar_item_id.
    I case Exchange does not auto-processing the meetings we will store the Meeting Request and then accept it

 src/camel/camel-ews-folder.c |    2 +-
 src/server/e-ews-item.c      |   22 +++++++++++-----------
 src/server/e-ews-item.h      |    4 +---
 3 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 8f27309..0e489e9 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -402,7 +402,7 @@ camel_ews_folder_get_message (CamelFolder *folder, const gchar *uid, gint pri, G
 			}
 			goto exit;
 		}
-		associated_calendar_id = e_ews_item_get_associated_calendar_item_id (items_req->data);
+		associated_calendar_id = e_ews_item_get_calendar_item_accept_id (items_req->data);
 		/*In case of non-exchange based meetings invites the calendar backend have to create the meeting*/
 		if (associated_calendar_id) {
 			mime_fname_new = ews_update_mgtrequest_mime_calendar_itemid (mime_content,
diff --git a/src/server/e-ews-item.c b/src/server/e-ews-item.c
index 7aaace7..ccca138 100644
--- a/src/server/e-ews-item.c
+++ b/src/server/e-ews-item.c
@@ -167,7 +167,7 @@ struct _EEwsItemPrivate {
 	GSList *attachments_list;
 	GSList *attendees;
 
-	EwsId *associated_calendar_item_id;
+	EwsId *calendar_item_accept_id;
 
 	struct _EEwsContactFields *contact_fields;
 };
@@ -247,11 +247,11 @@ e_ews_item_dispose (GObject *object)
 
 	}
 
-	if (priv->associated_calendar_item_id) {
-		g_free (priv->associated_calendar_item_id->id);
-		g_free (priv->associated_calendar_item_id->change_key);
-		g_free (priv->associated_calendar_item_id);
-		priv->associated_calendar_item_id = NULL;
+	if (priv->calendar_item_accept_id) {
+		g_free (priv->calendar_item_accept_id->id);
+		g_free (priv->calendar_item_accept_id->change_key);
+		g_free (priv->calendar_item_accept_id);
+		priv->calendar_item_accept_id = NULL;
 	}
 
 	ews_item_free_mailbox (priv->sender);
@@ -854,9 +854,9 @@ e_ews_item_set_from_soap_parameter (EEwsItem *item, ESoapParameter *param)
 		} else if (!g_ascii_strcasecmp (name, "OptionalAttendees")) {
 			process_attendees (priv, subparam, "Optional");
 		} else if (!g_ascii_strcasecmp (name, "AssociatedCalendarItemId")) {
-			priv->associated_calendar_item_id = g_new0 (EwsId, 1);
-			priv->associated_calendar_item_id->id = e_soap_parameter_get_property (subparam, "Id");
-			priv->associated_calendar_item_id->change_key = e_soap_parameter_get_property (subparam, "ChangeKey");
+			priv->calendar_item_accept_id = g_new0 (EwsId, 1);
+			priv->calendar_item_accept_id->id = e_soap_parameter_get_property (subparam, "Id");
+			priv->calendar_item_accept_id->change_key = e_soap_parameter_get_property (subparam, "ChangeKey");
 		}
 	}
 
@@ -1223,11 +1223,11 @@ e_ews_item_get_attendees (EEwsItem *item)
 }
 
 const EwsId *
-e_ews_item_get_associated_calendar_item_id (EEwsItem *item)
+e_ews_item_get_calendar_item_accept_id (EEwsItem *item)
 {
 	g_return_val_if_fail(E_IS_EWS_ITEM(item), NULL);
 
-	return (const EwsId*) item->priv->associated_calendar_item_id;
+	return (const EwsId*) item->priv->calendar_item_accept_id;
 }
 
 const gchar *
diff --git a/src/server/e-ews-item.h b/src/server/e-ews-item.h
index b965596..162cc3e 100644
--- a/src/server/e-ews-item.h
+++ b/src/server/e-ews-item.h
@@ -160,9 +160,7 @@ e_ews_item_dump_mime_content(EEwsItem *item, const gchar *cache);
 
 const GSList *	e_ews_item_get_attendees	(EEwsItem *item);
 
-const gchar *	e_ews_item_get_associatedcalendarid
-						(EEwsItem *item);
-const EwsId *	e_ews_item_get_associated_calendar_item_id
+const EwsId *	e_ews_item_get_calendar_item_accept_id
 						(EEwsItem *item);
 
 /* Contact fields */