diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 1997-11-28 06:47:01 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1997-11-28 06:47:01 +0000 |
| commit | b50a9f760b38081e06559e3baf229fc0bb8ef3d5 (patch) | |
| tree | cec1defb87837a7fd6973e553ba07a9bdf116d2f /gtk/gtkwindow.c | |
| parent | ebdcd27f1569045a2e608d71c12b1dbca1b0d3d1 (diff) | |
| download | gtk+-b50a9f760b38081e06559e3baf229fc0bb8ef3d5.tar.gz | |
Misc fixes for color changing stuff
Diffstat (limited to 'gtk/gtkwindow.c')
| -rw-r--r-- | gtk/gtkwindow.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 8ae112adf8..90cfc844b9 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -841,16 +841,20 @@ gtk_window_style_set_event (GtkWidget *widget, if(gdk_property_get (GDK_ROOT_PARENT(), atom_default_colors, - GDK_NONE, + gdk_atom_intern("STRING", FALSE), 0, sizeof(GdkColor) * GTK_STYLE_NUM_STYLECOLORS(), FALSE, &realtype, &retfmt, &retlen, - (guchar **)&data) != TRUE - || retfmt != sizeof(gushort)) { - g_warning("gdk_property_get() failed in _GTK_STYLE_CHANGED\n"); + (guchar **)&data) != TRUE) { + g_warning("gdk_property_get() failed in _GTK_STYLE_CHANGED handler\n"); + return; + } + if(retfmt != sizeof(gushort)*8) { + g_warning("retfmt (%d) != sizeof(gushort)*8 (%d)\n", retfmt, + sizeof(gushort)*8); return; } /* We have the color data, now let's interpret it */ |