summaryrefslogtreecommitdiff
path: root/ChangeLog.pre-2-6
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@ximian.com>2004-06-11 00:47:51 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2004-06-11 00:47:51 +0000
commitbb6dd7da57e1a937a140af3bbd260423c05961b5 (patch)
tree2045ecbe34c171ff96b8ca6563598210bab0dafb /ChangeLog.pre-2-6
parent2fb484d7cc4ae666a7332b9a4fe9a9ffa2da52c5 (diff)
downloadgdk-pixbuf-bb6dd7da57e1a937a140af3bbd260423c05961b5.tar.gz
Merge from HEAD:
2004-06-10 Federico Mena Quintero <federico@ximian.com> Merge from HEAD: Fixes #144110, patch by Bastien Nocera <hadess@hadess.net>. * gtk/gtkfilechooser.c (gtk_file_chooser_list_shortcut_folders): Refer to gtk_file_chooser_add_shortcut_folder(). (gtk_file_chooser_list_shortcut_folder_uris): Refer to gtk_file_chooser_add_shortcut_folder_uri().
Diffstat (limited to 'ChangeLog.pre-2-6')
-rw-r--r--ChangeLog.pre-2-611
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 39034c30b..0ff849e21 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2004-06-10 Federico Mena Quintero <federico@ximian.com>
+
+ Merge from HEAD:
+
+ Fixes #144110, patch by Bastien Nocera <hadess@hadess.net>.
+
+ * gtk/gtkfilechooser.c (gtk_file_chooser_list_shortcut_folders):
+ Refer to gtk_file_chooser_add_shortcut_folder().
+ (gtk_file_chooser_list_shortcut_folder_uris): Refer to
+ gtk_file_chooser_add_shortcut_folder_uri().
+
Thu Jun 10 00:36:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Start