summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-10-08 15:34:53 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-10-08 15:34:53 +0000
commit865dd1f3ffe2a722f9eabf9630b4fc477acaa9e2 (patch)
tree481da208b674691ddd694f569e640742ead54e96
parent6235e5c9edd88cac3ec0b91e547796e428596b1a (diff)
downloadgdk-pixbuf-865dd1f3ffe2a722f9eabf9630b4fc477acaa9e2.tar.gz
Don't forget to reset reload_state when current_folder is already correct.
2008-10-08 Matthias Clasen <mclasen@redhat.com> * 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
-rw-r--r--ChangeLog8
-rw-r--r--gtk/gtkfilechooserdefault.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2fd075ec..89f28b94f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-08 Matthias Clasen <mclasen@redhat.com>
+
+ 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 <mclasen@redhat.com>
Merged from trunk:
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index a6f266e78..16759a167 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)