#include <gtk/gtkliststore.h>
#include <string.h> /* For strcmp(). */
#include <modest-account-mgr-helpers.h>
+#include <modest-datetime-formatter.h>
/* 'private'/'protected' functions */
static void modest_account_view_class_init (ModestAccountViewClass *klass);
static void on_account_updated (ModestAccountMgr* mgr, gchar* account_name,
gpointer user_data);
+static void update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view);
typedef enum {
MODEST_ACCOUNT_VIEW_NAME_COLUMN,
struct _ModestAccountViewPrivate {
ModestAccountMgr *account_mgr;
+ ModestDatetimeFormatter *datetime_formatter;
+
/* Signal handlers */
GSList *sig_handlers;
};
}
static void
+datetime_format_changed (ModestDatetimeFormatter *formatter,
+ ModestAccountView *self)
+{
+ ModestAccountViewPrivate *priv;
+
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+ update_account_view (priv->account_mgr, self);
+}
+
+static void
modest_account_view_init (ModestAccountView *obj)
{
ModestAccountViewPrivate *priv;
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
priv->sig_handlers = NULL;
+
+ priv->datetime_formatter = modest_datetime_formatter_new ();
+ g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed",
+ G_CALLBACK (datetime_format_changed), (gpointer) obj);
#ifdef MODEST_TOOLKIT_HILDON2
gtk_rc_parse_string ("style \"fremantle-modest-account-view\" {\n"
" GtkWidget::hildon-mode = 1\n"
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
+ if (priv->datetime_formatter) {
+ g_object_unref (priv->datetime_formatter);
+ priv->datetime_formatter = NULL;
+ }
+
/* Disconnect signals */
modest_signal_mgr_disconnect_all_and_destroy (priv->sig_handlers);
/* 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)
+get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr, ModestAccountSettings *settings)
{
/* FIXME: let's assume that 'last update' applies to the store account... */
const gchar *last_updated_string;
const gchar *account_name;
time_t last_updated;
ModestServerAccountSettings *server_settings;
+ ModestAccountViewPrivate *priv;
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
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
+ if (last_updated > 0) {
+ last_updated_string =
+ modest_datetime_formatter_display_datetime (priv->datetime_formatter,
+ last_updated);
+ } else {
last_updated_string = _("mcen_va_never");
+ }
} else {
last_updated_string = _("mcen_va_refreshing");
}
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);
+ cursor = cursor->next;
continue;
}
store_settings = modest_account_settings_get_store_settings (settings);
GtkTreeIter iter;
/* don't free */
- const gchar *last_updated_string = get_last_updated_string(account_mgr, settings);
+ const gchar *last_updated_string = get_last_updated_string(view, account_mgr, settings);
if (modest_account_settings_get_enabled (settings)) {
ModestProtocolType protocol_type;
g_free (cur_name);
return;
}
- const gchar* last_updated_string = get_last_updated_string(account_mgr, settings);
+ const gchar* last_updated_string = get_last_updated_string(self, account_mgr, settings);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gchar *last_updated_hildon2;
+
+ last_updated_hildon2 = g_strconcat ("<span size='x-small'>", _("mcen_ti_lastupdated"), "\n",
+ last_updated_string, "</span>",
+ NULL);
+#endif
gtk_list_store_set(model, &iter,
+#ifdef MODEST_TOOLKIT_HILDON2
+ MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_hildon2,
+#else
MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
+#endif
-1);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_free (last_updated_hildon2);
+#endif
g_object_unref (settings);
found = TRUE;
}