GNOME.org
 

[evolution/email-factory-3-4: 47/53] Port pending issues and fix compilation stuffs.

commit 860c67e2dfb31160545829f7b98273df96832977
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Tue Jan 3 15:01:09 2012 +0530

    Port pending issues and fix compilation stuffs.

 libemail-engine/mail-ops.c        |    6 ++----
 mail/e-mail-account-manager.c     |    2 +-
 mail/e-mail-sidebar.h             |    2 +-
 mail/e-mail-ui-session.c          |    2 +-
 mail/e-mail-ui-session.h          |    7 +++++++
 mail/em-account-editor.c          |    2 +-
 mail/em-filter-context.h          |    2 +-
 mail/em-filter-folder-element.h   |    2 +-
 mail/em-filter-source-element.h   |    2 +-
 mail/em-folder-properties.c       |    1 +
 mail/em-folder-properties.h       |    3 ++-
 mail/em-folder-selection-button.h |    2 +-
 mail/em-folder-tree-model.c       |    2 +-
 mail/em-folder-tree.c             |    1 +
 mail/em-folder-tree.h             |    3 ++-
 mail/em-folder-utils.c            |    3 ++-
 mail/em-folder-utils.h            |    2 +-
 mail/em-subscription-editor.h     |    2 +-
 mail/em-vfolder-context.h         |    2 +-
 mail/em-vfolder-rule.h            |    2 +-
 mail/mail-autofilter.h            |    2 +-
 mail/mail-send-recv.c             |    4 +++-
 mail/mail-send-recv.h             |    2 +-
 mail/message-list.c               |    1 +
 mail/message-list.h               |    2 +-
 modules/mail/em-account-prefs.c   |    2 +-
 26 files changed, 38 insertions(+), 25 deletions(-)
---
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 7d4e8ba..d5c992c 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -1519,7 +1519,7 @@ mail_expunge_folder (CamelFolder *folder)
 	CamelService *service;
 	CamelStore *parent_store;
 
-	parent_store = camel_folder_get_parent_store (m->folder);
+	parent_store = camel_folder_get_parent_store (folder);
 	service = CAMEL_SERVICE (parent_store);
 	session = camel_service_get_session (service);
 
@@ -1613,10 +1613,8 @@ mail_empty_trash (CamelStore *store)
 	struct _empty_trash_msg *m;
 	CamelSession *session;
 	CamelService *service;
-	CamelStore *parent_store;
 
-	parent_store = camel_folder_get_parent_store (m->folder);
-	service = CAMEL_SERVICE (parent_store);
+	service = CAMEL_SERVICE (store);
 	session = camel_service_get_session (service);
 
 	g_return_if_fail (CAMEL_IS_STORE (store));
diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c
index 522e26e..86a0bf5 100644
--- a/mail/e-mail-account-manager.c
+++ b/mail/e-mail-account-manager.c
@@ -22,7 +22,7 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <mail/e-mail-account-tree-view.h>
 
 #define E_MAIL_ACCOUNT_MANAGER_GET_PRIVATE(obj) \
diff --git a/mail/e-mail-sidebar.h b/mail/e-mail-sidebar.h
index a88c3cc..136e194 100644
--- a/mail/e-mail-sidebar.h
+++ b/mail/e-mail-sidebar.h
@@ -22,7 +22,7 @@
 #ifndef E_MAIL_SIDEBAR_H
 #define E_MAIL_SIDEBAR_H
 
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <mail/em-folder-tree.h>
 
 /* Standard GObject macros */
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index b12dc56..1bce1e1 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -895,7 +895,7 @@ e_mail_session_get_label_store (EMailSession *session)
 {
 	g_return_val_if_fail (E_IS_MAIL_SESSION (session), NULL);
 
-	return session->priv->label_store;
+	return ((EMailUISession *) session)->priv->label_store;
 }
 
 
diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h
index 46d98cc..ea54a8d 100644
--- a/mail/e-mail-ui-session.h
+++ b/mail/e-mail-ui-session.h
@@ -34,6 +34,9 @@
 #include <mail/e-mail-account-store.h>
 #include <e-util/e-activity.h>
 
