* make modest_text_utils_get_display_date return a ptr to

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

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index a9d8836..8fa5421 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -54,6 +54,10 @@ static void modest_account_view_select_account (ModestAccountView *account_view,
 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);
+
 typedef enum {
        MODEST_ACCOUNT_VIEW_NAME_COLUMN,
        MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
@@ -142,22 +146,23 @@ modest_account_view_finalize (GObject *obj)
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
-/* Get the string for the last updated time. Result must be g_freed */
-static gchar*
+/* Get the string for the last updated time. Result must NOT be g_freed */
+static const gchar*
 get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountData *account_data)
 {
        /* FIXME: let's assume that 'last update' applies to the store account... */
-       gchar* last_updated_string;
+       const 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)) {
                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(_("mcen_va_refreshing"));
+               last_updated_string = _("mcen_va_refreshing");
        }
+       
        return last_updated_string;
 }
 
@@ -203,8 +208,9 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
                if (account_data->store_account) {
 
                        GtkTreeIter iter;
-                       
-                       gchar *last_updated_string = get_last_updated_string(account_mgr, account_data);
+
+                       /* don't free */
+                       const gchar *last_updated_string = get_last_updated_string(account_mgr, account_data);
                        
                        if (account_data->is_enabled) {
                                const gchar *proto_name;
@@ -220,7 +226,6 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
                                        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);
@@ -245,30 +250,34 @@ on_account_busy_changed(ModestAccountMgr *account_mgr,
 {
        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))
-               {
+               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)
+                       if (!account_data) {
+                               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, account_data);
                        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;
+                       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
@@ -321,8 +330,6 @@ on_account_changed (TnyAccountStore *account_store,
        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); */
 }
@@ -482,6 +489,12 @@ init_view (ModestAccountView *self)
                                           "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);
 }
 
 
@@ -597,7 +610,7 @@ on_default_account_changed (ModestAccountMgr *mgr,
                                    -1);
 
                /* Update the default account column */
-               if (!strcmp (name, default_account_name))
+               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
@@ -612,3 +625,12 @@ on_default_account_changed (ModestAccountMgr *mgr,
        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));
+}