3.6.4

It's a lot uglier now, but it shouldn't crash anymore.

We must update the font description for animations, but we can't free it
on query, because some paths call gtk_style_context_get_font() twice in
a row without stopping the use of the first call. So us just creating a
new font description all the time and unreffing the old one is not a
good idea. So we just mere the new one into the old one.

https://bugzilla.gnome.org/show_bug.cgi?id=691186

NEWS

@@ -1,8 +1,16 @@
+Overview of Changes in GTK+ 3.6.4
+=================================
+
+* Bug fixes:
+ 691186 stylecontext: Make font hack not crash
+
+
 Overview of Changes in GTK+ 3.6.3
 =================================
 
 * The Wayland backend works with Wayland 1.0.0 now
 
+
 * Bug fixes:
  132333 Can't add a palette to the dialog of a color button
  371034 Doc for gtk_file_chooser_get_filename: Is the resulting...

configure.ac

@@ -10,8 +10,8 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [6])
-m4_define([gtk_micro_version], [3])
-m4_define([gtk_interface_age], [3])
+m4_define([gtk_micro_version], [4])
+m4_define([gtk_interface_age], [4])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],

gtk/gtkstylecontext.c

@@ -3508,7 +3508,7 @@ gtk_style_context_get_font (GtkStyleContext *context,
 {
   GtkStyleContextPrivate *priv;
   StyleData *data;
-  PangoFontDescription *description;
+  PangoFontDescription *description, *previous;
 
   g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
 
@@ -3520,10 +3520,22 @@ gtk_style_context_get_font (GtkStyleContext *context,
   /* Yuck, fonts are created on-demand but we don't return a ref.
    * Do bad things to achieve this requirement */
   gtk_style_context_get (context, state, "font", &description, NULL);
-  g_object_set_data_full (G_OBJECT (data->store),
-                          "font-cache-for-get_font",
-                          description,
-                          (GDestroyNotify) pango_font_description_free);
+  
+  previous = g_object_get_data (G_OBJECT (data->store), "font-cache-for-get_font");
+
+  if (previous)
+    {
+      pango_font_description_merge (previous, description, TRUE);
+      pango_font_description_free (description);
+      description = previous;
+    }
+  else
+    {
+      g_object_set_data_full (G_OBJECT (data->store),
+                              "font-cache-for-get_font",
+                              description,
+                              (GDestroyNotify) pango_font_description_free);
+    }
 
   return description;
 }

tests/a11y/about.txt

@@ -91,7 +91,7 @@ window1
           "page tab"
           parent: unnamed-GtkNotebookAccessible-3
           index: 0
-          state: enabled selectable selected showing visible
+          state: enabled showing visible
           <AtkComponent>
           layer: widget
           alpha: 1

tests/a11y/combos.txt

@@ -73,7 +73,7 @@ window1
         "menu"
         parent: combo1
         index: 0
-        state: enabled selectable sensitive
+        state: enabled sensitive
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -95,7 +95,7 @@ window1
         "menu"
         parent: combo2
         index: 0
-        state: enabled selectable sensitive
+        state: enabled sensitive
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -105,7 +105,7 @@ window1
         "text"
         parent: combo2
         index: 1
-        state: editable enabled focusable selectable sensitive single-line visible
+        state: editable enabled focusable sensitive single-line visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
@@ -157,7 +157,7 @@ window1
         "menu"
         parent: combo3
         index: 0
-        state: enabled selectable sensitive
+        state: enabled sensitive
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -179,7 +179,7 @@ window1
         "menu"
         parent: combo4
         index: 0
-        state: enabled selectable sensitive
+        state: enabled sensitive
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -189,7 +189,7 @@ window1
         "text"
         parent: combo4
         index: 1
-        state: editable enabled focusable selectable sensitive single-line visible
+        state: editable enabled focusable sensitive single-line visible
         toolkit: gtk
         <AtkComponent>
         layer: widget

tests/a11y/menu.txt

@@ -21,7 +21,7 @@ window1
       parent: menubar1
       index: 0
       name: File
-      state: enabled selectable sensitive showing visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: popup
@@ -35,7 +35,7 @@ window1
         parent: menuitem1
         index: 0
         name: New
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -49,7 +49,7 @@ window1
         parent: menuitem1
         index: 1
         name: Open
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -66,7 +66,7 @@ window1
           member-of: radiomenuitem3
                      radiomenuitem2
                      radiomenuitem1
-          state: checked enabled selectable sensitive visible
+          state: checked enabled sensitive visible
           toolkit: gtk
           <AtkComponent>
           layer: popup
@@ -82,7 +82,7 @@ window1
           member-of: radiomenuitem3
                      radiomenuitem2
                      radiomenuitem1
-          state: enabled selectable sensitive visible
+          state: enabled sensitive visible
           toolkit: gtk
           <AtkComponent>
           layer: popup
@@ -98,7 +98,7 @@ window1
           member-of: radiomenuitem3
                      radiomenuitem2
                      radiomenuitem1
-          state: enabled selectable sensitive visible
+          state: enabled sensitive visible
           toolkit: gtk
           <AtkComponent>
           layer: popup
@@ -111,7 +111,7 @@ window1
         parent: menuitem1
         index: 2
         name: Save
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -125,7 +125,7 @@ window1
         parent: menuitem1
         index: 3
         name: Save As
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -138,7 +138,7 @@ window1
         "separator"
         parent: menuitem1
         index: 4
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -150,7 +150,7 @@ window1
         parent: menuitem1
         index: 5
         name: awesome
-        state: selectable sensitive visible indeterminate
+        state: sensitive visible indeterminate
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -162,7 +162,7 @@ window1
         "separator"
         parent: menuitem1
         index: 6
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -174,7 +174,7 @@ window1
         parent: menuitem1
         index: 7
         name: Quit
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -188,7 +188,7 @@ window1
       parent: menubar1
       index: 1
       name: Edit
-      state: enabled selectable sensitive showing visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: popup
@@ -202,7 +202,7 @@ window1
         parent: menuitem2
         index: 0
         name: Cut
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -216,7 +216,7 @@ window1
         parent: menuitem2
         index: 1
         name: Copy
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -230,7 +230,7 @@ window1
         parent: menuitem2
         index: 2
         name: Paste
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -244,7 +244,7 @@ window1
         parent: menuitem2
         index: 3
         name: Delete
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -258,7 +258,7 @@ window1
       parent: menubar1
       index: 2
       name: View
-      state: enabled selectable sensitive showing visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: popup
@@ -272,7 +272,7 @@ window1
       parent: menubar1
       index: 3
       name: Help
-      state: enabled selectable sensitive showing visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: popup
@@ -286,7 +286,7 @@ window1
         parent: menuitem4
         index: 0
         name: About
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup

tests/a11y/menus.txt

@@ -21,7 +21,7 @@ window1
       parent: menubar1
       index: 0
       name: File
-      state: enabled selectable sensitive showing visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: popup
@@ -35,7 +35,7 @@ window1
         parent: menuitem1
         index: 0
         name: New
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -49,7 +49,7 @@ window1
         parent: menuitem1
         index: 1
         name: bla
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -61,7 +61,7 @@ window1
         "separator"
         parent: menuitem1
         index: 2
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -73,7 +73,7 @@ window1
         parent: menuitem1
         index: 3
         name: check item
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -86,7 +86,7 @@ window1
       parent: menubar1
       index: 1
       name: Edit
-      state: enabled selectable sensitive showing visible
+      state: enabled sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: popup
@@ -102,7 +102,7 @@ window1
         name: radio1
         member-of: menuitem5
                    menuitem4
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup
@@ -117,7 +117,7 @@ window1
         name: radio2
         member-of: menuitem5
                    menuitem4
-        state: enabled selectable sensitive visible
+        state: enabled sensitive visible
         toolkit: gtk
         <AtkComponent>
         layer: popup

tests/a11y/notebook.txt

@@ -22,7 +22,7 @@ window1
       parent: notebook1
       index: 0
       name: Tab 1
-      state: enabled multi-line selectable selected sensitive showing visible
+      state: enabled multi-line sensitive showing visible
       <AtkComponent>
       layer: widget
       alpha: 1
@@ -46,7 +46,7 @@ window1
       parent: notebook1
       index: 1
       name: Tab 2
-      state: enabled multi-line selectable sensitive showing visible
+      state: enabled multi-line sensitive showing visible
       <AtkComponent>
       layer: widget
       alpha: 1

tests/a11y/pickers.txt

@@ -55,7 +55,7 @@ window1
           "menu"
           parent: unnamed-GtkComboBoxAccessible-1
           index: 0
-          state: enabled selectable sensitive
+          state: enabled sensitive
           toolkit: gtk
           <AtkComponent>
           layer: popup
@@ -65,7 +65,7 @@ window1
             "menu item"
             parent: unnamed-GtkMenuAccessible-2
             index: 0
-            state: enabled selectable sensitive visible
+            state: enabled sensitive visible
             toolkit: gtk
             <AtkComponent>
             layer: popup
@@ -78,7 +78,7 @@ window1
             parent: unnamed-GtkMenuAccessible-2
             index: 1
             name: Desktop
-            state: enabled selectable sensitive visible
+            state: enabled sensitive visible
             toolkit: gtk
             <AtkComponent>
             layer: popup
@@ -91,7 +91,7 @@ window1
             parent: unnamed-GtkMenuAccessible-2
             index: 2
             name: File System
-            state: enabled selectable sensitive visible
+            state: enabled sensitive visible
             toolkit: gtk
             <AtkComponent>
             layer: popup
@@ -103,7 +103,7 @@ window1
             "separator"
             parent: unnamed-GtkMenuAccessible-2
             index: 3
-            state: enabled selectable sensitive visible
+            state: enabled sensitive visible
             toolkit: gtk
             <AtkComponent>
             layer: popup
@@ -114,7 +114,7 @@ window1
             "separator"
             parent: unnamed-GtkMenuAccessible-2
             index: 4
-            state: enabled selectable sensitive visible
+            state: enabled sensitive visible
             toolkit: gtk
             <AtkComponent>
             layer: popup
@@ -126,7 +126,7 @@ window1
             parent: unnamed-GtkMenuAccessible-2
             index: 5
             name: Other...
-            state: enabled selectable sensitive visible
+            state: enabled sensitive visible
             toolkit: gtk
             <AtkComponent>
             layer: popup
@@ -179,7 +179,7 @@ window1
         "menu"
         parent: button1
         index: 0
-        state: enabled selectable sensitive
+        state: enabled sensitive
         toolkit: gtk
         <AtkComponent>
         layer: popup