anjuta r4827 - in trunk: . libanjuta

[jhs svn gnome org]

Author: jhs
Date: Wed Mar  4 14:15:50 2009
New Revision: 4827
URL: http://svn.gnome.org/viewvc/anjuta?rev=4827&view=rev

Log:
2009-03-04  Johannes Schmid  <jhs gnome org>

	* libanjuta/e-splash.c (e_splash_init), (e_splash_set):
	Fixed critical in new splash code

Modified:
   trunk/ChangeLog
   trunk/libanjuta/e-splash.c

Modified: trunk/libanjuta/e-splash.c
==============================================================================
--- trunk/libanjuta/e-splash.c	(original)
+++ trunk/libanjuta/e-splash.c	Wed Mar  4 14:15:50 2009
@@ -97,10 +97,7 @@
 {
 	ESplashPrivate *priv;
 
-	priv = g_new (ESplashPrivate, 1);
-	priv->splash_image_pixbuf = NULL;
-	priv->icon_pixbuf = NULL;
-	priv->title = NULL;
+	priv = g_new0 (ESplashPrivate, 1);
 	priv->progressbar_position = 100;
 	splash->priv = priv;
 }
@@ -282,8 +279,8 @@
 		                  (double) ICON_SIZE / gdk_pixbuf_get_width (icon_pixbuf),
 		                  (double) ICON_SIZE / gdk_pixbuf_get_height (icon_pixbuf),
 		                  GDK_INTERP_HYPER);
-
-		g_object_unref (priv->icon_pixbuf);
+		if (priv->icon_pixbuf)
+			g_object_unref (priv->icon_pixbuf);
 		priv->icon_pixbuf = scaled_pixbuf;
 	}