murrine r58 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Fri Sep  5 21:08:49 2008
New Revision: 58
URL: http://svn.gnome.org/viewvc/murrine?rev=58&view=rev

Log:
2008-09-05  Andrea Cimitan  <andrea cimitan gmail com>

	* src/murrine_style.c (murrine_widget_is_rgba),
	(murrine_set_widget_parameters):
	Check if widget is not null before proceed asking for the screen


Modified:
   trunk/ChangeLog
   trunk/src/murrine_style.c

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Fri Sep  5 21:08:49 2008
@@ -95,11 +95,17 @@
 static
 boolean murrine_widget_is_rgba (GtkWidget *widget)
 {
-	GdkScreen *screen = gtk_widget_get_screen (widget);
 	boolean use_rgba = FALSE;
+	GdkScreen *screen;
+
+	if (widget)
+		screen = gtk_widget_get_screen (widget);
+	else
+		return use_rgba;
 
 #ifdef HAVE_RGBA
-	if (gdk_screen_is_composited(screen) && gdk_screen_get_rgba_colormap (screen))
+	if (gdk_screen_is_composited(screen) &&
+	    gdk_screen_get_rgba_colormap (screen))
 		use_rgba = (gtk_widget_get_colormap (widget) ==
 		            gdk_screen_get_rgba_colormap (screen));
 #endif
@@ -153,7 +159,8 @@
 		mrn_gradient.gradient_shades[3] = 1.0;
 	}
 	mrn_gradient.gradients = murrine_style->gradients;
-	mrn_gradient.use_rgba = (murrine_widget_is_rgba ((GtkWidget*) widget) && murrine_style->rgba);
+	mrn_gradient.use_rgba = (murrine_widget_is_rgba ((GtkWidget*) widget) &&
+	                         murrine_style->rgba);
 	mrn_gradient.rgba_opacity = GRADIENT_OPACITY;
 
 	MurrineDrawStyles drawstyle = MRN_DRAW_STYLE_MURRINE;