css: Stop supporting builtin images
authorMatthias Clasen <mclasen@redhat.com>
Fri, 10 Jan 2020 17:56:47 +0000 (12:56 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 10 Jan 2020 19:32:06 +0000 (14:32 -0500)
Change the default value of -gtk-icon-source to 'none',
and stop parsing 'builtin' as a value.

gtk/gtkcssstylepropertyimpl.c

index 0ebaffeaf7816fb81b33a06a38e1cd758db87542..6a59e702fefb8457a0bc36e42a92f58d7713efad 100644 (file)
@@ -46,7 +46,6 @@
 #include "gtkcssfontfeaturesvalueprivate.h"
 #include "gtkcssiconthemevalueprivate.h"
 #include "gtkcssimageprivate.h"
-#include "gtkcssimagebuiltinprivate.h"
 #include "gtkcssimagevalueprivate.h"
 #include "gtkcssinitialvalueprivate.h"
 #include "gtkcssenumvalueprivate.h"
@@ -677,16 +676,6 @@ css_image_value_parse (GtkCssStyleProperty *property,
   return _gtk_css_image_value_new (image);
 }
 
-static GtkCssValue *
-css_image_value_parse_with_builtin (GtkCssStyleProperty *property,
-                                    GtkCssParser        *parser)
-{
-  if (gtk_css_parser_try_ident (parser, "builtin"))
-    return _gtk_css_image_value_new (gtk_css_image_builtin_new ());
-
-  return css_image_value_parse (property, parser);
-}
-
 static GtkCssValue *
 background_image_value_parse_one (GtkCssParser *parser)
 {
@@ -1512,9 +1501,9 @@ _gtk_css_style_property_init_properties (void)
                                           G_TYPE_NONE,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON,
-                                          css_image_value_parse_with_builtin,
+                                          css_image_value_parse,
                                           NULL,
-                                          _gtk_css_image_value_new (gtk_css_image_builtin_new ()));
+                                          _gtk_css_image_value_new (NULL));
   gtk_css_style_property_register        ("-gtk-icon-size",
                                           GTK_CSS_PROPERTY_ICON_SIZE,
                                           G_TYPE_NONE,