summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 438a2fd05..f529a3601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-06-02 Matthias Clasen <mclasen@redhat.com>
+
+ Merge from trunk:
+
+ * gtk/gtkfilechooserdefault.c:
+ (shortcuts_activate_volume_mount_cb): Ignore G_IO_ERROR_FAILED_HANDLED
+ errors (#532262).
+
+2008-06-02 Matthias Clasen <mclasen@redhat.com>
+
+ Merge from trunk:
+
+ * gtk/gtkfilechooserdefault.c: (location_toggle_popup_handler): Don't
+ try to toggle the visibility of the location entry field in search and
+ recent mode (#526422).
+
2008-06-02 Matthias Clasen <mclasen@redhat.com>
Merge from trunk: