* don't do autocaps in to/cc/bcc after tall...

[modest] / src / widgets / modest-account-view.c

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index 814aff1..dfab882 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -39,6 +39,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkliststore.h>
+#include <string.h> /* For strcmp(). */
 
 /* 'private'/'protected' functions */
 static void modest_account_view_class_init    (ModestAccountViewClass *klass);
@@ -203,7 +204,7 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
                        if (last_updated > 0) 
                                last_updated_string = modest_text_utils_get_display_date(last_updated);
                        else
-                               last_updated_string = g_strdup (_("FIXME: Never"));
+                               last_updated_string = g_strdup (_("mcen_va_never"));
                        
                        if (account_data->is_enabled) {
                                gtk_list_store_insert_with_values (
@@ -214,8 +215,7 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
                                        MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,    account_data->is_default,
        
                                        MODEST_ACCOUNT_VIEW_PROTO_COLUMN,
-                                       modest_protocol_info_get_protocol_name  (account_data->store_account->proto,
-                                                                                MODEST_TRANSPORT_STORE_PROTOCOL),
+                                       modest_protocol_info_get_transport_store_protocol_name (account_data->store_account->proto),
        
                                        MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN,  last_updated_string,
                                        -1);
@@ -293,6 +293,23 @@ on_account_enable_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
 }
 #endif
 
+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,
                           ModestAccountView *self)
@@ -319,7 +336,20 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
                            -1);
        
        /* Set this previously-non-default account as the default: */
-       modest_account_mgr_set_default_account (priv->account_mgr, account_name);
+       if (modest_account_mgr_set_default_account (priv->account_mgr, account_name))
+       {
+               /* Explicitely set default column because we are ignoring gconf changes */
+               GtkTreeIter old_default_iter;
+               if (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);
+               } else {
+                       g_warning ("%s: Did not find old default account in view", __FUNCTION__);
+               }
+
+               gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                                   MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1);
+       }
 
        g_free (account_name);
 }
@@ -453,6 +483,55 @@ modest_account_view_get_selected_account (ModestAccountView *self)
        return account_name;
 }
 
+/* This allows us to pass more than one piece of data to the signal handler,
+ * and get a result: */
+typedef struct 
+{
+               ModestAccountView* self;
+               const gchar *account_name;
+} ForEachData;
+
+static gboolean
+on_model_foreach_select_account(GtkTreeModel *model, 
+       GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
+{
+       ForEachData *state = (ForEachData*)(user_data);
+       
+       /* Select the item if it has the matching account name: */
+       gchar *this_account_name = NULL;
+       gtk_tree_model_get (model, iter, 
+               MODEST_ACCOUNT_VIEW_NAME_COLUMN, &this_account_name, 
+               -1); 
+       if(this_account_name && state->account_name 
+               && (strcmp (this_account_name, state->account_name) == 0)) {
+               
+               GtkTreeSelection *selection = 
+                       gtk_tree_view_get_selection (GTK_TREE_VIEW (state->self));
+               gtk_tree_selection_select_iter (selection, iter);
+               
+               return TRUE; /* Stop walking the tree. */
+       }
+       
+       return FALSE; /* Keep walking the tree. */
+}
+
+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);
+       state->self = account_view;
+       state->account_name = account_name;
+       
+       GtkTreeModel *model = gtk_tree_view_get_model (
+               GTK_TREE_VIEW (account_view));
+       gtk_tree_model_foreach (model, 
+               on_model_foreach_select_account, state);
+               
+       g_free (state);
+}
+
+
 
 void modest_account_view_block_conf_updates (ModestAccountView *account_view)
 {