diff options
| author | Carlos Garnacho <carlos@imendio.com> | 2008-06-16 10:03:16 +0000 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@src.gnome.org> | 2008-06-16 10:03:16 +0000 |
| commit | 6afb455e5a7b194b741af1bdb74f0a9292f6b7e0 (patch) | |
| tree | 49c0896a7554565d7df81ca86b5c41e4d1ade4b1 /gtk/gtkcellrendererpixbuf.c | |
| parent | 0fc1f3aeedfb264e780823477d30ab5f7be70745 (diff) | |
| download | gtk+-6afb455e5a7b194b741af1bdb74f0a9292f6b7e0.tar.gz | |
Bug 538519 – GtkCellRendererPixbuf doesn't allow unsetting the icon
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.
svn path=/trunk/; revision=20395
Diffstat (limited to 'gtk/gtkcellrendererpixbuf.c')
| -rw-r--r-- | gtk/gtkcellrendererpixbuf.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index fa51cea223..12dc76662a 100644 --- a/gtk/gtkcellrendererpixbuf.c +++ b/gtk/gtkcellrendererpixbuf.c @@ -332,11 +332,8 @@ gtk_cell_renderer_pixbuf_set_property (GObject *object, 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 @@ gtk_cell_renderer_pixbuf_set_property (GObject *object, 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 @@ gtk_cell_renderer_pixbuf_set_property (GObject *object, 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); |