* Fixed a funny typo

pmo-trunk-r2022

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index bf8279d..cfe9dc3 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -173,7 +173,7 @@ on_caption_combobox_changed (GtkComboBox *widget, gpointer user_data)
 /** This is a convenience function to create a caption containing a mandatory widget.
  * When the widget is edited, the enable_buttons() vfunc will be called.
  */
-static GtkWidget* create_caption_new_with_asterix(ModestEasysetupWizardDialog *self,
+static GtkWidget* create_caption_new_with_asterisk(ModestEasysetupWizardDialog *self,
                                                  GtkSizeGroup *group,
                                                  const gchar *value,
                                                  GtkWidget *control,
@@ -286,7 +286,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
 
        /* The country widgets: */
        self->combo_account_country = GTK_WIDGET (easysetup_country_combo_box_new ());
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_country"), 
+       GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_country"), 
                                                              self->combo_account_country, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->combo_account_country);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -303,7 +303,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
        /* The service provider widgets: */     
        self->combo_account_serviceprovider = GTK_WIDGET (easysetup_provider_combo_box_new ());
        
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_serviceprovider"), 
+       caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_serviceprovider"), 
                                                   self->combo_account_serviceprovider, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->combo_account_serviceprovider);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -369,7 +369,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
        g_free (default_account_name);
        default_account_name = NULL;
 
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_account_title"), 
+       caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_account_title"), 
                                                   self->entry_account_title, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_account_title);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -423,7 +423,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_name), 64);
        modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_name), 
                                              on_entry_max, self);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
+       GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, 
                                                              _("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_user_name);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -442,7 +442,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        self->entry_user_username = GTK_WIDGET (modest_validating_entry_new ());
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), 
+       caption = create_caption_new_with_asterisk (self, sizegroup, _("mail_fi_username"), 
                                                   self->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_user_username);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -466,7 +466,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
                                         HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
        gtk_entry_set_visibility (GTK_ENTRY (self->entry_user_password), FALSE);
        /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_user_password), '*'); */
-       caption = create_caption_new_with_asterix (self, sizegroup, 
+       caption = create_caption_new_with_asterisk (self, sizegroup, 
                                                   _("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_user_password);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -476,7 +476,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        self->entry_user_email = GTK_WIDGET (modest_validating_entry_new ());
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
-       caption = create_caption_new_with_asterix (self, sizegroup, 
+       caption = create_caption_new_with_asterisk (self, sizegroup, 
                                                   _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
        gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), EXAMPLE_EMAIL_ADDRESS); /* Default text. */
        gtk_widget_show (self->entry_user_email);
@@ -561,7 +561,7 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self
                self->combo_incoming_servertype = GTK_WIDGET (easysetup_servertype_combo_box_new ());
        easysetup_servertype_combo_box_set_active_servertype (
                EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype), MODEST_PROTOCOL_STORE_POP);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
+       GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, 
                                                              _("mcen_li_emailsetup_type"), self->combo_incoming_servertype, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->combo_incoming_servertype);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -579,7 +579,7 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self
        /* The caption title will be updated in update_incoming_server_title().
         * so this default text will never be seen: */
        /* (Note: Changing the title seems pointless. murrayc) */
-       self->caption_incoming = create_caption_new_with_asterix (self, sizegroup, 
+       self->caption_incoming = create_caption_new_with_asterisk (self, sizegroup, 
                                                                  "Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
        update_incoming_server_title (self);
        gtk_widget_show (self->entry_incomingserver);
@@ -670,7 +670,7 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
                self->entry_outgoingserver = gtk_entry_new ();
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
+       GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, 
                                                              _("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_outgoingserver);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index c5ad061..765289c 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -205,7 +205,7 @@ on_caption_combobox_changed (GtkComboBox *widget, gpointer user_data)
 /** This is a convenience function to create a caption containing a mandatory widget.
  * When the widget is edited, the enable_buttons() vfunc will be called.
  */
-static GtkWidget* create_caption_new_with_asterix(ModestAccountSettingsDialog *self,
+static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog *self,
        GtkSizeGroup *group,
        const gchar *value,
        GtkWidget *control,
@@ -271,7 +271,7 @@ create_page_account_details (ModestAccountSettingsDialog *self)
        /* Do use auto-capitalization: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_account_title), 
                HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_account_title"), 
+       GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_account_title"), 
                self->entry_account_title, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_account_title);
        connect_for_modified (self, self->entry_account_title);
@@ -304,7 +304,7 @@ create_page_account_details (ModestAccountSettingsDialog *self)
        
        /* The retrieve combobox: */
        self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ());
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_retrievetype"), 
+       caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_advsetup_retrievetype"), 
                self->combo_retrieve, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->combo_retrieve);
        connect_for_modified (self, self->combo_retrieve);
@@ -313,7 +313,7 @@ create_page_account_details (ModestAccountSettingsDialog *self)
        
        /* The limit-retrieve combobox: */
        self->combo_limit_retrieve = GTK_WIDGET (modest_limit_retrieve_combo_box_new ());
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_limit_retrieve"), 
+       caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_advsetup_limit_retrieve"), 
                self->combo_limit_retrieve, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->combo_limit_retrieve);
        connect_for_modified (self, self->combo_limit_retrieve);
@@ -324,7 +324,7 @@ create_page_account_details (ModestAccountSettingsDialog *self)
        if(!self->checkbox_leave_messages)
                self->checkbox_leave_messages = gtk_check_button_new ();
        if (!self->caption_leave_messages) {
-               self->caption_leave_messages = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), 
+               self->caption_leave_messages = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), 
                        self->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY);
        }
                        