+#include <mail/e-mail-account-store.h>
+#include <mail/e-mail-label-list-store.h>
+
 /* Standard GObject macros */
 #define E_TYPE_MAIL_UI_SESSION \
 	(e_mail_ui_session_get_type ())
@@ -66,6 +69,10 @@ struct _EMailUISession {
 
 struct _EMailUISessionClass {
 	EMailSessionClass parent_class;
+
+	void		(*activity_added)	(EMailUISession *session,
+						 EActivity *activity);
+
 };
 
 GType		e_mail_ui_session_get_type		(void);
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 37800e2..ba2b98d 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -5502,7 +5502,7 @@ emae_commit (EConfig *ec,
 		service = camel_session_get_service (
 			CAMEL_SESSION (session), account->uid);
 
-		store = e_mail_ui_session_get_account_store (session);
+		store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION(session));
 		e_mail_account_store_set_default_service (store, service);
 	}
 
diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h
index 3545bf1..77288d0 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -25,7 +25,7 @@
 #ifndef EM_FILTER_CONTEXT_H
 #define EM_FILTER_CONTEXT_H
 
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <filter/e-rule-context.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h
index f71b4c1..d36484c 100644
--- a/mail/em-filter-folder-element.h
+++ b/mail/em-filter-folder-element.h
@@ -25,7 +25,7 @@
 #ifndef EM_FILTER_FOLDER_ELEMENT_H
 #define EM_FILTER_FOLDER_ELEMENT_H
 
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <filter/e-filter-element.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h
index 41c3f3f..efd7a6a 100644
--- a/mail/em-filter-source-element.h
+++ b/mail/em-filter-source-element.h
@@ -24,7 +24,7 @@
 #ifndef EM_FILTER_SOURCE_ELEMENT_H
 #define EM_FILTER_SOURCE_ELEMENT_H
 
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <filter/e-filter-element.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 1ca776d..cd34364 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -33,6 +33,7 @@
 #include "em-config.h"
 
 #include "e-mail-backend.h"
+#include "e-mail-ui-session.h"
 #include "libemail-engine/e-mail-folder-utils.h"
 #include "libemail-engine/mail-ops.h"
 #include "libemail-utils/mail-mt.h"
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 704e43b..ee7ef67 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -25,7 +25,8 @@
 #define __EM_FOLDER_PROPERTIES_H__
 
 #include <camel/camel.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
+#include <e-util/e-alert-sink.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index 6e646e3..945f1da 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -25,7 +25,7 @@
 #define EM_FOLDER_SELECTION_BUTTON_H
 
 #include <gtk/gtk.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FOLDER_SELECTION_BUTTON \
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index e9684ee..e9db6b9 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -575,7 +575,7 @@ em_folder_tree_model_set_session (EMFolderTreeModel *model,
 		MailFolderCache *folder_cache;
 
 		folder_cache = e_mail_session_get_folder_cache (session);
-		account_store = e_mail_ui_session_get_account_store (session);
+		account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION(session));
 
 		/* Keep our own reference since we connect to its signals. */
 		g_warn_if_fail (model->priv->account_store == NULL);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index d301bf1..6e9f5cf 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -63,6 +63,7 @@
 
 #include "libemail-engine/e-mail-folder-utils.h"
 #include "libemail-engine/e-mail-session.h"
+#include "e-mail-ui-session.h"
 
 #define d(x)
 
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 6a60f2b..6c90fe2 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -26,8 +26,9 @@
 
 #include <gtk/gtk.h>
 #include <e-util/e-alert-sink.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <mail/em-folder-tree-model.h>
+#include <e-util/e-activity.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FOLDER_TREE \
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index eb40482..1bb1ecb 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -57,6 +57,7 @@
 #include "em-folder-utils.h"
 #include "em-folder-selector.h"
 #include "em-folder-properties.h"
+#include "e-mail-ui-session.h"
 
 #include "libemail-engine/e-mail-folder-utils.h"
 #include "libemail-engine/e-mail-session.h"
