#include <modest-tny-account.h>
#include <modest-text-utils.h>
#include <modest-runtime.h>
+#include <modest-signal-mgr.h>
#include <gtk/gtkcellrenderertoggle.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkliststore.h>
#include <string.h> /* For strcmp(). */
+#include <modest-account-mgr-helpers.h>
/* 'private'/'protected' functions */
static void modest_account_view_class_init (ModestAccountViewClass *klass);
static void modest_account_view_finalize (GObject *obj);
static void modest_account_view_select_account (ModestAccountView *account_view,
- const gchar* account_name);
+ const gchar* account_name);
+
+static void on_default_account_changed (ModestAccountMgr *mgr,
+ gpointer user_data);
+
+static void on_display_name_changed (ModestAccountMgr *self,
+ const gchar *account,
+ gpointer user_data);
+
+static void modest_account_view_select_first_account (ModestAccountView *account_view);
+
+static void on_account_updated (ModestAccountMgr* mgr, gchar* account_name,
+ gpointer user_data);
typedef enum {
MODEST_ACCOUNT_VIEW_NAME_COLUMN,
ModestAccountMgr *account_mgr;
/* Signal handlers */
- gulong acc_inserted_handler, acc_removed_handler,
- acc_busy_changed_handler, acc_changed_handler;
+ GSList *sig_handlers;
};
#define MODEST_ACCOUNT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNT_VIEW, \
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
- priv->account_mgr = NULL;
- priv->acc_inserted_handler = 0;
- priv->acc_removed_handler = 0;
- priv->acc_busy_changed_handler = 0;
- priv->acc_changed_handler = 0;
+ priv->sig_handlers = NULL;
}
static void
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
- if (priv->account_mgr) {
- if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
- priv->acc_inserted_handler))
- g_signal_handler_disconnect (modest_runtime_get_account_store (),
- priv->acc_inserted_handler);
+ /* Disconnect signals */
+ modest_signal_mgr_disconnect_all_and_destroy (priv->sig_handlers);
- if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
- priv->acc_removed_handler))
- g_signal_handler_disconnect (modest_runtime_get_account_store (),
- priv->acc_removed_handler);
-
- if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
- priv->acc_changed_handler))
- g_signal_handler_disconnect (modest_runtime_get_account_store (),
- priv->acc_changed_handler);
-
- if (priv->acc_busy_changed_handler)
- g_signal_handler_disconnect (priv->account_mgr, priv->acc_busy_changed_handler);
-
-
+ if (priv->account_mgr) {
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
}
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
-/* Get the string for the last updated time. Result must be g_freed */
-static gchar*
-get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountData *account_data)
+/* Get the string for the last updated time. Result must NOT be g_freed */
+static const gchar*
+get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountSettings *settings)
{
/* FIXME: let's assume that 'last update' applies to the store account... */
- gchar* last_updated_string;
- time_t last_updated = account_data->store_account->last_updated;
- if (!modest_account_mgr_account_is_busy(account_mgr, account_data->account_name)) {
+ const gchar *last_updated_string;
+ const gchar *store_account_name;
+ const gchar *account_name;
+ time_t last_updated;
+ ModestServerAccountSettings *server_settings;
+
+ server_settings = modest_account_settings_get_store_settings (settings);
+ store_account_name = modest_server_account_settings_get_account_name (server_settings);
+ last_updated = modest_account_mgr_get_last_updated (account_mgr, store_account_name);
+ g_object_unref (server_settings);
+ account_name = modest_account_settings_get_account_name (settings);
+ if (!modest_account_mgr_account_is_busy(account_mgr, account_name)) {
if (last_updated > 0)
last_updated_string = modest_text_utils_get_display_date(last_updated);
else
- last_updated_string = g_strdup (_("mcen_va_never"));
+ last_updated_string = _("mcen_va_never");
} else {
/* FIXME: There should be a logical name in the UI specs */
- last_updated_string = g_strdup(_("..."));
+ last_updated_string = _("mcen_va_refreshing");
}
+
return last_updated_string;
}
while (cursor) {
gchar *account_name;
- ModestAccountData *account_data;
+ ModestAccountSettings *settings;
+ ModestServerAccountSettings *store_settings;
account_name = (gchar*)cursor->data;
- account_data = modest_account_mgr_get_account_data (account_mgr, account_name);
- if (!account_data) {
+ settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
+ if (!settings) {
g_printerr ("modest: failed to get account data for %s\n", account_name);
continue;
}
+ store_settings = modest_account_settings_get_store_settings (settings);
/* don't display accounts without stores */
- if (account_data->store_account) {
+ if (modest_server_account_settings_get_account_name (store_settings) != NULL) {
GtkTreeIter iter;
+
+ /* don't free */
+ const gchar *last_updated_string = get_last_updated_string(account_mgr, settings);
- gchar *last_updated_string = get_last_updated_string(account_mgr, account_data);
-
- if (account_data->is_enabled) {
+ if (modest_account_settings_get_enabled (settings)) {
+ const gchar *proto_name;
+
+ proto_name = modest_protocol_info_get_transport_store_protocol_name
+ (modest_server_account_settings_get_protocol (store_settings));
gtk_list_store_insert_with_values (
model, &iter, 0,
- MODEST_ACCOUNT_VIEW_NAME_COLUMN, account_name,
- MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, account_data->display_name,
- MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, account_data->is_enabled,
- MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, account_data->is_default,
-
- MODEST_ACCOUNT_VIEW_PROTO_COLUMN,
- modest_protocol_info_get_transport_store_protocol_name (account_data->store_account->proto),
-
+ MODEST_ACCOUNT_VIEW_NAME_COLUMN, account_name,
+ MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
+ modest_account_settings_get_display_name (settings),
+ MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN,
+ modest_account_settings_get_enabled (settings),
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
+ modest_account_settings_get_is_default (settings),
+ MODEST_ACCOUNT_VIEW_PROTO_COLUMN, proto_name,
MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
-1);
}
- g_free (last_updated_string);
}
-
- modest_account_mgr_free_account_data (account_mgr, account_data);
+
+ g_object_unref (store_settings);
+ g_object_unref (settings);
cursor = cursor->next;
}
{
GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(self)));
GtkTreeIter iter;
- g_message(__FUNCTION__);
+ gboolean found = FALSE;
+
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
return;
- do
- {
+
+ do {
gchar* cur_name;
- gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN,
- &cur_name, -1);
- if (g_str_equal(cur_name, account_name))
- {
- ModestAccountData* account_data =
- modest_account_mgr_get_account_data (account_mgr, account_name);
- if (!account_data)
+ gtk_tree_model_get(GTK_TREE_MODEL(model), &iter,
+ MODEST_ACCOUNT_VIEW_NAME_COLUMN,
+ &cur_name, -1);
+
+ if (g_str_equal(cur_name, account_name)) {
+ ModestAccountSettings* settings =
+ modest_account_mgr_load_account_settings (account_mgr, account_name);
+ if (!settings) {
+ g_free (cur_name);
return;
- gchar* last_updated_string = get_last_updated_string(account_mgr, account_data);
+ }
+ const gchar* last_updated_string = get_last_updated_string(account_mgr, settings);
gtk_list_store_set(model, &iter,
MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
-1);
- g_free (last_updated_string);
- modest_account_mgr_free_account_data (account_mgr, account_data);
- return;
+ g_object_unref (settings);
+ found = TRUE;
}
- }
- while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
+ g_free (cur_name);
+
+ } while (!found && gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
}
static void
self = MODEST_ACCOUNT_VIEW (user_data);
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
-
+
+ gchar *selected_name = modest_account_view_get_selected_account (self);
+ if (selected_name == NULL) {
+ /* we select the first account if none is selected */
+ modest_account_view_select_first_account (self);
+ } else {
+ g_free (selected_name);
+ }
+
update_account_view (priv->account_mgr, self);
}
self = MODEST_ACCOUNT_VIEW (user_data);
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
- g_warning ("account changed: %s", tny_account_get_id(account));
-
/* Update account view */
/* update_account_view (priv->account_mgr, self); */
}
-
-
-static gboolean
-find_default_account(ModestAccountView *self, GtkTreeIter *iter)
-{
- GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
- gboolean result;
- for (result = gtk_tree_model_get_iter_first(model, iter);
- result == TRUE; result = gtk_tree_model_iter_next(model, iter))
- {
- gboolean is_default;
- gtk_tree_model_get (model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default, -1);
- if(is_default)
- return TRUE;
- }
-
- return FALSE;
-}
-
static void
on_account_default_toggled (GtkCellRendererToggle *cell_renderer,
gchar *path,
MODEST_ACCOUNT_VIEW_NAME_COLUMN,
&account_name, -1);
- /* Set this previously-non-default account as the default */
- if (modest_account_mgr_set_default_account (priv->account_mgr, account_name)) {
- GtkTreeIter old_default_iter;
+ /* Set this previously-non-default account as the
+ default. We're not updating here the value of the
+ DEFAULT_COLUMN because we'll do it in the
+ "default_account_changed" signal handler. We do it like
+ this because that way the signal handler is useful also
+ when we're inserting a new account and there is no other
+ one defined, in that case the change of account is provoked
+ by the account mgr and not by a signal toggle.*/
+ modest_account_mgr_set_default_account (priv->account_mgr, account_name);
- find_default_account (self, &old_default_iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &old_default_iter,
- MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, FALSE, -1);
-
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1);
- }
g_free (account_name);
}
+static void
+on_account_updated (ModestAccountMgr* mgr,
+ gchar* account_name,
+ gpointer user_data)
+{
+ update_account_view (mgr, MODEST_ACCOUNT_VIEW (user_data));
+}
+
void
bold_if_default_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
toggle_renderer = gtk_cell_renderer_toggle_new ();
text_renderer = gtk_cell_renderer_text_new ();
+ g_object_set (G_OBJECT (text_renderer), "ellipsize", PANGO_ELLIPSIZE_END,
+ "ellipsize-set", TRUE, NULL);
/* the is_default column */
g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE, "radio", TRUE, NULL);
g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL);
#endif /* MODEST_HAVE_HILDON0_WIDGETS */
- g_signal_connect (G_OBJECT(toggle_renderer), "toggled",
- G_CALLBACK(on_account_default_toggled),
- self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT(toggle_renderer),
+ "toggled",
+ G_CALLBACK(on_account_default_toggled),
+ self);
/* account name */
column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_account"), text_renderer, "text",
MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
+ gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
NULL, NULL);
*/
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
- priv->acc_removed_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
- "account_removed",
- G_CALLBACK(on_account_removed), self);
-
- priv->acc_inserted_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
- "account_inserted",
- G_CALLBACK(on_account_inserted), self);
-
- priv->acc_changed_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
- "account_changed",
- G_CALLBACK(on_account_changed), self);
-
- priv->acc_busy_changed_handler = g_signal_connect (G_OBJECT(priv->account_mgr),
- "account_busy_changed",
- G_CALLBACK(on_account_busy_changed), self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT (modest_runtime_get_account_store ()),
+ "account_removed",
+ G_CALLBACK(on_account_removed),
+ self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT (modest_runtime_get_account_store ()),
+ "account_inserted",
+ G_CALLBACK(on_account_inserted),
+ self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT (modest_runtime_get_account_store ()),
+ "account_changed",
+ G_CALLBACK(on_account_changed),
+ self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT(priv->account_mgr),
+ "account_busy_changed",
+ G_CALLBACK(on_account_busy_changed),
+ self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT(priv->account_mgr),
+ "default_account_changed",
+ G_CALLBACK(on_default_account_changed),
+ self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT(priv->account_mgr),
+ "display_name_changed",
+ G_CALLBACK(on_display_name_changed),
+ self);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT (priv->account_mgr),
+ "account_updated",
+ G_CALLBACK (on_account_updated),
+ self);
}
return FALSE; /* Keep walking the tree. */
}
-static void modest_account_view_select_account (ModestAccountView *account_view,
- const gchar* account_name)
+static void
+modest_account_view_select_account (ModestAccountView *account_view,
+ const gchar* account_name)
{
/* Create a state instance so we can send two items of data to the signal handler: */
ForEachData *state = g_new0 (ForEachData, 1);
g_free (state);
}
+static void
+modest_account_view_select_first_account (ModestAccountView *account_view)
+{
+ GtkTreeIter iter;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (account_view));
+
+ if (gtk_tree_model_get_iter_first (model, &iter)) {
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (account_view));
+
+ gtk_tree_selection_select_iter (selection, &iter);
+ }
+}
+
+static void
+on_default_account_changed (ModestAccountMgr *mgr,
+ gpointer user_data)
+{
+ GtkTreeIter iter;
+ gchar *default_account_name;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
+
+ default_account_name = modest_account_mgr_get_default_account (mgr);
+
+ do {
+ gboolean is_default;
+ gchar *name;
+
+ gtk_tree_model_get (model, &iter,
+ MODEST_ACCOUNT_VIEW_NAME_COLUMN, &name,
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default,
+ -1);
+
+ /* Update the default account column */
+ if ((default_account_name != NULL) && (!strcmp (name, default_account_name)))
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1);
+ else
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, FALSE, -1);
+
+ g_free (name);
+
+ } while (gtk_tree_model_iter_next(model, &iter));
+
+ /* Free and force a redraw */
+ g_free (default_account_name);
+ gtk_widget_queue_draw (GTK_WIDGET (user_data));
+}
+
+static void
+on_display_name_changed (ModestAccountMgr *mgr,
+ const gchar *account,
+ gpointer user_data)
+{
+ /* Update the view */
+ update_account_view (mgr, MODEST_ACCOUNT_VIEW (user_data));
+}