From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 1 Apr 2018 00:59:35 +0000 (-0400)
Subject: font chooser: Align property defaults
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~703
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=17693a2820fe184c2c3e9ab51ab9ab6f4f6ef9c2;p=gtk4.git

font chooser: Align property defaults

Set the default font chooser level to the same value we use
in the backports, to preserve font chooser behavior.
---

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index d8749e3ac8..57b86d82b8 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -608,8 +608,7 @@ gtk_font_button_init (GtkFontButton *font_button)
   font_button->priv->title = g_strdup (_("Pick a Font"));
   font_button->priv->level = GTK_FONT_CHOOSER_LEVEL_FAMILY |
                              GTK_FONT_CHOOSER_LEVEL_STYLE |
-                             GTK_FONT_CHOOSER_LEVEL_SIZE |
-                             GTK_FONT_CHOOSER_LEVEL_VARIATION;
+                             GTK_FONT_CHOOSER_LEVEL_SIZE;
 
   gtk_font_button_take_font_desc (font_button, NULL);
 
@@ -1196,7 +1195,6 @@ pango_font_description_to_css (PangoFontDescription *desc,
           g_string_append (s, "font-stretch: expanded; ");
           break;
         case PANGO_STRETCH_EXTRA_EXPANDED:
-          g_string_append (s, "font-stretch: extra-expanded; ");
           break;
         case PANGO_STRETCH_ULTRA_EXPANDED:
           g_string_append (s, "font-stretch: ultra-expanded; ");
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 23940af7a5..70ab30a3e5 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -118,8 +118,7 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface)
                           GTK_TYPE_FONT_CHOOSER_LEVEL,
                           GTK_FONT_CHOOSER_LEVEL_FAMILY |
                           GTK_FONT_CHOOSER_LEVEL_STYLE |
-                          GTK_FONT_CHOOSER_LEVEL_SIZE |
-                          GTK_FONT_CHOOSER_LEVEL_VARIATION,
+                          GTK_FONT_CHOOSER_LEVEL_SIZE,
                           GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   /**