summaryrefslogtreecommitdiff
path: root/ChangeLog.pre-2-10
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@ximian.com>2004-11-20 01:39:26 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2004-11-20 01:39:26 +0000
commita006f6623855b66f38101a3ae46a6ecc899179c1 (patch)
treeb830ada58f9bb95f6313f74abda7dfdd556ba03a /ChangeLog.pre-2-10
parent74c146301c24b2dc5146fe3fb3a60ffafb52a26a (diff)
downloadgtk+-a006f6623855b66f38101a3ae46a6ecc899179c1.tar.gz
Merged from gtk-2-4:
2004-11-19 Federico Mena Quintero <federico@ximian.com> Merged from gtk-2-4: Fix #158477: * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): Remove the "save_extra_align" and "browse_extra_align" fields; use a single "extra_align" field. (save_widgets_create): Don't create the save_extra_align. (browse_widgets_create): Don't create the browse_extra_align. (gtk_file_chooser_default_constructor): Create the extra_align here. (set_extra_widget): Add the extra widget to the alignment here, and remove the old one if necessary. (update_appearance): No need to frob the extra widget's alignments anymore. (gtk_file_chooser_default_set_property): No need to call update_appearance() anymore when we set the extra widget. 2004-11-19 Federico Mena Quintero <federico@ximian.com> Merged from gtk-2-4: * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_initial_focus): Don't set the cursor if we are still loading.
Diffstat (limited to 'ChangeLog.pre-2-10')
-rw-r--r--ChangeLog.pre-2-1028
1 files changed, 28 insertions, 0 deletions
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 367c28dac8..9492c15944 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,31 @@
+2004-11-19 Federico Mena Quintero <federico@ximian.com>
+
+ Merged from gtk-2-4:
+
+ Fix #158477:
+
+ * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault):
+ Remove the "save_extra_align" and "browse_extra_align" fields; use
+ a single "extra_align" field.
+ (save_widgets_create): Don't create the save_extra_align.
+ (browse_widgets_create): Don't create the browse_extra_align.
+ (gtk_file_chooser_default_constructor): Create the extra_align
+ here.
+ (set_extra_widget): Add the extra widget to the alignment here,
+ and remove the old one if necessary.
+ (update_appearance): No need to frob the extra widget's alignments
+ anymore.
+ (gtk_file_chooser_default_set_property): No need to call
+ update_appearance() anymore when we set the extra widget.
+
+2004-11-19 Federico Mena Quintero <federico@ximian.com>
+
+ Merged from gtk-2-4:
+
+ * gtk/gtkfilechooserdefault.c
+ (gtk_file_chooser_default_initial_focus): Don't set the cursor if
+ we are still loading.
+
2004-11-18 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-4: