[evolution-mapi] Bug #623057 - Calls e_book_backend_summary_new with NULL filename

[Milan Crha <mcrha src gnome org>]

commit f3c6514a47d70bf9b82be4ebea2b0e09ae905e7e
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 30 13:02:30 2010 +0200

    Bug #623057 - Calls e_book_backend_summary_new with NULL filename

 src/addressbook/e-book-backend-mapi-gal.c |   18 +++++-------------
 src/addressbook/e-book-backend-mapi.c     |   18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi-gal.c b/src/addressbook/e-book-backend-mapi-gal.c
index e470614..3da54f0 100644
--- a/src/addressbook/e-book-backend-mapi-gal.c
+++ b/src/addressbook/e-book-backend-mapi-gal.c
@@ -196,12 +196,6 @@ build_cache (EBookBackendMAPIGAL *ebmapi)
 		priv->cache = e_book_backend_cache_new (priv->uri);
 	}
 
-	if (!priv->summary) {
-		priv->summary = e_book_backend_summary_new (priv->summary_file_name,
-							    SUMMARY_FLUSH_TIMEOUT);
-		printf("Summary file name is %s\n", priv->summary_file_name);
-	}
-
 	fgd.ebmapi = ebmapi;
 	fgd.book_view = find_book_view (ebmapi);
 	fgd.fid = exchange_mapi_connection_get_default_folder_id (priv->conn, olFolderContacts);
@@ -410,12 +404,13 @@ e_book_backend_mapi_gal_load_source (EBookBackend *backend,
 		return GNOME_Evolution_Addressbook_OfflineUnavailable;
 	}
 
+	g_free (priv->summary_file_name);
+	priv->summary_file_name = get_filename_from_uri (priv->uri, "cache.summary");
+	if (priv->summary) g_object_unref (priv->summary);
+	priv->summary = e_book_backend_summary_new (priv->summary_file_name, SUMMARY_FLUSH_TIMEOUT);
+
 	if (priv->marked_for_offline) {
-		priv->summary_file_name = get_filename_from_uri (priv->uri, "cache.summary");
 		if (g_file_test (priv->summary_file_name, G_FILE_TEST_EXISTS)) {
-			printf("Loading the summary\n");
-			priv->summary = e_book_backend_summary_new (priv->summary_file_name,
-								    SUMMARY_FLUSH_TIMEOUT);
 			e_book_backend_summary_load (priv->summary);
 			priv->is_summary_ready = TRUE;
 		}
@@ -424,7 +419,6 @@ e_book_backend_mapi_gal_load_source (EBookBackend *backend,
 		if (e_book_backend_cache_exists (priv->uri)) {
 			gchar *last_time;
 
-			printf("Loading the cache\n");
 			priv->cache = e_book_backend_cache_new (priv->uri);
 
 			last_time = e_book_backend_cache_get_time (priv->cache);
@@ -432,8 +426,6 @@ e_book_backend_mapi_gal_load_source (EBookBackend *backend,
 			g_free (last_time);
 		}
 		//FIXME: We may have to do a time based reload. Or deltas should upload.
-	} else {
-		priv->summary = e_book_backend_summary_new (NULL,SUMMARY_FLUSH_TIMEOUT);
 	}
 
 	e_book_backend_set_is_loaded (E_BOOK_BACKEND (backend), TRUE);
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index b280e16..4b242a1 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -274,25 +274,24 @@ e_book_backend_mapi_load_source (EBookBackend *backend,
 		return GNOME_Evolution_Addressbook_OfflineUnavailable;
 	}
 
+	g_free (priv->summary_file_name);
+	priv->summary_file_name = get_filename_from_uri (priv->uri, "cache.summary");
+	if (priv->summary) g_object_unref (priv->summary);
+	priv->summary = e_book_backend_summary_new (priv->summary_file_name, SUMMARY_FLUSH_TIMEOUT);
+
 	if (priv->marked_for_offline) {
-		priv->summary_file_name = get_filename_from_uri (priv->uri, "cache.summary");
 		if (g_file_test (priv->summary_file_name, G_FILE_TEST_EXISTS)) {
-			printf("Loading the summary\n");
-			priv->summary = e_book_backend_summary_new (priv->summary_file_name,
-								    SUMMARY_FLUSH_TIMEOUT);
 			e_book_backend_summary_load (priv->summary);
 			priv->is_summary_ready = TRUE;
 		}
 
 		/* Load the cache as well.*/
 		if (e_book_backend_cache_exists (priv->uri)) {
-			printf("Loading the cache\n");
 			priv->cache = e_book_backend_cache_new (priv->uri);
 			priv->is_cache_ready = TRUE;
 		}
 		//FIXME: We may have to do a time based reload. Or deltas should upload.
 	} else {
-		priv->summary = e_book_backend_summary_new (NULL,SUMMARY_FLUSH_TIMEOUT);
 		priv->cache = e_book_backend_cache_new (priv->uri);
 	}
 
@@ -1477,16 +1476,9 @@ build_cache (EBookBackendMAPI *ebmapi)
 
 	//FIXME: What if book view is NULL? Can it be? Check that.
 	if (!priv->cache) {
-		printf("Caching for the first time\n");
 		priv->cache = e_book_backend_cache_new (priv->uri);
 	}
 
-	if (!priv->summary) {
-		priv->summary = e_book_backend_summary_new (priv->summary_file_name,
-							    SUMMARY_FLUSH_TIMEOUT);
-		printf("Summary file name is %s\n", priv->summary_file_name);
-	}
-
 	e_file_cache_freeze_changes (E_FILE_CACHE (priv->cache));
 
 	if (!exchange_mapi_connection_fetch_items (priv->conn, priv->fid, NULL, NULL,