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 d8749e3ac89ec801d2f4ec069a762c186adba3c1..57b86d82b825e4615cd87ca9c8ce88a153e9247a 100644 (file)
--- 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 23940af7a5c33e2f59822159264e8579a6761a68..70ab30a3e5df2eae1f3f105a76860be7e0cffedc 100644 (file)
--- 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));
 
   /**