gtk+ r21095 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Aug 12 14:45:35 2008
New Revision: 21095
URL: http://svn.gnome.org/viewvc/gtk+?rev=21095&view=rev

Log:
2008-08-12  Michael Natterer  <mitch imendio com>

	* gtk/gtkstatusicon.c (gtk_status_icon_get_gicon): use
	g_return_val_if_fail() now that the function has a return value.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkstatusicon.c

Modified: trunk/gtk/gtkstatusicon.c
==============================================================================
--- trunk/gtk/gtkstatusicon.c	(original)
+++ trunk/gtk/gtkstatusicon.c	Tue Aug 12 14:45:35 2008
@@ -1737,12 +1737,12 @@
 {
   GtkStatusIconPrivate *priv;
 
-  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+  g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL);
 
   priv = status_icon->priv;
 
-  g_return_if_fail (priv->storage_type == GTK_IMAGE_GICON ||
-                    priv->storage_type == GTK_IMAGE_EMPTY);
+  g_return_val_if_fail (priv->storage_type == GTK_IMAGE_GICON ||
+                        priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 
   if (priv->storage_type == GTK_IMAGE_EMPTY)
     priv->image_data.gicon = NULL;