Missing changes

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

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index dc963c2..88e5739 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -47,6 +47,9 @@
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon-defines.h>
 #endif
+#ifdef MODEST_USE_LIBTIME
+#include <clockd/libtime.h>
+#endif
 
 /* 'private'/'protected' functions */
 static void modest_account_view_class_init    (ModestAccountViewClass *klass);
@@ -71,6 +74,7 @@ static void on_account_updated (ModestAccountMgr* mgr, gchar* account_name,
                     gpointer user_data);
 static void update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view);
 static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static void update_picker_mode (ModestAccountView *self);
 
 typedef enum {
        MODEST_ACCOUNT_VIEW_NAME_COLUMN,
@@ -88,6 +92,7 @@ struct _ModestAccountViewPrivate {
        ModestAccountMgr *account_mgr;
 
        ModestDatetimeFormatter *datetime_formatter;
+       gboolean picker_mode;
 
        /* Signal handlers */
        GSList *sig_handlers;
@@ -154,6 +159,7 @@ modest_account_view_init (ModestAccountView *obj)
        priv->sig_handlers = NULL;
 
        priv->datetime_formatter = modest_datetime_formatter_new ();
+       priv->picker_mode = FALSE;
        g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", 
                          G_CALLBACK (datetime_format_changed), (gpointer) obj);
 #ifdef MODEST_TOOLKIT_HILDON2
@@ -205,6 +211,16 @@ get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr,
        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);
+
+#ifdef MODEST_USE_LIBTIME
+       /* If we use libtime, we are storing the time in UTC so we have to convert to currently
+        * selected time */
+       time_t now;
+       struct tm *localtime_tm;
+       time (&now);
+       localtime_tm = localtime (&now);
+       last_updated -= time_get_utc_offset (localtime_tm->tm_zone);
+#endif
        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)) {
@@ -449,8 +465,12 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer,
                return;
 
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));  
-       gtk_tree_model_get_iter_from_string (model, &iter, path);
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
+
+       if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) {
+               g_warning ("Got path of a not existing iter");
+               return;
+       }
        
        gtk_tree_model_get (model, &iter, 
                            MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
@@ -491,7 +511,8 @@ bold_if_default_account_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
        gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
                            &is_default, -1);
 
-       widget = gtk_tree_view_column_get_tree_view (column);
+/*     widget = gtk_tree_view_column_get_tree_view (column); */
+       widget = GTK_WIDGET (user_data);
        font_style = is_default?"EmpSystemFont":"SystemFont";
        style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (GTK_WIDGET(widget)),
                                           font_style, NULL,
@@ -528,7 +549,8 @@ bold_if_default_last_updated_cell_data  (GtkTreeViewColumn *column,  GtkCellRend
        gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
                            &is_default, -1);
 
-       widget = gtk_tree_view_column_get_tree_view (column);
+/*     widget = gtk_tree_view_column_get_tree_view (column); */
+       widget = GTK_WIDGET (user_data);
        font_style = is_default?"EmpSmallSystemFont":"SmallSystemFont";
        style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (GTK_WIDGET(widget)),
                                           font_style, NULL,
@@ -623,7 +645,7 @@ init_view (ModestAccountView *self)
        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_account_cell_data,
-                                               NULL, NULL);
+                                               self, NULL);
 
        /* last update for this account */
        text_renderer = gtk_cell_renderer_text_new ();
@@ -640,8 +662,8 @@ init_view (ModestAccountView *self)
        gtk_tree_view_append_column (GTK_TREE_VIEW(self),column);
        gtk_tree_view_column_set_expand (column, FALSE);
        gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_last_updated_cell_data,
-                                               NULL, NULL);
-                       
+                                               self, NULL);
+
        /* Show the column headers,
         * which does not seem to be the default on Maemo.
         */
@@ -649,6 +671,8 @@ init_view (ModestAccountView *self)
        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
 #endif
 
+       update_picker_mode (self);
+
        priv->sig_handlers = 
                modest_signal_mgr_connect (priv->sig_handlers, 
                                           G_OBJECT (modest_runtime_get_account_store ()),
@@ -874,3 +898,51 @@ on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
        } 
 }
 
+static void
+update_picker_mode (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+       GtkTreeViewColumn *column;
+       GList *renderers;
+       GtkCellRenderer *renderer;
+       
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       /* Last updated column */
+       column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 2);
+       gtk_tree_view_column_set_visible (column, !priv->picker_mode);
+
+       /* Name column */
+       column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 1);
+       renderers = gtk_tree_view_column_get_cell_renderers (column);
+       renderer = (GtkCellRenderer *) renderers->data;
+       g_object_set (renderer, 
+                     "align-set", TRUE,
+                     "alignment", priv->picker_mode?PANGO_ALIGN_CENTER:PANGO_ALIGN_LEFT,
+                     NULL);
+       g_list_free (renderers);
+}
+
+void 
+modest_account_view_set_picker_mode (ModestAccountView *self, gboolean enable)
+{
+       ModestAccountViewPrivate *priv;
+       
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       priv->picker_mode = enable;
+       update_picker_mode (self);
+}
+
+gboolean 
+modest_account_view_get_picker_mode (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+       
+       g_return_val_if_fail (MODEST_IS_ACCOUNT_VIEW (self), FALSE);
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       return priv->picker_mode;
+}