* Use osso_abook_aggregator_get_default to open the addressbook

[modest] / src / hildon2 / modest-easysetup-wizard-dialog.c

diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index 7e8fb92..ff63170 100644 (file)
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -72,7 +72,7 @@ G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODE
                                                    MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, \
                                                    ModestEasysetupWizardDialogPrivate))
 
-#define LABELS_WIDTH 480
+#define LABELS_WIDTH 520
 #define DIALOG_WIDTH LABELS_WIDTH + MODEST_MARGIN_DOUBLE
 
 typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate;
@@ -594,6 +594,39 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
        return GTK_WIDGET (align);
 }
 
+static void
+on_user_username_changed(GtkWidget* widget, ModestEasysetupWizardDialog *self)
+{
+       ModestEasysetupWizardDialogPrivate* priv;
+       gchar* provider_id = NULL;
+
+       priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+       /* Work out the user email address */
+       provider_id = modest_provider_picker_get_active_provider_id (
+               MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
+
+       if (provider_id) {
+               gchar *email_address;
+               gchar *domain_name = modest_presets_get_domain (priv->presets, provider_id);
+
+               email_address = g_strdup_printf ("%s@%s",
+                                                hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username)),
+                                                domain_name);
+
+               /* Update the email address */
+               hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), email_address);
+
+               g_free (email_address);
+               g_free (domain_name);
+               g_free (provider_id);
+       }
+
+       /* Update state */
+       on_easysetup_changed(widget, self);
+}
+
+
 static GtkWidget*
 create_page_user_details (ModestEasysetupWizardDialog *self)
 {
@@ -658,7 +691,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        gtk_widget_show (priv->entry_user_username);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(priv->entry_user_username), "changed",
-                        G_CALLBACK(on_easysetup_changed), self);
+                        G_CALLBACK(on_user_username_changed), self);
        gtk_widget_show (caption);
 
        /* Prevent the use of some characters in the username,
@@ -1128,28 +1161,27 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data)
 static GtkWidget*
 create_page_complete_custom (ModestEasysetupWizardDialog *self)
 {
+       gchar *complete_string;
        GtkWidget *align;
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
-       GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
-       GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings"));
-       hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+       GtkWidget *box;
+       GtkWidget *label;
+       GtkWidget *button_edit;
+
+       box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+       complete_string = g_strconcat (_("mcen_ia_emailsetup_setup_complete"), " ",
+                                      _("mcen_ia_customsetup_complete"), NULL);
+       label = gtk_label_new(complete_string);
+       g_free (complete_string);
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
-       gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
-       gtk_widget_show (label);
-
-       label = gtk_label_new (_("mcen_ia_customsetup_complete"));
-       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
-       gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
-       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-       gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
-       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
        gtk_widget_show (label);
 
+       button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings"));
+       hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
        gtk_widget_show (button_edit);
        gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, 0);
 
@@ -2093,8 +2125,8 @@ save_to_settings (ModestEasysetupWizardDialog *self)
                                                                      priv->settings);
                        g_list_free (wizard_pages);
                } else {
-                       g_warning ("The selected protocol is a plugin protocol "//
-                                  "but it's not a ModestAccountProtocol");
+                       g_debug ("The selected protocol is a plugin protocol "//
+                                "but it's not a ModestAccountProtocol");
                }
 
                g_free (provider_id);