* typos fixed

* default identity renamed and actually used in wizard

pmo-trunk-r216

diff --git a/src/gtk-glade/modest-ui-wizard.c b/src/gtk-glade/modest-ui-wizard.c
index 1d59630..041157f 100644 (file)
--- a/src/gtk-glade/modest-ui-wizard.c
+++ b/src/gtk-glade/modest-ui-wizard.c
@@ -111,7 +111,7 @@ gboolean advance_sanity_check(GtkWindow *parent, GladeXML *glade_xml, gint cp)
         return FALSE;
 }
 
-gchar *search_unused_account_or_idenitity_name(gpointer mgr, gchar *draft)
+gchar *search_unused_account_or_identity_name(gpointer mgr, gchar *draft)
 {
        GString *tmpaccount_name;
        gint counter;
@@ -151,7 +151,7 @@ gboolean wizard_account_add(GladeXML *glade_xml, ModestUI *modest_ui)
        tmptext=g_utf8_strdown(tmptext2, -1);
        g_free(tmptext2);
 
-       tmpaccount_name=search_unused_account_or_idenitity_name(acc_mgr, "incoming");
+       tmpaccount_name=search_unused_account_or_identity_name(acc_mgr, "incoming");
        modest_account_mgr_add_server_account (acc_mgr,
                                               tmpaccount_name,
                                               gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWInServerComboEntry"))),
@@ -161,7 +161,7 @@ gboolean wizard_account_add(GladeXML *glade_xml, ModestUI *modest_ui)
        g_free(tmpaccount_name);
        g_free(tmptext);
 
-       tmpaccount_name=search_unused_account_or_idenitity_name(acc_mgr, "outgoing");
+       tmpaccount_name=search_unused_account_or_identity_name(acc_mgr, "outgoing");
        modest_account_mgr_add_server_account (acc_mgr,
                                               tmpaccount_name,
                                               gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWOutServerComboEntry"))),
@@ -170,7 +170,7 @@ gboolean wizard_account_add(GladeXML *glade_xml, ModestUI *modest_ui)
                                               "smtp");
        g_free(tmpaccount_name);
 
-       tmpaccount_name=search_unused_account_or_idenitity_name(id_mgr, "default");
+       tmpaccount_name=search_unused_account_or_identity_name(id_mgr, MODEST_IDENTITY_DEFAULT_IDENTITY);
        if (!modest_identity_mgr_add_identity (id_mgr,
                                               tmpaccount_name,
                                               gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWEMailAddressEntry"))),

diff --git a/src/modest-identity-keys.h b/src/modest-identity-keys.h
index 19f4869..27db9c5 100644 (file)
--- a/src/modest-identity-keys.h
+++ b/src/modest-identity-keys.h
@@ -3,7 +3,7 @@
 
 #include "modest-conf-keys.h"
 
-#define MODEST_IDENTITY_DEFAULT_IDENTITY  "myidentity"
+#define MODEST_IDENTITY_DEFAULT_IDENTITY  "default"
 
 
 /* configuration key definitions for modest */