[maemo-commits] [maemo-commits] r13353 - in projects/haf/trunk/sapwood: . src

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-08-22 17:59:46 +0300 (Wed, 22 Aug 2007)
New Revision: 13353

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-draw.c
Log:
Assume 'widget' can be NULL and don't crash

2007-08-22  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* src/sapwood-draw.c (get_window_for_shape, draw_simple_image,
	draw_expander): Assume 'widget' can be NULL and don't crash. Pointed
	out by Frank Li.


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-08-22 14:59:44 UTC (rev 13352)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-08-22 14:59:46 UTC (rev 13353)
@@ -1,3 +1,9 @@
+2007-08-22  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* src/sapwood-draw.c (get_window_for_shape, draw_simple_image,
+	draw_expander): Assume 'widget' can be NULL and don't crash. Pointed
+	out by Frank Li.
+
 2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/sapwood-draw.c (maybe_check_submenu_state): cover menu items in

Modified: projects/haf/trunk/sapwood/src/sapwood-draw.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-08-22 14:59:44 UTC (rev 13352)
+++ projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-08-22 14:59:46 UTC (rev 13353)
@@ -116,7 +116,8 @@
    * Noticed when GtkMenu was changed to do two paints, the other one being on
    * ->bin_window (http://bugzilla.gnome.org/show_bug.cgi?id=169532)
    */
-  if (image->background_shaped && window == widget->window)
+  if (image->background_shaped &&
+      widget && window == widget->window)
     {
       gint window_width;
       gint window_height;
@@ -246,7 +247,7 @@
     }
 
   /* Check for maemo-position-theming to update the position data */
-  if (widget->parent &&
+  if (widget && widget->parent &&
       gtk_widget_class_find_style_property (GTK_WIDGET_GET_CLASS (widget->parent),
                                             "maemo-position-theming"))
     {
@@ -1102,7 +1103,7 @@
                GtkExpanderStyle expander_style)
 {
   ThemeMatchData match_data;
-  gint expander_size;
+  gint expander_size = 10;
 
   g_return_if_fail(style != NULL);
   g_return_if_fail(window != NULL);
@@ -1112,7 +1113,8 @@
    * XXX Might want to introduce proper keywords for expanders some day.
    */
 
-  gtk_widget_style_get (widget, "expander-size", &expander_size, NULL);
+  if (widget)
+    gtk_widget_style_get (widget, "expander-size", &expander_size, NULL);
 
   match_data.function = TOKEN_D_ARROW;
   match_data.detail = (gchar *)detail;