* src/widgets/modest-header-view-render.c:

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 37016d4..ace733a 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -50,7 +50,6 @@
 #include "modest-tny-msg.h"
 
 static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
-static gboolean init_local_folders  (void);
 static gboolean init_default_account_maybe  (ModestAccountMgr *acc_mgr);
 static void     init_i18n (void);
 static void     init_stock_icons (void);
@@ -78,9 +77,7 @@ static const FolderCols INBOX_COLUMNS_DETAILS[] = {
 };
 
 static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 180, 0},
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE, 240, -1}
 };
 
 static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
@@ -93,15 +90,12 @@ static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
 };
 
 static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
        {MODEST_HEADER_VIEW_COLUMN_STATUS, 240, 0}
 };
 
 static const FolderCols SENT_COLUMNS_TWOLINES[] = {
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE, 240, -1}
 };
 
 #ifdef MODEST_PLATFORM_MAEMO
@@ -169,7 +163,7 @@ modest_init_init_core (void)
 
        init_default_settings (modest_runtime_get_conf ());
        
-       if (!init_local_folders()) {
+       if (!modest_init_local_folders(NULL /* means $HOME */)) {
                modest_init_uninit ();
                g_printerr ("modest: failed to init local folders\n");
                return FALSE;
@@ -331,7 +325,9 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
 }
 
 /**
- * init_local_folders:
+ * modest_init_local_folders:
+ * @location_filepath: The location at which the local-folders directory should be created, 
+ * or NULL to specify $HOME.
  * 
  * create the Local Folders folder under cache, if they
  * do not exist yet.
@@ -339,10 +335,10 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
  * Returns: TRUE if the folder were already there, or
  * they were created, FALSE otherwise
  */
-static gboolean
-init_local_folders  (void)
+gboolean
+modest_init_local_folders  (const gchar* location_filepath)
 {      
-       gchar *maildir_path = modest_local_folder_info_get_maildir_path ();
+       gchar *maildir_path = modest_local_folder_info_get_maildir_path (location_filepath);
 
        /* Create each of the standard on-disk folders.
         * Per-account outbox folders will be created when first needed. */