@@ -568,7 +569,7 @@ em_folder_utils_create_folder (GtkWindow *parent,
 	model = em_folder_tree_model_new ();
 	em_folder_tree_model_set_session (model, session);
 
-	account_store = e_mail_session_get_account_store (session);
+	account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION(session));
 	e_mail_account_store_queue_enabled_services (account_store, &queue);
 
 	while (!g_queue_is_empty (&queue)) {
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index 9211cac..db38530 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <mail/em-folder-tree.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-subscription-editor.h b/mail/em-subscription-editor.h
index c6f6c25..b9abedb 100644
--- a/mail/em-subscription-editor.h
+++ b/mail/em-subscription-editor.h
@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_SUBSCRIPTION_EDITOR \
diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h
index c0fd041..069b8ce 100644
--- a/mail/em-vfolder-context.h
+++ b/mail/em-vfolder-context.h
@@ -25,7 +25,7 @@
 #ifndef EM_VFOLDER_CONTEXT_H
 #define EM_VFOLDER_CONTEXT_H
 
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <filter/e-rule-context.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h
index 7fc8daa..a3319c6 100644
--- a/mail/em-vfolder-rule.h
+++ b/mail/em-vfolder-rule.h
@@ -24,7 +24,7 @@
 #ifndef EM_VFOLDER_RULE_H
 #define EM_VFOLDER_RULE_H
 
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <filter/e-filter-rule.h>
 
 /* Standard GObject macros */
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index 47f68c3..9b2dbf5 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -27,7 +27,7 @@
 #include <camel/camel.h>
 
 #include <filter/e-filter-rule.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 #include <mail/em-filter-context.h>
 #include <mail/em-vfolder-context.h>
 
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index a498366..1aebf0a 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -39,6 +39,7 @@
 #include "libemail-engine/e-mail-folder-utils.h"
 #include "libemail-engine/e-mail-utils.h"
 #include "libemail-engine/e-mail-session.h"
+#include "mail/e-mail-ui-session.h"
 #include "em-event.h"
 #include "em-filter-rule.h"
 #include "em-utils.h"
@@ -47,6 +48,7 @@
 #include "libemail-engine/mail-ops.h"
 #include "mail-send-recv.h"
 #include "libemail-engine/mail-tools.h"
+#include <mail/e-mail-account-store.h>
 
 #define d(x)
 
@@ -503,7 +505,7 @@ build_dialog (GtkWindow *parent,
 	EMEventTargetSendReceive *target;
 	GQueue queue = G_QUEUE_INIT;
 
-	account_store = e_mail_session_get_account_store (session);
+	account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION(session));
 
 	/* Convert the outgoing account to a CamelTransport. */
 	if (outgoing_account != NULL) {
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index cd11a4a..fb49493 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -24,7 +24,7 @@
 #define MAIL_SEND_RECV_H
 
 #include <gtk/gtk.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/message-list.c b/mail/message-list.c
index ad2041b..695436e 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -66,6 +66,7 @@
 #include "libemail-engine/mail-tools.h"
 #include "libemail-engine/e-mail-utils.h"
 #include "message-list.h"
+#include "mail/e-mail-ui-session.h"
 
 #if HAVE_CLUTTER
 #include <clutter/clutter.h>
diff --git a/mail/message-list.h b/mail/message-list.h
index bd2e97b..44a312e 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -27,7 +27,7 @@
 #include <camel/camel.h>
 
 #include <table/e-tree.h>
-#include <mail/e-mail-session.h>
+#include <libemail-engine/e-mail-session.h>
 
 /* Standard GObject macros */
 #define MESSAGE_LIST_TYPE \
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 4d2c92c..8051b35 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -322,7 +322,7 @@ em_account_prefs_new (EPreferencesWindow *window)
 
 	backend = E_MAIL_BACKEND (shell_backend);
 	session = e_mail_backend_get_session (backend);
-	account_store = e_mail_session_get_account_store (session);
+	account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION(session));
 
 	return g_object_new (
 		EM_TYPE_ACCOUNT_PREFS,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]