[evolution] EMFolderSelectionButton: Add an "account" property.

[Matthew Barnes <mbarnes src gnome org>]

commit 8045a9c0feed0ff5eb2ea8975d0cd85f692c5229
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Aug 9 22:28:35 2011 -0400

    EMFolderSelectionButton: Add an "account" property.
    
    The "account" property, if set, limits the displayed folder tree to the
    corresponding CamelStore only.  Useful in contexts where the choice of
    folders should be limited to one particular store.

 mail/em-folder-selection-button.c |  136 +++++++++++++++++++++++++++++--------
 mail/em-folder-selection-button.h |   16 +++--
 2 files changed, 118 insertions(+), 34 deletions(-)
---
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 5bdf5d2..0b43812 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -44,6 +44,7 @@ struct _EMFolderSelectionButtonPrivate {
 	EMailBackend *backend;
 	GtkWidget *icon;
 	GtkWidget *label;
+	EAccount *account;
 
 	gchar *title;
 	gchar *caption;
@@ -52,6 +53,7 @@ struct _EMFolderSelectionButtonPrivate {
 
 enum {
 	PROP_0,
+	PROP_ACCOUNT,
 	PROP_BACKEND,
 	PROP_CAPTION,
 	PROP_FOLDER_URI,
@@ -133,6 +135,12 @@ folder_selection_button_set_property (GObject *object,
                                       GParamSpec *pspec)
 {
 	switch (property_id) {
+		case PROP_ACCOUNT:
+			em_folder_selection_button_set_account (
+				EM_FOLDER_SELECTION_BUTTON (object),
+				g_value_get_object (value));
+			return;
+
 		case PROP_BACKEND:
 			em_folder_selection_button_set_backend (
 				EM_FOLDER_SELECTION_BUTTON (object),
@@ -168,6 +176,13 @@ folder_selection_button_get_property (GObject *object,
                                       GParamSpec *pspec)
 {
 	switch (property_id) {
+		case PROP_ACCOUNT:
+			g_value_set_object (
+				value,
+				em_folder_selection_button_get_account (
+				EM_FOLDER_SELECTION_BUTTON (object)));
+			return;
+
 		case PROP_BACKEND:
 			g_value_set_object (
 				value,
@@ -207,6 +222,11 @@ folder_selection_button_dispose (GObject *object)
 
 	priv = EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE (object);
 
+	if (priv->account != NULL) {
+		g_object_unref (priv->account);
+		priv->account = NULL;
+	}
+
 	if (priv->backend != NULL) {
 		g_object_unref (priv->backend);
 		priv->backend = NULL;
@@ -239,7 +259,7 @@ folder_selection_button_clicked (GtkButton *button)
 	EMFolderSelectionButtonPrivate *priv;
 	EMFolderSelector *selector;
 	EMFolderTree *folder_tree;
-	EMFolderTreeModel *model;
+	EMFolderTreeModel *model = NULL;
 	GtkWidget *dialog;
 	GtkTreeSelection *selection;
 	gpointer parent;
@@ -249,13 +269,34 @@ folder_selection_button_clicked (GtkButton *button)
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
 	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
-	model = em_folder_tree_model_get_default ();
+	if (priv->account != NULL && priv->account->source != NULL) {
+		EMailSession *session;
+		CamelService *service;
+
+		session = e_mail_backend_get_session (priv->backend);
+
+		service = camel_session_get_service (
+			CAMEL_SESSION (session), priv->account->uid);
+
+		if (CAMEL_IS_STORE (service)) {
+			model = em_folder_tree_model_new ();
+			em_folder_tree_model_set_session (model, session);
+			em_folder_tree_model_add_store (
+				model, CAMEL_STORE (service),
+				priv->account->name);
+		}
+	}
+
+	if (model == NULL)
+		model = g_object_ref (em_folder_tree_model_get_default ());
 
 	dialog = em_folder_selector_new (
 		parent, priv->backend, model,
 		EM_FOLDER_SELECTOR_CAN_CREATE,
 		priv->title, priv->caption, NULL);
 
+	g_object_unref (model);
+
 	selector = EM_FOLDER_SELECTOR (dialog);
 	folder_tree = em_folder_selector_get_folder_tree (selector);
 
@@ -302,6 +343,16 @@ em_folder_selection_button_class_init (EMFolderSelectionButtonClass *class)
 
 	g_object_class_install_property (
 		object_class,
+		PROP_ACCOUNT,
+		g_param_spec_object (
+			"account",
+			NULL,
+			NULL,
+			E_TYPE_ACCOUNT,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
 		PROP_BACKEND,
 		g_param_spec_object (
 			"backend",
@@ -389,6 +440,60 @@ em_folder_selection_button_new (EMailBackend *backend,
 		"caption", caption, NULL);
 }
 
+EAccount *
+em_folder_selection_button_get_account (EMFolderSelectionButton *button)
+{
+	g_return_val_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button), NULL);
+
+	return button->priv->account;
+}
+
+void
+em_folder_selection_button_set_account (EMFolderSelectionButton *button,
+                                        EAccount *account)
+{
+	g_return_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button));
+
+	if (account != NULL) {
+		g_return_if_fail (E_IS_ACCOUNT (account));
+		g_object_ref (account);
+	}
+
+	if (button->priv->account != NULL)
+		g_object_unref (button->priv->account);
+
+	button->priv->account = account;
+
+	g_object_notify (G_OBJECT (button), "account");
+}
+
+EMailBackend *
+em_folder_selection_button_get_backend (EMFolderSelectionButton *button)
+{
+	g_return_val_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button), NULL);
+
+	return button->priv->backend;
+}
+
+void
+em_folder_selection_button_set_backend (EMFolderSelectionButton *button,
+                                        EMailBackend *backend)
+{
+	g_return_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button));
+
+	if (backend != NULL) {
+		g_return_if_fail (E_IS_MAIL_BACKEND (backend));
+		g_object_ref (backend);
+	}
+
+	if (button->priv->backend != NULL)
+		g_object_unref (button->priv->backend);
+
+	button->priv->backend = backend;
+
+	g_object_notify (G_OBJECT (button), "backend");
+}
+
 const gchar *
 em_folder_selection_button_get_caption (EMFolderSelectionButton *button)
 {
@@ -435,33 +540,6 @@ em_folder_selection_button_set_folder_uri (EMFolderSelectionButton *button,
 	g_object_notify (G_OBJECT (button), "folder-uri");
 }
 
-EMailBackend *
-em_folder_selection_button_get_backend (EMFolderSelectionButton *button)
-{
-	g_return_val_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button), NULL);
-
-	return button->priv->backend;
-}
-
-void
-em_folder_selection_button_set_backend (EMFolderSelectionButton *button,
-                                        EMailBackend *backend)
-{
-	g_return_if_fail (EM_IS_FOLDER_SELECTION_BUTTON (button));
-
-	if (backend != NULL) {
-		g_return_if_fail (E_IS_MAIL_BACKEND (backend));
-		g_object_ref (backend);
-	}
-
-	if (button->priv->backend != NULL)
-		g_object_unref (button->priv->backend);
-
-	button->priv->backend = backend;
-
-	g_object_notify (G_OBJECT (button), "backend");
-}
-
 const gchar *
 em_folder_selection_button_get_title (EMFolderSelectionButton *button)
 {
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index 91c5e3a..dd826d1 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -26,6 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <mail/e-mail-backend.h>
+#include <libedataserver/e-account.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FOLDER_SELECTION_BUTTON \
@@ -70,6 +71,16 @@ GtkWidget *	em_folder_selection_button_new
 					(EMailBackend *backend,
 					 const gchar *title,
 					 const gchar *caption);
+EAccount *	em_folder_selection_button_get_account
+					(EMFolderSelectionButton *button);
+void		em_folder_selection_button_set_account
+					(EMFolderSelectionButton *button,
+					 EAccount *account);
+EMailBackend *	em_folder_selection_button_get_backend
+					(EMFolderSelectionButton *button);
+void		em_folder_selection_button_set_backend
+					(EMFolderSelectionButton *button,
+					 EMailBackend *backend);
 const gchar *	em_folder_selection_button_get_caption
 					(EMFolderSelectionButton *button);
 void		em_folder_selection_button_set_caption
@@ -80,11 +91,6 @@ const gchar *	em_folder_selection_button_get_folder_uri
 void		em_folder_selection_button_set_folder_uri
 					(EMFolderSelectionButton *button,
 					 const gchar *folder_uri);
-void		em_folder_selection_button_set_backend
-					(EMFolderSelectionButton *button,
-					 EMailBackend *backend);
-EMailBackend *	em_folder_selection_button_get_backend
-					(EMFolderSelectionButton *button);
 const gchar *	em_folder_selection_button_get_title
 					(EMFolderSelectionButton *button);
 void		em_folder_selection_button_set_title