Protect against NULL widget. (#379503)

2006-11-26  Benjamin Berg  <benjamin@sipsolutions.net>

	* gtk/gtkstyle.c: (gtk_default_draw_flat_box): Protect against NULL
	  widget. (#379503)

diff --git a/ChangeLog b/ChangeLog
index e18f9e8910d0bb046c8236087d9155e33cde0b2b..dc2ef109943ac09618741b7d6a782830225e8432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-26  Benjamin Berg  <benjamin@sipsolutions.net>
+
+       * gtk/gtkstyle.c: (gtk_default_draw_flat_box): Protect against NULL
+         widget. (#379503)
+
 2006-11-25  Matthias Clasen  <mclasen@redhat.com>
 
        * modules/printbackends/cups/gtkprintbackendcups.c: Make

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 0b56a0bbc42435d728ecf9db54c41b36212d3d5e..ed177917b5c176b67cdd837658f3536b295d7255 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -3435,7 +3435,7 @@ gtk_default_draw_flat_box (GtkStyle      *style,
                   !strcmp ("cell_even_ruled_sorted", detail))
             {
              /* This has to be really broken; alex made me do it. -jrb */
-             if (GTK_WIDGET_HAS_FOCUS (widget))
+             if (widget && GTK_WIDGET_HAS_FOCUS (widget))
                gc1 = style->base_gc[state_type];
              else
                gc1 = style->base_gc[GTK_STATE_ACTIVE];
@@ -3443,7 +3443,7 @@ gtk_default_draw_flat_box (GtkStyle      *style,
          else if (!strcmp ("cell_odd_ruled", detail) ||
                   !strcmp ("cell_odd_ruled_sorted", detail))
            {
-             if (GTK_WIDGET_HAS_FOCUS (widget))
+             if (widget && GTK_WIDGET_HAS_FOCUS (widget))
                freeme = get_darkened_gc (window, &style->base[state_type], 1);
              else
                freeme = get_darkened_gc (window, &style->base[GTK_STATE_ACTIVE], 1);