* set the default paned pos for the main window to something sane

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 12c7d04..a51ca27 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -72,6 +72,9 @@ typedef struct {
        gint                  sort;
 } FolderCols;
 
+
+static const guint MODEST_MAIN_PANED_POS = 280;
+
 static const FolderCols INBOX_COLUMNS_DETAILS[] = {
        {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40, 0},
@@ -95,8 +98,8 @@ static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
 };
 
 static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
-       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
-       {MODEST_HEADER_VIEW_COLUMN_STATUS, 240, 0}
+       {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0}
+//     {MODEST_HEADER_VIEW_COLUMN_STATUS, 240, 0}
 };
 
 static const FolderCols SENT_COLUMNS_TWOLINES[] = {
@@ -168,13 +171,13 @@ modest_init_init_core (void)
 
        init_default_settings (modest_runtime_get_conf ());
        
-       if (!modest_init_local_folders()) {
+       if (!modest_init_local_folders(NULL)) {
                modest_init_uninit ();
                g_printerr ("modest: failed to init local folders\n");
                return FALSE;
        }
        
-       if (!init_default_account_maybe(modest_runtime_get_account_mgr ())) {
+       if (!init_default_account_maybe (modest_runtime_get_account_mgr ())) {
                modest_init_uninit ();
                g_printerr ("modest: failed to init default account\n");
                return FALSE;
@@ -269,6 +272,7 @@ static gboolean
 init_header_columns (ModestConf *conf, gboolean overwrite)
 {
        int folder_type;
+       gchar *key;
        
        for (folder_type = TNY_FOLDER_TYPE_UNKNOWN;
             folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) {          
@@ -308,6 +312,14 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
                                      overwrite);
                };
        }
+       
+       key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, MODEST_WIDGET_MEMORY_PARAM_POS);
+       /* if we're not in overwrite mode, only write stuff it
+        * there was nothing before */
+       if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
+               modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS, NULL);
+       
+       g_free (key);
        return TRUE;
 }
 
@@ -323,7 +335,7 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
                                        maildirs[j],
                                        NULL);
                if (g_mkdir_with_parents (dir, 0755) < 0) {
-                       g_printerr ("modest: failed to create %s\n", dir);
+                       g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, dir);
                        g_free (dir);
                        return FALSE;
                }
@@ -344,25 +356,35 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
  * they were created, FALSE otherwise
  */
 gboolean
-modest_init_local_folders  ()
+modest_init_local_folders (const gchar* location_filepath)
 {      
-       gchar *maildir_path = modest_local_folder_info_get_maildir_path (NULL);
+       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. */
-       int i;
-       for (i = 0; i != G_N_ELEMENTS(LOCAL_FOLDERS); ++i) {
-               gchar *dir = g_build_filename (maildir_path,
-                                               modest_local_folder_info_get_type_name(LOCAL_FOLDERS[i]),
-                                               NULL);                  
-               const gboolean created = modest_init_one_local_folder (dir);
-               g_free(dir);
-               
-               if (!created) {
+       if (location_filepath) {
+               /* For instance, for memory card, just create the top-level .modest folder: */
+               if (g_mkdir_with_parents (maildir_path, 0755) < 0) {
+                       g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, location_filepath);
                        g_free (maildir_path);
                        return FALSE;
                }
        }
+       else {
+               /* Create each of the standard on-disk folders.
+                * Per-account outbox folders will be created when first needed. */
+               int i;
+               for (i = 0; i != G_N_ELEMENTS(LOCAL_FOLDERS); ++i) {
+                       gchar *dir = g_build_filename (maildir_path,
+                                                       modest_local_folder_info_get_type_name(LOCAL_FOLDERS[i]),
+                                                       NULL);                  
+                       const gboolean created = modest_init_one_local_folder (dir);
+                       g_free(dir);
+                       
+                       if (!created) {
+                               g_free (maildir_path);
+                               return FALSE;
+                       }
+               }
+       }
        
        g_free (maildir_path);
        return TRUE;