From 34059cf29396d88e2b0841445e4c2a01aa9e75e8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Sep 2004 20:36:31 +0000 Subject: [PATCH] Don't assert that current_focus != NULL, just return FALSE. 2004-09-21 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Don't assert that current_focus != NULL, just return FALSE. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkfilechooserdefault.c | 5 +++-- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d50450f325..ba42d4eeca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-09-21 Matthias Clasen + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): + Don't assert that current_focus != NULL, just return FALSE. + * gtk/gtkpathbar.c (gtk_path_bar_size_request): Give the path bar arrows some more space. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d50450f325..ba42d4eeca 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-09-21 Matthias Clasen + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): + Don't assert that current_focus != NULL, just return FALSE. + * gtk/gtkpathbar.c (gtk_path_bar_size_request): Give the path bar arrows some more space. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d50450f325..ba42d4eeca 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-09-21 Matthias Clasen + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): + Don't assert that current_focus != NULL, just return FALSE. + * gtk/gtkpathbar.c (gtk_path_bar_size_request): Give the path bar arrows some more space. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d50450f325..ba42d4eeca 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-09-21 Matthias Clasen + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): + Don't assert that current_focus != NULL, just return FALSE. + * gtk/gtkpathbar.c (gtk_path_bar_size_request): Give the path bar arrows some more space. diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index d3a9cfdb09..b743d3359c 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -4931,9 +4931,10 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed) g_assert (GTK_IS_WINDOW (toplevel)); current_focus = gtk_window_get_focus (GTK_WINDOW (toplevel)); - g_assert (current_focus != NULL); - if (current_focus == impl->browse_files_tree_view) + if (current_focus == NULL) + return FALSE; + else if (current_focus == impl->browse_files_tree_view) { int num_selected; gboolean all_files, all_folders;