From e14ad12b3ff6b41b4f429171ba3ec3717cc6b4c8 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 29 Sep 2005 01:56:10 +0000 Subject: [PATCH] Oops, return if the unmap test fails. (test_reload_sequence): Use 2005-09-28 Federico Mena Quintero * tests/autotestfilechooser.c (test_reload_sequence): Oops, return if the unmap test fails. (test_reload_sequence): Use gtk_widget_show_now() instead of gtk_widget_show() for the dialog. Thanks to Tim Janik for noticing these. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ tests/autotestfilechooser.c | 8 +++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bef2a58412..84e0de75e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-09-28 Federico Mena Quintero + + * tests/autotestfilechooser.c (test_reload_sequence): Oops, return + if the unmap test fails. + (test_reload_sequence): Use gtk_widget_show_now() instead of + gtk_widget_show() for the dialog. + Thanks to Tim Janik for noticing these. + 2005-09-28 Federico Mena Quintero * tests/testcellrenderertext.c: New file with a set of tests for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bef2a58412..84e0de75e0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2005-09-28 Federico Mena Quintero + + * tests/autotestfilechooser.c (test_reload_sequence): Oops, return + if the unmap test fails. + (test_reload_sequence): Use gtk_widget_show_now() instead of + gtk_widget_show() for the dialog. + Thanks to Tim Janik for noticing these. + 2005-09-28 Federico Mena Quintero * tests/testcellrenderertext.c: New file with a set of tests for diff --git a/tests/autotestfilechooser.c b/tests/autotestfilechooser.c index 10f26c591f..7597bf52a5 100644 --- a/tests/autotestfilechooser.c +++ b/tests/autotestfilechooser.c @@ -257,7 +257,7 @@ test_action_widgets (void) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - gtk_widget_show (dialog); + gtk_widget_show_now (dialog); action = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog)); @@ -322,7 +322,7 @@ test_reload_sequence (gboolean set_folder_before_map) /* After mapping, it is loading some folder, either the one that was explicitly set or the default one */ - gtk_widget_show (dialog); + gtk_widget_show_now (dialog); passed = (impl->current_folder != NULL && impl->browse_files_model != NULL @@ -347,10 +347,12 @@ test_reload_sequence (gboolean set_folder_before_map) && ((impl->load_state == LOAD_LOADING || impl->load_state == LOAD_FINISHED) ? (impl->load_timeout_id == 0 && impl->sort_model != NULL) : TRUE)); + if (!passed) + return FALSE; /* Map it again! */ - gtk_widget_show (dialog); + gtk_widget_show_now (dialog); passed = (impl->current_folder != NULL && impl->browse_files_model != NULL