* Fixes NB#86773, wait until the message is added to the queue to end the mail opera...

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

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index c7f84a7..5592be1 100644 (file)
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -217,7 +217,11 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
 
        ppriv->updating_page = create_updating_page (self);
        ppriv->composing_page = create_composing_page (self);
-    
+
+       /* Add the buttons: */
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
+
        /* Set the default focusable widgets */
        g_object_set_data (G_OBJECT(ppriv->updating_page), DEFAULT_FOCUS_WIDGET,
                           (gpointer)ppriv->auto_update);
@@ -233,7 +237,7 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
 
-       gtk_window_set_default_size (GTK_WINDOW (self), -1, 300);
+       gtk_window_set_default_size (GTK_WINDOW (self), 700, 300);
 
        g_signal_connect (G_OBJECT (self), "key-press-event",
                          G_CALLBACK (on_inner_tabs_key_pressed), self);
@@ -510,7 +514,7 @@ on_inner_tabs_key_pressed (GtkWidget *widget,
 
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
 
-       if (widget == user_data) {
+       if (widget == ppriv->notebook) {
                if (event->keyval == GDK_Right) {
                        gtk_notebook_next_page (GTK_NOTEBOOK (ppriv->notebook));
                        retval = TRUE;