From 25f173fc051299f5df5f445d1b2cf4ab83c241df Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Thu, 6 Nov 2008 10:36:37 +0000 Subject: MAPI: Fix some compilation warnings in camel/providers/mapi. svn path=/branches/EXCHANGE_MAPI_BRANCH/; revision=9730 --- camel/providers/mapi/ChangeLog | 12 ++++++++++++ camel/providers/mapi/camel-mapi-folder.c | 1 - camel/providers/mapi/camel-mapi-store-summary.c | 1 - camel/providers/mapi/camel-mapi-store.c | 15 ++++----------- camel/providers/mapi/camel-mapi-store.h | 1 + camel/providers/mapi/camel-mapi-summary.c | 1 - camel/providers/mapi/camel-mapi-transport.c | 1 - 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/camel/providers/mapi/ChangeLog b/camel/providers/mapi/ChangeLog index 6b3298099..a2000c991 100644 --- a/camel/providers/mapi/ChangeLog +++ b/camel/providers/mapi/ChangeLog @@ -1,3 +1,15 @@ +2008-11-06 Suman Manjunath + + * camel-mapi-folder.c (mapi_refresh_folder): + * camel-mapi-store-summary.c (summary_header_load): + * camel-mapi-store.c (mapi_create_folder), (mapi_rename_folder), + (mapi_build_folder_info), (mapi_convert_to_folder_info), + (mapi_folders_sync), (mapi_get_folder_info): + * camel-mapi-store.h: + * camel-mapi-summary.c (mapi_message_info_to_db): + * camel-mapi-transport.c (mail_build_props): + Fix some compilation warnings. + 2008-10-31 Johnny Jacob * camel-mapi-summary.c (mapi_summary_header_to_db): Fixed bad return type. diff --git a/camel/providers/mapi/camel-mapi-folder.c b/camel/providers/mapi/camel-mapi-folder.c index ed1a660a9..abda7f474 100644 --- a/camel/providers/mapi/camel-mapi-folder.c +++ b/camel/providers/mapi/camel-mapi-folder.c @@ -558,7 +558,6 @@ mapi_refresh_folder(CamelFolder *folder, CamelException *ex) if (!is_proxy) { mapi_id_t temp_folder_id; guint32 options = 0; - CamelFolderInfo *fi = NULL; fetch_data->last_modification_time = g_new0 (struct timeval, 1); /*First Sync*/ diff --git a/camel/providers/mapi/camel-mapi-store-summary.c b/camel/providers/mapi/camel-mapi-store-summary.c index fffd79abc..0b0a56311 100644 --- a/camel/providers/mapi/camel-mapi-store-summary.c +++ b/camel/providers/mapi/camel-mapi-store-summary.c @@ -121,7 +121,6 @@ static int summary_header_load(CamelStoreSummary *s, FILE *in) { CamelMapiStoreSummary *summary = (CamelMapiStoreSummary *)s ; - gint32 version; /* TODO */ if (camel_mapi_store_summary_parent->summary_header_load ((CamelStoreSummary *)s, in) == -1) diff --git a/camel/providers/mapi/camel-mapi-store.c b/camel/providers/mapi/camel-mapi-store.c index b316d405e..5f7d2d547 100644 --- a/camel/providers/mapi/camel-mapi-store.c +++ b/camel/providers/mapi/camel-mapi-store.c @@ -433,7 +433,7 @@ mapi_create_folder(CamelStore *store, const char *parent_name, const char *folde return NULL; } - if (mapi_fid_is_system_folder (store, camel_mapi_store_folder_id_lookup (mapi_store, folder_name))) { + if (mapi_fid_is_system_folder (mapi_store, camel_mapi_store_folder_id_lookup (mapi_store, folder_name))) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot create new folder `%s'"), folder_name); return NULL; @@ -661,7 +661,7 @@ mapi_rename_folder(CamelStore *store, const char *old_name, const char *new_name } /*Do not allow rename for system folders.*/ - if (mapi_fid_is_system_folder (store, folder_id)) { + if (mapi_fid_is_system_folder (mapi_store, folder_id)) { camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Mapi folder `%s' to `%s'. Default folder."), old_name, new_name); return; @@ -833,7 +833,6 @@ mapi_build_folder_info(CamelMapiStore *mapi_store, const char *parent_name, cons const char *name; CamelFolderInfo *fi; CamelMapiStorePrivate *priv = mapi_store->priv; - char *excl_parent; fi = g_malloc0(sizeof(*fi)); @@ -972,7 +971,6 @@ mapi_convert_to_folder_info (CamelMapiStore *store, ExchangeMAPIFolder *folder, char *par_name = NULL; CamelFolderInfo *fi; - CamelMapiStoreInfo *si = NULL; CamelMapiStorePrivate *priv = store->priv; name = exchange_mapi_folder_get_name (folder); @@ -1073,13 +1071,9 @@ mapi_folders_sync (CamelMapiStore *store, CamelException *ex) CamelMapiStorePrivate *priv = store->priv; gboolean status; GSList *folder_list = NULL, *temp_list = NULL, *list = NULL; - GSList *pf_folder_list = NULL; char *url, *temp_url; - CamelFolderInfo *info = NULL, *hfi = NULL; - GHashTable *present; - CamelStoreInfo *si = NULL; + CamelFolderInfo *info = NULL; CamelMapiStoreInfo *mapi_si = NULL; - int count, i; if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL) { if (((CamelService *)store)->status == CAMEL_SERVICE_DISCONNECTED){ @@ -1156,7 +1150,7 @@ mapi_folders_sync (CamelMapiStore *store, CamelException *ex) continue; info = mapi_convert_to_folder_info (store, folder, (const char *)url, ex); - if (!(mapi_si = camel_store_summary_path (store->summary, info->full_name))){ + if (!(mapi_si = camel_store_summary_path ((CamelStoreSummary *)store->summary, info->full_name))){ mapi_si = camel_mapi_store_summary_add_from_full (store->summary, info->full_name, '/'); if (mapi_si == NULL) { continue; @@ -1182,7 +1176,6 @@ static CamelFolderInfo* mapi_get_folder_info(CamelStore *store, const char *top, guint32 flags, CamelException *ex) { CamelMapiStore *mapi_store = CAMEL_MAPI_STORE (store); - CamelMapiStorePrivate *priv = mapi_store->priv; CamelFolderInfo *info = NULL; int s_count = 0; diff --git a/camel/providers/mapi/camel-mapi-store.h b/camel/providers/mapi/camel-mapi-store.h index 9003d26de..9029638b5 100644 --- a/camel/providers/mapi/camel-mapi-store.h +++ b/camel/providers/mapi/camel-mapi-store.h @@ -93,6 +93,7 @@ gboolean camel_mapi_store_connected(CamelMapiStore *, CamelException *); const gchar* camel_mapi_store_folder_id_lookup (CamelMapiStore *mapi_store, const char *folder_name); const gchar* camel_mapi_store_folder_lookup (CamelMapiStore *mapi_store, const char *folder_id); const gchar* camel_mapi_store_get_profile_name (CamelMapiStore *mapi_store); +const gchar *camel_mapi_store_system_folder_fid (CamelMapiStore *mapi_store, guint folder_type); __END_DECLS diff --git a/camel/providers/mapi/camel-mapi-summary.c b/camel/providers/mapi/camel-mapi-summary.c index eb99ead03..1eda712d8 100644 --- a/camel/providers/mapi/camel-mapi-summary.c +++ b/camel/providers/mapi/camel-mapi-summary.c @@ -213,7 +213,6 @@ mapi_message_info_from_db (CamelFolderSummary *s, CamelMIRecord *mir) static CamelMIRecord * mapi_message_info_to_db (CamelFolderSummary *s, CamelMessageInfo *info) { - CamelMapiMessageInfo *minfo = (CamelMapiMessageInfo *)info; struct _CamelMIRecord *mir; mir = camel_mapi_summary_parent->message_info_to_db (s, info); diff --git a/camel/providers/mapi/camel-mapi-transport.c b/camel/providers/mapi/camel-mapi-transport.c index 83ecef707..5ef79dd13 100644 --- a/camel/providers/mapi/camel-mapi-transport.c +++ b/camel/providers/mapi/camel-mapi-transport.c @@ -376,7 +376,6 @@ mail_build_props (struct SPropValue **value, struct SPropTagArray *SPropTagArray GSList *l; uint32_t *msgflag = g_new0 (uint32_t, 1); - uint32_t *editor = g_new0 (uint32_t, 1); int i=0; props = g_new0 (struct SPropValue, 6); -- cgit v1.2.1