evolution-data-server r9730 - branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi

[msuman svn gnome org]

Author: msuman
Date: Thu Nov  6 10:36:37 2008
New Revision: 9730
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9730&view=rev

Log:
MAPI: Fix some compilation warnings in camel/providers/mapi.

Modified:
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store-summary.c
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.h
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-transport.c

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-folder.c	Thu Nov  6 10:36:37 2008
@@ -558,7 +558,6 @@
 	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*/
 

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store-summary.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store-summary.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store-summary.c	Thu Nov  6 10:36:37 2008
@@ -121,7 +121,6 @@
 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)

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c	Thu Nov  6 10:36:37 2008
@@ -433,7 +433,7 @@
 		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 @@
 	}
 
 	/*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 @@
 	const char *name;
 	CamelFolderInfo *fi;
 	CamelMapiStorePrivate *priv = mapi_store->priv;
-	char *excl_parent;
 
 	fi = g_malloc0(sizeof(*fi));
 	
@@ -972,7 +971,6 @@
 
 	char *par_name = NULL;
 	CamelFolderInfo *fi;
-	CamelMapiStoreInfo *si = NULL;
 	CamelMapiStorePrivate *priv = store->priv;
 
 	name = exchange_mapi_folder_get_name (folder);
@@ -1073,13 +1071,9 @@
 	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 @@
 			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 @@
 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;	
 

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.h
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.h	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.h	Thu Nov  6 10:36:37 2008
@@ -93,6 +93,7 @@
 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
 

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-summary.c	Thu Nov  6 10:36:37 2008
@@ -213,7 +213,6 @@
 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);

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-transport.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-transport.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-transport.c	Thu Nov  6 10:36:37 2008
@@ -376,7 +376,6 @@
 	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);