2007-06-11 Murray Cumming <murrayc@murrayc.com>

* src/maemo/easysetup/modest-easysetup-provider-combo-box.c:
        (easysetup_provider_combo_box_fill): Remove debug code that showed the
        provider ID in the combo.

        * src/maemo/easysetup/modest-wizard-dialog.c: (create_title):
        Do not show the page numbers, because it would be confusing when we add
        the 2 extra pages for the custom setup, when the user chooses the Other
        provider. This fixes projects.maemo.org bug NB#59028

        * src/modest-init.c: (modest_init_init_core),
        (modest_init_local_folders):
        * src/modest-init.h:
        * src/modest-tny-account.c:
        (modest_tny_account_new_for_local_folders): Do not create default folders
        for the memory card. This should fix projects.maemo.org bug NB#59328.

pmo-trunk-r2150

diff --git a/ChangeLog2 b/ChangeLog2
index 564fc2b..55d5aa7 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,23 @@
 2007-06-11  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/easysetup/modest-easysetup-provider-combo-box.c:
+       (easysetup_provider_combo_box_fill): Remove debug code that showed the 
+       provider ID in the combo.
+       
+       * src/maemo/easysetup/modest-wizard-dialog.c: (create_title):
+       Do not show the page numbers, because it would be confusing when we add 
+       the 2 extra pages for the custom setup, when the user chooses the "Other"
+       provider. This fixes projects.maemo.org bug NB#59028
+       
+       * src/modest-init.c: (modest_init_init_core),
+       (modest_init_local_folders):
+       * src/modest-init.h:
+       * src/modest-tny-account.c:
+       (modest_tny_account_new_for_local_folders): Do not create default folders 
+       for the memory card. This should fix projects.maemo.org bug NB#59328.
+
+2007-06-11  Murray Cumming  <murrayc@murrayc.com>
+
        * src/modest-account-mgr.c: (modest_account_mgr_finalize):
        Free the changed_conf_keys string items. They are already freed in the 
        idle handler if that runs first.

diff --git a/src/maemo/easysetup/modest-easysetup-provider-combo-box.c b/src/maemo/easysetup/modest-easysetup-provider-combo-box.c
index cd2ed83..48914a0 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-provider-combo-box.c
+++ b/src/maemo/easysetup/modest-easysetup-provider-combo-box.c
@@ -182,11 +182,9 @@ void easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, Mod
                                GtkTreeIter iter;
                                gtk_list_store_append (liststore, &iter);
                                
-                               gchar *debug = g_strdup_printf ("%s: %s", provider_id, provider_name);
                                gtk_list_store_set(liststore, &iter, 
                                        MODEL_COL_ID, provider_id, 
-                                       MODEL_COL_NAME, debug, -1);
-                               g_free (debug);
+                                       MODEL_COL_NAME, provider_name, -1);
                                
                                provider_ids_used_already = g_slist_append (
                                        provider_ids_used_already, (gpointer)g_strdup (provider_id));

diff --git a/src/maemo/easysetup/modest-wizard-dialog.c b/src/maemo/easysetup/modest-wizard-dialog.c
index 8103fd0..0f71694 100644 (file)
--- a/src/maemo/easysetup/modest-wizard-dialog.c
+++ b/src/maemo/easysetup/modest-wizard-dialog.c
@@ -441,7 +441,6 @@ get_property (GObject      *object,
 static void
 create_title (ModestWizardDialog *wizard_dialog)
 {
-    gint pages, current;
     gchar *str = NULL;
     ModestWizardDialogPrivate *priv = NULL;
     GtkNotebook *notebook = NULL;
@@ -456,22 +455,37 @@ create_title (ModestWizardDialog *wizard_dialog)
         return;
 
     /* Get page information, we'll need that when creating title */
-    pages = gtk_notebook_get_n_pages (notebook);
-    current = gtk_notebook_get_current_page (priv->notebook);
+    /*
+    gint pages = gtk_notebook_get_n_pages (notebook);
+       */
+       
+    gint current = gtk_notebook_get_current_page (priv->notebook);
     if (current < 0)
         current = 0;
 
     /* the welcome title on the initial page */
+    /* This is the standard wizard title, with, e.g., 1/4 at the end,
+        * but the Modest UI spec does not want this. */
+       /*
     if (current == 0) {
         str = g_strdup_printf (_("ecdg_ti_wizard_welcome"), 
                 priv->wizard_name, pages);
     } else {
-        const gchar *steps = gtk_notebook_get_tab_label_text (notebook,
-                gtk_notebook_get_nth_page (notebook, current));
-
+    */
+       const gchar *steps = gtk_notebook_get_tab_label_text (notebook,
+               gtk_notebook_get_nth_page (notebook, current));
+                
+               /* This is the standard wizard title, with, e.g., 1/4 at the end,
+                * but the Modest UI spec does not want this.
+                */
+               /*
         str = g_strdup_printf (_("ecdg_ti_wizard_step"), 
                 priv->wizard_name, current + 1, pages, steps);
-    }
+        */
+
+        str = g_strdup_printf (_("%s: %s"), 
+                priv->wizard_name, steps);
+    /* } */
 
     /* Update the dialog to display the generated title */
     gtk_window_set_title (GTK_WINDOW (wizard_dialog), str);

diff --git a/src/modest-init.c b/src/modest-init.c
index 18684cb..04e61e7 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -168,7 +168,7 @@ modest_init_init_core (void)
 
        init_default_settings (modest_runtime_get_conf ());
        
-       if (!modest_init_local_folders(NULL /* means $HOME */)) {
+       if (!modest_init_local_folders()) {
                modest_init_uninit ();
                g_printerr ("modest: failed to init local folders\n");
                return FALSE;
@@ -336,8 +336,6 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
 
 /**
  * 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.
@@ -346,9 +344,9 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
  * they were created, FALSE otherwise
  */
 gboolean
-modest_init_local_folders  (const gchar* location_filepath)
+modest_init_local_folders  ()
 {      
-       gchar *maildir_path = modest_local_folder_info_get_maildir_path (location_filepath);
+       gchar *maildir_path = modest_local_folder_info_get_maildir_path (NULL);
 
        /* Create each of the standard on-disk folders.
         * Per-account outbox folders will be created when first needed. */

diff --git a/src/modest-init.h b/src/modest-init.h
index 911bb81..ee312af 100644 (file)
--- a/src/modest-init.h
+++ b/src/modest-init.h
@@ -73,8 +73,6 @@ gboolean modest_init_uninit (void);
 
 /**
  * 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.
@@ -82,7 +80,7 @@ gboolean modest_init_uninit (void);
  * Returns: TRUE if the folder were already there, or
  * they were created, FALSE otherwise
  */
-gboolean modest_init_local_folders  (const gchar* location_filepath);
+gboolean modest_init_local_folders  ();
 
 /**
  * modest_init_one_local_folder:

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 6716c72..c3c6614 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -448,7 +448,8 @@ TnyAccount*
 modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySessionCamel *session, const gchar* location_filepath)
 {
        /* Make sure that the directories exist: */
-       modest_init_local_folders (location_filepath);
+       if (location_filepath == NULL) /* Only for the special local folders account, not for the memory card. */
+               modest_init_local_folders ();
 
        TnyStoreAccount *tny_account;
        CamelURL *url;