From fd7eda15f1943a3551f83d64cd3f4cccede20c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann?= Date: Tue, 18 Jan 2005 16:01:19 +0000 Subject: [PATCH] Check for NULL detail and NULL widget. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tue Jan 18 10:55:47 2005 Søren Sandmann * gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail and NULL widget. * gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and NULL widget. (#164477, Michael Natterer) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkstyle.c | 8 ++++---- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0017dde57..776a480e9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jan 18 10:55:47 2005 Søren Sandmann + + * gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail + and NULL widget. + + * gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and + NULL widget. (#164477, Michael Natterer) + 2005-01-18 Matthias Clasen Avoid X errors when running against servers which diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b0017dde57..776a480e9a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Jan 18 10:55:47 2005 Søren Sandmann + + * gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail + and NULL widget. + + * gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and + NULL widget. (#164477, Michael Natterer) + 2005-01-18 Matthias Clasen Avoid X errors when running against servers which diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b0017dde57..776a480e9a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Jan 18 10:55:47 2005 Søren Sandmann + + * gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail + and NULL widget. + + * gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and + NULL widget. (#164477, Michael Natterer) + 2005-01-18 Matthias Clasen Avoid X errors when running against servers which diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 691ee65802..141977c238 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -3468,9 +3468,9 @@ gtk_default_draw_box (GtkStyle *style, { GdkGC *gc = style->bg_gc[state_type]; - if (state_type == GTK_STATE_SELECTED && strcmp (detail, "paned") == 0) + if (state_type == GTK_STATE_SELECTED && detail && strcmp (detail, "paned") == 0) { - if (!GTK_WIDGET_HAS_FOCUS (widget)) + if (widget && !GTK_WIDGET_HAS_FOCUS (widget)) gc = style->base_gc[GTK_STATE_ACTIVE]; } @@ -4877,13 +4877,13 @@ gtk_default_draw_handle (GtkStyle *style, detail, x, y, width, height); - if (!strcmp (detail, "paned")) + if (detail && !strcmp (detail, "paned")) { /* we want to ignore the shadow border in paned widgets */ xthick = 0; ythick = 0; - if (state_type == GTK_STATE_SELECTED && !GTK_WIDGET_HAS_FOCUS (widget)) + if (state_type == GTK_STATE_SELECTED && widget && !GTK_WIDGET_HAS_FOCUS (widget)) { GdkColor unfocused_light;