static void modest_folder_view_init (ModestFolderView *obj);
static void modest_folder_view_finalize (GObject *obj);
-static gboolean update_model (ModestFolderView *self,
- ModestTnyAccountStore *account_store);
-static gboolean update_model_empty (ModestFolderView *self);
-static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
-static gboolean modest_folder_view_update_model (ModestFolderView *self,
- TnyAccountStoreIface *account_store);
+static gboolean update_model (ModestFolderView *self,
+ ModestTnyAccountStore *account_store);
+static gboolean update_model_empty (ModestFolderView *self);
+
+static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
+static void on_subscription_changed (TnyStoreAccount *store_account, TnyFolder *folder,
+ ModestFolderView *self);
+
+static gboolean modest_folder_view_update_model (ModestFolderView *self,
+ TnyAccountStore *account_store);
+static const gchar *get_account_name_from_folder (GtkTreeModel *model, GtkTreeIter iter);
+
+static void modest_folder_view_disconnect_store_account_handlers (GtkTreeView *self);
enum {
FOLDER_SELECTED_SIGNAL,
typedef struct _ModestFolderViewPrivate ModestFolderViewPrivate;
struct _ModestFolderViewPrivate {
- TnyAccountStoreIface *account_store;
- TnyFolder *cur_folder;
+ TnyAccountStore *account_store;
+ TnyFolder *cur_folder;
gboolean view_is_empty;
gulong sig1, sig2;
- GMutex *lock;
+ gulong *store_accounts_handlers;
+ GMutex *lock;
+ GtkTreeSelection *cur_selection;
+ TnyFolderStoreQuery *query;
+
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), \
/* FIXME: move these to TnyMail */
enum {
- TNY_FOLDER_TYPE_NOTES = TNY_FOLDER_TYPE_SENT + 1, /* urgh */
+ TNY_FOLDER_TYPE_NOTES = TNY_FOLDER_TYPE_ROOT + 1, /* urgh */
TNY_FOLDER_TYPE_DRAFTS,
TNY_FOLDER_TYPE_CONTACTS,
TNY_FOLDER_TYPE_CALENDAR
g_free (fname);
switch (type) {
- case TNY_FOLDER_TYPE_INBOX:
+ case TNY_FOLDER_TYPE_ROOT:
+ pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+ break;
+ case TNY_FOLDER_TYPE_INBOX:
pixbuf = modest_icon_factory_get_small_icon (MODEST_FOLDER_ICON_INBOX);
break;
case TNY_FOLDER_TYPE_OUTBOX:
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
- priv->view_is_empty = TRUE;
- priv->account_store = NULL;
- priv->cur_folder = NULL;
-
- priv->lock = g_mutex_new ();
-
- column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_title (column,
- _("All Mail Folders"));
+ priv->view_is_empty = TRUE;
+ priv->account_store = NULL;
+ priv->cur_folder = NULL;
+ priv->query = NULL;
+ priv->lock = g_mutex_new ();
+ column = gtk_tree_view_column_new ();
gtk_tree_view_append_column (GTK_TREE_VIEW(obj),
column);
gtk_tree_view_column_set_spacing (column, 2);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_column_set_fixed_width (column, TRUE);
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(obj), TRUE);
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), FALSE);
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW(obj), FALSE);
}
+static void
+modest_folder_view_disconnect_store_account_handlers (GtkTreeView *self)
+{
+ TnyIterator *iter;
+ ModestFolderViewPrivate *priv;
+ GtkTreeModel *model;
+ GtkTreeModelSort *sortable;
+ gint i = 0;
+
+ sortable = GTK_TREE_MODEL_SORT (gtk_tree_view_get_model (self));
+ if (!sortable)
+ return;
+
+ model = gtk_tree_model_sort_get_model (sortable);
+ if (!model)
+ return;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+ iter = tny_list_create_iterator (TNY_LIST (model));
+ do {
+ g_signal_handler_disconnect (G_OBJECT (tny_iterator_get_current (iter)),
+ priv->store_accounts_handlers [i++]);
+ tny_iterator_next (iter);
+ } while (!tny_iterator_is_done (iter));
+}
+
static void
modest_folder_view_finalize (GObject *obj)
priv->lock = NULL;
}
+ if (priv->store_accounts_handlers) {
+ modest_folder_view_disconnect_store_account_handlers (GTK_TREE_VIEW (obj));
+ g_free (priv->store_accounts_handlers);
+ priv->store_accounts_handlers = NULL;
+ }
+
+ if (priv->query) {
+ g_object_unref (G_OBJECT (priv->query));
+ priv->query = NULL;
+ }
+
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
if (sel)
g_signal_handler_disconnect (G_OBJECT(sel), priv->sig2);
static void
-on_account_update (TnyAccountStoreIface *account_store, const gchar *account,
+on_account_update (TnyAccountStore *account_store, const gchar *account,
gpointer user_data)
{
update_model_empty (MODEST_FOLDER_VIEW(user_data));
account);
}
+void
+modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
+{
+ GtkTreeViewColumn *col;
+
+ g_return_if_fail (self);
+
+ col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
+ if (!col) {
+ g_printerr ("modest: failed get column for title\n");
+ return;
+ }
+
+ gtk_tree_view_column_set_title (col, title);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self),
+ title != NULL);
+}
GtkWidget*
-modest_folder_view_new (ModestTnyAccountStore *account_store)
+modest_folder_view_new (ModestTnyAccountStore *account_store,
+ TnyFolderStoreQuery *query)
{
GObject *self;
ModestFolderViewPrivate *priv;
self = G_OBJECT(g_object_new(MODEST_TYPE_FOLDER_VIEW, NULL));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
- if (!update_model (MODEST_FOLDER_VIEW(self),
+ priv->account_store = g_object_ref (G_OBJECT (account_store));
+ if (query)
+ priv->query = g_object_ref (G_OBJECT (query));
+
+ if (!update_model (MODEST_FOLDER_VIEW(self),
MODEST_TNY_ACCOUNT_STORE(account_store)))
- g_printerr ("modest: failed to update model");
+ g_printerr ("modest: failed to update model\n");
priv->sig1 = g_signal_connect (G_OBJECT(account_store), "account_update",
G_CALLBACK (on_account_update), self);
}
+const gchar *
+modest_folder_view_get_selected_account (ModestFolderView *self)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ ModestFolderViewPrivate *priv;
+
+ g_return_val_if_fail (self, NULL);
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+ gtk_tree_selection_get_selected (priv->cur_selection, &model, &iter);
+
+ return get_account_name_from_folder (model, iter);
+}
static gboolean
update_model_empty (ModestFolderView *self)
g_return_val_if_fail (self, FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+ /* Disconnect old handlers */
+ if (priv->store_accounts_handlers) {
+ modest_folder_view_disconnect_store_account_handlers (GTK_TREE_VIEW (self));
+ g_free (priv->store_accounts_handlers);
+ priv->store_accounts_handlers = NULL;
+ }
+
+ /* Create the new model */
store = gtk_tree_store_new (1, G_TYPE_STRING);
gtk_tree_store_append (store, &iter, NULL);
g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTED_SIGNAL], 0,
NULL);
-
return TRUE;
}
+static void
+update_store_account_handlers (ModestFolderView *self, TnyList *account_list)
+{
+ gint size;
+ ModestFolderViewPrivate *priv;
+ TnyIterator *iter;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+ /* Listen to subscription changes */
+ size = tny_list_get_length (TNY_LIST (account_list)) * sizeof (gulong);
+
+ g_assert (priv->store_accounts_handlers == NULL); /* don't leak */
+ priv->store_accounts_handlers = g_malloc0 (size);
+ iter = tny_list_create_iterator (account_list);
+
+ if (!tny_iterator_is_done (iter))
+ priv->view_is_empty = FALSE;
+ else {
+ gint i = 0;
+ while (!tny_iterator_is_done (iter)) {
+
+ priv->store_accounts_handlers [i++] =
+ g_signal_connect (G_OBJECT (tny_iterator_get_current (iter)),
+ "subscription_changed",
+ G_CALLBACK (on_subscription_changed),
+ self);
+ tny_iterator_next (iter);
+ }
+ }
+ g_object_unref (iter);
+}
+
static gboolean
update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
{
g_return_val_if_fail (account_store, FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
-
- model = GTK_TREE_MODEL(tny_gtk_account_tree_model_new (TRUE)); /* async */
- account_list = TNY_LIST(model);
update_model_empty (self); /* cleanup */
- priv->view_is_empty = TRUE;
+
+ //model = GTK_TREE_MODEL(tny_gtk_account_tree_model_new (TRUE, priv->query)); /* async */
+ model = GTK_TREE_MODEL(tny_gtk_account_tree_model_new (TRUE, NULL)); /* async */
+
+ account_list = TNY_LIST(model);
tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
account_list,
TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
if (account_list) {
-
sortable = gtk_tree_model_sort_new_with_model (model);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
TNY_GTK_ACCOUNT_TREE_MODEL_NAME_COLUMN,
GTK_SORT_ASCENDING);
-
gtk_tree_view_set_model (GTK_TREE_VIEW(self), sortable);
-
- priv->view_is_empty = FALSE;
- g_object_unref (model);
+
+ update_store_account_handlers (self, account_list);
}
+ g_object_unref (model);
return TRUE;
}
ModestFolderView *tree_view;
ModestFolderViewPrivate *priv;
gint type;
+ const gchar *account_name;
g_return_if_fail (sel);
g_return_if_fail (user_data);
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
+ priv->cur_selection = sel;
+
/* is_empty means that there is only the 'empty' item */
if (priv->view_is_empty)
return;
tree_view = MODEST_FOLDER_VIEW (user_data);
gtk_tree_model_get (model, &iter,
- TNY_GTK_ACCOUNT_TREE_MODEL_TYPE_COLUMN,
- &type, -1);
+ TNY_GTK_ACCOUNT_TREE_MODEL_TYPE_COLUMN, &type,
+ TNY_GTK_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN, &folder,
+ -1);
if (type == TNY_FOLDER_TYPE_ROOT) {
- g_message ("FOLDER ROOT");
+ account_name = tny_account_get_name (TNY_ACCOUNT (folder));
} else {
- gtk_tree_model_get (model, &iter,
- TNY_GTK_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN,
- &folder, -1);
+ if (priv->cur_folder)
+ tny_folder_expunge (priv->cur_folder, NULL); /* FIXME */
+ priv->cur_folder = folder;
- if (TNY_IS_FOLDER (folder)) {
+ /* FIXME: this is ugly */
+ account_name = get_account_name_from_folder (model, iter);
- if (priv->cur_folder)
- tny_folder_expunge (priv->cur_folder);
- priv->cur_folder = folder;
-
-
- g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTED_SIGNAL], 0,
- folder);
- }
+ g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTED_SIGNAL], 0,
+ folder);
}
+
+}
+
+static void
+on_subscription_changed (TnyStoreAccount *store_account,
+ TnyFolder *folder,
+ ModestFolderView *self)
+{
+ /* TODO: probably we won't need a full reload, just the store
+ account or even the parent of the folder */
+
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+ update_model (self, MODEST_TNY_ACCOUNT_STORE (priv->account_store));
}
static gboolean
-modest_folder_view_update_model (ModestFolderView *self, TnyAccountStoreIface *account_store)
+modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store)
{
gboolean retval;
return retval;
}
+
+static const gchar *
+get_account_name_from_folder (GtkTreeModel *model, GtkTreeIter iter)
+{
+ GtkTreePath *path;
+ GtkTreeIter new_iter;
+ TnyFolder *account_folder;
+ gint depth, i;
+
+ path = gtk_tree_model_get_path (model, &iter);
+ depth = gtk_tree_path_get_depth (path);
+
+ for (i = 1; i < depth; ++i)
+ gtk_tree_path_up (path);
+
+ gtk_tree_model_get_iter (model, &new_iter, path);
+ gtk_tree_model_get (model, &new_iter,
+ TNY_GTK_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN, &account_folder,
+ -1);
+ return tny_account_get_name (TNY_ACCOUNT (account_folder));
+}
projects / modest / blobdiff