@@ -393,7 +393,7 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_name), 64);
        modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_name), 
                on_entry_max, self);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
+       GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, 
                _("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_user_name);
        connect_for_modified (self, self->entry_user_name);
@@ -413,7 +413,7 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        self->entry_user_username = GTK_WIDGET (modest_validating_entry_new ());
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), 
+       caption = create_caption_new_with_asterisk (self, sizegroup, _("mail_fi_username"), 
                self->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_user_username);
        connect_for_modified (self, self->entry_user_username);
@@ -438,7 +438,7 @@ create_page_user_details (ModestAccountSettingsDialog *self)
                HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
        gtk_entry_set_visibility (GTK_ENTRY (self->entry_user_password), FALSE);
        /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_user_password), '*'); */
-       caption = create_caption_new_with_asterix (self, sizegroup, 
+       caption = create_caption_new_with_asterisk (self, sizegroup, 
                _("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_user_password);
        connect_for_modified (self, self->entry_user_password);
@@ -449,7 +449,7 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        self->entry_user_email = GTK_WIDGET (modest_validating_entry_new ());
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
-       caption = create_caption_new_with_asterix (self, sizegroup, 
+       caption = create_caption_new_with_asterisk (self, sizegroup, 
                _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
        gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), EXAMPLE_EMAIL_ADDRESS); /* Default text. */
        gtk_widget_show (self->entry_user_email);
@@ -532,7 +532,7 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
        /* The caption title will be updated in update_incoming_server_title().
         * so this default text will never be seen: */
        /* (Note: Changing the title seems pointless. murrayc) */
-       self->caption_incoming = create_caption_new_with_asterix (self, sizegroup, 
+       self->caption_incoming = create_caption_new_with_asterisk (self, sizegroup, 
                "Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_incomingserver);
        connect_for_modified (self, self->entry_incomingserver);
@@ -680,7 +680,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
                self->entry_outgoingserver = gtk_entry_new ();
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
+       GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, 
                _("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_outgoingserver);
        connect_for_modified (self, self->entry_outgoingserver);
@@ -704,7 +704,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
        self->entry_outgoing_username = GTK_WIDGET (modest_validating_entry_new ());
        /* Auto-capitalization is the default, so let's turn it off: */
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoing_username), HILDON_GTK_INPUT_MODE_FULL);
-       self->caption_outgoing_username = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), 
+       self->caption_outgoing_username = create_caption_new_with_asterisk (self, sizegroup, _("mail_fi_username"), 
                self->entry_outgoing_username, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_outgoing_username);
        connect_for_modified (self, self->entry_outgoing_username);
@@ -729,7 +729,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
                HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
        gtk_entry_set_visibility (GTK_ENTRY (self->entry_outgoing_password), FALSE);
        /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_outgoing_password), '*'); */
-       self->caption_outgoing_password = create_caption_new_with_asterix (self, sizegroup, 
+       self->caption_outgoing_password = create_caption_new_with_asterisk (self, sizegroup, 
                _("mail_fi_password"), self->entry_outgoing_password, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_outgoing_password);
        connect_for_modified (self, self->entry_outgoing_password);