* change the example e-mail from first.last@provider.com => first.last@example.com

  (following Felipe's suggestion)
* put the #define for this is modest-defs.h

pmo-trunk-r3759

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index 8e32cda..1ca45b0 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -61,8 +61,6 @@
 #include <config.h>
 #endif
 
 #include <config.h>
 #endif
 

-#define EXAMPLE_EMAIL_ADDRESS "first.last@provider.com"
-

 G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODEST_TYPE_WIZARD_DIALOG);
 
 #define WIZARD_DIALOG_GET_PRIVATE(o)                                   \
 G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODEST_TYPE_WIZARD_DIALOG);
 
 #define WIZARD_DIALOG_GET_PRIVATE(o)                                   \

@@ -380,7 +378,7 @@ on_combo_account_serviceprovider (GtkComboBox *widget, gpointer user_data)
                domain_name = modest_presets_get_domain (priv->presets, provider_id);
        
        if(!domain_name)
                domain_name = modest_presets_get_domain (priv->presets, provider_id);
        
        if(!domain_name)

-               domain_name = g_strdup (EXAMPLE_EMAIL_ADDRESS);
+               domain_name = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);

                
        if (self->entry_user_email)
                gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), domain_name);
                
        if (self->entry_user_email)
                gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), domain_name);

@@ -640,7 +638,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
        caption = create_caption_new_with_asterisk (self, sizegroup, 
                                                   _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
        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_entry_set_text (GTK_ENTRY (self->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */

        gtk_widget_show (self->entry_user_email);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
        g_signal_connect(G_OBJECT(self->entry_user_email), "changed", 
        gtk_widget_show (self->entry_user_email);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
        g_signal_connect(G_OBJECT(self->entry_user_email), "changed", 

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index f73e9d7..43cb5c9 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -66,8 +66,6 @@
 #include <config.h>
 #endif
 
 #include <config.h>
 #endif
 

-#define EXAMPLE_EMAIL_ADDRESS "first.last@provider.com"
-

 #define PORT_MIN 1
 #define PORT_MAX 65535
 
 #define PORT_MIN 1
 #define PORT_MAX 65535
 

@@ -539,7 +537,7 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
        caption = create_caption_new_with_asterisk (self, sizegroup, 
                _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
        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_entry_set_text (GTK_ENTRY (self->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */

        gtk_widget_show (self->entry_user_email);
        connect_for_modified (self, self->entry_user_email);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (self->entry_user_email);
        connect_for_modified (self, self->entry_user_email);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);

diff --git a/src/modest-defs.h b/src/modest-defs.h
index 06c63ce..2742683 100644 (file)
--- a/src/modest-defs.h
+++ b/src/modest-defs.h
@@ -194,4 +194,7 @@
 /* Notification ids */
 #define MODEST_CONF_NOTIFICATION_IDS MODEST_CONF_NAMESPACE "/notification_ids"      /* list of ints */
 
 /* Notification ids */
 #define MODEST_CONF_NOTIFICATION_IDS MODEST_CONF_NAMESPACE "/notification_ids"      /* list of ints */
 

+
+#define MODEST_EXAMPLE_EMAIL_ADDRESS "first.last@example.com"
+

 #endif /*__MODEST_DEFS_H__*/
 #endif /*__MODEST_DEFS_H__*/