3.12.1

We are keeping references on the widget we are handling as we
are iterating up, but that doesn't protect us against the entire
tree being axed from inside gtk_widget_handle_event.
https://bugzilla.gnome.org/show_bug.cgi?id=727644

NEWS

@@ -1,3 +1,46 @@
+Overview of Changes in GTK+ 3.12.0 to 3.12.1
+============================================
+
+* Bug fixes:
+ 712752 GtkClipboard: add _get_default and _get_primary
+ 722058 GtkTreeModelFilter bug
+ 722817 Add gobject-introspection for GdkWin32
+ 726298 gtk-font-name isn't correctly handled on Windows
+ 726475 After looking at Asielriot solitare, I get rendering glitches...
+ 726859 Assertion/crash if gtk_radio_menu_item_set_group() is called twice
+ 726870 all: Name more idles and timeouts
+ 726871 treeview: Lower the duration of validation iterations
+ 726996 Label-for/Labelled-by AtkRelations missing for containers in ...
+ 727009 redefinition of GtkPrinterCloudprint: cloudprint fails to build
+ 727022 W32: Both inc- and dec-buttons on GtkSpinbutton are "inc"
+ 727035 W32: Combobox button is drawn with two arrows
+ 727036 W32: Combobox dropdown color is button-gray instead of window-white
+ 727037 W32: Menu items look thin, while submenu arrows are huge
+ 727075 W32: Combobox (with an entry) is gigantic
+ 727078 W32: GtkPopover is transparent and non-interactable
+ 727080 W32: Window re-size grip looks UGLY.
+ 727210 W32: Prelight doesn't apply to check/radio marks
+ 727211 W32: Selection background color applies to check/radio marks
+ 727213 W32: Notebook widget is not styled correctly
+ 727244 W32: Items selected in listbox have correct background color,...
+ 727245 W32: No .dim-label style
+ 727313 a11y: do not use deprecated a11y functions.
+ 727322 docs: Remove '\' escape character from literals
+ 727391 W32: scrollbar sliders have no "active" and "insensitive" styles
+ 727410 W32: tooltips are not themed
+ 727414 Redundant text in titlebar
+ 727643 Segfault in gtk-3.12.0
+ 727662 [PATCH] GtkVolumeButton displays "missing image" icons
+ 727973 W32: focused button is visibly smaller  
+ 728023 Warning when passing NULL window to inhibit
+ 727644 SEGV in gtk_window_propagate_key_event()
+
+* Translation updates:
+ Basque
+ Catalan
+ Greek
+ Russian
+
 Overview of Changes in GTK+ 3.11.9 to 3.12.0
 ============================================
 

build/win32/vs10/gtk-install.props

@@ -214,6 +214,8 @@ copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiV
 
 copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
+copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
+
 copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 
 copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

build/win32/vs9/gtk-install.vsprops

@@ -121,6 +121,7 @@ copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(ApiVers
 copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

+copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y

 copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y


gtk/gtkapplication-dbus.c

@@ -339,7 +339,7 @@ gtk_application_impl_dbus_inhibit (GtkApplicationImpl         *impl,
                                 "Inhibit",
                                 g_variant_new ("(s@usu)",
                                                dbus->app_id,
-                                               gtk_application_impl_dbus_get_window_system_id (dbus, window),
+                                               window ? gtk_application_impl_dbus_get_window_system_id (dbus, window) : 0,
                                                reason,
                                                flags),
                                 G_DBUS_CALL_FLAGS_NONE,

gtk/gtkassistant.c

@@ -2425,7 +2425,7 @@ gtk_assistant_accessible_get_n_children (AtkObject *accessible)
   if (widget == NULL)
     return 0;
 
-  return g_list_length (GTK_ASSISTANT (widget)->priv->pages) + 1;
+  return g_list_length (GTK_ASSISTANT (widget)->priv->pages) + 2;
 }
 
 static AtkObject *
@@ -2461,6 +2461,11 @@ gtk_assistant_accessible_ref_child (AtkObject *accessible,
       child = priv->action_area;
       title = NULL;
     }
+  else if (index == n_pages + 1)
+    {
+      child = priv->headerbar;
+      title = NULL;
+    }
   else
     return NULL;
 

gtk/gtkdialog.c

@@ -574,7 +574,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
    * content area of the dialog, as returned by
    * gtk_dialog_get_content_area(), unless gtk_container_set_border_width()
    * was called on that widget directly.
-   *
    */
   gtk_widget_class_install_style_property (widget_class,
 					   g_param_spec_int ("content-area-border",
@@ -611,6 +610,14 @@ gtk_dialog_class_init (GtkDialogClass *class)
                                                              6,
                                                              GTK_PARAM_READABLE));
 
+  /**
+   * GtkDialog:action-area-border:
+   *
+   * The default border width used around the
+   * action area of the dialog, as returned by
+   * gtk_dialog_get_action_area(), unless gtk_container_set_border_width()
+   * was called on that widget directly.
+   */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("action-area-border",
                                                              P_("Action area border"),
@@ -668,8 +675,11 @@ update_spacings (GtkDialog *dialog)
                         NULL);
 
   if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->vbox)))
