/* notebook pages: */
GtkWidget *page_welcome;
- GtkWidget *check_support_progress;
gboolean check_support_done;
guint check_support_show_progress_id;
- guint check_support_progress_pulse_id;
gint pending_check_support;
gboolean destroyed;
gpointer userdata);
static void check_support_of_protocols (ModestEasysetupWizardDialog *self);
static gboolean check_support_show_progress (gpointer userdata);
-static gboolean check_support_progress_pulse (gpointer userdata);
static gboolean
on_delete_event (GtkWidget *widget,
priv->check_support_show_progress_id = 0;
}
- if (priv->check_support_progress_pulse_id > 0) {
- g_source_remove (priv->check_support_progress_pulse_id);
- priv->check_support_progress_pulse_id = 0;
- }
-
if (G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->dispose)
G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->dispose (object);
}
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
label = gtk_label_new(_("mcen_ia_emailsetup_intro"));
- priv->check_support_progress = gtk_progress_bar_new ();
align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- gtk_box_pack_end (GTK_BOX (box), priv->check_support_progress, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (align), box);
gtk_widget_show (label);
gtk_widget_show (GTK_WIDGET (box));
}
static void
-on_account_country_selector_changed (HildonTouchSelector *widget, gint column, gpointer user_data)
+on_account_country_selector_changed (HildonTouchSelector *widget, gpointer user_data)
{
ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
g_assert(self);
MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
if (provider_id) {
+ const gchar *current_username;
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);
+ current_username = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username));
+
+ if (current_username && strstr (current_username, "@")) {
+ email_address = g_strdup (current_username);
+ } else {
+ email_address = g_strdup_printf ("%s@%s",
+ current_username,
+ domain_name);
+ }
/* Update the email address */
hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), email_address);
/* This is mostly copied from
* src/maemo/modest-account-settings-dialog.c */
if (priv->dirty) {
- GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self),
- _("imum_nc_wizard_confirm_lose_changes")));
- /* TODO: These button names will be ambiguous, and not
- * specified in the UI specification. */
+ gint dialog_response;
+ GtkWidget *dialog;
+
+ dialog = hildon_note_new_confirmation ((GtkWindow *) self,
+ _("imum_nc_wizard_confirm_lose_changes"));
- const gint dialog_response = gtk_dialog_run (dialog);
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ (GtkWindow *) dialog,
+ (GtkWindow *) wizard_dialog);
+
+ dialog_response = gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (GTK_WIDGET (dialog));
if (dialog_response != GTK_RESPONSE_OK) {
modest_country_picker_load_data(
MODEST_COUNTRY_PICKER (priv->account_country_picker));
/* connect to country picker's changed signal, so we can fill the provider picker: */
- g_signal_connect (G_OBJECT (hildon_picker_button_get_selector
- (HILDON_PICKER_BUTTON (priv->account_country_picker))),
- "changed",
+ g_signal_connect ((GObject *) priv->account_country_picker,
+ "value-changed",
G_CALLBACK (on_account_country_selector_changed), self);
modest_country_picker_set_active_country_locale (
/* Initialize fields */
priv->check_support_done = FALSE;
priv->check_support_show_progress_id = 0;
- priv->check_support_progress_pulse_id = 0;
priv->pending_check_support = 0;
priv->destroyed = FALSE;
priv->page_welcome = create_page_welcome (self);
}
static gboolean
-check_support_progress_pulse (gpointer userdata)
-{
- ModestEasysetupWizardDialog *self = (ModestEasysetupWizardDialog *) userdata;
- ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
-
- if (priv->destroyed) {
- priv->check_support_progress_pulse_id = 0;
- return FALSE;
- }
-
- gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->check_support_progress));
-
- return TRUE;
-}
-
-static gboolean
check_support_show_progress (gpointer userdata)
{
ModestEasysetupWizardDialog *self = (ModestEasysetupWizardDialog *) userdata;
if (priv->destroyed)
return FALSE;
- gtk_widget_show (priv->check_support_progress);
- gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->check_support_progress));
-
- priv->check_support_progress_pulse_id = g_timeout_add (200, check_support_progress_pulse, self);
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
return FALSE;
}
priv->check_support_show_progress_id = 0;
}
- if (priv->check_support_progress_pulse_id > 0) {
- g_source_remove (priv->check_support_progress_pulse_id);
- priv->check_support_progress_pulse_id = 0;
- }
-
if (priv->pending_check_support == 0) {
priv->check_support_done = TRUE;
if (!priv->destroyed) {
if (priv->presets)
fill_providers (self);
- gtk_widget_hide (priv->check_support_progress);
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), FALSE);
invoke_enable_buttons_vfunc (self);
}
}
projects / modest / blobdiff