* src/widgets/modest-header-view-render.c:

[modest] / src / maemo / modest-account-settings-dialog.c

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 4df0082..e5f7c25 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -171,21 +171,32 @@ on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data)
        self->modified = TRUE;
 }
 
+static void
+on_modified_number_editor_changed (HildonNumberEditor *number_editor, gint new_value, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       self->modified = TRUE;
+}
+
 /* Set a modified boolean whenever the widget is changed, 
  * so we can check for it later.
  */
 static void
 connect_for_modified (ModestAccountSettingsDialog *self, GtkWidget *widget)
 {
-       if (GTK_IS_ENTRY (widget)) {
-         g_signal_connect (G_OBJECT (widget), "changed",
-               G_CALLBACK (on_modified_entry_changed), self);  
+       if (HILDON_IS_NUMBER_EDITOR (widget)) {
+               g_signal_connect (G_OBJECT (widget), "notify::value",
+                       G_CALLBACK (on_modified_number_editor_changed), self);
+       }
+       else if (GTK_IS_ENTRY (widget)) {
+               g_signal_connect (G_OBJECT (widget), "changed",
+                       G_CALLBACK (on_modified_entry_changed), self);
        } else if (GTK_IS_COMBO_BOX (widget)) {
                g_signal_connect (G_OBJECT (widget), "changed",
-               G_CALLBACK (on_modified_combobox_changed), self);       
+                       G_CALLBACK (on_modified_combobox_changed), self);       
        } else if (GTK_IS_TOGGLE_BUTTON (widget)) {
                g_signal_connect (G_OBJECT (widget), "toggled",
-               G_CALLBACK (on_modified_checkbox_toggled), self);
+                       G_CALLBACK (on_modified_checkbox_toggled), self);
        }
 }
 
@@ -251,7 +262,7 @@ static void
 on_entry_max (ModestValidatingEntry *self, gpointer user_data)
 {
        ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       show_error (GTK_WINDOW (dialog), _("ckdg_ib_maximum_characters_reached"));
+       show_error (GTK_WINDOW (dialog), _CS("ckdg_ib_maximum_characters_reached"));
 }
 
 static GtkWidget*
@@ -824,7 +835,7 @@ check_data (ModestAccountSettingsDialog *self)
        
                if (name_in_use) {
                        /* Warn the user via a dialog: */
-                       show_error (GTK_WINDOW (self), _("mail_ib_account_name_already_existing"));
+                       hildon_banner_show_information(NULL, NULL, _("mail_ib_account_name_already_existing"));
                
                        return FALSE;
                }
@@ -835,7 +846,7 @@ check_data (ModestAccountSettingsDialog *self)
        if ((!email_address) || (strlen(email_address) == 0))
                return FALSE;
                        
-       if (!modest_text_utils_validate_email_address (email_address)) {
+       if (!modest_text_utils_validate_email_address (email_address, NULL)) {
                /* Warn the user via a dialog: */
                /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/
                hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email"));
@@ -887,14 +898,12 @@ check_data (ModestAccountSettingsDialog *self)
                                if(error == NULL || error->domain != modest_maemo_utils_get_supported_secure_authentication_error_quark() ||
                                                error->code != MODEST_MAEMO_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED)
                                {
-                                       GtkWidget* error_dialog = gtk_message_dialog_new(GTK_WINDOW(self),
-                                                                                        GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
-                                                                                        GTK_BUTTONS_OK, (error != NULL) ? error->message : _("Server does not support secure authentication!"));
-                                       gtk_dialog_run(GTK_DIALOG(error_dialog));
-                                       gtk_widget_destroy(error_dialog);
+                                       show_error (GTK_WINDOW (self), _("Could not discover supported secure authentication methods."));
                                }
 
-                               if(error != NULL) g_error_free(error);
+                               if(error != NULL)
+                                       g_error_free(error);
+                                       
                                /* This is a nasty hack. jschmid. */
                                /* Don't let the dialog close */
                                /*g_signal_stop_emission_by_name (dialog, "response");*/
@@ -902,7 +911,7 @@ check_data (ModestAccountSettingsDialog *self)
                        }
                }
        }
-       
+
        /* TODO: The UI Spec wants us to check that the servernames are valid, 
         * but does not specify how.
         */
@@ -920,7 +929,7 @@ on_response (GtkDialog *wizard_dialog,
        enable_buttons (self);
        
        gboolean prevent_response = FALSE;
-       
+
        /* Warn about unsaved changes: */
        if (response_id == GTK_RESPONSE_CANCEL && self->modified) {
                GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), 
@@ -1464,7 +1473,3 @@ show_ok (GtkWindow *parent_window, const gchar* text)
        hildon_banner_show_information(GTK_WIDGET(
                                                                                                                                                                                gtk_widget_get_parent_window(GTK_WIDGET(parent_window))), NULL, text);
 }
-
-
-
-