-    gtk_container_set_border_width (GTK_CONTAINER (priv->vbox),
-                                    content_area_border);
+    {
+      gtk_container_set_border_width (GTK_CONTAINER (priv->vbox),
+                                      content_area_border);
+      _gtk_container_set_border_width_set (GTK_CONTAINER (priv->vbox), FALSE);
+    }
 
   if (!_gtk_box_get_spacing_set (GTK_BOX (priv->vbox)))
     {
@@ -681,8 +691,11 @@ update_spacings (GtkDialog *dialog)
                        button_spacing);
 
   if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->action_area)))
-    gtk_container_set_border_width (GTK_CONTAINER (priv->action_area),
-                                    action_area_border);
+    {
+      gtk_container_set_border_width (GTK_CONTAINER (priv->action_area),
+                                      action_area_border);
+      _gtk_container_set_border_width_set (GTK_CONTAINER (priv->action_area), FALSE);
+    }
 }
 
 static void

gtk/gtkentry.c

@@ -3452,6 +3452,7 @@ gtk_entry_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
   _gtk_entry_get_borders (entry, &borders);
   pango_layout_get_pixel_size (layout, NULL, &height);
 
+  height = MAX (height, PANGO_PIXELS (priv->ascent + priv->descent));
   height += borders.top + borders.bottom;
 
   baseline = pango_layout_get_baseline (layout) / PANGO_SCALE;

gtk/gtkpixelcache.c

@@ -377,12 +377,14 @@ _gtk_pixel_cache_repaint (GtkPixelCache *cache,
     cairo_region_destroy (region_dirty);
 }
 
-static gboolean
-blow_cache_cb  (gpointer user_data)
+static void
+gtk_pixel_cache_blow_cache (GtkPixelCache *cache)
 {
-  GtkPixelCache *cache = user_data;
-
-  cache->timeout_tag = 0;
+  if (cache->timeout_tag)
+    {
+      g_source_remove (cache->timeout_tag);
+      cache->timeout_tag = 0;
+    }
 
   if (cache->surface)
     {
@@ -392,6 +394,16 @@ blow_cache_cb  (gpointer user_data)
 	cairo_region_destroy (cache->surface_dirty);
       cache->surface_dirty = NULL;
     }
+}
+
+static gboolean
+blow_cache_cb  (gpointer user_data)
+{
+  GtkPixelCache *cache = user_data;
+
+  cache->timeout_tag = 0;
+
+  gtk_pixel_cache_blow_cache (cache);
 
   return G_SOURCE_REMOVE;
 }
@@ -455,3 +467,15 @@ _gtk_pixel_cache_draw (GtkPixelCache *cache,
       draw (cr, user_data);
     }
 }
+
+void
+_gtk_pixel_cache_map (GtkPixelCache *cache)
+{
+  _gtk_pixel_cache_invalidate (cache, NULL);
+}
+
+void
+_gtk_pixel_cache_unmap (GtkPixelCache *cache)
+{
+  gtk_pixel_cache_blow_cache (cache);
+}

gtk/gtkpixelcacheprivate.h

