diff options
author | Owen Taylor <otaylor@redhat.com> | 2002-09-07 00:35:57 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2002-09-07 00:35:57 +0000 |
commit | 11c662717471e8252f4c26ef44f59a2b29865787 (patch) | |
tree | bfb8721bdbe131266d128dfa1d917ee8a3a43ddb /modules | |
parent | b413cff130003b670c1918357ad7f94b86aea29e (diff) | |
download | gdk-pixbuf-11c662717471e8252f4c26ef44f59a2b29865787.tar.gz |
Account for the possibility of detail == NULL (#89561, Hongli Lai)
Fri Sep 6 20:32:45 2002 Owen Taylor <otaylor@redhat.com>
* pixbuf-draw.c: Account for the possibility of detail == NULL
(#89561, Hongli Lai)
Diffstat (limited to 'modules')
-rw-r--r-- | modules/engines/pixbuf/ChangeLog | 5 | ||||
-rw-r--r-- | modules/engines/pixbuf/pixbuf-draw.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog index d6b717ba8..d864854f9 100644 --- a/modules/engines/pixbuf/ChangeLog +++ b/modules/engines/pixbuf/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 6 20:32:45 2002 Owen Taylor <otaylor@redhat.com> + + * pixbuf-draw.c: Account for the possibility of detail == NULL + (#89561, Hongli Lai) + Sun Apr 21 14:10:04 2002 Owen Taylor <otaylor@redhat.com> * pixbuf-rc-style.c pixbuf.h pixbuf-draw.c: Add a fake STEPPER diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c index 9aef0ea78..3796816b4 100644 --- a/modules/engines/pixbuf/pixbuf-draw.c +++ b/modules/engines/pixbuf/pixbuf-draw.c @@ -485,7 +485,8 @@ draw_arrow (GtkStyle *style, g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); - if (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0) + if (detail && + (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0)) { /* This is a hack to work around the fact that scrollbar steppers are drawn * as a box + arrow, so we never have @@ -637,7 +638,8 @@ draw_box (GtkStyle *style, g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); - if (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0) + if (detail && + (strcmp (detail, "hscrollbar") == 0 || strcmp (detail, "vscrollbar") == 0)) { /* We handle this in draw_arrow */ return; |