[evolution-groupwise] Adapt to CamelFolder:name -> display-name.

[Matthew Barnes <mbarnes src gnome org>]

commit 86468a733f165b6ceea7f1c84d0ae0f03112527e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat May 7 11:19:45 2011 -0400

    Adapt to CamelFolder:name -> display-name.

 src/camel/camel-groupwise-folder.c  |   12 ++++++------
 src/camel/camel-groupwise-journal.c |    2 +-
 src/camel/camel-groupwise-store.c   |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/camel/camel-groupwise-folder.c b/src/camel/camel-groupwise-folder.c
index bbb0fde..cee042b 100644
--- a/src/camel/camel-groupwise-folder.c
+++ b/src/camel/camel-groupwise-folder.c
@@ -745,7 +745,7 @@ groupwise_sync (CamelFolder *folder,
 				continue;
 		}
 
-		if ((flags & CAMEL_MESSAGE_JUNK) && strcmp (camel_folder_get_name (folder), JUNK_FOLDER)) {
+		if ((flags & CAMEL_MESSAGE_JUNK) && strcmp (camel_folder_get_display_name (folder), JUNK_FOLDER)) {
 			/*marked a message junk*/
 			move_to_junk (folder, info, cancellable, error);
 			camel_folder_summary_remove_uid (folder->summary, camel_message_info_uid (info));
@@ -753,7 +753,7 @@ groupwise_sync (CamelFolder *folder,
 			continue;
 		}
 
-		if ((flags & CAMEL_GW_MESSAGE_NOJUNK) && !strcmp (camel_folder_get_name (folder), JUNK_FOLDER)) {
+		if ((flags & CAMEL_GW_MESSAGE_NOJUNK) && !strcmp (camel_folder_get_display_name (folder), JUNK_FOLDER)) {
 			/*message was marked as junk, now unjunk*/
 			move_to_mailbox (folder, info, cancellable, error);
 			camel_folder_summary_remove_uid (folder->summary, camel_message_info_uid (info));
@@ -905,7 +905,7 @@ groupwise_sync (CamelFolder *folder,
 		camel_service_lock (CAMEL_SERVICE (gw_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 		status = e_gw_connection_purge_deleted_items (cnc);
 		if (status == E_GW_CONNECTION_STATUS_OK) {
-			g_message ("Purged deleted items in %s", camel_folder_get_name (folder));
+			g_message ("Purged deleted items in %s", camel_folder_get_display_name (folder));
 		}
 		camel_service_unlock (CAMEL_SERVICE (gw_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 	}
@@ -1052,7 +1052,7 @@ update_update (CamelSession *session,
 	camel_operation_push_message (
 		cancellable,
 		_("Checking for deleted messages %s"),
-		camel_folder_get_name (data->folder));
+		camel_folder_get_display_name (data->folder));
 
 	status = e_gw_connection_create_cursor (data->cnc, data->container_id, "id", NULL, &cursor);
 	if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
@@ -1528,7 +1528,7 @@ gw_update_cache (CamelFolder *folder,
 	camel_operation_push_message (
 		cancellable,
 		_("Fetching summary information for new messages in %s"),
-		camel_folder_get_name (folder));
+		camel_folder_get_display_name (folder));
 
 	for (; item_list != NULL; item_list = g_list_next (item_list) ) {
 		EGwItem *temp_item;
@@ -2422,7 +2422,7 @@ groupwise_append_message_sync (CamelFolder *folder,
 	gchar *id;
 	gboolean is_ok = FALSE;
 
-	name = camel_folder_get_name (folder);
+	name = camel_folder_get_display_name (folder);
 	full_name = camel_folder_get_full_name (folder);
 	parent_store = camel_folder_get_parent_store (folder);
 
diff --git a/src/camel/camel-groupwise-journal.c b/src/camel/camel-groupwise-journal.c
index 81fa47c..64bb281 100644
--- a/src/camel/camel-groupwise-journal.c
+++ b/src/camel/camel-groupwise-journal.c
@@ -411,7 +411,7 @@ camel_groupwise_journal_transfer (CamelGroupwiseJournal *groupwise_journal,
 	entry->type = CAMEL_GROUPWISE_JOURNAL_ENTRY_APPEND;
 	entry->uid = uid;
 	entry->original_uid = g_strdup (original_uid);
-	entry->source_container = g_strdup (camel_groupwise_store_container_id_lookup (gw_store, camel_folder_get_name (((CamelFolder *)source_folder))));
+	entry->source_container = g_strdup (camel_groupwise_store_container_id_lookup (gw_store, camel_folder_get_display_name (((CamelFolder *)source_folder))));
 
 	camel_dlist_addtail (&journal->queue, (CamelDListNode *) entry);
 
diff --git a/src/camel/camel-groupwise-store.c b/src/camel/camel-groupwise-store.c
index 9064b74..86b8b94 100644
--- a/src/camel/camel-groupwise-store.c
+++ b/src/camel/camel-groupwise-store.c
@@ -601,7 +601,7 @@ groupwise_store_get_folder_sync (CamelStore *store,
 		camel_operation_push_message (
 			cancellable,
 			_("Fetching summary information for new messages in %s"),
-			camel_folder_get_name (folder));
+			camel_folder_get_display_name (folder));
 		camel_folder_summary_clear (folder->summary);
 
 		while (!done) {
@@ -681,7 +681,7 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store,
 	const gchar *name;
 	guint total = 0;
 
-	name = camel_folder_get_name (folder);
+	name = camel_folder_get_display_name (folder);
 	full_name = camel_folder_get_full_name (folder);
 
 	camel_service_lock (CAMEL_SERVICE (gw_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -732,7 +732,7 @@ gw_store_reload_folder (CamelGroupwiseStore *gw_store,
 			camel_operation_push_message (
 				cancellable,
 				_("Fetching summary information for new messages in %s"),
-				camel_folder_get_name (folder));
+				camel_folder_get_display_name (folder));
 
 			while (!done) {
 					status = e_gw_connection_read_cursor (priv->cnc, container_id,