#include <tny-simple-list.h>
#include <modest-tny-folder.h>
#include <modest-tny-local-folders-account.h>
+#include <modest-tny-outbox-account.h>
#include <modest-marshal.h>
#include <modest-icon-names.h>
#include <modest-tny-account-store.h>
#include "modest-folder-view.h"
#include <modest-dnd.h>
#include <modest-platform.h>
-#include <modest-account-mgr-helpers.h>
#include <modest-widget-memory.h>
#include <modest-ui-actions.h>
static void modest_folder_view_set_account_store (TnyAccountStoreView *self,
TnyAccountStore *account_store);
-static gboolean update_model (ModestFolderView *self,
- ModestTnyAccountStore *account_store);
-
static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
static void on_account_update (TnyAccountStore *account_store,
const gchar *account,
gpointer user_data);
+static void on_account_removed (TnyAccountStore *self,
+ TnyAccount *account,
+ gpointer user_data);
+
static void on_accounts_reloaded (TnyAccountStore *store,
gpointer user_data);
gulong account_update_signal;
gulong changed_signal;
gulong accounts_reloaded_signal;
+ gulong account_removed_signal;
TnyFolderStoreQuery *query;
guint timer_expander;
ModestFolderViewPrivate *priv;
GObject *rendobj;
gchar *fname = NULL;
- gint unread, all;
- TnyFolderType type;
+ gint unread = 0;
+ gint all = 0;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
g_return_if_fail (column);
gint number = 0;
if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) {
- TnyFolderType type;
- type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
- if (type != TNY_FOLDER_TYPE_UNKNOWN) {
+ TnyFolderType folder_type
+ = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
+ if (folder_type != TNY_FOLDER_TYPE_UNKNOWN) {
g_free (fname);
- fname = g_strdup(modest_local_folder_info_get_type_display_name (type));
+ fname = g_strdup(modest_local_folder_info_get_type_display_name (folder_type));
}
}
{
GObject *rendobj = NULL, *instance = NULL;
GdkPixbuf *pixbuf = NULL;
- TnyFolderType type;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
gchar *fname = NULL;
const gchar *account_id = NULL;
- gint unread;
+ gint unread = 0;
rendobj = G_OBJECT(renderer);
gtk_tree_model_get (tree_model, iter,
priv->account_update_signal);
g_signal_handler_disconnect (G_OBJECT(priv->account_store),
priv->accounts_reloaded_signal);
+ g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+ priv->account_removed_signal);
g_object_unref (G_OBJECT(priv->account_store));
priv->account_store = NULL;
}
priv->accounts_reloaded_signal))
g_signal_handler_disconnect (G_OBJECT (priv->account_store),
priv->accounts_reloaded_signal);
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ priv->account_removed_signal))
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ priv->account_removed_signal);
g_object_unref (G_OBJECT (priv->account_store));
}
g_signal_connect (G_OBJECT(account_store), "account_update",
G_CALLBACK (on_account_update), self);
+ priv->account_removed_signal =
+ g_signal_connect (G_OBJECT(account_store), "account_removed",
+ G_CALLBACK (on_account_removed), self);
+
priv->accounts_reloaded_signal =
g_signal_connect (G_OBJECT(account_store), "accounts_reloaded",
G_CALLBACK (on_accounts_reloaded), self);
+
+ on_accounts_reloaded (account_store, (gpointer ) self);
g_object_unref (G_OBJECT (device));
}
static void
-on_account_update (TnyAccountStore *account_store, const gchar *account,
+on_account_removed (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+ /* If the removed account is the currently viewed one then
+ clear the configuration value. The new visible account will be the default account */
+ if (!strcmp (priv->visible_account_id, tny_account_get_id (account))) {
+ modest_folder_view_set_account_id_of_visible_server_account (self, NULL);
+ }
+}
+
+static void
+on_account_update (TnyAccountStore *account_store,
+ const gchar *account,
gpointer user_data)
{
- if (!update_model (MODEST_FOLDER_VIEW(user_data),
- MODEST_TNY_ACCOUNT_STORE(account_store)))
+ ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+ if (!priv->visible_account_id)
+ modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self),
+ MODEST_CONF_FOLDER_VIEW_KEY);
+
+ if (!modest_folder_view_update_model (self, account_store))
g_printerr ("modest: failed to update model for changes in '%s'",
account);
}
on_accounts_reloaded (TnyAccountStore *account_store,
gpointer user_data)
{
- ModestConf *conf = modest_runtime_get_conf ();
-
- modest_widget_memory_save (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
- update_model (MODEST_FOLDER_VIEW (user_data),
- MODEST_TNY_ACCOUNT_STORE(account_store));
- modest_widget_memory_restore (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
+ modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store);
}
void
priv->changed_signal = g_signal_connect (sel, "changed",
G_CALLBACK (on_selection_changed), self);
- return GTK_WIDGET(self);
+ return GTK_WIDGET(self);
}
/* this feels dirty; any other way to expand all the root items? */
gpointer data)
{
gboolean retval = TRUE;
- gint type = 0;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
gtk_tree_model_get (model, iter,
if (TNY_IS_ACCOUNT (instance)) {
TnyAccount *acc = TNY_ACCOUNT (instance);
const gchar *account_id = tny_account_get_id (acc);
-
+
/* If it isn't a special folder,
* don't show it unless it is the visible account: */
if (!modest_tny_account_is_virtual_local_folders (acc) &&
if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
retval = FALSE;
}
+
+ /* Never show these to the user. They are merged into one folder
+ * in the local-folders account instead: */
+ if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
+ retval = FALSE;
}
}
return retval;
}
-/*
-static void on_tnylist_accounts_debug_print(gpointer data, gpointer user_data)
-{
- TnyAccount* account = TNY_ACCOUNT(data);
- const gchar *prefix = (const gchar*)(user_data);
-
- printf("%s account id=%s\n", prefix, tny_account_get_id (account));
-}
-*/
-
-static gboolean
-update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
+gboolean
+modest_folder_view_update_model (ModestFolderView *self,
+ TnyAccountStore *account_store)
{
ModestFolderViewPrivate *priv;
GtkTreeModel *model /* , *old_model */;
signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
NULL, TRUE);
- /* Remove the old model as observer of the local folder account */
-#if 0 /* Commented out until Sergio fixes the crash. */
- local_account =
- modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store (),
- MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID,
- TNY_ACCOUNT_TYPE_STORE);
- old_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
-
- if (old_model) {
- GtkTreeModel *sorted, *model;
-
- if (GTK_IS_TREE_MODEL_FILTER (old_model))
- sorted = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (old_model));
- else
- sorted = old_model;
-
- model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sorted));
-
- tny_folder_store_remove_observer (TNY_FOLDER_STORE (local_account),
- TNY_FOLDER_STORE_OBSERVER (model));
- }
-#endif
-
/* FIXME: the local accounts are not shown when the query
selects only the subscribed folders. */
/* model = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */
tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
model_as_list,
TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
-
-#if 0 /* Commented out until Sergio fixes the crash. */
- /* Set the folder view as an account observer in order to let
- us see the UI changes automatically when creating and
- deleting folders just under the local account */
- tny_folder_store_add_observer (TNY_FOLDER_STORE (local_account),
- TNY_FOLDER_STORE_OBSERVER (model));
- g_object_unref (local_account);
-#endif
-
g_object_unref (model_as_list);
model_as_list = NULL;
-
- /*
- if (account_list)
- tny_list_foreach (account_list, on_tnylist_accounts_debug_print, "update_model: ");
- */
GtkTreeModel *filter_model = NULL, *sortable = NULL;
(filter_model) ? filter_model : sortable);
expand_root_items (self); /* expand all account folders */
-
g_object_unref (model);
if (filter_model)
- g_object_unref (filter_model);
+ g_object_unref (filter_model);
g_object_unref (sortable);
+
+ /* Select the first inbox or the local account if not found */
+ modest_folder_view_select_first_inbox_or_local (self);
return TRUE;
}
GtkTreeIter iter;
ModestFolderView *tree_view;
ModestFolderViewPrivate *priv;
- gint type;
g_return_if_fail (sel);
g_return_if_fail (user_data);
tree_view = MODEST_FOLDER_VIEW (user_data);
gtk_tree_model_get (model, &iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
-1);
gpointer user_data)
{
gint cmp;
- gchar *name1, *name2;
- TnyFolderType type;
+ gchar *name1 = NULL;
+ gchar *name2 = NULL;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *folder1 = NULL;
GObject *folder2 = NULL;
GtkTreePath *dest_row,
DndHelper *helper)
{
- TnyList *headers;
- TnyHeader *header;
- TnyFolder *folder;
- ModestMailOperation *mail_op;
+ TnyList *headers = NULL;
+ TnyHeader *header = NULL;
+ TnyFolder *folder = NULL;
+ ModestMailOperation *mail_op = NULL;
GtkTreeIter source_iter, dest_iter;
+ g_return_if_fail (GTK_IS_TREE_MODEL(source_model));
+ g_return_if_fail (GTK_IS_TREE_MODEL(dest_model));
+ g_return_if_fail (dest_row);
+ g_return_if_fail (helper);
+
/* Get header */
gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row);
gtk_tree_model_get (source_model, &source_iter,
TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
&header, -1);
-
+ if (!TNY_IS_HEADER(header)) {
+ g_warning ("BUG: %s could not get a valid header", __FUNCTION__);
+ goto cleanup;
+ }
+
/* Get Folder */
gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
gtk_tree_model_get (dest_model, &dest_iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
&folder, -1);
+ if (!TNY_IS_FOLDER(folder)) {
+ g_warning ("BUG: %s could not get a valid folder", __FUNCTION__);
+ goto cleanup;
+ }
+
/* Transfer message */
mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
-
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
g_signal_connect (G_OBJECT (mail_op), "progress-changed",
G_CALLBACK (on_progress_changed), helper);
- /* FIXME: I replaced this because the API changed, but D&D
- should be reviewed in order to allow multiple drags*/
headers = tny_simple_list_new ();
tny_list_append (headers, G_OBJECT (header));
- modest_mail_operation_xfer_msgs (mail_op, headers, folder, helper->delete_source, NULL, NULL);
+ modest_mail_operation_xfer_msgs (mail_op,
+ headers,
+ folder,
+ helper->delete_source,
+ NULL, NULL);
/* Frees */
- g_object_unref (G_OBJECT (mail_op));
- g_object_unref (G_OBJECT (header));
- g_object_unref (G_OBJECT (folder));
- g_object_unref (headers);
+cleanup:
+ if (G_IS_OBJECT(mail_op))
+ g_object_unref (G_OBJECT (mail_op));
+ if (G_IS_OBJECT(header))
+ g_object_unref (G_OBJECT (header));
+ if (G_IS_OBJECT(folder))
+ g_object_unref (G_OBJECT (folder));
+ if (G_IS_OBJECT(headers))
+ g_object_unref (headers);
}
/*
/* This will be used by the filter_row callback,
* to decided which rows to show: */
- if (priv->visible_account_id)
+ if (priv->visible_account_id) {
g_free (priv->visible_account_id);
- priv->visible_account_id = g_strdup (account_id);
+ priv->visible_account_id = NULL;
+ }
+ if (account_id)
+ priv->visible_account_id = g_strdup (account_id);
/* Refilter */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
if (GTK_IS_TREE_MODEL_FILTER (model))
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+
+ /* Save settings to gconf */
+ modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self),
+ MODEST_CONF_FOLDER_VIEW_KEY);
}
const gchar *
return (const gchar *) priv->visible_account_id;
}
+
+static gboolean
+find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter)
+{
+ do {
+ GtkTreeIter child;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+ gchar *name = NULL;
+
+ gtk_tree_model_get (model, iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
+ &type, -1);
+
+ /*
+ printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n",
+ __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX);
+ */
+
+ gboolean result = FALSE;
+ if (type == TNY_FOLDER_TYPE_INBOX) {
+ result = TRUE;
+ } else if (type == TNY_FOLDER_TYPE_NORMAL) {
+ /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL
+ * when getting folders from the cache, before connectin, so we do
+ * an extra check. We could fix this in tinymail, but it's easier
+ * to do here.
+ */
+ if (strcmp (name, "Inbox") == 0)
+ result = TRUE;
+ }
+
+ g_free (name);
+
+ if (result) {
+ *inbox_iter = *iter;
+ return TRUE;
+ }
+
+ if (gtk_tree_model_iter_children (model, &child, iter)) {
+ if (find_inbox_iter (model, &child, inbox_iter))
+ return TRUE;
+ }
+
+ } while (gtk_tree_model_iter_next (model, iter));
+
+ return FALSE;
+}
+
+void
+modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter, inbox_iter;
+ GtkTreeSelection *sel;
+
+ /* Do not set it if the folder view was not painted */
+ if (!GTK_WIDGET_MAPPED (self))
+ return;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ if (!model)
+ return;
+
+ expand_root_items (self);
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+
+ gtk_tree_model_get_iter_first (model, &iter);
+ if (find_inbox_iter (model, &iter, &inbox_iter)) {
+ gtk_tree_selection_select_iter (sel, &inbox_iter);
+ }
+ else {
+ gtk_tree_model_get_iter_first (model, &iter);
+ gtk_tree_selection_select_iter (sel, &iter);
+ }
+}