icon-helper: remove useless checks
When we change storage type, we always clear the rest of the object, so these checks do not add any safety.
This commit is contained in:
		@ -502,54 +502,36 @@ _gtk_icon_helper_get_pixel_size (GtkIconHelper *self)
 | 
				
			|||||||
GdkPixbuf *
 | 
					GdkPixbuf *
 | 
				
			||||||
_gtk_icon_helper_peek_pixbuf (GtkIconHelper *self)
 | 
					_gtk_icon_helper_peek_pixbuf (GtkIconHelper *self)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_PIXBUF ||
 | 
					 | 
				
			||||||
                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  return self->priv->orig_pixbuf;
 | 
					  return self->priv->orig_pixbuf;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GIcon *
 | 
					GIcon *
 | 
				
			||||||
_gtk_icon_helper_peek_gicon (GtkIconHelper *self)
 | 
					_gtk_icon_helper_peek_gicon (GtkIconHelper *self)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_GICON ||
 | 
					 | 
				
			||||||
                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  return self->priv->gicon;
 | 
					  return self->priv->gicon;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GdkPixbufAnimation *
 | 
					GdkPixbufAnimation *
 | 
				
			||||||
_gtk_icon_helper_peek_animation (GtkIconHelper *self)
 | 
					_gtk_icon_helper_peek_animation (GtkIconHelper *self)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_ANIMATION ||
 | 
					 | 
				
			||||||
                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  return self->priv->animation;
 | 
					  return self->priv->animation;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GtkIconSet *
 | 
					GtkIconSet *
 | 
				
			||||||
_gtk_icon_helper_peek_icon_set (GtkIconHelper *self)
 | 
					_gtk_icon_helper_peek_icon_set (GtkIconHelper *self)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_ICON_SET ||
 | 
					 | 
				
			||||||
                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  return self->priv->icon_set;
 | 
					  return self->priv->icon_set;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const gchar *
 | 
					const gchar *
 | 
				
			||||||
_gtk_icon_helper_get_stock_id (GtkIconHelper *self)
 | 
					_gtk_icon_helper_get_stock_id (GtkIconHelper *self)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_STOCK ||
 | 
					 | 
				
			||||||
                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  return self->priv->stock_id;
 | 
					  return self->priv->stock_id;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const gchar *
 | 
					const gchar *
 | 
				
			||||||
_gtk_icon_helper_get_icon_name (GtkIconHelper *self)
 | 
					_gtk_icon_helper_get_icon_name (GtkIconHelper *self)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  g_return_val_if_fail (self->priv->storage_type == GTK_IMAGE_ICON_NAME ||
 | 
					 | 
				
			||||||
                        self->priv->storage_type == GTK_IMAGE_EMPTY, NULL);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  return self->priv->icon_name;
 | 
					  return self->priv->icon_name;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user