From 865dd1f3ffe2a722f9eabf9630b4fc477acaa9e2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Oct 2008 15:34:53 +0000 Subject: [PATCH] Don't forget to reset reload_state when current_folder is already correct. 2008-10-08 Matthias Clasen * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb): Don't forget to reset reload_state when current_folder is already correct. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=465992 svn path=/branches/gtk-2-14/; revision=21610 --- ChangeLog | 8 ++++++++ gtk/gtkfilechooserdefault.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2fd075ec9..89f28b94f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-08 Matthias Clasen + + Merged from trunk: + + * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb): + Don't forget to reset reload_state when current_folder is already + correct. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=465992 + 2008-10-06 Matthias Clasen Merged from trunk: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index a6f266e78e..16759a1673 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -6912,10 +6912,10 @@ update_current_folder_get_info_cb (GCancellable *cancellable, g_object_unref (impl->current_folder); impl->current_folder = g_object_ref (data->file); - - impl->reload_state = RELOAD_HAS_FOLDER; } + impl->reload_state = RELOAD_HAS_FOLDER; + /* Update the widgets that may trigger a folder change themselves. */ if (!impl->changing_folder)