[evolution-mapi] Fix CamelOperation string (add folder name to it)
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Fix CamelOperation string (add folder name to it)
- Date: Tue, 11 May 2010 16:22:17 +0000 (UTC)
commit fc32625889e7f12f63b56d8e2cedf5b76e5fc2dd
Author: Milan Crha <mcrha redhat com>
Date: Tue May 11 18:21:33 2010 +0200
Fix CamelOperation string (add folder name to it)
src/camel/camel-mapi-folder.c | 6 +++---
src/camel/camel-mapi-folder.h | 2 +-
src/camel/camel-mapi-notifications.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index f05fc4e..cc23dc8 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1015,7 +1015,7 @@ mapi_camel_get_summary_list (ExchangeMapiConnection *conn, mapi_id_t fid, TALLOC
}
gboolean
-camel_mapi_folder_fetch_summary (CamelStore *store, const mapi_id_t fid, struct mapi_SRestriction *res,
+camel_mapi_folder_fetch_summary (CamelStore *store, CamelFolder *folder, const mapi_id_t fid, struct mapi_SRestriction *res,
struct SSortOrderSet *sort, fetch_items_data *fetch_data, guint32 options)
{
gboolean status;
@@ -1023,7 +1023,7 @@ camel_mapi_folder_fetch_summary (CamelStore *store, const mapi_id_t fid, struct
/*TODO : Check for online state*/
- camel_operation_start (NULL, _("Fetching summary information for new messages in")); /* %s"), folder->name); */
+ camel_operation_start (NULL, _("Fetching summary information for new messages in %s"), camel_folder_get_name (folder));
camel_service_lock (CAMEL_SERVICE (mapi_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -1145,7 +1145,7 @@ mapi_refresh_folder(CamelFolder *folder, CamelException *ex)
if (((CamelMapiFolder *)folder)->type & CAMEL_MAPI_FOLDER_PUBLIC)
options |= MAPI_OPTIONS_USE_PFSTORE;
- status = camel_mapi_folder_fetch_summary ((CamelStore *)mapi_store, temp_folder_id, res, sort,
+ status = camel_mapi_folder_fetch_summary ((CamelStore *)mapi_store, folder, temp_folder_id, res, sort,
fetch_data, options);
if (!status) {
diff --git a/src/camel/camel-mapi-folder.h b/src/camel/camel-mapi-folder.h
index 44ca31f..09d49d5 100644
--- a/src/camel/camel-mapi-folder.h
+++ b/src/camel/camel-mapi-folder.h
@@ -149,7 +149,7 @@ camel_mapi_folder_new(CamelStore *store, const gchar *folder_name, const gchar *
void mapi_update_summary ( CamelFolder *folder, GList *item_list,CamelException *ex);
void mapi_refresh_folder(CamelFolder *folder, CamelException *ex);
-gboolean camel_mapi_folder_fetch_summary (CamelStore *store, const mapi_id_t fid, struct mapi_SRestriction *res,
+gboolean camel_mapi_folder_fetch_summary (CamelStore *store, CamelFolder *folder, const mapi_id_t fid, struct mapi_SRestriction *res,
struct SSortOrderSet *sort, fetch_items_data *fetch_data, guint32 options);
G_END_DECLS
diff --git a/src/camel/camel-mapi-notifications.c b/src/camel/camel-mapi-notifications.c
index ee74957..c6a7b28 100644
--- a/src/camel/camel-mapi-notifications.c
+++ b/src/camel/camel-mapi-notifications.c
@@ -117,7 +117,7 @@ process_mapi_new_mail_notif (CamelMapiStore *store, struct NewMailNotification *
fetch_data->folder = folder;
camel_service_lock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
- camel_mapi_folder_fetch_summary ((CamelStore *)store, new_mail_notif->FID, res, NULL, fetch_data, options);
+ camel_mapi_folder_fetch_summary ((CamelStore *)store, folder, new_mail_notif->FID, res, NULL, fetch_data, options);
camel_service_unlock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
camel_folder_summary_touch (folder->summary);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]