diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2005-12-19 05:28:49 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-12-19 05:28:49 +0000 |
| commit | af467cfb654135daf66fdf6d0cf14f6ae9aeb01c (patch) | |
| tree | 87c56ae814c7841888de5718fc4ce12e56249b91 | |
| parent | d88e9fe58d3afb14a2c4bb2823aea5fc0355144c (diff) | |
| download | gtk+-af467cfb654135daf66fdf6d0cf14f6ae9aeb01c.tar.gz | |
Fix a crash
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtksettings.c | 3 |
3 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2005-12-17 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtksettings.c (get_color_hash): Don't crash if + there is no color scheme. (#324429, Diego Gonzalez) + 2005-12-16 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfilesystem.c (gtk_file_system_module_load): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c0957a8e50..0605fee1b5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-12-17 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtksettings.c (get_color_hash): Don't crash if + there is no color scheme. (#324429, Diego Gonzalez) + 2005-12-16 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfilesystem.c (gtk_file_system_module_load): diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 399c8e78f7..1199c452e3 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1749,6 +1749,9 @@ get_color_hash (GtkSettings *settings) data = (ColorSchemeData *)g_object_get_data (G_OBJECT (settings), "gtk-color-scheme"); + if (!data) + return NULL; + return data->color_hash; } |