Replaced GtkWindow by ModestWindow in several places and viceversa

[modest] / src / widgets / modest-default-global-settings-dialog.c

diff --git a/src/widgets/modest-default-global-settings-dialog.c b/src/widgets/modest-default-global-settings-dialog.c
index e82b9b5..df54c4a 100644 (file)
--- a/src/widgets/modest-default-global-settings-dialog.c
+++ b/src/widgets/modest-default-global-settings-dialog.c
@@ -146,6 +146,7 @@ modest_default_global_settings_dialog_init (ModestDefaultGlobalSettingsDialog *s
                                   MODEST_MARGIN_DOUBLE, MODEST_MARGIN_TRIPLE);
 
        /* Add the buttons: */
+       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
        gtk_dialog_add_button (GTK_DIALOG (self), _HL_SAVE, GTK_RESPONSE_OK);
        gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 
@@ -157,7 +158,7 @@ modest_default_global_settings_dialog_init (ModestDefaultGlobalSettingsDialog *s
        gtk_container_add (GTK_CONTAINER (align), top_vbox);
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), align);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
-       gtk_window_set_default_size (GTK_WINDOW (self), MODEST_DIALOG_WINDOW_MAX_WIDTH, -1);
+       gtk_window_set_default_size (GTK_WINDOW (self), MODEST_DIALOG_WINDOW_MAX_WIDTH, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
 
        gtk_widget_show (align);
        gtk_widget_show (top_vbox);