Don't assert that current_focus != NULL, just return FALSE.

2004-09-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond):
	Don't assert that current_focus != NULL, just return FALSE.

diff --git a/ChangeLog b/ChangeLog
index d50450f3253290980f2c7a029fd943826f0e062c..ba42d4eecabe04d42825595a4011f6b13c886b1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 d50450f3253290980f2c7a029fd943826f0e062c..ba42d4eecabe04d42825595a4011f6b13c886b1a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 d50450f3253290980f2c7a029fd943826f0e062c..ba42d4eecabe04d42825595a4011f6b13c886b1a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 d50450f3253290980f2c7a029fd943826f0e062c..ba42d4eecabe04d42825595a4011f6b13c886b1a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-09-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 d3a9cfdb097ff6e3fdb4ce2eedcbb3b539f7fd98..b743d3359c82f6a1b4eed299f877ecf9aa3fec2d 100644 (file)
--- 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;