X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-account-view.c;h=75d0b5324899c147e1381c17e54d20d01848a4dc;hb=1da44f9313cda2cd96051b9edfd0d6f09602084c;hp=a5ebda0f720e1642429af04a8460a2236d8c7776;hpb=96d0d173e287c0453ba53589fe7f407136590b9d;p=modest diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c index a5ebda0..75d0b53 100644 --- a/src/widgets/modest-account-view.c +++ b/src/widgets/modest-account-view.c @@ -42,6 +42,7 @@ #include #include #include /* For strcmp(). */ +#include /* 'private'/'protected' functions */ static void modest_account_view_class_init (ModestAccountViewClass *klass); @@ -60,6 +61,9 @@ static void on_display_name_changed (ModestAccountMgr *self, 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, MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, @@ -150,18 +154,26 @@ modest_account_view_finalize (GObject *obj) /* 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) +get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountSettings *settings) { /* FIXME: let's assume that 'last update' applies to the store account... */ - 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)) { + 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 = _("mcen_va_never"); } else { - /* FIXME: There should be a logical name in the UI specs */ last_updated_string = _("mcen_va_refreshing"); } @@ -196,41 +208,48 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view) 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, account_data); + const gchar *last_updated_string = get_last_updated_string(account_mgr, settings); - 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 (account_data->store_account->proto); + 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_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); } } - - modest_account_mgr_free_account_data (account_mgr, account_data); + + g_object_unref (store_settings); + g_object_unref (settings); cursor = cursor->next; } @@ -264,17 +283,17 @@ on_account_busy_changed(ModestAccountMgr *account_mgr, &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) { + ModestAccountSettings* settings = + modest_account_mgr_load_account_settings (account_mgr, account_name); + if (!settings) { g_free (cur_name); return; } - const 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); - modest_account_mgr_free_account_data (account_mgr, account_data); + g_object_unref (settings); found = TRUE; } g_free (cur_name); @@ -382,6 +401,14 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer, 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) @@ -423,6 +450,8 @@ init_view (ModestAccountView *self) 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); @@ -454,6 +483,7 @@ init_view (ModestAccountView *self) 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); @@ -461,6 +491,7 @@ init_view (ModestAccountView *self) column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"text", MODEST_ACCOUNT_VIEW_LAST_UPDATED_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); @@ -505,6 +536,12 @@ init_view (ModestAccountView *self) "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); } @@ -600,16 +637,14 @@ modest_account_view_select_account (ModestAccountView *account_view, static void modest_account_view_select_first_account (ModestAccountView *account_view) { - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (account_view)); - g_return_if_fail (model != NULL); - GtkTreeIter iter; - gtk_tree_model_get_iter_first (model, &iter); - - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (account_view)); - g_return_if_fail (selection != NULL); + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (account_view)); - gtk_tree_selection_select_iter (selection, &iter); + 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