Use GTK+ single includes

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

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index 50231c6..abfce39 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -28,6 +28,7 @@
  */
 
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include "modest-account-view.h"
 
 #include <modest-account-mgr.h>
@@ -37,16 +38,15 @@
 #include <modest-runtime.h>
 #include <modest-signal-mgr.h>
 
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
 #include <string.h> /* For strcmp(). */
 #include <modest-account-mgr-helpers.h>
 #include <modest-datetime-formatter.h>
 #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);
@@ -208,6 +208,7 @@ 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);
+
        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)) {
@@ -221,7 +222,7 @@ get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr,
        } else  {
                last_updated_string = _("mcen_va_refreshing");
        }
-       
+
        return last_updated_string;
 }
 
@@ -230,9 +231,9 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
 {
        GSList *account_names, *cursor;
        GtkListStore *model;
-               
+
        model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(view)));
-       
+
        /* Get the ID of the currently-selected account,
         * so we can select it again after rebuilding the list.
         * Note that the name doesn't change even when the display name changes.
@@ -452,8 +453,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, 
@@ -897,7 +902,7 @@ update_picker_mode (ModestAccountView *self)
        gtk_tree_view_column_set_visible (column, !priv->picker_mode);
 
        /* Name column */
-       column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 2);
+       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,