[evolution/email-factory-3-4: 30/53] commit 60978976388e00a611f2aeb87c9b27e67a2b0f05 Author: Matthew Barnes <mbarnes redhat com> Date:

[Srinivasa Ragavan <sragavan src gnome org>]

commit 09d4b6ce10c2967814a82e26e240c9b778457e47
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Fri Dec 16 13:44:25 2011 +0530

    commit 60978976388e00a611f2aeb87c9b27e67a2b0f05
    Author: Matthew Barnes <mbarnes redhat com>
    Date:   Wed Dec 7 22:27:16 2011 -0500
    
        mail_folder_cache_note_store: CamelSession arg is unnecessary.
    
    	    The CamelStore argument already has the CamelSession:
    
    		        session = camel_service_get_session
    			(CAMEL_SERVICE (store));

 libemail-engine/mail-folder-cache.c |    4 +++-
 libemail-engine/mail-folder-cache.h |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 3d6c86a..74323fa 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -1134,12 +1134,12 @@ mail_folder_cache_new (void)
  */
 void
 mail_folder_cache_note_store (MailFolderCache *self,
-                              CamelSession *session,
                               CamelStore *store,
                               GCancellable *cancellable,
                               NoteDoneFunc done,
                               gpointer data)
 {
+	CamelSession *session;	
 	struct _store_info *si;
 	struct _update_data *ud;
 	gint hook = 0;
@@ -1147,6 +1147,8 @@ mail_folder_cache_note_store (MailFolderCache *self,
 	g_return_if_fail (CAMEL_IS_STORE (store));
 	g_return_if_fail (mail_in_main_thread ());
 
+	session = camel_service_get_session (CAMEL_SERVICE (store));
+
 	g_mutex_lock (self->priv->stores_mutex);
 
 	printf("Loading: %s %s\n", camel_service_get_display_name ((CamelService *) store), camel_service_get_uid ((CamelService *) store));
diff --git a/libemail-engine/mail-folder-cache.h b/libemail-engine/mail-folder-cache.h
index a142272..8253461 100644
--- a/libemail-engine/mail-folder-cache.h
+++ b/libemail-engine/mail-folder-cache.h
@@ -109,7 +109,6 @@ GType		mail_folder_cache_get_type	(void) G_GNUC_CONST;
 MailFolderCache *
 		mail_folder_cache_new		(void);
 void		mail_folder_cache_note_store	(MailFolderCache *self,
-						 CamelSession *session,
 						 CamelStore *store,
 						 GCancellable *cancellable,
 						 NoteDoneFunc done,