[evolution/email-factory-3-4] Fix some build issues.

[Matthew Barnes <mbarnes src gnome org>]

commit f961ff537f8ea291d10b9cf245802d74182aa64b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jan 17 16:17:05 2012 -0500

    Fix some build issues.

 libemail-engine/mail-folder-cache.c |   15 ---------------
 mail/e-mail-ui-session.c            |   20 +++++---------------
 2 files changed, 5 insertions(+), 30 deletions(-)
---
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index b07c122..c62ccf4 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -1224,20 +1224,6 @@ mail_folder_cache_finalize (GObject *object)
 }
 
 static void
-mail_folder_cache_constructed (GObject *object)
-{
-	MailFolderCache *cache;
-	EMailSession *session;
-
-	cache = MAIL_FOLDER_CACHE (object);
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (mail_folder_cache_parent_class)->constructed (object);
-
-	session = mail_folder_cache_get_session (cache);
-}
-
-static void
 mail_folder_cache_folder_available (MailFolderCache *cache,
                                     CamelStore *store,
                                     const gchar *folder_name)
@@ -1399,7 +1385,6 @@ mail_folder_cache_class_init (MailFolderCacheClass *class)
 	object_class->get_property = mail_folder_cache_get_property;
 	object_class->dispose = mail_folder_cache_dispose;
 	object_class->finalize = mail_folder_cache_finalize;
-	object_class->constructed = mail_folder_cache_constructed;
 
 	class->folder_available = mail_folder_cache_folder_available;
 	class->folder_unavailable = mail_folder_cache_folder_unavailable;
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index fe253f2..d39dba1 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -492,17 +492,6 @@ mail_ui_session_dispose (GObject *object)
 }
 
 static void
-mail_ui_session_finalize (GObject *object)
-{
-	EMailUISessionPrivate *priv;
-
-	priv = E_MAIL_UI_SESSION_GET_PRIVATE (object);
-
-	/* Chain up to parent's finalize() method. */
-	G_OBJECT_CLASS (e_mail_ui_session_parent_class)->finalize (object);
-}
-
-static void
 mail_ui_session_add_vfolder_store (EMailUISession *uisession)
 {
 	CamelSession *camel_session;
@@ -580,11 +569,14 @@ mail_ui_session_account_changed_cb (EAccountList *account_list,
 static gboolean
 mail_ui_session_initialize_stores_idle (gpointer user_data)
 {
-	EMailSession *session = user_data;
+	EMailUISession *session = user_data;
+	EMailAccountStore *account_store;
 	EAccount *account;
 
 	g_return_val_if_fail (session != NULL, FALSE);
 
+	account_store = e_mail_ui_session_get_account_store (session);
+
 	/* Initialize which account is default. */
 	account = e_get_default_account ();
 	if (account != NULL) {
@@ -593,7 +585,7 @@ mail_ui_session_initialize_stores_idle (gpointer user_data)
 		service = camel_session_get_service (
 			CAMEL_SESSION (session), account->uid);
 		e_mail_account_store_set_default_service (
-			priv->account_store, service);
+			account_store, service);
 	}
 
 	return FALSE;
@@ -606,7 +598,6 @@ mail_ui_session_constructed (GObject *object)
 	EMFolderTreeModel *folder_tree_model;
 	EMailSession *session;
 	EMailUISession *uisession;
-	EAccount *account;
 	EAccountList *account_list;
 	gulong handler_id;
 
@@ -811,7 +802,6 @@ e_mail_ui_session_class_init (EMailUISessionClass *class)
 	object_class->set_property = mail_ui_session_set_property;
 	object_class->get_property = mail_ui_session_get_property;	
 	object_class->dispose = mail_ui_session_dispose;
-	object_class->finalize = mail_ui_session_finalize;
 	object_class->constructed = mail_ui_session_constructed;
 
 	session_class = CAMEL_SESSION_CLASS (class);