@@ -32,6 +32,8 @@ typedef void (*GtkPixelCacheDrawFunc) (cairo_t *cr,
 
 GtkPixelCache *_gtk_pixel_cache_new            (void);
 void           _gtk_pixel_cache_free           (GtkPixelCache         *cache);
+void           _gtk_pixel_cache_map            (GtkPixelCache         *cache);
+void           _gtk_pixel_cache_unmap          (GtkPixelCache         *cache);
 void           _gtk_pixel_cache_invalidate     (GtkPixelCache         *cache,
                                                 cairo_region_t        *region);
 void           _gtk_pixel_cache_draw           (GtkPixelCache         *cache,

gtk/gtktextview.c

@@ -326,6 +326,8 @@ static void gtk_text_view_get_preferred_height (GtkWidget        *widget,
 						gint             *natural);
 static void gtk_text_view_size_allocate        (GtkWidget        *widget,
                                                 GtkAllocation    *allocation);
+static void gtk_text_view_map                  (GtkWidget        *widget);
+static void gtk_text_view_unmap                (GtkWidget        *widget);
 static void gtk_text_view_realize              (GtkWidget        *widget);
 static void gtk_text_view_unrealize            (GtkWidget        *widget);
 static void gtk_text_view_style_updated        (GtkWidget        *widget);
@@ -649,6 +651,8 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   gobject_class->finalize = gtk_text_view_finalize;
 
   widget_class->destroy = gtk_text_view_destroy;
+  widget_class->map = gtk_text_view_map;
+  widget_class->unmap = gtk_text_view_unmap;
   widget_class->realize = gtk_text_view_realize;
   widget_class->unrealize = gtk_text_view_unrealize;
   widget_class->style_updated = gtk_text_view_style_updated;
@@ -4322,6 +4326,34 @@ gtk_text_view_unrealize (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_text_view_parent_class)->unrealize (widget);
 }
 
+static void
+gtk_text_view_map (GtkWidget *widget)
+{
+  GtkTextView *text_view;
+  GtkTextViewPrivate *priv;
+
+  text_view = GTK_TEXT_VIEW (widget);
+  priv = text_view->priv;
+
+  _gtk_pixel_cache_map (priv->pixel_cache);
+
+  GTK_WIDGET_CLASS (gtk_text_view_parent_class)->map (widget);
+}
+
+static void
+gtk_text_view_unmap (GtkWidget *widget)
+{
+  GtkTextView *text_view;
+  GtkTextViewPrivate *priv;
+
+  text_view = GTK_TEXT_VIEW (widget);
+  priv = text_view->priv;
+
+  GTK_WIDGET_CLASS (gtk_text_view_parent_class)->unmap (widget);
+
+  _gtk_pixel_cache_unmap (priv->pixel_cache);
+}
+
 static void
 gtk_text_view_set_background (GtkTextView *text_view)
 {

gtk/gtktreeview.c

@@ -563,6 +563,7 @@ static void     gtk_tree_view_destroy              (GtkWidget        *widget);
 static void     gtk_tree_view_realize              (GtkWidget        *widget);
 static void     gtk_tree_view_unrealize            (GtkWidget        *widget);
 static void     gtk_tree_view_map                  (GtkWidget        *widget);
+static void     gtk_tree_view_unmap                (GtkWidget        *widget);
 static void     gtk_tree_view_get_preferred_width  (GtkWidget        *widget,
 						    gint             *minimum,
 						    gint             *natural);
@@ -918,6 +919,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   /* GtkWidget signals */
   widget_class->destroy = gtk_tree_view_destroy;
   widget_class->map = gtk_tree_view_map;
+  widget_class->unmap = gtk_tree_view_unmap;
   widget_class->realize = gtk_tree_view_realize;
   widget_class->unrealize = gtk_tree_view_unrealize;
   widget_class->get_preferred_width = gtk_tree_view_get_preferred_width;
@@ -2215,6 +2217,8 @@ gtk_tree_view_map (GtkWidget *widget)
   GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
   GList *tmp_list;
 
+  _gtk_pixel_cache_map (tree_view->priv->pixel_cache);
+
   gtk_widget_set_mapped (widget, TRUE);
 
   tmp_list = tree_view->priv->children;
@@ -2236,6 +2240,16 @@ gtk_tree_view_map (GtkWidget *widget)
   gdk_window_show (gtk_widget_get_window (widget));
 }
 
+static void
+gtk_tree_view_unmap (GtkWidget *widget)
+{
+  GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+
+  GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unmap (widget);
+
+  _gtk_pixel_cache_unmap (tree_view->priv->pixel_cache);
+}
+
 static void
 gtk_tree_view_ensure_background (GtkTreeView *tree_view)
 {

gtk/gtkviewport.c

@@ -96,6 +96,8 @@ static void gtk_viewport_get_property             (GObject         *object,
 static void gtk_viewport_destroy                  (GtkWidget        *widget);
 static void gtk_viewport_realize                  (GtkWidget        *widget);
 static void gtk_viewport_unrealize                (GtkWidget        *widget);
+static void gtk_viewport_map                      (GtkWidget        *widget);
+static void gtk_viewport_unmap                    (GtkWidget        *widget);
 static gint gtk_viewport_draw                     (GtkWidget        *widget,
 						   cairo_t          *cr);
 static void gtk_viewport_add                      (GtkContainer     *container,
@@ -140,6 +142,8 @@ gtk_viewport_class_init (GtkViewportClass *class)
   widget_class->destroy = gtk_viewport_destroy;
   widget_class->realize = gtk_viewport_realize;
   widget_class->unrealize = gtk_viewport_unrealize;
+  widget_class->map = gtk_viewport_map;
+  widget_class->unmap = gtk_viewport_unmap;
   widget_class->draw = gtk_viewport_draw;
   widget_class->size_allocate = gtk_viewport_size_allocate;
   widget_class->style_updated = gtk_viewport_style_updated;
@@ -789,6 +793,28 @@ gtk_viewport_unrealize (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize (widget);
 }
 
+static void
+gtk_viewport_map (GtkWidget *widget)
+{
+  GtkViewport *viewport = GTK_VIEWPORT (widget);
+  GtkViewportPrivate *priv = viewport->priv;
+
+  _gtk_pixel_cache_map (priv->pixel_cache);
+
+  GTK_WIDGET_CLASS (gtk_viewport_parent_class)->map (widget);
+}
+
+static void
+gtk_viewport_unmap (GtkWidget *widget)
+{
+  GtkViewport *viewport = GTK_VIEWPORT (widget);
+  GtkViewportPrivate *priv = viewport->priv;
+
+  GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unmap (widget);
+
+  _gtk_pixel_cache_unmap (priv->pixel_cache);
+}
+
 static void
 draw_bin (cairo_t *cr,
 	  gpointer user_data)

gtk/gtkwindow.c

@@ -7613,7 +7613,11 @@ gtk_window_propagate_key_event (GtkWindow        *window,
       GtkWidget *parent;
       
       if (gtk_widget_is_sensitive (focus))
-        handled = gtk_widget_event (focus, (GdkEvent*) event);
+        {
+          handled = gtk_widget_event (focus, (GdkEvent*) event);
+          if (handled)
+            break;
+        }
 
       parent = gtk_widget_get_parent (focus);
       if (parent)

gtk/resources/theme/gtk-win32-base.css

@@ -129,6 +129,7 @@ GtkAssistant .sidebar .highlight {
     -GtkWidget-focus-line-width: 1;
     -GtkWidget-focus-padding: 3;
     -GtkButton-interior-focus: true;
+    -GtkButton-default-border: 0px;
     padding: 3px;
 }
 

gtk/resources/ui/gtkmessagedialog.ui

@@ -87,11 +87,6 @@
             <property name="position">0</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="border_width">0</property>
-          </object>
-        </child>
       </object>
     </child>
   </template>

po/ru.po

@@ -24,16 +24,16 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
 "%2b&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2014-03-25 22:15+0000\n"
-"PO-Revision-Date: 2014-03-26 16:34+0300\n"
-"Last-Translator: Stas Solovey <whats_up@tut.by>\n"
+"PO-Revision-Date: 2014-04-09 00:22+0400\n"
+"Last-Translator: Yuri Myasoedov <ymyasoedov@yandex.ru>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: ../gdk/broadway/gdkbroadway-server.c:141
 #, c-format
@@ -5088,7 +5088,7 @@ msgstr "Выбрать шрифт"
 
 #: ../gtk/resources/ui/gtkfontchooserwidget.ui.h:1
 msgid "Search font name"
-msgstr "Найти название шрифта"
+msgstr "Поиск на названию шрифта"
 
 #: ../gtk/resources/ui/gtkfontchooserwidget.ui.h:2
 msgid "Font Family"
@@ -5097,8 +5097,8 @@ msgstr "Гарнитура шрифта"
 #: ../gtk/resources/ui/gtkfontchooserwidget.ui.h:3
 msgid "No fonts matched your search. You can revise your search and try again."
 msgstr ""
-"Нет шрифтов, соответствующих вашему запросу. Измените параметры поиска и "
-"попробуйте ещё раз."
+"Нет шрифтов, соответствующих вашему запросу. Попробуйте изменить параметры "
+"поиска."
 
 #: ../gtk/resources/ui/gtkpagesetupunixdialog.ui.h:2
 msgid "_Format for:"

testsuite/a11y/assistant.txt

@@ -46,3 +46,114 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+  headerbar
+    "panel"
+    parent: window1
+    index: 1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+    cancel
+      "push button"
+      parent: headerbar
+      index: 0
+      name: Cancel
+      state: enabled focusable sensitive showing visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>c
+    back
+      "push button"
+      parent: headerbar
+      index: 1
+      name: Back
+      state: enabled focusable sensitive
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>b
+    close
+      "push button"
+      parent: headerbar
+      index: 2
+      name: Close
+      state: enabled focusable sensitive
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>c
+    last
+      "push button"
+      parent: headerbar
+      index: 3
+      name: Finish
+      state: focusable
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>f
+    forward
+      "push button"
+      parent: headerbar
+      index: 4
+      name: Next
+      state: focusable showing visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>n
+    apply
+      "push button"
+      parent: headerbar
+      index: 5
+      name: Apply
+      state: enabled focusable sensitive
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkImage>
+      image size: -1 x -1
+      image description: (null)
+      <AtkAction>
+      action 0 name: click
+      action 0 description: Clicks the button
+      action 0 keybinding: <Alt>a

testsuite/a11y/messagedialog.txt

@@ -164,7 +164,7 @@ window1
                               weight: <omitted>
                               wrap-mode: word
           <AtkHypertext>
-    ___object_7___
+    action_area
       "filler"
       parent: dialog-vbox1
       index: 1