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.
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));
static void
create_title (ModestWizardDialog *wizard_dialog)
{
- gint pages, current;
gchar *str = NULL;
ModestWizardDialogPrivate *priv = NULL;
GtkNotebook *notebook = NULL;
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);
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;
/**
* 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.
* 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. */
/**
* 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.
* 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:
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;