From 9032abed7cacce3fd6467b9fef20c8bc9bda9a1a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 27 Jan 2005 20:08:56 +0000 Subject: [PATCH] Merged from gtk-2-6: 2005-01-27 Federico Mena Quintero Merged from gtk-2-6: * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_path): Oops, don't assert that we can't reach the end of the function; this happens if we are still loading but don't need a path change. Fixes #165213. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkfilechooserdefault.c | 3 +-- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 937086d65d..ad525a6ded 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-01-27 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilechooserdefault.c + (gtk_file_chooser_default_select_path): Oops, don't assert that we + can't reach the end of the function; this happens if we are still + loading but don't need a path change. Fixes #165213. + 2005-01-27 Matthias Clasen * gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 937086d65d..ad525a6ded 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-01-27 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilechooserdefault.c + (gtk_file_chooser_default_select_path): Oops, don't assert that we + can't reach the end of the function; this happens if we are still + loading but don't need a path change. Fixes #165213. + 2005-01-27 Matthias Clasen * gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 937086d65d..ad525a6ded 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-01-27 Federico Mena Quintero + + Merged from gtk-2-6: + + * gtk/gtkfilechooserdefault.c + (gtk_file_chooser_default_select_path): Oops, don't assert that we + can't reach the end of the function; this happens if we are still + loading but don't need a path change. Fixes #165213. + 2005-01-27 Matthias Clasen * gtk/gtkaboutdialog.c: Some visual tweaks to the about dialog, diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 46782e3d51..77a14c4c13 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -4848,8 +4848,7 @@ gtk_file_chooser_default_select_path (GtkFileChooser *chooser, return result; } - g_assert_not_reached (); - return FALSE; + return TRUE; } static void -- GitLab