gtk+ r20395 - in trunk: . gtk

[carlosg svn gnome org]

Author: carlosg
Date: Mon Jun 16 10:03:16 2008
New Revision: 20395
URL: http://svn.gnome.org/viewvc/gtk+?rev=20395&view=rev

Log:
2008-06-16  Carlos Garnacho  <carlos imendio com>

        Bug 538519 â GtkCellRendererPixbuf doesn't allow unsetting the icon
        anymore

        * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_set_property):
        Allow again setting any of the properties to render an image back to
        NULL.


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

Modified: trunk/gtk/gtkcellrendererpixbuf.c
==============================================================================
--- trunk/gtk/gtkcellrendererpixbuf.c	(original)
+++ trunk/gtk/gtkcellrendererpixbuf.c	Mon Jun 16 10:03:16 2008
@@ -332,11 +332,8 @@
   switch (param_id)
     {
     case PROP_PIXBUF:
-      if (g_value_get_object (value))
-        {
-          unset_image_properties (cellpixbuf); 
-          cellpixbuf->pixbuf = (GdkPixbuf *) g_value_dup_object (value);
-        }
+      unset_image_properties (cellpixbuf);
+      cellpixbuf->pixbuf = (GdkPixbuf *) g_value_dup_object (value);
       break;
     case PROP_PIXBUF_EXPANDER_OPEN:
       if (cellpixbuf->pixbuf_expander_open)
@@ -349,11 +346,8 @@
       cellpixbuf->pixbuf_expander_closed = (GdkPixbuf*) g_value_dup_object (value);
       break;
     case PROP_STOCK_ID:
-      if (g_value_get_string (value))
-        {
-          unset_image_properties (cellpixbuf);
-          priv->stock_id = g_value_dup_string (value);
-        }
+      unset_image_properties (cellpixbuf);
+      priv->stock_id = g_value_dup_string (value);
       break;
     case PROP_STOCK_SIZE:
       priv->stock_size = g_value_get_uint (value);
@@ -363,21 +357,15 @@
       priv->stock_detail = g_value_dup_string (value);
       break;
     case PROP_ICON_NAME:
-      if (g_value_get_string (value))
-        {
-          unset_image_properties (cellpixbuf);
-          priv->icon_name = g_value_dup_string (value);
-        }
+      unset_image_properties (cellpixbuf);
+      priv->icon_name = g_value_dup_string (value);
       break;
     case PROP_FOLLOW_STATE:
       priv->follow_state = g_value_get_boolean (value);
       break;
     case PROP_GICON:
-      if (g_value_get_object (value))
-        {
-          unset_image_properties (cellpixbuf); 
-          priv->gicon = (GIcon *) g_value_dup_object (value);
-        }
+      unset_image_properties (cellpixbuf);
+      priv->gicon = (GIcon *) g_value_dup_object (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);