diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-04-30 19:29:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-04-30 19:29:33 +0000 |
| commit | 5eae4ef392169538888ebfa27cf9d892bb4d7e8c (patch) | |
| tree | 0035d35de2104a1d39c81a16eccfbcd7c451e4c8 | |
| parent | abf1066d78243210f6a081033bf71a85b6fe36ca (diff) | |
| download | gdk-pixbuf-5eae4ef392169538888ebfa27cf9d892bb4d7e8c.tar.gz | |
Make sure we always have a color_hash. (#423916, Jens Granseuer)
2007-04-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksettings.c (settings_update_color_scheme):
Make sure we always have a color_hash. (#423916, Jens Granseuer)
svn path=/branches/gtk-2-10/; revision=17749
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gtk/gtksettings.c | 2 |
2 files changed, 10 insertions, 0 deletions
@@ -2,6 +2,14 @@ Merge from trunk: + * gtk/gtksettings.c (settings_update_color_scheme): + Make sure we always have a color_hash. (#423916, Jens + Granseuer) + +2007-04-30 Matthias Clasen <mclasen@redhat.com> + + Merge from trunk: + * gtk/gtkexpander.c (gtk_expander_realize): A NO_WINDOW widget must not set the background of its window. (#433972, Guilherme Polo) diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 746f78c2b..f1468a985 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1668,6 +1668,8 @@ settings_update_color_scheme (GtkSettings *settings) GValue value = { 0, }; data = g_new0 (ColorSchemeData, 1); + data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, + (GDestroyNotify) gdk_color_free); g_object_set_data_full (G_OBJECT (settings), "gtk-color-scheme", data, (GDestroyNotify) color_scheme_data_free); |