From 672b17adcbfe8356fac9d46348a762cc755e6e37 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Mon, 30 Jul 2007 08:22:37 +0000 Subject: [PATCH] 2007-07-30 Murray Cumming * src/modest-ui-actions.c: (run_account_setup_wizard), (modest_ui_actions_on_accounts): Revert a change that set these to modal dialogs, freezing the UI when they show secondary dialogs. This fixed projects.maemo.org bug NB#64519. pmo-trunk-r2839 --- ChangeLog | 2 +- ChangeLog2 | 7 +++++++ src/modest-ui-actions.c | 11 +++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index acb6b92..48f7a59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1 +1 @@ -* please check the svn log instead + please check the svn log instead diff --git a/ChangeLog2 b/ChangeLog2 index 3fb7900..63f70a5 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,3 +1,10 @@ +2007-07-30 Murray Cumming + + * src/modest-ui-actions.c: (run_account_setup_wizard), + (modest_ui_actions_on_accounts): Revert a change that set these + to modal dialogs, freezing the UI when they show secondary dialogs. + This fixed projects.maemo.org bug NB#64519. + 2007-07-27 Murray Cumming * src/widgets/modest-header-view-render.c: diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index ebc91d7..9a9aa95 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -150,7 +150,11 @@ run_account_setup_wizard (ModestWindow *win) wizard = modest_easysetup_wizard_dialog_new (); gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); - gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); + + /* Don't make this a modal window, because secondary windows will then + * be unusable, freezing the UI: */ + /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */ + gtk_dialog_run (GTK_DIALOG (wizard)); gtk_widget_destroy (GTK_WIDGET (wizard)); } @@ -529,7 +533,10 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win) /* Show the list of accounts: */ GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ()); gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win)); - gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); + + /* Don't make this a modal window, because secondary windows will then + * be unusable, freezing the UI: */ + /* gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); */ modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); } #else -- 1.7.9.5