summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-09-12 03:16:46 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-09-12 03:16:46 +0000
commit3083a903d16ee77e7fd27f7d96f0abf9fbd2d2ae (patch)
tree6a26e18d8eec1d96bd9c07d60e3abc907f863a63
parent1db39506abcfbb33cb0e71429a7d73ef8f318d76 (diff)
downloadgtk+-3083a903d16ee77e7fd27f7d96f0abf9fbd2d2ae.tar.gz
Bug 542523 - GtkTextTag should handle setting properties to NULL
* gtk/gtktexttag.c (gtk_text_tag_set_property): Unset the color when setting it to NULL instead of displaying a warning. svn path=/branches/gtk-2-12/; revision=21357
-rw-r--r--ChangeLog53
1 files changed, 53 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ad65250733..85df5f0db9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,59 @@
Merged from trunk:
+ Bug 542523 - GtkTextTag should handle setting properties to NULL
+
+ * gtk/gtktexttag.c (gtk_text_tag_set_property): Unset the color when
+ setting it to NULL instead of displaying a warning.
+ Patch by Xavier Claessens
+
+2008-09-11 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
+ Bug 479780 – Bookmarks in left pane of FileChooser cannot be renamed
+
+ * gtk/gtkfilechooserdefault.c (shortcuts_build_popup_menu):
+ Call shortcuts_check_popup_sensitivity() every time the
+ menu is popped up. Problem reported by Hong Jen Yee
+
+2008-09-11 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
+ * gtk/gtkfilechooserbutton.c (update_label_and_image): Unset
+ the image when the label is set to "(None)". Reported by
+ Neil Roberts
+
+2008-09-11 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
+ * gtk/gtkuimanager.c (update_node): Skip update of accelerator
+ child node if it has no associated action. Fixes #541950.
+ Patch by Christian Neumair
+
+2008-09-11 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
+ Bug 528845 – segv from GtkBuilder on attempting <accelerator> under
+ GtkCellView
+
+ * gtk/gtkcellview.c: Don't blindly chain up in the buildable
+ implementation. Reported by Kevin Ryde.
+
+2008-09-11 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
+ Bug 541645 – gtkfilechooserdefault segfaults when bookmark does not
+ contain ://
+
+2008-09-11 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
Bug 479780 – Bookmarks in left pane of FileChooser cannot be renamed
* gtk/gtkfilechooserdefault.c (shortcuts_build_popup_menu):