css: Make test pass

The new css tree may change the order of selectors (keeping the same semantics). This affects how the selectors are printed later, which causes some css parsing tests to not match the references. Fortunately the order is consistent between runs given the same css, so we just have to switch around the order in some of the .ref.css files.
css: Allocate the css tree in a single chunk
2012-11-30 14:18:39 +01:00 · 2012-11-29 22:21:23 +01:00 · 2012-11-29 22:21:23 +01:00 · 2012-11-29 22:21:23 +01:00 · 2012-11-29 22:21:23 +01:00 · 2012-11-29 22:21:23 +01:00
76 changed files with 4636 additions and 4072 deletions
@@ -10,7 +10,7 @@

 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [7])
-m4_define([gtk_micro_version], [2])
+m4_define([gtk_micro_version], [3])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -176,7 +176,7 @@ const static struct {
  { 67, GDK_KEY_asterisk, GDK_KEY_KP_Multiply },
  { 69, GDK_KEY_plus, GDK_KEY_KP_Add },
  { 75, GDK_KEY_slash, GDK_KEY_KP_Divide },
-  { 76, 0x01000003, GDK_KEY_KP_Enter },
+  { 76, GDK_KEY_Return, GDK_KEY_KP_Enter },
  { 78, GDK_KEY_minus, GDK_KEY_KP_Subtract },
  { 81, GDK_KEY_equal, GDK_KEY_KP_Equal },
  { 82, GDK_KEY_0, GDK_KEY_KP_0 },
@@ -2384,13 +2384,31 @@ window_type_hint_to_shadow (GdkWindowTypeHint hint)
  return FALSE;
 }

+static gboolean
+window_type_hint_to_hides_on_deactivate (GdkWindowTypeHint hint)
+{
+  switch (hint)
+    {
+    case GDK_WINDOW_TYPE_HINT_UTILITY:
+    case GDK_WINDOW_TYPE_HINT_MENU: /* Torn-off menu */
+    case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
+    case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
+    case GDK_WINDOW_TYPE_HINT_TOOLTIP:
+      return TRUE;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}

 static void
 gdk_quartz_window_set_type_hint (GdkWindow        *window,
                                 GdkWindowTypeHint hint)
 {
  GdkWindowImplQuartz *impl;
-  
+
  if (GDK_WINDOW_DESTROYED (window) ||
      !WINDOW_IS_TOPLEVEL (window))
    return;
@@ -2405,6 +2423,7 @@ gdk_quartz_window_set_type_hint (GdkWindow        *window,

  [impl->toplevel setHasShadow: window_type_hint_to_shadow (hint)];
  [impl->toplevel setLevel: window_type_hint_to_level (hint)];
+  [impl->toplevel setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (hint)];
 }

 static GdkWindowTypeHint
@@ -2622,6 +2641,7 @@ gdk_quartz_window_set_decorations (GdkWindow       *window,
                                                                    defer:NO];
          [impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
          [impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
+          [impl->toplevel setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (impl->type_hint)];
          [impl->toplevel setContentView:old_view];
        }

@@ -148,6 +148,7 @@ deprecated_h_sources = 			\
 	deprecated/gtkcolorsel.h	\
 	deprecated/gtkcolorseldialog.h	\
 	deprecated/gtkfontsel.h		\
+	deprecated/gtkgradient.h	\
 	deprecated/gtkhandlebox.h	\
 	deprecated/gtkhbbox.h		\
 	deprecated/gtkhbox.h		\
@@ -156,8 +157,9 @@ deprecated_h_sources = 			\
 	deprecated/gtkhscrollbar.h	\
 	deprecated/gtkhseparator.h	\
 	deprecated/gtkhsv.h		\
-	deprecated/gtkstyle.h		\
 	deprecated/gtkrc.h		\
+	deprecated/gtkstyle.h		\
+	deprecated/gtksymboliccolor.h	\
 	deprecated/gtktable.h		\
 	deprecated/gtktearoffmenuitem.h	\
 	deprecated/gtkvbbox.h		\
@@ -167,6 +169,10 @@ deprecated_h_sources = 			\
 	deprecated/gtkvseparator.h	\
 	deprecated/gtkvpaned.h

+deprecated_private_h_sources =			\
+	deprecated/gtkgradientprivate.h		\
+	deprecated/gtksymboliccolorprivate.h
+
 gtk_public_h_sources = 		\
 	gtk.h			\
 	gtkx.h			\
@@ -249,7 +255,6 @@ gtk_public_h_sources = 		\
 	gtkfontchooserdialog.h  \
 	gtkfontchooserwidget.h	\
 	gtkframe.h		\
-	gtkgradient.h		\
 	gtkgrid.h		\
 	gtkiconfactory.h	\
 	gtkicontheme.h		\
@@ -330,7 +335,6 @@ gtk_public_h_sources = 		\
 	gtkstyleproperties.h	\
 	gtkstyleprovider.h	\
 	gtkswitch.h		\
-	gtksymboliccolor.h	\
 	gtktestutils.h		\
 	gtktextattributes.h	\
 	gtktextbuffer.h		\
@@ -478,7 +482,6 @@ gtk_private_h_sources =		\
 	gtkfilesystemmodel.h	\
 	gtkfontchooserprivate.h	\
 	gtkfontchooserutils.h	\
-	gtkgradientprivate.h	\
 	gtkhslaprivate.h	\
 	gtkiconcache.h		\
 	gtkiconhelperprivate.h  \
@@ -527,7 +530,6 @@ gtk_private_h_sources =		\
 	gtkstylepropertiesprivate.h \
 	gtkstylepropertyprivate.h \
 	gtkstyleproviderprivate.h \
-	gtksymboliccolorprivate.h \
 	gtktextbtree.h		\
 	gtktextbufferserialize.h \
 	gtktextchildprivate.h	\
@@ -556,6 +558,7 @@ deprecated_c_sources = 			\
 	deprecated/gtkcolorsel.c	\
 	deprecated/gtkcolorseldialog.c	\
 	deprecated/gtkfontsel.c		\
+	deprecated/gtkgradient.c	\
 	deprecated/gtkhandlebox.c	\
 	deprecated/gtkhbbox.c		\
 	deprecated/gtkhbox.c		\
@@ -566,6 +569,7 @@ deprecated_c_sources = 			\
 	deprecated/gtkhsv.c		\
 	deprecated/gtkrc.c		\
 	deprecated/gtkstyle.c		\
+	deprecated/gtksymboliccolor.c	\
 	deprecated/gtktable.c		\
 	deprecated/gtktearoffmenuitem.c	\
 	deprecated/gtkvbbox.c		\
@@ -721,7 +725,6 @@ gtk_base_c_sources = 		\
 	gtkfontchooserutils.c	\
 	gtkfontchooserwidget.c	\
 	gtkframe.c		\
-	gtkgradient.c		\
 	gtkgrid.c		\
 	gtkhsla.c		\
 	gtkiconcache.c		\
@@ -824,7 +827,6 @@ gtk_base_c_sources = 		\
 	gtkstyleprovider.c	\
 	gtkstyleproviderprivate.c	\
 	gtkswitch.c		\
-	gtksymboliccolor.c	\
 	gtktestutils.c		\
 	gtktextattributes.c	\
 	gtktextbtree.c		\
@@ -973,6 +975,7 @@ gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
 endif

 gtk_all_private_h_sources = \
+	$(deprecated_private_h_sources) \
 	$(gtk_private_h_sources) \
 	$(gtk_use_x11_private_h_sources) \
 	$(gtk_use_win32_private_h_sources) \
@@ -17,8 +17,11 @@

 #include "config.h"

+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
 #include "gtkgradientprivate.h"

+#include "gtkcsscolorvalueprivate.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkstyleproperties.h"
@@ -40,6 +43,11 @@
 * It is not normally necessary to deal directly with #GtkGradients,
 * since they are mostly used behind the scenes by #GtkStyleContext and
 * #GtkCssProvider.
+ *
+ * #GtkGradient is deprecated. It was used internally by GTK's CSS engine
+ * to represent gradients. As its handling is not conforming to modern
+ * web standards, it is not used anymore. If you want to use gradients in
+ * your own code, please use Cairo directly.
 */

 G_DEFINE_BOXED_TYPE (GtkGradient, gtk_gradient,
@@ -80,6 +88,8 @@ struct _GtkGradient
 * Returns: A newly created #GtkGradient
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkGradient is deprecated.
 **/
 GtkGradient *
 gtk_gradient_new_linear (gdouble x0,
@@ -120,6 +130,8 @@ gtk_gradient_new_linear (gdouble x0,
 * Returns: A newly created #GtkGradient
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkGradient is deprecated.
 **/
 GtkGradient *
 gtk_gradient_new_radial (gdouble x0,
@@ -155,6 +167,8 @@ gtk_gradient_new_radial (gdouble x0,
 * Adds a stop color to @gradient.
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkGradient is deprecated.
 **/
 void
 gtk_gradient_add_color_stop (GtkGradient      *gradient,
@@ -180,6 +194,8 @@ gtk_gradient_add_color_stop (GtkGradient      *gradient,
 * Returns: The same @gradient
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkGradient is deprecated.
 **/
 GtkGradient *
 gtk_gradient_ref (GtkGradient *gradient)
@@ -199,6 +215,8 @@ gtk_gradient_ref (GtkGradient *gradient)
 * if the reference count reaches 0.
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkGradient is deprecated.
 **/
 void
 gtk_gradient_unref (GtkGradient *gradient)
@@ -239,6 +257,8 @@ gtk_gradient_unref (GtkGradient *gradient)
 * Returns: %TRUE if the gradient has been resolved
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkGradient is deprecated.
 **/
 gboolean
 gtk_gradient_resolve (GtkGradient         *gradient,
@@ -318,11 +338,11 @@ _gtk_gradient_resolve_full (GtkGradient             *gradient,
      stop = &g_array_index (gradient->stops, ColorStop, i);

      /* if color resolving fails, assume transparency */
-      val = _gtk_symbolic_color_resolve_full (stop->color,
-                                              provider,
-                                              _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
-                                              GTK_CSS_DEPENDS_ON_COLOR,
-                                              &stop_deps);
+      val = _gtk_css_color_value_resolve (_gtk_symbolic_color_get_css_value (stop->color),
+                                          provider,
+                                          _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
+                                          GTK_CSS_DEPENDS_ON_COLOR,
+                                          &stop_deps);
      if (val)
        {
          rgba = *_gtk_css_rgba_value_get_rgba (val);
@@ -372,6 +392,8 @@ append_number (GString    *str,
 * for using in GTK CSS files.
 *
 * Returns: A string representation for @gradient
+ *
+ * Deprecated: 3.8: #GtkGradient is deprecated.
 **/
 char *
 gtk_gradient_to_string (GtkGradient *gradient)
@@ -518,11 +540,9 @@ _gtk_gradient_transition (GtkGradient *start,
      end_stop = &g_array_index (end->stops, ColorStop, i);

      offset = (1 - progress) * start_stop->offset + progress * end_stop->offset;
-      color = (GtkSymbolicColor *) _gtk_css_value_transition ((GtkCssValue *) start_stop->color,
-                                                              (GtkCssValue *) end_stop->color,
-                                                              property_id,
-                                                              progress);
-      g_assert (color);
+      color = gtk_symbolic_color_new_mix (start_stop->color,
+                                          end_stop->color,
+                                          progress);
      gtk_gradient_add_color_stop (gradient, offset, color);
      gtk_symbolic_color_unref (color);
    }
@@ -25,7 +25,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkstylecontext.h>
 #include <gtk/gtkstyleproperties.h>
-#include <gtk/gtksymboliccolor.h>
+#include <gtk/deprecated/gtksymboliccolor.h>

 G_BEGIN_DECLS

@@ -33,10 +33,12 @@ G_BEGIN_DECLS

 GType         gtk_gradient_get_type       (void) G_GNUC_CONST;

+GDK_DEPRECATED_IN_3_8
 GtkGradient * gtk_gradient_new_linear     (gdouble              x0,
                                           gdouble              y0,
                                           gdouble              x1,
                                           gdouble              y1);
+GDK_DEPRECATED_IN_3_8
 GtkGradient * gtk_gradient_new_radial     (gdouble              x0,
                                           gdouble              y0,
                                           gdouble              radius0,
@@ -44,21 +46,27 @@ GtkGradient * gtk_gradient_new_radial     (gdouble              x0,
                                           gdouble              y1,
                                           gdouble              radius1);

+GDK_DEPRECATED_IN_3_8
 void          gtk_gradient_add_color_stop (GtkGradient         *gradient,
                                           gdouble              offset,
                                           GtkSymbolicColor    *color);

+GDK_DEPRECATED_IN_3_8
 GtkGradient * gtk_gradient_ref            (GtkGradient         *gradient);
+GDK_DEPRECATED_IN_3_8
 void          gtk_gradient_unref          (GtkGradient         *gradient);

+GDK_DEPRECATED_IN_3_8
 gboolean      gtk_gradient_resolve        (GtkGradient         *gradient,
                                           GtkStyleProperties  *props,
                                           cairo_pattern_t    **resolved_gradient);
+GDK_DEPRECATED_IN_3_8
 cairo_pattern_t *
              gtk_gradient_resolve_for_context
                                          (GtkGradient         *gradient,
                                           GtkStyleContext     *context);

+GDK_DEPRECATED_IN_3_8
 char *        gtk_gradient_to_string      (GtkGradient         *gradient);

 G_END_DECLS
@@ -0,0 +1,359 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
+#include "gtkcsscolorvalueprivate.h"
+#include "gtkcssrgbavalueprivate.h"
+#include "gtkcssstylepropertyprivate.h"
+#include "gtkhslaprivate.h"
+#include "gtkstylepropertyprivate.h"
+#include "gtksymboliccolorprivate.h"
+#include "gtkstyleproperties.h"
+#include "gtkintl.h"
+#include "gtkwin32themeprivate.h"
+
+/**
+ * SECTION:gtksymboliccolor
+ * @Short_description: Symbolic colors
+ * @Title: GtkSymbolicColor
+ *
+ * GtkSymbolicColor is a boxed type that represents a symbolic color.
+ * It is the result of parsing a
+ * <link linkend="gtkcssprovider-symbolic-colors">color expression</link>.
+ * To obtain the color represented by a GtkSymbolicColor, it has to
+ * be resolved with gtk_symbolic_color_resolve(), which replaces all
+ * symbolic color references by the colors they refer to (in a given
+ * context) and evaluates mix, shade and other expressions, resulting
+ * in a #GdkRGBA value.
+ *
+ * It is not normally necessary to deal directly with #GtkSymbolicColors,
+ * since they are mostly used behind the scenes by #GtkStyleContext and
+ * #GtkCssProvider.
+ *
+ * #GtkSymbolicColor is deprecated. Symbolic colors are considered an
+ * implementation detail of GTK+.
+ */
+
+G_DEFINE_BOXED_TYPE (GtkSymbolicColor, gtk_symbolic_color,
+                     gtk_symbolic_color_ref, gtk_symbolic_color_unref)
+
+struct _GtkSymbolicColor
+{
+  GtkCssValue *value;
+  gint ref_count;
+};
+
+static GtkSymbolicColor *
+gtk_symbolic_color_new (GtkCssValue *value)
+{
+  GtkSymbolicColor *symbolic;
+
+  symbolic = g_slice_new0 (GtkSymbolicColor);
+  symbolic->value = value;
+  symbolic->ref_count = 1;
+
+  return symbolic;
+}
+
+/**
+ * gtk_symbolic_color_new_literal:
+ * @color: a #GdkRGBA
+ *
+ * Creates a symbolic color pointing to a literal color.
+ *
+ * Returns: a newly created #GtkSymbolicColor
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+GtkSymbolicColor *
+gtk_symbolic_color_new_literal (const GdkRGBA *color)
+{
+  g_return_val_if_fail (color != NULL, NULL);
+
+  return gtk_symbolic_color_new (_gtk_css_color_value_new_literal (color));
+}
+
+/**
+ * gtk_symbolic_color_new_name:
+ * @name: color name
+ *
+ * Creates a symbolic color pointing to an unresolved named
+ * color. See gtk_style_context_lookup_color() and
+ * gtk_style_properties_lookup_color().
+ *
+ * Returns: a newly created #GtkSymbolicColor
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+GtkSymbolicColor *
+gtk_symbolic_color_new_name (const gchar *name)
+{
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return gtk_symbolic_color_new (_gtk_css_color_value_new_name (name));
+}
+
+/**
+ * gtk_symbolic_color_new_shade: (constructor)
+ * @color: another #GtkSymbolicColor
+ * @factor: shading factor to apply to @color
+ *
+ * Creates a symbolic color defined as a shade of
+ * another color. A factor > 1.0 would resolve to
+ * a brighter color, while < 1.0 would resolve to
+ * a darker color.
+ *
+ * Returns: A newly created #GtkSymbolicColor
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+GtkSymbolicColor *
+gtk_symbolic_color_new_shade (GtkSymbolicColor *color,
+                              gdouble           factor)
+{
+  g_return_val_if_fail (color != NULL, NULL);
+
+  return gtk_symbolic_color_new (_gtk_css_color_value_new_shade (color->value,
+                                                                 factor));
+}
+
+/**
+ * gtk_symbolic_color_new_alpha: (constructor)
+ * @color: another #GtkSymbolicColor
+ * @factor: factor to apply to @color alpha
+ *
+ * Creates a symbolic color by modifying the relative alpha
+ * value of @color. A factor < 1.0 would resolve to a more
+ * transparent color, while > 1.0 would resolve to a more
+ * opaque color.
+ *
+ * Returns: A newly created #GtkSymbolicColor
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+GtkSymbolicColor *
+gtk_symbolic_color_new_alpha (GtkSymbolicColor *color,
+                              gdouble           factor)
+{
+  g_return_val_if_fail (color != NULL, NULL);
+
+  return gtk_symbolic_color_new (_gtk_css_color_value_new_alpha (color->value,
+                                                                 factor));
+}
+
+/**
+ * gtk_symbolic_color_new_mix: (constructor)
+ * @color1: color to mix
+ * @color2: another color to mix
+ * @factor: mix factor
+ *
+ * Creates a symbolic color defined as a mix of another
+ * two colors. a mix factor of 0 would resolve to @color1,
+ * while a factor of 1 would resolve to @color2.
+ *
+ * Returns: A newly created #GtkSymbolicColor
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+GtkSymbolicColor *
+gtk_symbolic_color_new_mix (GtkSymbolicColor *color1,
+                            GtkSymbolicColor *color2,
+                            gdouble           factor)
+{
+  g_return_val_if_fail (color1 != NULL, NULL);
+  g_return_val_if_fail (color1 != NULL, NULL);
+
+  return gtk_symbolic_color_new (_gtk_css_color_value_new_mix (color1->value,
+                                                               color2->value,
+                                                               factor));
+}
+
+/**
+ * gtk_symbolic_color_new_win32: (constructor)
+ * @theme_class: The theme class to pull color from
+ * @id: The color id
+ *
+ * Creates a symbolic color based on the current win32
+ * theme.
+ *
+ * Note that while this call is available on all platforms
+ * the actual value returned is not reliable on non-win32
+ * platforms.
+ *
+ * Returns: A newly created #GtkSymbolicColor
+ *
+ * Since: 3.4
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ */
+GtkSymbolicColor *
+gtk_symbolic_color_new_win32 (const gchar *theme_class,
+                              gint         id)
+{
+  g_return_val_if_fail (theme_class != NULL, NULL);
+
+  return gtk_symbolic_color_new (_gtk_css_color_value_new_win32 (theme_class, id));
+}
+
+/**
+ * gtk_symbolic_color_ref:
+ * @color: a #GtkSymbolicColor
+ *
+ * Increases the reference count of @color
+ *
+ * Returns: the same @color
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+GtkSymbolicColor *
+gtk_symbolic_color_ref (GtkSymbolicColor *color)
+{
+  g_return_val_if_fail (color != NULL, NULL);
+
+  color->ref_count++;
+
+  return color;
+}
+
+/**
+ * gtk_symbolic_color_unref:
+ * @color: a #GtkSymbolicColor
+ *
+ * Decreases the reference count of @color, freeing its memory if the
+ * reference count reaches 0.
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+void
+gtk_symbolic_color_unref (GtkSymbolicColor *color)
+{
+  g_return_if_fail (color != NULL);
+
+  if (--color->ref_count)
+    return;
+
+  _gtk_css_value_unref (color->value);
+
+  g_slice_free (GtkSymbolicColor, color);
+}
+
+/**
+ * gtk_symbolic_color_resolve:
+ * @color: a #GtkSymbolicColor
+ * @props: (allow-none): #GtkStyleProperties to use when resolving
+ *    named colors, or %NULL
+ * @resolved_color: (out): return location for the resolved color
+ *
+ * If @color is resolvable, @resolved_color will be filled in
+ * with the resolved color, and %TRUE will be returned. Generally,
+ * if @color can't be resolved, it is due to it being defined on
+ * top of a named color that doesn't exist in @props.
+ *
+ * When @props is %NULL, resolving of named colors will fail, so if
+ * your @color is or references such a color, this function will
+ * return %FALSE.
+ *
+ * Returns: %TRUE if the color has been resolved
+ *
+ * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+gboolean
+gtk_symbolic_color_resolve (GtkSymbolicColor   *color,
+			    GtkStyleProperties *props,
+			    GdkRGBA            *resolved_color)
+{
+  GdkRGBA pink = { 1.0, 0.5, 0.5, 1.0 };
+  GtkCssValue *v, *current;
+
+  g_return_val_if_fail (color != NULL, FALSE);
+  g_return_val_if_fail (resolved_color != NULL, FALSE);
+  g_return_val_if_fail (props == NULL || GTK_IS_STYLE_PROPERTIES (props), FALSE);
+
+  current = _gtk_css_rgba_value_new_from_rgba (&pink);
+  v = _gtk_css_color_value_resolve (color->value,
+                                    GTK_STYLE_PROVIDER_PRIVATE (props),
+                                    current,
+                                    0,
+                                    NULL);
+  _gtk_css_value_unref (current);
+  if (v == NULL)
+    return FALSE;
+
+  *resolved_color = *_gtk_css_rgba_value_get_rgba (v);
+  _gtk_css_value_unref (v);
+  return TRUE;
+}
+
+/**
+ * gtk_symbolic_color_to_string:
+ * @color: color to convert to a string
+ *
+ * Converts the given @color to a string representation. This is useful
+ * both for debugging and for serialization of strings. The format of
+ * the string may change between different versions of GTK, but it is
+ * guaranteed that the GTK css parser is able to read the string and
+ * create the same symbolic color from it.
+ *
+ * Returns: a new string representing @color
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
+ **/
+char *
+gtk_symbolic_color_to_string (GtkSymbolicColor *color)
+{
+  g_return_val_if_fail (color != NULL, NULL);
+
+  return _gtk_css_value_to_string (color->value);
+}
+
+GtkSymbolicColor *
+_gtk_css_symbolic_value_new (GtkCssParser *parser)
+{
+  GtkCssValue *value;
+
+  value = _gtk_css_color_value_parse (parser);
+  if (value == NULL)
+    return NULL;
+
+  return gtk_symbolic_color_new (value);
+}
+
+GtkCssValue *
+_gtk_symbolic_color_get_css_value (GtkSymbolicColor *symbolic)
+{
+  return symbolic->value;
+}
+
@@ -31,23 +31,33 @@ G_BEGIN_DECLS

 GType              gtk_symbolic_color_get_type    (void) G_GNUC_CONST;

+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_symbolic_color_new_literal (const GdkRGBA      *color);
+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_symbolic_color_new_name    (const gchar        *name);
+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_symbolic_color_new_shade   (GtkSymbolicColor   *color,
                                                   gdouble             factor);
+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_symbolic_color_new_alpha   (GtkSymbolicColor   *color,
                                                   gdouble             factor);
+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_symbolic_color_new_mix     (GtkSymbolicColor   *color1,
                                                   GtkSymbolicColor   *color2,
                                                   gdouble             factor);
+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_symbolic_color_new_win32   (const gchar        *theme_class,
                                                   gint                id);

+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_symbolic_color_ref         (GtkSymbolicColor   *color);
+GDK_DEPRECATED_IN_3_8
 void               gtk_symbolic_color_unref       (GtkSymbolicColor   *color);

+GDK_DEPRECATED_IN_3_8
 char *             gtk_symbolic_color_to_string   (GtkSymbolicColor   *color);

+GDK_DEPRECATED_IN_3_8
 gboolean           gtk_symbolic_color_resolve     (GtkSymbolicColor   *color,
                                                   GtkStyleProperties *props,
                                                   GdkRGBA            *resolved_color);
@@ -0,0 +1,33 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_SYMBOLIC_COLOR_PRIVATE_H__
+#define __GTK_SYMBOLIC_COLOR_PRIVATE_H__
+
+#include "gtk/deprecated/gtksymboliccolor.h"
+#include "gtk/gtkcssparserprivate.h"
+#include "gtk/gtkcssvalueprivate.h"
+
+G_BEGIN_DECLS
+
+GtkSymbolicColor * _gtk_css_symbolic_value_new            (GtkCssParser               *parser);
+
+GtkCssValue *      _gtk_symbolic_color_get_css_value      (GtkSymbolicColor           *symbolic);
+
+G_END_DECLS
+
+#endif /* __GTK_SYMBOLIC_COLOR_PRIVATE_H__ */
@@ -66,9 +66,9 @@ main (int argc, char *argv[])
 #endif

  /* Translators: this message will appear immediately after the */
-  /* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>    */
+  /* usage string - Usage: COMMAND [OPTION]… <THIS_MESSAGE>    */
  context =
-    g_option_context_new (_("APPLICATION [URI...] - launch an APPLICATION with URI."));
+    g_option_context_new (_("APPLICATION [URI…] — launch an APPLICATION with URI."));

  /* Translators: this message will appear after the usage string */
  /* and before the list of options.                              */
@@ -107,7 +107,6 @@
 #include <gtk/gtkfontchooserdialog.h>
 #include <gtk/gtkfontchooserwidget.h>
 #include <gtk/gtkframe.h>
-#include <gtk/gtkgradient.h>
 #include <gtk/gtkgrid.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtkicontheme.h>
@@ -185,7 +184,6 @@
 #include <gtk/gtkstyleproperties.h>
 #include <gtk/gtkstyleprovider.h>
 #include <gtk/gtkswitch.h>
-#include <gtk/gtksymboliccolor.h>
 #include <gtk/gtktextattributes.h>
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextbufferrichtext.h>
@@ -229,6 +227,7 @@
 #include <gtk/deprecated/gtkcolorsel.h>
 #include <gtk/deprecated/gtkcolorseldialog.h>
 #include <gtk/deprecated/gtkfontsel.h>
+#include <gtk/deprecated/gtkgradient.h>
 #include <gtk/deprecated/gtkhandlebox.h>
 #include <gtk/deprecated/gtkhbbox.h>
 #include <gtk/deprecated/gtkhbox.h>
@@ -239,6 +238,7 @@
 #include <gtk/deprecated/gtkhseparator.h>
 #include <gtk/deprecated/gtkrc.h>
 #include <gtk/deprecated/gtkstyle.h>
+#include <gtk/deprecated/gtksymboliccolor.h>
 #include <gtk/deprecated/gtktable.h>
 #include <gtk/deprecated/gtktearoffmenuitem.h>
 #include <gtk/deprecated/gtkvbbox.h>
@@ -2664,7 +2664,7 @@ gtk_about_dialog_get_license_type (GtkAboutDialog *about)
 * gtk_about_dialog_add_credit_section:
 * @about: A #GtkAboutDialog
 * @section_name: The name of the section
- * @people: The people who belong to that section
+ * @people: (array zero-terminated=1): The people who belong to that section
 *
 * Creates a new section in the Credits page.
 *
@@ -225,7 +225,7 @@ other_application_dialog_response_cb (GtkDialog *dialog,
  if (response_id != GTK_RESPONSE_OK)
    {
      /* reset the active item, otherwise we are stuck on
-       * 'Other application...'
+       * 'Other application…'
       */
      gtk_combo_box_set_active (GTK_COMBO_BOX (self), self->priv->last_active);
      gtk_widget_destroy (GTK_WIDGET (dialog));
@@ -287,7 +287,7 @@ gtk_app_chooser_button_ensure_dialog_item (GtkAppChooserButton *self,

  gtk_list_store_insert_after (self->priv->store, &iter, &iter2);
  real_insert_custom_item (self, CUSTOM_ITEM_OTHER_APP,
-                           _("Other application..."), NULL,
+                           _("Other application…"), NULL,
                           FALSE, &iter);
 }

@@ -611,7 +611,7 @@ gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass)
   */
  pspec =
    g_param_spec_boolean ("show-dialog-item",
-                          P_("Include an 'Other...' item"),
+                          P_("Include an 'Other…' item"),
                          P_("Whether the combobox should include an item that triggers a GtkAppChooserDialog"),
                          FALSE,
                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
@@ -413,7 +413,7 @@ gtk_cell_renderer_accel_get_preferred_width (GtkCellRenderer    *cell,
  GtkRequisition min_req, nat_req;

  if (priv->sizing_label == NULL)
-    priv->sizing_label = gtk_label_new (_("New accelerator..."));
+    priv->sizing_label = gtk_label_new (_("New accelerator…"));

  gtk_widget_get_preferred_size (priv->sizing_label, &min_req, &nat_req);

@@ -744,7 +744,7 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
   * an accelerator when the cell is clicked to change the 
   * acelerator.
   */
-  gtk_label_set_text (GTK_LABEL (label), _("New accelerator..."));
+  gtk_label_set_text (GTK_LABEL (label), _("New accelerator…"));

  gtk_container_add (GTK_CONTAINER (eventbox), label);
  
@@ -24,7 +24,6 @@
 #include "gtkhslaprivate.h"
 #include "gtkstylepropertyprivate.h"
 #include "gtkstyleproperties.h"
-#include "gtksymboliccolorprivate.h"
 #include "gtkwin32themeprivate.h"

 typedef enum {
@@ -136,12 +135,12 @@ gtk_css_value_color_get_fallback (guint                    property_id,
    }
 }

-static GtkCssValue *
-gtk_css_color_value_resolve_full (GtkCssValue             *color,
-                                  GtkStyleProviderPrivate *provider,
-                                  GtkCssValue             *current,
-                                  GtkCssDependencies       current_deps,
-                                  GtkCssDependencies      *dependencies)
+GtkCssValue *
+_gtk_css_color_value_resolve (GtkCssValue             *color,
+                              GtkStyleProviderPrivate *provider,
+                              GtkCssValue             *current,
+                              GtkCssDependencies       current_deps,
+                              GtkCssDependencies      *dependencies)
 {
  GtkCssDependencies unused;
  GtkCssValue *value;
@@ -161,14 +160,13 @@ gtk_css_color_value_resolve_full (GtkCssValue             *color,
      return _gtk_css_value_ref (color->last_value);
    case COLOR_TYPE_NAME:
      {
-	GtkSymbolicColor *symbolic;
+	GtkCssValue *named;

-        symbolic = _gtk_style_provider_private_get_color (provider, color->sym_col.name);
-
-	if (!symbolic)
+        named = _gtk_style_provider_private_get_color (provider, color->sym_col.name);
+	if (named == NULL)
 	  return NULL;

-        value = _gtk_symbolic_color_resolve_full (symbolic, provider, current, current_deps, dependencies);
+        value = _gtk_css_color_value_resolve (named, provider, current, current_deps, dependencies);
      }

      break;
@@ -178,19 +176,14 @@ gtk_css_color_value_resolve_full (GtkCssValue             *color,
        GtkHSLA hsla;
 	GdkRGBA shade;

-	val = gtk_css_color_value_resolve_full (color->sym_col.shade.color, provider, current, current_deps, dependencies);
+	val = _gtk_css_color_value_resolve (color->sym_col.shade.color, provider, current, current_deps, dependencies);
 	if (val == NULL)
 	  return NULL;

        *dependencies = _gtk_css_dependencies_union (*dependencies, 0);
        
        _gtk_hsla_init_from_rgba (&hsla, _gtk_css_rgba_value_get_rgba (val));
-
-        hsla.lightness *= color->sym_col.shade.factor;
-        hsla.lightness = CLAMP (hsla.lightness, 0.0, 1.0);
-
-        hsla.saturation *= color->sym_col.shade.factor;
-        hsla.saturation = CLAMP (hsla.saturation, 0.0, 1.0);
+        _gtk_hsla_shade (&hsla, &hsla, color->sym_col.shade.factor);

        _gdk_rgba_init_from_hsla (&shade, &hsla);

@@ -205,7 +198,7 @@ gtk_css_color_value_resolve_full (GtkCssValue             *color,
 	GtkCssValue *val;
 	GdkRGBA alpha;

-	val = gtk_css_color_value_resolve_full (color->sym_col.alpha.color, provider, current, current_deps, dependencies);
+	val = _gtk_css_color_value_resolve (color->sym_col.alpha.color, provider, current, current_deps, dependencies);
 	if (val == NULL)
 	  return NULL;

@@ -225,13 +218,13 @@ gtk_css_color_value_resolve_full (GtkCssValue             *color,
 	GdkRGBA color1, color2, res;
        GtkCssDependencies dep1, dep2;

-	val = gtk_css_color_value_resolve_full (color->sym_col.mix.color1, provider, current, current_deps, &dep1);
+	val = _gtk_css_color_value_resolve (color->sym_col.mix.color1, provider, current, current_deps, &dep1);
 	if (val == NULL)
 	  return NULL;
 	color1 = *_gtk_css_rgba_value_get_rgba (val);
 	_gtk_css_value_unref (val);

-	val = gtk_css_color_value_resolve_full (color->sym_col.mix.color2, provider, current, current_deps, &dep2);
+	val = _gtk_css_color_value_resolve (color->sym_col.mix.color2, provider, current, current_deps, &dep2);
 	if (val == NULL)
 	  return NULL;
 	color2 = *_gtk_css_rgba_value_get_rgba (val);
@@ -329,11 +322,11 @@ gtk_css_value_color_compute (GtkCssValue             *value,
      current_deps = GTK_CSS_DEPENDS_ON_COLOR;
    }
  
-  resolved = gtk_css_color_value_resolve_full (value,
-                                               provider,
-                                               current,
-                                               current_deps,
-                                               dependencies);
+  resolved = _gtk_css_color_value_resolve (value,
+                                           provider,
+                                           current,
+                                           current_deps,
+                                           dependencies);

  if (resolved == NULL)
    return gtk_css_value_color_get_fallback (property_id, provider, values, parent_values);
@@ -43,6 +43,12 @@ GtkCssValue *   _gtk_css_color_value_new_current_color  (void);

 GtkCssValue *   _gtk_css_color_value_parse              (GtkCssParser   *parser);

+GtkCssValue *   _gtk_css_color_value_resolve            (GtkCssValue             *color,
+                                                         GtkStyleProviderPrivate *provider,
+                                                         GtkCssValue             *current,
+                                                         GtkCssDependencies       current_deps,
+                                                         GtkCssDependencies      *dependencies);
+

 G_END_DECLS

@@ -28,16 +28,22 @@
 #include "gtkstylepropertiesprivate.h"
 #include "gtkthemingengine.h"

+#include "deprecated/gtksymboliccolor.h"
+
 G_DEFINE_TYPE (GtkCssCustomProperty, _gtk_css_custom_property, GTK_TYPE_CSS_STYLE_PROPERTY)

 static GType
 gtk_css_custom_property_get_specified_type (GParamSpec *pspec)
 {
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
  if (pspec->value_type == GDK_TYPE_RGBA ||
      pspec->value_type == GDK_TYPE_COLOR)
    return GTK_TYPE_SYMBOLIC_COLOR;
  else
    return pspec->value_type;
+
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }

 static GtkCssValue *
@@ -19,11 +19,14 @@

 #include "config.h"

+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
 #include "gtkcssimagegradientprivate.h"

 #include "gtkcssprovider.h"
-#include "gtkgradientprivate.h"
-#include "gtksymboliccolorprivate.h"
+
+#include "deprecated/gtkgradientprivate.h"
+#include "deprecated/gtksymboliccolorprivate.h"

 G_DEFINE_TYPE (GtkCssImageGradient, _gtk_css_image_gradient, GTK_TYPE_CSS_IMAGE)

@@ -474,7 +477,7 @@ _gtk_gradient_parse (GtkCssParser *parser)
          return NULL;
        }

-      color = _gtk_symbolic_color_new_take_value (_gtk_css_symbolic_value_new (parser));
+      color = _gtk_css_symbolic_value_new (parser);
      if (color == NULL)
        {
          gtk_gradient_unref (gradient);
@@ -22,7 +22,7 @@

 #include "gtk/gtkcssimageprivate.h"

-#include <gtk/gtkgradient.h>
+#include <gtk/deprecated/gtkgradient.h>

 G_BEGIN_DECLS

@@ -19,7 +19,7 @@

 #include "gtkcssinheritvalueprivate.h"

-#include "gtkcssstylepropertyprivate.h"
+#include "gtkcssinitialvalueprivate.h"
 #include "gtkstylecontextprivate.h"

 struct _GtkCssValue {
@@ -48,7 +48,7 @@ gtk_css_value_inherit_compute (GtkCssValue             *value,
    }
  else
    {
-      return _gtk_css_value_compute (_gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (property_id)),
+      return _gtk_css_value_compute (_gtk_css_initial_value_get (),
                                     property_id,
                                     provider,
                                     values,
@@ -86,3 +86,9 @@ _gtk_css_initial_value_new (void)
 {
  return _gtk_css_value_ref (&initial);
 }
+
+GtkCssValue *
+_gtk_css_initial_value_get (void)
+{
+  return &initial;
+}
@@ -25,6 +25,7 @@
 G_BEGIN_DECLS

 GtkCssValue *   _gtk_css_initial_value_new            (void);
+GtkCssValue *   _gtk_css_initial_value_get            (void);

 G_END_DECLS

@@ -185,6 +185,7 @@ static const GtkCssMatcherClass GTK_CSS_MATCHER_WIDGET_PATH = {
  gtk_css_matcher_widget_path_has_regions,
  gtk_css_matcher_widget_path_has_region,
  gtk_css_matcher_widget_path_has_position,
+  FALSE
 };

 gboolean
@@ -288,6 +289,7 @@ static const GtkCssMatcherClass GTK_CSS_MATCHER_ANY = {
  gtk_css_matcher_any_has_regions,
  gtk_css_matcher_any_has_region,
  gtk_css_matcher_any_has_position,
+  TRUE
 };

 void
@@ -406,6 +408,7 @@ static const GtkCssMatcherClass GTK_CSS_MATCHER_SUPERSET = {
  gtk_css_matcher_superset_has_regions,
  gtk_css_matcher_superset_has_region,
  gtk_css_matcher_superset_has_position,
+  FALSE
 };

 void
@@ -50,6 +50,7 @@ struct _GtkCssMatcherClass {
                                                   gboolean               forward,
                                                   int                    a,
                                                   int                    b);
+  gboolean is_any;
 };

 struct _GtkCssMatcherWidgetPath {
@@ -146,6 +147,12 @@ _gtk_css_matcher_has_position (const GtkCssMatcher *matcher,
  return matcher->klass->has_position (matcher, forward, a, b);
 }

+static inline gboolean
+_gtk_css_matcher_matches_any (const GtkCssMatcher *matcher)
+{
+  return matcher->klass->is_any;
+}
+

 G_END_DECLS

@@ -27,13 +27,13 @@

 #include "gtkbitmaskprivate.h"
 #include "gtkcssarrayvalueprivate.h"
+#include "gtkcsscolorvalueprivate.h"
 #include "gtkcsskeyframesprivate.h"
 #include "gtkcssparserprivate.h"
 #include "gtkcsssectionprivate.h"
 #include "gtkcssselectorprivate.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkcssstylefuncsprivate.h"
-#include "gtksymboliccolor.h"
 #include "gtkstyleprovider.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkstylepropertiesprivate.h"
@@ -986,6 +986,7 @@ struct _WidgetPropertyValue {
 struct GtkCssRuleset
 {
  GtkCssSelector *selector;
+  GtkCssSelectorTree *selector_match;
  WidgetPropertyValue *widget_style;
  PropertyValue *styles;
  GtkBitmask *set_styles;
@@ -1011,6 +1012,7 @@ struct _GtkCssProviderPrivate
  GHashTable *keyframes;

  GArray *rulesets;
+  GtkCssSelectorTree *tree;
  GResource *resource;
 };

@@ -1271,17 +1273,10 @@ gtk_css_ruleset_add (GtkCssRuleset       *ruleset,
    ruleset->styles[i].section = NULL;
 }

-static gboolean
-gtk_css_ruleset_matches (GtkCssRuleset       *ruleset,
-                         const GtkCssMatcher *matcher)
-{
-  return _gtk_css_selector_matches (ruleset->selector, matcher);
-}
-
 static GtkCssChange
 gtk_css_ruleset_get_change (GtkCssRuleset *ruleset)
 {
-  return _gtk_css_selector_get_change (ruleset->selector);
+  return _gtk_css_selector_tree_match_get_change (ruleset->selector_match);
 }

 static void
@@ -1403,73 +1398,47 @@ gtk_css_provider_init (GtkCssProvider *css_provider)

  priv->symbolic_colors = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                 (GDestroyNotify) g_free,
-                                                 (GDestroyNotify) gtk_symbolic_color_unref);
+                                                 (GDestroyNotify) _gtk_css_value_unref);
  priv->keyframes = g_hash_table_new_full (g_str_hash, g_str_equal,
                                           (GDestroyNotify) g_free,
                                           (GDestroyNotify) _gtk_css_value_unref);
 }

 static void
-css_provider_dump_symbolic_colors (GtkCssProvider     *css_provider,
-                                   GtkStyleProperties *props)
+verify_tree_match_results (GtkCssProvider *provider,
+			   const GtkCssMatcher *matcher,
+			   GPtrArray *tree_rules)
 {
-  GtkCssProviderPrivate *priv;
-  GHashTableIter iter;
-  gpointer key, value;
+#ifdef VERIFY_TREE
+  GtkCssProviderPrivate *priv = provider->priv;
+  GtkCssRuleset *ruleset;
+  gboolean should_match;
+  int i, j;

-  priv = css_provider->priv;
-  g_hash_table_iter_init (&iter, priv->symbolic_colors);
-
-  while (g_hash_table_iter_next (&iter, &key, &value))
+  for (i = 0; i < priv->rulesets->len; i++)
    {
-      const gchar *name;
-      GtkSymbolicColor *color;
+      gboolean found = FALSE;

-      name = key;
-      color = value;
+      ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);

-      gtk_style_properties_map_color (props, name, color);
+      for (j = 0; j < tree_rules->len; j++)
+	{
+	  if (ruleset == tree_rules->pdata[j])
+	    {
+	      found = TRUE;
+	      break;
+	    }
+	}
+      should_match = _gtk_css_selector_matches (ruleset->selector, matcher);
+      if (found != !!should_match)
+	{
+	  g_error ("expected rule '%s' to %s, but it %s\n",
+		   _gtk_css_selector_to_string (ruleset->selector),
+		   should_match ? "match" : "not match",
+		   found ? "matched" : "didn't match");
+	}
    }
-}
-
-static GtkStyleProperties *
-gtk_css_provider_get_style (GtkStyleProvider *provider,
-                            GtkWidgetPath    *path)
-{
-  GtkCssMatcher matcher;
-  GtkCssProvider *css_provider;
-  GtkCssProviderPrivate *priv;
-  GtkStyleProperties *props;
-  guint i, j;
-
-  css_provider = GTK_CSS_PROVIDER (provider);
-  priv = css_provider->priv;
-  props = gtk_style_properties_new ();
-
-  css_provider_dump_symbolic_colors (css_provider, props);
-  if (_gtk_css_matcher_init (&matcher, path, 0))
-    {
-      for (i = 0; i < priv->rulesets->len; i++)
-        {
-          GtkCssRuleset *ruleset;
-
-          ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
-
-          if (ruleset->styles == NULL)
-            continue;
-
-          if (!gtk_css_ruleset_matches (ruleset, &matcher))
-            continue;
-
-          for (j = 0; j < ruleset->n_styles; j++)
-            _gtk_style_properties_set_property_by_property (props,
-                                                            GTK_CSS_STYLE_PROPERTY (ruleset->styles[i].property),
-                                                            _gtk_css_selector_get_state_flags (ruleset->selector),
-                                                            ruleset->styles[i].value);
-        }
-    }
-
-  return props;
+#endif
 }

 static gboolean
@@ -1482,6 +1451,7 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
  GtkCssProvider *css_provider = GTK_CSS_PROVIDER (provider);
  GtkCssProviderPrivate *priv = css_provider->priv;
  WidgetPropertyValue *val;
+  GPtrArray *tree_rules;
  GtkCssMatcher matcher;
  gboolean found = FALSE;
  gchar *prop_name;
@@ -1490,22 +1460,20 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
  if (!_gtk_css_matcher_init (&matcher, path, state))
    return FALSE;

+  tree_rules = _gtk_css_selector_tree_match_all (priv->tree, &matcher);
+  verify_tree_match_results (css_provider, &matcher, tree_rules);
+
  prop_name = g_strdup_printf ("-%s-%s",
                               g_type_name (pspec->owner_type),
                               pspec->name);

-  for (i = priv->rulesets->len - 1; i >= 0; i--)
+  for (i = tree_rules->len - 1; i >= 0; i--)
    {
-      GtkCssRuleset *ruleset;
-
-      ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
+      GtkCssRuleset *ruleset = tree_rules->pdata[i];

      if (ruleset->widget_style == NULL)
        continue;

-      if (!gtk_css_ruleset_matches (ruleset, &matcher))
-        continue;
-
      for (val = ruleset->widget_style; val != NULL; val = val->next)
 	{
 	  if (strcmp (val->name, prop_name) == 0)
@@ -1532,6 +1500,7 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
    }

  g_free (prop_name);
+  g_ptr_array_free (tree_rules, TRUE);

  return found;
 }
@@ -1539,11 +1508,10 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
 static void
 gtk_css_style_provider_iface_init (GtkStyleProviderIface *iface)
 {
-  iface->get_style = gtk_css_provider_get_style;
  iface->get_style_property = gtk_css_provider_get_style_property;
 }

-static GtkSymbolicColor *
+static GtkCssValue *
 gtk_css_style_provider_get_color (GtkStyleProviderPrivate *provider,
                                  const char              *name)
 {
@@ -1570,17 +1538,19 @@ gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider,
  GtkCssProviderPrivate *priv;
  GtkCssRuleset *ruleset;
  guint j;
+  int i;
+  GPtrArray *tree_rules;

  css_provider = GTK_CSS_PROVIDER (provider);
  priv = css_provider->priv;

-  if (priv->rulesets->len == 0)
-    return;
+  tree_rules = _gtk_css_selector_tree_match_all (priv->tree, matcher);
+  verify_tree_match_results (css_provider, matcher, tree_rules);

-  for (ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, priv->rulesets->len - 1);
-       ruleset >= &g_array_index (priv->rulesets, GtkCssRuleset, 0);
-       ruleset--)
+  for (i = tree_rules->len - 1; i >= 0; i--)
    {
+      ruleset = tree_rules->pdata[i];
+
      if (ruleset->styles == NULL)
        continue;

@@ -1588,9 +1558,6 @@ gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider,
                                    ruleset->set_styles))
        continue;

-      if (!gtk_css_ruleset_matches (ruleset, matcher))
-        continue;
-
      for (j = 0; j < ruleset->n_styles; j++)
        {
          GtkCssStyleProperty *prop = ruleset->styles[j].property;
@@ -1608,6 +1575,8 @@ gtk_css_style_provider_lookup (GtkStyleProviderPrivate *provider,
      if (_gtk_bitmask_is_empty (_gtk_css_lookup_get_missing (lookup)))
        break;
    }
+
+  g_ptr_array_free (tree_rules, TRUE);
 }

 static GtkCssChange
@@ -1617,26 +1586,29 @@ gtk_css_style_provider_get_change (GtkStyleProviderPrivate *provider,
  GtkCssProvider *css_provider;
  GtkCssProviderPrivate *priv;
  GtkCssChange change = 0;
+  GPtrArray *tree_rules;
  int i;

  css_provider = GTK_CSS_PROVIDER (provider);
  priv = css_provider->priv;

-  for (i = priv->rulesets->len - 1; i >= 0; i--)
+  tree_rules = _gtk_css_selector_tree_match_all (priv->tree, matcher);
+  verify_tree_match_results (css_provider, matcher, tree_rules);
+
+  for (i = tree_rules->len - 1; i >= 0; i--)
    {
      GtkCssRuleset *ruleset;

-      ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
+      ruleset = tree_rules->pdata[i];

      if (ruleset->styles == NULL)
        continue;

-      if (!gtk_css_ruleset_matches (ruleset, matcher))
-        continue;
-
      change |= gtk_css_ruleset_get_change (ruleset);
    }

+  g_ptr_array_free (tree_rules, TRUE);
+
  return change;
 }

@@ -1663,6 +1635,7 @@ gtk_css_provider_finalize (GObject *object)
    gtk_css_ruleset_clear (&g_array_index (priv->rulesets, GtkCssRuleset, i));

  g_array_free (priv->rulesets, TRUE);
+  _gtk_css_selector_tree_free (priv->tree);

  g_hash_table_destroy (priv->symbolic_colors);
  g_hash_table_destroy (priv->keyframes);
@@ -1800,6 +1773,9 @@ gtk_css_provider_reset (GtkCssProvider *css_provider)
  for (i = 0; i < priv->rulesets->len; i++)
    gtk_css_ruleset_clear (&g_array_index (priv->rulesets, GtkCssRuleset, i));
  g_array_set_size (priv->rulesets, 0);
+  _gtk_css_selector_tree_free (priv->tree);
+  priv->tree = NULL;
+
 }

 static void
@@ -1902,7 +1878,7 @@ parse_import (GtkCssScanner *scanner)
 static gboolean
 parse_color_definition (GtkCssScanner *scanner)
 {
-  GtkCssValue *symbolic;
+  GtkCssValue *color;
  char *name;

  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
@@ -1926,8 +1902,8 @@ parse_color_definition (GtkCssScanner *scanner)
      return TRUE;
    }

-  symbolic = _gtk_css_symbolic_value_new (scanner->parser);
-  if (symbolic == NULL)
+  color = _gtk_css_color_value_parse (scanner->parser);
+  if (color == NULL)
    {
      g_free (name);
      _gtk_css_parser_resync (scanner->parser, TRUE, 0);
@@ -1938,7 +1914,7 @@ parse_color_definition (GtkCssScanner *scanner)
  if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
    {
      g_free (name);
-      _gtk_css_value_unref (symbolic);
+      _gtk_css_value_unref (color);
      gtk_css_provider_error_literal (scanner->provider,
                                      scanner,
                                      GTK_CSS_PROVIDER_ERROR,
@@ -1950,7 +1926,7 @@ parse_color_definition (GtkCssScanner *scanner)
      return TRUE;
    }

-  g_hash_table_insert (scanner->provider->priv->symbolic_colors, name, symbolic);
+  g_hash_table_insert (scanner->provider->priv->symbolic_colors, name, color);

  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
  return TRUE;
@@ -2434,8 +2410,38 @@ static void
 gtk_css_provider_postprocess (GtkCssProvider *css_provider)
 {
  GtkCssProviderPrivate *priv = css_provider->priv;
+  GtkCssSelectorTreeBuilder *builder;
+  guint i;

  g_array_sort (priv->rulesets, gtk_css_provider_compare_rule);
+
+  builder = _gtk_css_selector_tree_builder_new ();
+  for (i = 0; i < priv->rulesets->len; i++)
+    {
+      GtkCssRuleset *ruleset;
+
+      ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
+
+      _gtk_css_selector_tree_builder_add (builder,
+					  ruleset->selector,
+					  &ruleset->selector_match,
+					  ruleset);
+    }
+
+  priv->tree = _gtk_css_selector_tree_builder_build (builder);
+  _gtk_css_selector_tree_builder_free (builder);
+
+#ifndef VERIFY_TREE
+  for (i = 0; i < priv->rulesets->len; i++)
+    {
+      GtkCssRuleset *ruleset;
+
+      ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
+
+      _gtk_css_selector_free (ruleset->selector);
+      ruleset->selector = NULL;
+    }
+#endif
 }

 static gboolean
@@ -2884,7 +2890,7 @@ gtk_css_ruleset_print (const GtkCssRuleset *ruleset,
  WidgetPropertyValue *widget_value;
  guint i;

-  _gtk_css_selector_print (ruleset->selector, str);
+  _gtk_css_selector_tree_match_print (ruleset->selector_match, str);

  g_string_append (str, " {\n");

@@ -2942,7 +2948,6 @@ gtk_css_provider_print_colors (GHashTable *colors,
                               GString    *str)
 {
  GList *keys, *walk;
-  char *s;

  keys = g_hash_table_get_keys (colors);
  /* so the output is identical for identical styles */
@@ -2951,14 +2956,12 @@ gtk_css_provider_print_colors (GHashTable *colors,
  for (walk = keys; walk; walk = walk->next)
    {
      const char *name = walk->data;
-      GtkSymbolicColor *symbolic = g_hash_table_lookup (colors, (gpointer) name);
+      GtkCssValue *color = g_hash_table_lookup (colors, (gpointer) name);

      g_string_append (str, "@define-color ");
      g_string_append (str, name);
      g_string_append (str, " ");
-      s = gtk_symbolic_color_to_string (symbolic);
-      g_string_append (str, s);
-      g_free (s);
+      _gtk_css_value_print (color, str);
      g_string_append (str, ";\n");
    }

@@ -21,7 +21,6 @@

 #include "gtkcssstylepropertyprivate.h"
 #include "gtkstylecontextprivate.h"
-#include "gtksymboliccolorprivate.h"

 struct _GtkCssValue {
  GTK_CSS_VALUE_BASE
@@ -24,6 +24,8 @@
 G_BEGIN_DECLS

 typedef struct _GtkCssSelector GtkCssSelector;
+typedef struct _GtkCssSelectorTree GtkCssSelectorTree;
+typedef struct _GtkCssSelectorTreeBuilder GtkCssSelectorTreeBuilder;

 GtkCssSelector *  _gtk_css_selector_parse           (GtkCssParser           *parser);
 void              _gtk_css_selector_free            (GtkCssSelector         *selector);
@@ -32,14 +34,27 @@ char *            _gtk_css_selector_to_string       (const GtkCssSelector   *sel
 void              _gtk_css_selector_print           (const GtkCssSelector   *selector,
                                                     GString                *str);

-GtkStateFlags     _gtk_css_selector_get_state_flags (const GtkCssSelector   *selector);
-
-GtkCssChange      _gtk_css_selector_get_change      (const GtkCssSelector   *selector);
 gboolean          _gtk_css_selector_matches         (const GtkCssSelector   *selector,
                                                     const GtkCssMatcher    *matcher);
 int               _gtk_css_selector_compare         (const GtkCssSelector   *a,
                                                     const GtkCssSelector   *b);

+void         _gtk_css_selector_tree_free             (GtkCssSelectorTree       *tree);
+GPtrArray *  _gtk_css_selector_tree_match_all        (const GtkCssSelectorTree *tree,
+						      const GtkCssMatcher      *matcher);
+void         _gtk_css_selector_tree_match_print      (const GtkCssSelectorTree *tree,
+						      GString                  *str);
+GtkCssChange _gtk_css_selector_tree_match_get_change (const GtkCssSelectorTree *tree);
+
+
+GtkCssSelectorTreeBuilder *_gtk_css_selector_tree_builder_new   (void);
+void                       _gtk_css_selector_tree_builder_add   (GtkCssSelectorTreeBuilder *builder,
+								 GtkCssSelector            *selectors,
+								 GtkCssSelectorTree       **selector_match,
+								 gpointer                   match);
+GtkCssSelectorTree *       _gtk_css_selector_tree_builder_build (GtkCssSelectorTreeBuilder *builder);
+void                       _gtk_css_selector_tree_builder_free  (GtkCssSelectorTreeBuilder *builder);
+
 G_END_DECLS

 #endif /* __GTK_CSS_SELECTOR_PRIVATE_H__ */
@@ -27,20 +27,21 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <cairo-gobject.h>

+#include "gtkcsscolorvalueprivate.h"
 #include "gtkcssimagegradientprivate.h"
 #include "gtkcssprovider.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkcsstypedvalueprivate.h"
 #include "gtkcsstypesprivate.h"
-#include "gtkgradient.h"
-#include "gtkgradientprivate.h"
 #include "gtkprivatetypebuiltins.h"
 #include "gtkstylecontextprivate.h"
-#include "gtksymboliccolorprivate.h"
 #include "gtkthemingengine.h"
 #include "gtktypebuiltins.h"
 #include "gtkwin32themeprivate.h"

+#include "deprecated/gtkgradientprivate.h"
+#include "deprecated/gtksymboliccolorprivate.h"
+
 /* this is in case round() is not provided by the compiler, 
 * such as in the case of C89 compilers, like MSVC
 */
@@ -171,7 +172,9 @@ rgba_value_parse (GtkCssParser *parser,
  GtkSymbolicColor *symbolic;
  GdkRGBA rgba;

-  symbolic = _gtk_symbolic_color_new_take_value (_gtk_css_symbolic_value_new (parser));
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
+  symbolic = _gtk_css_symbolic_value_new (parser);
  if (symbolic == NULL)
    return FALSE;

@@ -187,6 +190,8 @@ rgba_value_parse (GtkCssParser *parser,
      g_value_take_boxed (value, symbolic);
    }

+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
  return TRUE;
 }

@@ -225,11 +230,11 @@ rgba_value_compute (GtkStyleProviderPrivate *provider,
      GValue new_value = G_VALUE_INIT;
      GdkRGBA rgba;

-      val = _gtk_symbolic_color_resolve_full (symbolic,
-                                              provider,
-                                              _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
-                                              GTK_CSS_DEPENDS_ON_COLOR,
-                                              dependencies);
+      val = _gtk_css_color_value_resolve (_gtk_symbolic_color_get_css_value (symbolic),
+                                          provider,
+                                          _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
+                                          GTK_CSS_DEPENDS_ON_COLOR,
+                                          dependencies);
      if (val != NULL)
        {
          rgba = *_gtk_css_rgba_value_get_rgba (val);
@@ -253,7 +258,9 @@ color_value_parse (GtkCssParser *parser,
  GtkSymbolicColor *symbolic;
  GdkRGBA rgba;

-  symbolic = _gtk_symbolic_color_new_take_value (_gtk_css_symbolic_value_new (parser));
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
+  symbolic = _gtk_css_symbolic_value_new (parser);
  if (symbolic == NULL)
    return FALSE;

@@ -274,6 +281,8 @@ color_value_parse (GtkCssParser *parser,
      g_value_take_boxed (value, symbolic);
    }

+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
  return TRUE;
 }

@@ -310,11 +319,11 @@ color_value_compute (GtkStyleProviderPrivate *provider,
      GValue new_value = G_VALUE_INIT;
      GtkCssValue *val;

-      val = _gtk_symbolic_color_resolve_full ((GtkSymbolicColor *) g_value_get_boxed (value),
-                                              provider,
-                                              _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
-                                              GTK_CSS_DEPENDS_ON_COLOR,
-                                              dependencies);
+      val = _gtk_css_color_value_resolve (_gtk_symbolic_color_get_css_value (g_value_get_boxed (value)),
+                                          provider,
+                                          _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR),
+                                          GTK_CSS_DEPENDS_ON_COLOR,
+                                          dependencies);
      if (val != NULL)
        {
          const GdkRGBA *rgba = _gtk_css_rgba_value_get_rgba (val);
@@ -338,7 +347,7 @@ symbolic_color_value_parse (GtkCssParser *parser,
 {
  GtkSymbolicColor *symbolic;

-  symbolic = _gtk_symbolic_color_new_take_value (_gtk_css_symbolic_value_new (parser));
+  symbolic = _gtk_css_symbolic_value_new (parser);
  if (symbolic == NULL)
    return FALSE;

@@ -352,6 +361,8 @@ symbolic_color_value_print (const GValue *value,
 {
  GtkSymbolicColor *symbolic = g_value_get_boxed (value);

+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
  if (symbolic == NULL)
    g_string_append (string, "none");
  else
@@ -360,6 +371,8 @@ symbolic_color_value_print (const GValue *value,
      g_string_append (string, s);
      g_free (s);
    }
+
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }

 static gboolean 
@@ -702,6 +715,8 @@ gradient_value_print (const GValue *value,
 {
  GtkGradient *gradient = g_value_get_boxed (value);

+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
  if (gradient == NULL)
    g_string_append (string, "none");
  else
@@ -710,6 +725,8 @@ gradient_value_print (const GValue *value,
      g_string_append (string, s);
      g_free (s);
    }
+
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }

 static gboolean 
@@ -46,9 +46,10 @@
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcsseasevalueprivate.h"
 #include "gtkcssenginevalueprivate.h"
-#include "gtkcssimagegradientprivate.h"
 #include "gtkcssimageprivate.h"
+#include "gtkcssimagegradientprivate.h"
 #include "gtkcssimagevalueprivate.h"
+#include "gtkcssinitialvalueprivate.h"
 #include "gtkcssenumvalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsspositionvalueprivate.h"
@@ -159,7 +160,7 @@ assign_border (GtkCssStyleProperty *property,
  const GtkBorder *border = g_value_get_boxed (value);

  if (border == NULL)
-    return _gtk_css_value_ref (_gtk_css_style_property_get_initial_value (property));
+    return _gtk_css_initial_value_new ();
  else
    return _gtk_css_border_value_new (_gtk_css_number_value_new (border->top, GTK_CSS_PX),
                                      _gtk_css_number_value_new (border->right, GTK_CSS_PX),
@@ -602,7 +602,7 @@ custom_paper_printer_data_func (GtkCellLayout   *cell_layout,
  if (printer)
    g_object_set (cell, "text",  gtk_printer_get_name (printer), NULL);
  else
-    g_object_set (cell, "text",  _("Margins from Printer..."), NULL);
+    g_object_set (cell, "text",  _("Margins from Printer…"), NULL);

  if (printer)
    g_object_unref (printer);
@@ -1032,8 +1032,9 @@ gtk_file_chooser_get_create_folders (GtkFileChooser *chooser)
 * @chooser: a #GtkFileChooser
 * 
 * Gets the filename for the currently selected file in
- * the file selector. If multiple files are selected,
- * one of the filenames will be returned at random.
+ * the file selector. The filename is returned as an absolute path. If
+ * multiple files are selected, one of the filenames will be returned at
+ * random.
 *
 * If the file chooser is in folder mode, this function returns the selected
 * folder.
@@ -2043,7 +2043,7 @@ model_add_other (GtkFileChooserButton *button)
  gtk_list_store_insert (store, &iter, pos);
  gtk_list_store_set (store, &iter,
 		      ICON_COLUMN, NULL,
-		      DISPLAY_NAME_COLUMN, _("Other..."),
+		      DISPLAY_NAME_COLUMN, _("Other…"),
 		      TYPE_COLUMN, ROW_TYPE_OTHER,
 		      DATA_COLUMN, NULL,
 		      IS_FOLDER_COLUMN, FALSE,
@@ -3386,7 +3386,7 @@ shortcuts_build_popup_menu (GtkFileChooserDefault *impl)
  gtk_widget_show (item);
  gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_shortcuts_popup_menu), item);

-  item = gtk_menu_item_new_with_label (_("Rename..."));
+  item = gtk_menu_item_new_with_label (_("Rename…"));
  impl->browse_shortcuts_popup_menu_rename_item = item;
  g_signal_connect (item, "activate",
 		    G_CALLBACK (rename_shortcut_cb), impl);
@@ -183,3 +183,21 @@ _gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
    }
 }

+void
+_gtk_hsla_shade (GtkHSLA       *dest,
+                 const GtkHSLA *src,
+                 double         factor)
+{
+  g_return_if_fail (dest != NULL);
+  g_return_if_fail (src != NULL);
+
+  dest->hue = src->hue;
+
+  dest->lightness = src->lightness * factor;
+  dest->lightness = CLAMP (dest->lightness, 0.0, 1.0);
+
+  dest->saturation = src->saturation * factor;
+  dest->saturation = CLAMP (dest->saturation, 0.0, 1.0);
+
+  dest->alpha = src->alpha;
+}
@@ -42,6 +42,10 @@ void            _gtk_hsla_init_from_rgba    (GtkHSLA          *hsla,
 void            _gdk_rgba_init_from_hsla    (GdkRGBA          *rgba,
                                             const GtkHSLA    *hsla);

+void            _gtk_hsla_shade             (GtkHSLA          *dest,
+                                             const GtkHSLA    *src,
+                                             double            factor);
+
 G_END_DECLS

 #endif /* __GTK_HSLA_PRIVATE_H__ */
@@ -133,9 +133,6 @@ static void             gtk_icon_view_get_property              (GObject
 static void             gtk_icon_view_destroy                   (GtkWidget          *widget);
 static void             gtk_icon_view_realize                   (GtkWidget          *widget);
 static void             gtk_icon_view_unrealize                 (GtkWidget          *widget);
-static void             gtk_icon_view_style_updated             (GtkWidget          *widget);
-static void             gtk_icon_view_state_flags_changed       (GtkWidget          *widget,
-			                                         GtkStateFlags       previous_state);
 static GtkSizeRequestMode gtk_icon_view_get_request_mode        (GtkWidget          *widget);
 static void             gtk_icon_view_get_preferred_width       (GtkWidget          *widget,
 								 gint               *minimum,
@@ -352,7 +349,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
  widget_class->destroy = gtk_icon_view_destroy;
  widget_class->realize = gtk_icon_view_realize;
  widget_class->unrealize = gtk_icon_view_unrealize;
-  widget_class->style_updated = gtk_icon_view_style_updated;
  widget_class->get_request_mode = gtk_icon_view_get_request_mode;
  widget_class->get_preferred_width = gtk_icon_view_get_preferred_width;
  widget_class->get_preferred_height = gtk_icon_view_get_preferred_height;
@@ -373,7 +369,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
  widget_class->drag_motion = gtk_icon_view_drag_motion;
  widget_class->drag_drop = gtk_icon_view_drag_drop;
  widget_class->drag_data_received = gtk_icon_view_drag_data_received;
-  widget_class->state_flags_changed = gtk_icon_view_state_flags_changed;

  container_class->remove = gtk_icon_view_remove;
  container_class->forall = gtk_icon_view_forall;
@@ -974,6 +969,9 @@ gtk_icon_view_init (GtkIconView *icon_view)

  icon_view->priv->row_contexts = 
    g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
+
+  gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (icon_view)),
+                               GTK_STYLE_CLASS_VIEW);
 }

 /* GObject methods */
@@ -1251,7 +1249,6 @@ gtk_icon_view_realize (GtkWidget *widget)
  GdkWindow *window;
  GdkWindowAttr attributes;
  gint attributes_mask;
-  GtkStyleContext *context;

  gtk_widget_set_realized (widget, TRUE);

@@ -1294,15 +1291,6 @@ gtk_icon_view_realize (GtkWidget *widget)
  icon_view->priv->bin_window = gdk_window_new (window,
 						&attributes, attributes_mask);
  gdk_window_set_user_data (icon_view->priv->bin_window, widget);
-
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_save (context);
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
-  gtk_style_context_set_background (context, icon_view->priv->bin_window);
-  gtk_style_context_set_background (context, window);
-  gtk_style_context_restore (context);
-
  gdk_window_show (icon_view->priv->bin_window);
 }

@@ -1320,44 +1308,6 @@ gtk_icon_view_unrealize (GtkWidget *widget)
  GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize (widget);
 }

-static void
-_gtk_icon_view_update_background (GtkIconView *icon_view)
-{
-  GtkWidget *widget = GTK_WIDGET (icon_view);
-
-  if (gtk_widget_get_realized (widget))
-    {
-      GtkStyleContext *context;
-
-      context = gtk_widget_get_style_context (widget);
-
-      gtk_style_context_save (context);
-      gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
-
-      gtk_style_context_set_background (context, gtk_widget_get_window (widget));
-      gtk_style_context_set_background (context, icon_view->priv->bin_window);
-
-      gtk_style_context_restore (context);
-    }
-}
-
-static void
-gtk_icon_view_state_flags_changed (GtkWidget     *widget,
-                                   GtkStateFlags  previous_state)
-{
-  _gtk_icon_view_update_background (GTK_ICON_VIEW (widget));
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-gtk_icon_view_style_updated (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->style_updated (widget);
-
-  _gtk_icon_view_update_background (GTK_ICON_VIEW (widget));
-  gtk_widget_queue_resize (widget);
-}
-
 static gint
 gtk_icon_view_get_n_items (GtkIconView *icon_view)
 {
@@ -1823,9 +1773,16 @@ gtk_icon_view_draw (GtkWidget *widget,
  gint dest_index;
  GtkIconViewDropPosition dest_pos;
  GtkIconViewItem *dest_item = NULL;
+  GtkStyleContext *context;

  icon_view = GTK_ICON_VIEW (widget);

+  context = gtk_widget_get_style_context (widget);
+  gtk_render_background (context, cr,
+                         0, 0,
+                         gtk_widget_get_allocated_width (widget),
+                         gtk_widget_get_allocated_height (widget));
+
  if (!gtk_cairo_should_draw_window (cr, icon_view->priv->bin_window))
    return FALSE;

@@ -3037,7 +2994,6 @@ gtk_icon_view_paint_item (GtkIconView     *icon_view,
  state = gtk_widget_get_state_flags (widget);

  gtk_style_context_save (style_context);
-  gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_VIEW);
  gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_CELL);

  state &= ~(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_PRELIGHT);
@@ -2435,7 +2435,15 @@ propagate_event_down (GtkWidget *widget,
      widget = (GtkWidget *)l->data;

      if (!gtk_widget_is_sensitive (widget))
-        handled_event = TRUE;
+        {
+          /* stop propagating on SCROLL, but don't handle the event, so it
+           * can propagate up again and reach its handling widget
+           */
+          if (event->type == GDK_SCROLL)
+            break;
+          else
+            handled_event = TRUE;
+        }
      else
        handled_event = _gtk_widget_captured_event (widget, event);
    }
@@ -81,16 +81,6 @@ _gtk_modifier_style_init (GtkModifierStyle *modifier_style)
  priv->style = gtk_style_properties_new ();
 }

-static GtkStyleProperties *
-gtk_modifier_style_get_style (GtkStyleProvider *provider,
-                              GtkWidgetPath    *path)
-{
-  GtkModifierStylePrivate *priv;
-
-  priv = GTK_MODIFIER_STYLE (provider)->priv;
-  return g_object_ref (priv->style);
-}
-
 static gboolean
 gtk_modifier_style_get_style_property (GtkStyleProvider *provider,
                                       GtkWidgetPath    *path,
@@ -129,11 +119,10 @@ gtk_modifier_style_get_style_property (GtkStyleProvider *provider,
 static void
 gtk_modifier_style_provider_init (GtkStyleProviderIface *iface)
 {
-  iface->get_style = gtk_modifier_style_get_style;
  iface->get_style_property = gtk_modifier_style_get_style_property;
 }

-static GtkSymbolicColor *
+static GtkCssValue *
 gtk_modifier_style_provider_get_color (GtkStyleProviderPrivate *provider,
                                       const char              *name)
 {
@@ -267,12 +256,16 @@ _gtk_modifier_style_map_color (GtkModifierStyle *style,

  priv = style->priv;

+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
  if (color)
    symbolic_color = gtk_symbolic_color_new_literal (color);

  gtk_style_properties_map_color (priv->style,
                                  name, symbolic_color);

+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
  g_signal_emit (style, signals[CHANGED], 0);
  _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (style));
 }
@@ -842,7 +842,7 @@ page_name_func (GtkCellLayout   *cell_layout,
      g_object_unref (page_setup);
    }
  else
-    g_object_set (cell, "text",  _("Manage Custom Sizes..."), NULL);
+    g_object_set (cell, "text",  _("Manage Custom Sizes…"), NULL);

 }

@@ -1913,7 +1913,7 @@ selected_printer_changed (GtkTreeSelection   *selection,
      set_busy_cursor (dialog, TRUE);
      gtk_list_store_set (GTK_LIST_STORE (priv->printer_list),
                          g_object_get_data (G_OBJECT (printer), "gtk-print-tree-iter"),
-                          PRINTER_LIST_COL_STATE, _("Getting printer information..."),
+                          PRINTER_LIST_COL_STATE, _("Getting printer information…"),
                          -1);
      return;
    }
@@ -3326,7 +3326,7 @@ page_name_func (GtkCellLayout   *cell_layout,
      g_object_unref (page_setup);
    }
  else
-    g_object_set (cell, "text",  _("Manage Custom Sizes..."), NULL);
+    g_object_set (cell, "text",  _("Manage Custom Sizes…"), NULL);
 }

 static void
@@ -32,7 +32,6 @@
 #include "gtkprivate.h"
 #include "gtkcssproviderprivate.h"
 #include "gtkstyleproviderprivate.h"
-#include "gtksymboliccolor.h"
 #include "gtktypebuiltins.h"
 #include "gtkversion.h"

@@ -241,15 +240,9 @@ static void    settings_update_cursor_theme      (GtkSettings           *setting
 static void    settings_update_resolution        (GtkSettings           *settings);
 static void    settings_update_font_options      (GtkSettings           *settings);
 static gboolean settings_update_fontconfig       (GtkSettings           *settings);
-static void    settings_update_color_scheme      (GtkSettings *settings);
 static void    settings_update_theme             (GtkSettings *settings);
 static void    settings_update_key_theme         (GtkSettings *settings);

-static void    merge_color_scheme                (GtkSettings           *settings,
-                                                  const GValue          *value,
-                                                  GtkSettingsSource      source);
-static gchar  *get_color_scheme                  (GtkSettings           *settings);
-static GHashTable *get_color_hash                (GtkSettings           *settings);
 static void gtk_settings_load_from_key_file      (GtkSettings           *settings,
                                                  const gchar           *path,
                                                  GtkSettingsSource      source);
@@ -694,6 +687,9 @@ gtk_settings_class_init (GtkSettingsClass *class)
   * </programlisting>
   *
   * Since: 2.10
+   *
+   * Deprecated: 3.8: Color scheme support was dropped and is no longer supported.
+   *     You can still set this property, but it will be ignored.
   */
  result = settings_install_property_parser (class,
                                             g_param_spec_string ("gtk-color-scheme",
@@ -869,6 +865,8 @@ gtk_settings_class_init (GtkSettingsClass *class)
   * setting, mapping color names to #GdkColor<!-- -->s.
   *
   * Since: 2.10
+   *
+   * Deprecated: 3.8: Will always return an empty hash table.
   */
  result = settings_install_property_parser (class,
                                             g_param_spec_boxed ("color-hash",
@@ -1417,9 +1415,7 @@ settings_ensure_style (GtkSettings *settings)
 {
  GtkSettingsPrivate *priv = settings->priv;
  PangoFontDescription *font_desc;
-  gchar *font_name, *color_scheme;
-  gchar **colors;
-  guint i;
+  gchar *font_name;

  if (priv->style)
    return;
@@ -1428,42 +1424,8 @@ settings_ensure_style (GtkSettings *settings)

  g_object_get (settings,
                "gtk-font-name", &font_name,
-                "gtk-color-scheme", &color_scheme,
                NULL);

-  colors = g_strsplit_set (color_scheme, "\n;", -1);
-
-  for (i = 0; colors[i]; i++)
-    {
-      GtkSymbolicColor *color;
-      gchar *name, *pos;
-      GdkRGBA col;
-
-      if (!*colors[i])
-        continue;
-
-      name = colors[i];
-      pos = strchr (colors[i], ':');
-
-      if (!pos)
-        continue;
-
-      /* Set NUL after color name */
-      *pos = '\0';
-      pos++;
-
-      /* Find start of color string */
-      while (*pos == ' ')
-        pos++;
-
-      if (!*pos || !gdk_rgba_parse (&col, pos))
-        continue;
-
-      color = gtk_symbolic_color_new_literal (&col);
-      gtk_style_properties_map_color (priv->style, name, color);
-      gtk_symbolic_color_unref (color);
-    }
-
  font_desc = pango_font_description_from_string (font_name);

  /* Unset normal attributes from this description,
@@ -1489,31 +1451,15 @@ settings_ensure_style (GtkSettings *settings)
                            NULL);

  pango_font_description_free (font_desc);
-  g_strfreev (colors);
-  g_free (color_scheme);
  g_free (font_name);
 }

-static GtkStyleProperties *
-gtk_settings_get_style (GtkStyleProvider *provider,
-                        GtkWidgetPath    *path)
-{
-  GtkSettings *settings;
-
-  settings = GTK_SETTINGS (provider);
-
-  settings_ensure_style (settings);
-
-  return g_object_ref (settings->priv->style);
-}
-
 static void
 gtk_settings_provider_iface_init (GtkStyleProviderIface *iface)
 {
-  iface->get_style = gtk_settings_get_style;
 }

-static GtkSymbolicColor *
+static GtkCssValue *
 gtk_settings_style_provider_get_color (GtkStyleProviderPrivate *provider,
                                       const char              *name)
 {
@@ -1661,7 +1607,6 @@ gtk_settings_get_for_screen (GdkScreen *screen)
      settings_update_cursor_theme (settings);
      settings_update_resolution (settings);
      settings_update_font_options (settings);
-      settings_update_color_scheme (settings);
    }

  return settings;
@@ -1698,9 +1643,6 @@ gtk_settings_set_property (GObject      *object,

  g_value_copy (value, &priv->property_values[property_id - 1].value);
  priv->property_values[property_id - 1].source = GTK_SETTINGS_SOURCE_APPLICATION;
-
-  if (pspec->param_id == PROP_COLOR_SCHEME)
-    merge_color_scheme (settings, value, GTK_SETTINGS_SOURCE_APPLICATION);
 }

 static void
@@ -1718,10 +1660,9 @@ gtk_settings_get_property (GObject     *object,
  switch (property_id)
    {
    case PROP_COLOR_HASH:
-      g_value_set_boxed (value, get_color_hash (settings));
-      return;
-    case PROP_COLOR_SCHEME:
-      g_value_take_string (value, get_color_scheme (settings));
+      g_value_take_boxed (value,
+                          g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                 g_free, (GDestroyNotify) gdk_color_free));
      return;
    default: ;
    }
@@ -1819,11 +1760,6 @@ gtk_settings_notify (GObject    *object,
    case PROP_DOUBLE_CLICK_DISTANCE:
      settings_update_double_click (settings);
      break;
-    case PROP_COLOR_SCHEME:
-      settings_update_color_scheme (settings);
-      settings_invalidate_style (settings);
-      gtk_style_context_reset_widgets (priv->screen);
-      break;
    case PROP_FONT_NAME:
      settings_invalidate_style (settings);
      gtk_style_context_reset_widgets (priv->screen);
@@ -1945,9 +1881,6 @@ apply_queued_setting (GtkSettings             *settings,
  if (_gtk_settings_parse_convert (parser, &qvalue->public.value,
                                   pspec, &tmp_value))
    {
-      if (pspec->param_id == PROP_COLOR_SCHEME)
-        merge_color_scheme (settings, &tmp_value, qvalue->source);
-
      if (priv->property_values[pspec->param_id - 1].source <= qvalue->source)
        {
          g_value_copy (&tmp_value, &priv->property_values[pspec->param_id - 1].value);
@@ -2578,28 +2511,13 @@ _gtk_settings_handle_event (GdkEventSetting *event)
  GdkScreen *screen;
  GtkSettings *settings;
  GParamSpec *pspec;
-  guint property_id;

  screen = gdk_window_get_screen (event->window);
  settings = gtk_settings_get_for_screen (screen);
  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (settings), event->name);

  if (pspec)
-    {
-      property_id = pspec->param_id;
-
-      if (property_id == PROP_COLOR_SCHEME)
-        {
-          GValue value = G_VALUE_INIT;
-
-          g_value_init (&value, G_TYPE_STRING);
-          if (!gdk_screen_get_setting (screen, pspec->name, &value))
-            g_value_set_static_string (&value, "");
-          merge_color_scheme (settings, &value, GTK_SETTINGS_SOURCE_XSETTING);
-          g_value_unset (&value);
-        }
-      g_object_notify (G_OBJECT (settings), pspec->name);
-   }
+    g_object_notify (G_OBJECT (settings), pspec->name);
 }

 static void
@@ -2847,54 +2765,6 @@ settings_update_resolution (GtkSettings *settings)
  gdk_screen_set_resolution (priv->screen, dpi);
 }

-typedef struct
-{
-  GHashTable *color_hash;
-  GHashTable *tables[GTK_SETTINGS_SOURCE_APPLICATION + 1];
-  gchar *lastentry[GTK_SETTINGS_SOURCE_APPLICATION + 1];
-} ColorSchemeData;
-
-static void
-color_scheme_data_free (ColorSchemeData *data)
-{
-  gint i;
-
-  g_hash_table_unref (data->color_hash);
-
-  for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++)
-    {
-      if (data->tables[i])
-        g_hash_table_unref (data->tables[i]);
-      g_free (data->lastentry[i]);
-    }
-
-  g_slice_free (ColorSchemeData, data);
-}
-
-static void
-settings_update_color_scheme (GtkSettings *settings)
-{
-  if (!g_object_get_data (G_OBJECT (settings), "gtk-color-scheme"))
-    {
-      GtkSettingsPrivate *priv = settings->priv;
-      ColorSchemeData *data;
-      GValue value = G_VALUE_INIT;
-
-      data = g_slice_new0 (ColorSchemeData);
-      data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-                                                (GDestroyNotify) gdk_color_free);
-      g_object_set_data_full (G_OBJECT (settings), "gtk-color-scheme",
-                              data, (GDestroyNotify) color_scheme_data_free);
-
-      g_value_init (&value, G_TYPE_STRING);
-      if (priv->screen && gdk_screen_get_setting (priv->screen, "gtk-color-scheme", &value))
-        {
-          merge_color_scheme (settings, &value, GTK_SETTINGS_SOURCE_XSETTING);
-          g_value_unset (&value);
-        }
-   }
-}
-
 static void
 settings_update_provider (GdkScreen       *screen,
                          GtkCssProvider **old,
@@ -2979,236 +2849,6 @@ settings_update_key_theme (GtkSettings *settings)
  g_free (key_theme_name);
 }

-static gboolean
-add_color_to_hash (gchar      *name,
-                   GdkColor   *color,
-                   GHashTable *target)
-{
-  GdkColor *old;
-
-  old = g_hash_table_lookup (target, name);
-  if (!old || !gdk_color_equal (old, color))
-    {
-      g_hash_table_insert (target, g_strdup (name), gdk_color_copy (color));
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-add_colors_to_hash_from_string (GHashTable  *hash,
-                                const gchar *colors)
-{
-  gchar *s, *p, *name;
-  GdkColor color;
-  gboolean changed = FALSE;
-  gchar *copy;
-
-  copy = g_strdup (colors);
-  s = copy;
-  while (s && *s)
-    {
-      name = s;
-      p = strchr (s, ':');
-      if (p)
-        {
-          *p = '\0';
-          p++;
-        }
-      else
-        break;
-
-      while (*p == ' ')
-        p++;
-
-      s = p;
-      while (*s)
-        {
-          if (*s == '\n' || *s == ';')
-            {
-              *s = '\0';
-              s++;
-              break;
-            }
-          s++;
-        }
-
-      if (gdk_color_parse (p, &color))
-        changed |= add_color_to_hash (name, &color, hash);
-    }
-
-  g_free (copy);
-
-  return changed;
-}
-
-static gboolean
-update_color_hash (ColorSchemeData   *data,
-                   const gchar       *str,
-                   GtkSettingsSource  source)
-{
-  gboolean changed = FALSE;
-  gint i;
-  GHashTable *old_hash;
-  GHashTableIter iter;
-  gpointer name;
-  gpointer color;
-
-  if ((str == NULL || *str == '\0') &&
-      (data->lastentry[source] == NULL || data->lastentry[source][0] == '\0'))
-    return FALSE;
-
-  if (str && data->lastentry[source] && strcmp (str, data->lastentry[source]) == 0)
-    return FALSE;
-
-  /* For the THEME source we merge the values rather than over-writing
-   * them, since multiple rc files might define independent sets of colors
-   */
-  if ((source != GTK_SETTINGS_SOURCE_THEME) &&
-      data->tables[source] && g_hash_table_size (data->tables[source]) > 0)
-    {
-      g_hash_table_unref (data->tables[source]);
-      data->tables[source] = NULL;
-      changed = TRUE; /* We can't rely on the code below since str might be "" */
-    }
-
-  if (data->tables[source] == NULL)
-    data->tables[source] = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                  g_free,
-                                                  (GDestroyNotify) gdk_color_free);
-
-  g_free (data->lastentry[source]);
-  data->lastentry[source] = g_strdup (str);
-
-  changed |= add_colors_to_hash_from_string (data->tables[source], str);
-
-  if (!changed)
-    return FALSE;
-
-  /* Rebuild the merged hash table. */
-  if (data->color_hash)
-    {
-      old_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
-                                        (GDestroyNotify) gdk_color_free);
-
-      g_hash_table_iter_init (&iter, data->color_hash);
-      while (g_hash_table_iter_next (&iter, &name, &color))
-        {
-          g_hash_table_insert (old_hash, name, color);
-          g_hash_table_iter_steal (&iter);
-        }
-    }
-  else
-    {
-      old_hash = NULL;
-    }
-
-  for (i = 0; i <= GTK_SETTINGS_SOURCE_APPLICATION; i++)
-    {
-      if (data->tables[i])
-        g_hash_table_foreach (data->tables[i], (GHFunc) add_color_to_hash,
-                              data->color_hash);
-    }
-
-  if (old_hash)
-    {
-      /* now check if the merged hash has changed */
-      changed = FALSE;
-      if (g_hash_table_size (old_hash) != g_hash_table_size (data->color_hash))
-        changed = TRUE;
-      else
-        {
-          GHashTableIter iter;
-          gpointer key, value, new_value;
-
-          g_hash_table_iter_init (&iter, old_hash);
-          while (g_hash_table_iter_next (&iter, &key, &value))
-            {
-              new_value = g_hash_table_lookup (data->color_hash, key);
-              if (!new_value || !gdk_color_equal (value, new_value))
-                {
-                  changed = TRUE;
-                  break;
-                }
-            }
-        }
-
-      g_hash_table_unref (old_hash);
-    }
-  else
-    changed = TRUE;
-
-  return changed;
-}
-
-static void
-merge_color_scheme (GtkSettings       *settings,
-                    const GValue      *value,
-                    GtkSettingsSource  source)
-{
-  ColorSchemeData *data;
-  const gchar *colors;
-
-  g_object_freeze_notify (G_OBJECT (settings));
-
-  colors = g_value_get_string (value);
-
-  settings_update_color_scheme (settings);
-
-  data = (ColorSchemeData *) g_object_get_data (G_OBJECT (settings),
-                                                "gtk-color-scheme");
-
-  if (update_color_hash (data, colors, source))
-    g_object_notify (G_OBJECT (settings), "color-hash");
-
-  g_object_thaw_notify (G_OBJECT (settings));
-}
-
-static GHashTable *
-get_color_hash (GtkSettings *settings)
-{
-  ColorSchemeData *data;
-
-  settings_update_color_scheme (settings);
-
-  data = (ColorSchemeData *)g_object_get_data (G_OBJECT (settings),
-                                               "gtk-color-scheme");
-
-  return data->color_hash;
-}
-
-static void
-append_color_scheme (gpointer key,
-                     gpointer value,
-                     gpointer data)
-{
-  gchar *name = (gchar *)key;
-  GdkColor *color = (GdkColor *)value;
-  GString *string = (GString *)data;
-
-  g_string_append_printf (string, "%s: #%04x%04x%04x\n",
-                          name, color->red, color->green, color->blue);
-}
-
-static gchar *
-get_color_scheme (GtkSettings *settings)
-{
-  ColorSchemeData *data;
-  GString *string;
-
-  settings_update_color_scheme (settings);
-
-  data = (ColorSchemeData *) g_object_get_data (G_OBJECT (settings),
-                                                "gtk-color-scheme");
-
-  string = g_string_new ("");
-
-  g_hash_table_foreach (data->color_hash, append_color_scheme, string);
-
-  return g_string_free (string, FALSE);
-}

 GdkScreen *
 _gtk_settings_get_screen (GtkSettings *settings)
@@ -152,17 +152,18 @@ G_STATIC_ASSERT (GTK_SIZE_GROUP_VERTICAL == (1 << GTK_ORIENTATION_VERTICAL));
 G_STATIC_ASSERT (GTK_SIZE_GROUP_BOTH == (GTK_SIZE_GROUP_HORIZONTAL | GTK_SIZE_GROUP_VERTICAL));

 static void
-add_widget_to_closure (GHashTable     *set,
+add_widget_to_closure (GHashTable     *widgets,
+                       GHashTable     *groups,
                       GtkWidget      *widget,
 		       GtkOrientation  orientation)
 {
  GSList *tmp_groups, *tmp_widgets;
  gboolean hidden;

-  if (g_hash_table_lookup (set, widget))
+  if (g_hash_table_lookup (widgets, widget))
    return;

-  g_hash_table_insert (set, widget, widget);
+  g_hash_table_add (widgets, widget);
  hidden = !gtk_widget_is_visible (widget);

  for (tmp_groups = _gtk_widget_get_sizegroups (widget); tmp_groups; tmp_groups = tmp_groups->next)
@@ -170,14 +171,19 @@ add_widget_to_closure (GHashTable     *set,
      GtkSizeGroup        *tmp_group = tmp_groups->data;
      GtkSizeGroupPrivate *tmp_priv  = tmp_group->priv;

+      if (g_hash_table_lookup (groups, tmp_group))
+        continue;
+
      if (tmp_priv->ignore_hidden && hidden)
        continue;

      if (!(tmp_priv->mode & (1 << orientation)))
        continue;

+      g_hash_table_add (groups, tmp_group);
+
      for (tmp_widgets = tmp_priv->widgets; tmp_widgets; tmp_widgets = tmp_widgets->next)
-        add_widget_to_closure (set, tmp_widgets->data, orientation);
+        add_widget_to_closure (widgets, groups, tmp_widgets->data, orientation);
    }
 }

@@ -185,13 +191,16 @@ GHashTable *
 _gtk_size_group_get_widget_peers (GtkWidget      *for_widget,
                                  GtkOrientation  orientation)
 {
-  GHashTable *result;
+  GHashTable *widgets, *groups;

-  result = g_hash_table_new (g_direct_hash, g_direct_equal);
+  widgets = g_hash_table_new (g_direct_hash, g_direct_equal);
+  groups = g_hash_table_new (g_direct_hash, g_direct_equal);

-  add_widget_to_closure (result, for_widget, orientation);
+  add_widget_to_closure (widgets, groups, for_widget, orientation);

-  return result;
+  g_hash_table_unref (groups);
+
+  return widgets;
 }
                                     
 static void
@@ -91,16 +91,6 @@ gtk_style_cascade_iter_init (GtkStyleCascade     *cascade,
  return gtk_style_cascade_iter_next (cascade, iter);
 }

-static GtkStyleProperties * 
-gtk_style_cascade_get_style (GtkStyleProvider *provider,
-                             GtkWidgetPath    *path)
-{
-  /* This function is not used anymore by GTK and nobody
-   * else is ever supposed to call it */
-  g_warn_if_reached ();
-  return NULL;
-}
-
 static gboolean
 gtk_style_cascade_get_style_property (GtkStyleProvider *provider,
                                      GtkWidgetPath    *path,
@@ -127,30 +117,19 @@ gtk_style_cascade_get_style_property (GtkStyleProvider *provider,
  return FALSE;
 }

-static GtkIconFactory *
-gtk_style_cascade_get_icon_factory (GtkStyleProvider *provider,
-				    GtkWidgetPath    *path)
-{
-  /* If anyone ever implements get_icon_factory(), I'll
-   * look at this function. Until then I'll just: */
-  return NULL;
-}
-
 static void
 gtk_style_cascade_provider_iface_init (GtkStyleProviderIface *iface)
 {
-  iface->get_style = gtk_style_cascade_get_style;
  iface->get_style_property = gtk_style_cascade_get_style_property;
-  iface->get_icon_factory = gtk_style_cascade_get_icon_factory;
 }

-static GtkSymbolicColor *
+static GtkCssValue *
 gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider,
                             const char              *name)
 {
  GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider);
  GtkStyleCascadeIter iter;
-  GtkSymbolicColor *symbolic;
+  GtkCssValue *color;
  GtkStyleProvider *item;

  for (item = gtk_style_cascade_iter_init (cascade, &iter);
@@ -159,9 +138,9 @@ gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider,
    {
      if (GTK_IS_STYLE_PROVIDER_PRIVATE (item))
        {
-          symbolic = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (item), name);
-          if (symbolic)
-            return symbolic;
+          color = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (item), name);
+          if (color)
+            return color;
        }
      else
        {
@@ -24,11 +24,11 @@

 #include "gtkstylecontextprivate.h"
 #include "gtkcontainerprivate.h"
+#include "gtkcsscolorvalueprivate.h"
 #include "gtkcssenginevalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkdebug.h"
-#include "gtkgradientprivate.h"
 #include "gtkstylepropertiesprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkthemingengineprivate.h"
@@ -36,7 +36,6 @@
 #include "gtkwidget.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"
-#include "gtksymboliccolorprivate.h"
 #include "gtkiconfactory.h"
 #include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
@@ -45,6 +44,9 @@
 #include "gtksettings.h"
 #include "gtksettingsprivate.h"

+#include "deprecated/gtkgradientprivate.h"
+#include "deprecated/gtksymboliccolorprivate.h"
+
 /**
 * SECTION:gtkstylecontext
 * @Short_description: Rendering UI elements
@@ -2282,6 +2284,8 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context,
                                                 widget_path,
                                                 state, pspec, &pcache->value))
        {
+          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
          /* Resolve symbolic colors to GdkColor/GdkRGBA */
          if (G_VALUE_TYPE (&pcache->value) == GTK_TYPE_SYMBOLIC_COLOR)
            {
@@ -2297,7 +2301,7 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context,
              else
                g_value_init (&pcache->value, GDK_TYPE_COLOR);

-              if (_gtk_style_context_resolve_color (context, color, &rgba, NULL))
+              if (_gtk_style_context_resolve_color (context, _gtk_symbolic_color_get_css_value (color), &rgba, NULL))
                {
                  if (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_RGBA)
                    g_value_set_boxed (&pcache->value, &rgba);
@@ -2318,6 +2322,8 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context,
              gtk_symbolic_color_unref (color);
            }

+          G_GNUC_END_IGNORE_DEPRECATIONS;
+
          if (priv->widget)
            gtk_widget_path_free (widget_path);

@@ -2703,7 +2709,7 @@ gtk_style_context_get_junction_sides (GtkStyleContext *context)

 gboolean
 _gtk_style_context_resolve_color (GtkStyleContext    *context,
-                                  GtkSymbolicColor   *color,
+                                  GtkCssValue        *color,
                                  GdkRGBA            *result,
                                  GtkCssDependencies *dependencies)
 {
@@ -2713,11 +2719,11 @@ _gtk_style_context_resolve_color (GtkStyleContext    *context,
  g_return_val_if_fail (color != NULL, FALSE);
  g_return_val_if_fail (result != NULL, FALSE);

-  val = _gtk_symbolic_color_resolve_full (color,
-                                          GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade),
-                                          _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR),
-                                          GTK_CSS_DEPENDS_ON_COLOR,
-                                          dependencies);
+  val = _gtk_css_color_value_resolve (color,
+                                      GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade),
+                                      _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR),
+                                      GTK_CSS_DEPENDS_ON_COLOR,
+                                      dependencies);
  if (val == NULL)
    return FALSE;

@@ -2741,17 +2747,17 @@ gtk_style_context_lookup_color (GtkStyleContext *context,
                                const gchar     *color_name,
                                GdkRGBA         *color)
 {
-  GtkSymbolicColor *sym_color;
+  GtkCssValue *value;

  g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), FALSE);
  g_return_val_if_fail (color_name != NULL, FALSE);
  g_return_val_if_fail (color != NULL, FALSE);

-  sym_color = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade), color_name);
-  if (sym_color == NULL)
+  value = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade), color_name);
+  if (value == NULL)
    return FALSE;

-  return _gtk_style_context_resolve_color (context, sym_color, color, NULL);
+  return _gtk_style_context_resolve_color (context, value, color, NULL);
 }

 /**
@@ -20,7 +20,6 @@

 #include "gtkstylecontext.h"
 #include "gtkstyleproviderprivate.h"
-#include "gtksymboliccolor.h"
 #include "gtkbitmaskprivate.h"
 #include "gtkcssvalueprivate.h"

@@ -46,7 +45,7 @@ void           _gtk_style_context_queue_invalidate           (GtkStyleContext *c
 gboolean       _gtk_style_context_check_region_name          (const gchar     *str);

 gboolean       _gtk_style_context_resolve_color              (GtkStyleContext    *context,
-                                                              GtkSymbolicColor   *color,
+                                                              GtkCssValue        *color,
                                                              GdkRGBA            *result,
                                                              GtkCssDependencies *dependencies);
 void           _gtk_style_context_get_cursor_color           (GtkStyleContext    *context,
@@ -24,9 +24,7 @@
 #include <cairo-gobject.h>

 #include "gtkstyleprovider.h"
-#include "gtksymboliccolor.h"
 #include "gtkthemingengine.h"
-#include "gtkgradient.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkcsstypedvalueprivate.h"
 #include "gtkcsstypesprivate.h"
@@ -36,9 +34,11 @@
 #include "gtkstylepropertyprivate.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtkintl.h"
-
 #include "gtkwin32themeprivate.h"

+#include "deprecated/gtkgradient.h"
+#include "deprecated/gtksymboliccolorprivate.h"
+
 /**
 * SECTION:gtkstyleproperties
 * @Short_description: Store for style property information
@@ -279,25 +279,26 @@ gtk_style_properties_finalize (GObject *object)
  G_OBJECT_CLASS (gtk_style_properties_parent_class)->finalize (object);
 }

-static GtkStyleProperties *
-gtk_style_properties_get_style (GtkStyleProvider *provider,
-                                GtkWidgetPath    *path)
-{
-  /* Return style set itself */
-  return g_object_ref (provider);
-}
-
 static void
 gtk_style_properties_provider_init (GtkStyleProviderIface *iface)
 {
-  iface->get_style = gtk_style_properties_get_style;
 }

-static GtkSymbolicColor *
+static GtkCssValue *
 gtk_style_properties_provider_get_color (GtkStyleProviderPrivate *provider,
                                         const char              *name)
 {
-  return gtk_style_properties_lookup_color (GTK_STYLE_PROPERTIES (provider), name);
+  GtkSymbolicColor *symbolic;
+
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
+  symbolic = gtk_style_properties_lookup_color (GTK_STYLE_PROPERTIES (provider), name);
+  if (symbolic == NULL)
+    return NULL;
+
+  return _gtk_symbolic_color_get_css_value (symbolic);
+
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 }

 static void
@@ -376,6 +377,8 @@ gtk_style_properties_new (void)
 * gtk_style_properties_lookup_color()
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
 **/
 void
 gtk_style_properties_map_color (GtkStyleProperties *props,
@@ -390,6 +393,8 @@ gtk_style_properties_map_color (GtkStyleProperties *props,

  priv = props->priv;

+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
  if (G_UNLIKELY (!priv->color_map))
    priv->color_map = g_hash_table_new_full (g_str_hash,
                                             g_str_equal,
@@ -400,6 +405,8 @@ gtk_style_properties_map_color (GtkStyleProperties *props,
                        g_strdup (name),
                        gtk_symbolic_color_ref (color));

+  G_GNUC_END_IGNORE_DEPRECATIONS;
+
  _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (props));
 }

@@ -414,6 +421,8 @@ gtk_style_properties_map_color (GtkStyleProperties *props,
 * Returns: (transfer none): The mapped color
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
 **/
 GtkSymbolicColor *
 gtk_style_properties_lookup_color (GtkStyleProperties *props,
@@ -870,7 +879,9 @@ gtk_style_properties_merge (GtkStyleProperties       *props,
              g_hash_table_lookup (priv->color_map, name))
            continue;

+          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
          gtk_style_properties_map_color (props, name, color);
+          G_GNUC_END_IGNORE_DEPRECATIONS;
        }
    }

@@ -74,9 +74,11 @@ gboolean gtk_style_properties_lookup_property   (const gchar             *proper

 GtkStyleProperties * gtk_style_properties_new (void);

+GDK_DEPRECATED_IN_3_8
 void               gtk_style_properties_map_color    (GtkStyleProperties *props,
                                                      const gchar        *name,
                                                      GtkSymbolicColor   *color);
+GDK_DEPRECATED_IN_3_8
 GtkSymbolicColor * gtk_style_properties_lookup_color (GtkStyleProperties *props,
                                                      const gchar        *name);

@@ -21,7 +21,6 @@
 #include "gtkstyleproperties.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkstylecontextprivate.h"
-#include "gtksymboliccolorprivate.h"

 G_BEGIN_DECLS

@@ -66,6 +66,9 @@ gtk_style_provider_iface_init (gpointer g_iface)
 * style settings affecting @path
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: Will always return %NULL for all GTK-provided style providers
+ *     as the interface cannot correctly work the way CSS is specified.
 **/
 GtkStyleProperties *
 gtk_style_provider_get_style (GtkStyleProvider *provider,
@@ -132,6 +135,8 @@ gtk_style_provider_get_style_property (GtkStyleProvider *provider,
 * Returns: (transfer none): The icon factory to use for @path, or %NULL
 *
 * Since: 3.0
+ *
+ * Deprecated: 3.8: Will always return %NULL for all GTK-provided style providers.
 **/
 GtkIconFactory *
 gtk_style_provider_get_icon_factory (GtkStyleProvider *provider,
@@ -109,6 +109,7 @@ struct _GtkStyleProviderIface

 GType gtk_style_provider_get_type (void) G_GNUC_CONST;

+GDK_DEPRECATED_IN_3_8
 GtkStyleProperties *gtk_style_provider_get_style (GtkStyleProvider *provider,
                                                  GtkWidgetPath    *path);

@@ -118,6 +119,7 @@ gboolean gtk_style_provider_get_style_property (GtkStyleProvider *provider,
                                                GParamSpec       *pspec,
                                                GValue           *value);

+GDK_DEPRECATED_IN_3_8_FOR(NULL)
 GtkIconFactory * gtk_style_provider_get_icon_factory (GtkStyleProvider *provider,
 						      GtkWidgetPath    *path);

@@ -44,7 +44,7 @@ _gtk_style_provider_private_default_init (GtkStyleProviderPrivateInterface *ifac

 }

-GtkSymbolicColor *
+GtkCssValue *
 _gtk_style_provider_private_get_color (GtkStyleProviderPrivate *provider,
                                       const char              *name)
 {
@@ -22,8 +22,7 @@
 #include "gtk/gtkcsskeyframesprivate.h"
 #include "gtk/gtkcsslookupprivate.h"
 #include "gtk/gtkcssmatcherprivate.h"
-#include <gtk/gtkenums.h>
-#include <gtk/gtksymboliccolor.h>
+#include "gtk/gtkcssvalueprivate.h"
 #include <gtk/gtktypes.h>

 G_BEGIN_DECLS
@@ -40,7 +39,7 @@ struct _GtkStyleProviderPrivateInterface
 {
  GTypeInterface g_iface;

-  GtkSymbolicColor *    (* get_color)           (GtkStyleProviderPrivate *provider,
+  GtkCssValue *         (* get_color)           (GtkStyleProviderPrivate *provider,
                                                 const char              *name);
  GtkCssKeyframes *     (* get_keyframes)       (GtkStyleProviderPrivate *provider,
                                                 const char              *name);
@@ -56,7 +55,7 @@ struct _GtkStyleProviderPrivateInterface

 GType                   _gtk_style_provider_private_get_type     (void) G_GNUC_CONST;

-GtkSymbolicColor *      _gtk_style_provider_private_get_color    (GtkStyleProviderPrivate *provider,
+GtkCssValue *           _gtk_style_provider_private_get_color    (GtkStyleProviderPrivate *provider,
                                                                  const char              *name);
 GtkCssKeyframes *       _gtk_style_provider_private_get_keyframes(GtkStyleProviderPrivate *provider,
                                                                  const char              *name);
@@ -1,52 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_SYMBOLIC_COLOR_PRIVATE_H__
-#define __GTK_SYMBOLIC_COLOR_PRIVATE_H__
-
-#include "gtk/gtksymboliccolor.h"
-#include "gtk/gtkcssparserprivate.h"
-#include "gtk/gtkcssvalueprivate.h"
-
-G_BEGIN_DECLS
-
-GtkCssValue *      _gtk_symbolic_color_resolve_full       (GtkSymbolicColor           *color,
-                                                           GtkStyleProviderPrivate    *provider,
-                                                           GtkCssValue                *current,
-                                                           GtkCssDependencies          current_deps,
-                                                           GtkCssDependencies         *dependencies);
-
-GtkSymbolicColor * _gtk_symbolic_color_get_current_color  (void);
-
-GtkCssValue *      _gtk_css_symbolic_value_new            (GtkCssParser               *parser);
-
-/* I made these inline functions instead of macros to gain type safety for the arguments passed in. */
-static inline GtkSymbolicColor *
-_gtk_symbolic_color_new_take_value (GtkCssValue *value)
-{
-  return (GtkSymbolicColor *) value;
-}
-
-static inline GtkCssValue *
-_gtk_css_symbolic_value_new_take_symbolic_color (GtkSymbolicColor *color)
-{
-  return (GtkCssValue *) color;
-}
-
-G_END_DECLS
-
-#endif /* __GTK_SYMBOLIC_COLOR_PRIVATE_H__ */
@@ -35,6 +35,7 @@
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
 #include "gtkcsstypesprivate.h"
+#include "gtkhslaprivate.h"
 #include "gtkthemingengineprivate.h"
 #include "gtkroundedboxprivate.h"
 #include "gtkthemingbackgroundprivate.h"
@@ -1339,14 +1340,11 @@ color_shade (const GdkRGBA *color,
             gdouble        factor,
             GdkRGBA       *color_return)
 {
-  GtkSymbolicColor *literal, *shade;
+  GtkHSLA hsla;

-  literal = gtk_symbolic_color_new_literal (color);
-  shade = gtk_symbolic_color_new_shade (literal, factor);
-  gtk_symbolic_color_unref (literal);
-
-  gtk_symbolic_color_resolve (shade, NULL, color_return);
-  gtk_symbolic_color_unref (shade);
+  _gtk_hsla_init_from_rgba (&hsla, color);
+  _gtk_hsla_shade (&hsla, &hsla, factor);
+  _gdk_rgba_init_from_hsla (color_return, &hsla);
 }

 static void
@@ -168,12 +168,12 @@
 * /&ast; Fill the list store with data &ast;/
 * populate_model (list_store);
 *
- * /&ast; Get the first iter in the list &ast;/
- * valid = gtk_tree_model_get_iter_first (list_store, &amp;iter);
- *
- * while (valid)
+ * /&ast; Get the first iter in the list, check it is valid and walk
+ *  &ast; through the list, reading each row. &ast;/
+ * for (valid = gtk_tree_model_get_iter_first (list_store, &amp;iter);
+ *      valid;
+ *      valid = gtk_tree_model_iter_next (list_store, &amp;iter))
 *  {
- *    /&ast; Walk through the list, reading each row &ast;/
 *    gchar *str_data;
 *    gint   int_data;
 *
@@ -190,7 +190,6 @@
 *    g_free (str_data);
 *
 *    row_count++;
- *    valid = gtk_tree_model_iter_next (list_store, &amp;iter);
 *  }
 * </programlisting>
 * </example>
@@ -190,9 +190,12 @@ gboolean     gtk_tree_path_is_ancestor      (GtkTreePath       *path,
 gboolean     gtk_tree_path_is_descendant    (GtkTreePath       *path,
                                             GtkTreePath       *ancestor);

-/* Row reference (an object that tracks model changes so it refers to the same
- * row always; a path refers to a position, not a fixed row).  You almost always
- * want to call gtk_tree_row_reference_new.
+/**
+ * GtkTreeRowReference:
+ *
+ * A GtkTreeRowReference tracks model changes so that it always refers to the
+ * same row (a #GtkTreePath refers to a position, not a fixed row). Create a
+ * new GtkTreeRowReference with gtk_tree_row_reference_new().
 */

 GType                gtk_tree_row_reference_get_type (void) G_GNUC_CONST;
@@ -1768,6 +1768,9 @@ gtk_tree_view_init (GtkTreeView *tree_view)

  gtk_tree_view_do_set_vadjustment (tree_view, NULL);
  gtk_tree_view_do_set_hadjustment (tree_view, NULL);
+
+  gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (tree_view)),
+                               GTK_STYLE_CLASS_VIEW);
 }


@@ -2190,13 +2193,6 @@ gtk_tree_view_ensure_background (GtkTreeView *tree_view)
  GtkStyleContext *context;

  context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
-
-  gtk_style_context_save (context);
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
-  gtk_style_context_set_background (context, tree_view->priv->bin_window);
-  gtk_style_context_set_background (context, gtk_widget_get_window (GTK_WIDGET (tree_view)));
-  gtk_style_context_restore (context);
-
  gtk_style_context_set_background (context, tree_view->priv->header_window);
 }

@@ -5349,24 +5345,23 @@ gtk_tree_view_draw (GtkWidget *widget,
 {
  GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
  GtkWidget   *button;
+  GtkStyleContext *context;
+
+  context = gtk_widget_get_style_context (widget);
+  gtk_render_background (context, cr,
+                         0, 0,
+                         gtk_widget_get_allocated_width (widget),
+                         gtk_widget_get_allocated_height (widget));

  if (gtk_cairo_should_draw_window (cr, tree_view->priv->bin_window))
    {
-      GtkStyleContext *context;
      GList *tmp_list;

-      context = gtk_widget_get_style_context (widget);
-
      cairo_save (cr);

-      gtk_style_context_save (context);
-      gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
-
      gtk_cairo_transform_to_window (cr, widget, tree_view->priv->bin_window);
-
      gtk_tree_view_bin_draw (widget, cr);

-      gtk_style_context_restore (context);
      cairo_restore (cr);

      /* We can't just chain up to Container::draw as it will try to send the
@@ -5383,6 +5378,9 @@ gtk_tree_view_draw (GtkWidget *widget,
 	}
    }

+  gtk_style_context_save (context);
+  gtk_style_context_remove_class (context, GTK_STYLE_CLASS_VIEW);
+
  if (gtk_cairo_should_draw_window (cr, tree_view->priv->header_window))
    {
      GList *list;
@@ -5411,6 +5409,8 @@ gtk_tree_view_draw (GtkWidget *widget,
                                    button, cr);
    }

+  gtk_style_context_restore (context);
+
  return FALSE;
 }

@@ -8138,9 +8138,6 @@ gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
    {
      tree_view->priv->fixed_height_mode = 0;
      tree_view->priv->fixed_height = -1;
-
-      /* force a revalidation */
-      install_presize_handler (tree_view);
    }
  else 
    {
@@ -8159,11 +8156,11 @@ gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
      
      tree_view->priv->fixed_height_mode = 1;
      tree_view->priv->fixed_height = -1;
-      
-      if (tree_view->priv->tree)
-	initialize_fixed_height_mode (tree_view);
    }

+  /* force a revalidation */
+  install_presize_handler (tree_view);
+
  g_object_notify (G_OBJECT (tree_view), "fixed-height-mode");
 }

@@ -14564,8 +14561,6 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
  context = gtk_widget_get_style_context (widget);

  gtk_style_context_save (context);
-
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
  gtk_style_context_add_region (context, GTK_STYLE_REGION_COLUMN, 0);

  gtk_widget_style_get (widget,
@@ -16431,7 +16426,7 @@ gtk_tree_view_set_tooltip_query_cb (GtkWidget  *widget,
 * for you. @column should be set to the column in @tree_view's model
 * containing the tooltip texts, or -1 to disable this feature.
 *
- * When enabled, #GtkWidget::has-tooltip will be set to %TRUE and
+ * When enabled, #GtkWidget:has-tooltip will be set to %TRUE and
 * @tree_view will connect a #GtkWidget::query-tooltip signal handler.
 *
 * Note that the signal handler sets the text with gtk_tooltip_set_markup(),
@@ -55,7 +55,6 @@
 #include "gtkbuilderprivate.h"
 #include "gtksizerequest.h"
 #include "gtkstylecontextprivate.h"
-#include "gtksymboliccolor.h"
 #include "gtkcssprovider.h"
 #include "gtkmodifierstyle.h"
 #include "gtkversion.h"
@@ -1957,7 +1956,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
   * button press events for buttons 4 and 5 when the wheel is turned.
   *
   * To receive this signal, the #GdkWindow associated to the widget needs
-   * to enable the #GDK_BUTTON_PRESS_MASK mask.
+   * to enable the #GDK_SCROLL_MASK mask.
   *
   * This signal will be sent to the grab widget if there is one.
   *
@@ -7264,8 +7263,6 @@ _gtk_widget_update_state_flags (GtkWidget     *widget,
      data.operation = operation;

      gtk_widget_propagate_state (widget, &data);
-
-      gtk_widget_queue_resize (widget);
    }
 }

@@ -23,8 +23,6 @@

 #include "gtkwin32themeprivate.h"

-#include <gtksymboliccolor.h>
-
 #ifdef G_OS_WIN32

 #include <cairo-win32.h>
@@ -383,41 +381,6 @@ _gtk_win32_theme_int_parse (GtkCssParser      *parser,
  return -1;
 }

-GtkSymbolicColor *
-_gtk_win32_theme_color_parse (GtkCssParser *parser)
-{
-  GtkSymbolicColor *color;
-  char *class;
-  int id;
-
-  class = _gtk_css_parser_try_name (parser, TRUE);
-  if (class == NULL)
-    {
-      _gtk_css_parser_error (parser,
-			     "Expected name as first argument to  '-gtk-win32-color'");
-      return NULL;
-    }
-
-  if (! _gtk_css_parser_try (parser, ",", TRUE))
-    {
-      g_free (class);
-      _gtk_css_parser_error (parser,
-			     "Expected ','");
-      return NULL;
-    }
-
-  if (!_gtk_css_parser_try_int (parser, &id))
-    {
-      g_free (class);
-      _gtk_css_parser_error (parser, "Expected a valid integer value");
-      return NULL;
-    }
-
-  color = gtk_symbolic_color_new_win32 (class, id);
-  g_free (class);
-  return color;
-}
-
 gboolean
 _gtk_win32_theme_color_resolve (const char *theme_class,
 				gint id,
@@ -50,7 +50,6 @@ cairo_surface_t *  _gtk_win32_theme_part_create_surface  (HTHEME       theme,

 int                _gtk_win32_theme_int_parse     (GtkCssParser      *parser,
 						   int               *value);
-GtkSymbolicColor  *_gtk_win32_theme_color_parse   (GtkCssParser      *parser);
 gboolean           _gtk_win32_theme_color_resolve (const char        *theme_class,
 						   gint               id,
 						   GdkRGBA           *color);
@@ -1696,7 +1696,7 @@ typedef struct
  const gchar *member_uris;
  const gchar *location;
  const gchar *description;
-  const gchar *state_msg;
+  gchar *state_msg;
  const gchar *reason_msg;
  PrinterStateLevel reason_level;
  gint state;
@@ -1732,7 +1732,7 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
  else if (strcmp (ippGetName (attr), "printer-info") == 0)
    info->description = ippGetString (attr, 0, NULL);
  else if (strcmp (ippGetName (attr), "printer-state-message") == 0)
-    info->state_msg = ippGetString (attr, 0, NULL);
+    info->state_msg = g_strdup (ippGetString (attr, 0, NULL));
  else if (strcmp (ippGetName (attr), "printer-state-reasons") == 0)
    /* Store most important reason to reason_msg and set
       its importance at printer_state_reason_level */
@@ -2130,8 +2130,8 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,

          if (tmp_msg2 != NULL)
 	    {
+	      g_free (info->state_msg);
 	      info->state_msg = tmp_msg2;
-	      g_free (tmp_msg2);
 	    }
 	}

@@ -2159,14 +2159,18 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
          if (info->reason_level >= GTK_PRINTER_STATE_LEVEL_WARNING)
            {
              if (strlen (info->state_msg) == 0)
-                info->state_msg = reason_msg_desc;
+                {
+                  g_free (info->state_msg);
+                  info->state_msg = reason_msg_desc;
+                  reason_msg_desc = NULL;
+                }
              else
                {
 		  gchar *tmp_msg = NULL;
 		  tmp_msg = g_strjoin (" ; ", info->state_msg,
 				       reason_msg_desc, NULL);
+                  g_free (info->state_msg);
                  info->state_msg = tmp_msg;
-		  g_free (tmp_msg);
                }
            }
 	  if (reason_msg_desc != NULL)
@@ -2195,6 +2199,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,

      /* The ref is held by GtkPrintBackend, in add_printer() */
      g_object_unref (printer);
+      g_free (info->state_msg);
      g_slice_free (PrinterSetupInfo, info);

      if (attr == NULL)
@@ -100,6 +100,8 @@ tests/reftests/sizegroups-get-preferred-null.ref.ui
 tests/reftests/sizegroups-get-preferred-null.ui
 tests/reftests/toplevel-vs-popup.ref.ui
 tests/reftests/toplevel-vs-popup.ui
+tests/reftests/treeview-fixed-height.ref.ui
+tests/reftests/treeview-fixed-height.ui
 tests/reftests/window-border-width.ref.ui
 tests/reftests/window-border-width.ui
 tests/testfilechooser.c
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
 "%2b&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2012-10-24 12:17+0000\n"
-"PO-Revision-Date: 2012-10-25 13:14+0530\n"
+"PO-Revision-Date: 2012-11-23 20:18+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
 "Language: as_IN\n"
@@ -101,6 +101,8 @@ tests/reftests/sizegroups-get-preferred-null.ref.ui
 tests/reftests/sizegroups-get-preferred-null.ui
 tests/reftests/toplevel-vs-popup.ref.ui
 tests/reftests/toplevel-vs-popup.ui
+tests/reftests/treeview-fixed-height.ref.ui
+tests/reftests/treeview-fixed-height.ui
 tests/reftests/window-border-width.ref.ui
 tests/reftests/window-border-width.ui
 tests/testfilechooser.c
@@ -9,17 +9,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=gtk%2b&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-10 13:12+0000\n"
-"PO-Revision-Date: 2012-09-11 19:47+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
+"%2b&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-11-20 21:08+0000\n"
+"PO-Revision-Date: 2012-11-23 20:16+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Language: as_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"

 #: ../gdk/gdk.c:155
@@ -71,7 +71,7 @@ msgstr "নিৰ্ধাৰণ কৰিবলে চিহ্নিত GDK
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456
+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
 msgid "FLAGS"
 msgstr "FLAGS"

@@ -479,7 +479,8 @@ msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
 msgstr ""
-"বাহিৰৰ চক্ৰৰ পৰা আপুনি বিচৰা ৰং বাছক। ভিতৰৰ ত্ৰিভূজৰ পৰা ৰঙৰ আন্ধাৰ বা উজ্জ্বলতা "
+"বাহিৰৰ চক্ৰৰ পৰা আপুনি বিচৰা ৰং বাছক। ভিতৰৰ ত্ৰিভূজৰ পৰা ৰঙৰ আন্ধাৰ বা "
+"উজ্জ্বলতা "
 "বাছক।"

 #: ../gtk/deprecated/gtkcolorsel.c:451
@@ -555,7 +556,8 @@ msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
 msgstr ""
-"আপুনি এটা HTML-স্ৰজন-প্ৰণালীৰ হেক্সাডেচিমেল ৰঙৰ মান দিব পাৰে, বা সাধাৰণ ভাবে এটা "
+"আপুনি এটা HTML-স্ৰজন-প্ৰণালীৰ হেক্সাডেচিমেল ৰঙৰ মান দিব পাৰে, বা সাধাৰণ ভাবে "
+"এটা "
 "ৰঙৰ নাম যেনে 'সমথিৰা' এই প্ৰবেশত।"

 #: ../gtk/deprecated/gtkcolorsel.c:548
@@ -572,7 +574,8 @@ msgid ""
 "now. You can drag this color to a palette entry, or select this color as "
 "current by dragging it to the other color swatch alongside."
 msgstr ""
-"পূৰ্ব-নিৰ্বাচিত ৰং, এতিয়া নিৰ্বাচন কৰা ৰঙৰ সৈতে তুলনা কৰিব'লৈ। আপুনি এই ৰং এটা "
+"পূৰ্ব-নিৰ্বাচিত ৰং, এতিয়া নিৰ্বাচন কৰা ৰঙৰ সৈতে তুলনা কৰিব'লৈ। আপুনি এই ৰং "
+"এটা "
 "পেলেটৰ প্ৰৱেশলৈ টানি নিব পাৰে, বা এই ৰং বৰ্ত্তমান হিচাপে বাছক ইয়াক কাষৰ বেলেগ "
 "এটা পেলেটলৈ টানি লৈ।"

@@ -603,7 +606,8 @@ msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
 msgstr ""
-"বৰ্ত্তমানৰ ৰং কৰিব'লৈ এই পেলেটত টিপক। এই প্ৰৱেশ সলনি কৰিব'লৈ, এটা ৰঙৰ প্ৰতিৰূপ "
+"বৰ্ত্তমানৰ ৰং কৰিব'লৈ এই পেলেটত টিপক। এই প্ৰৱেশ সলনি কৰিব'লৈ, এটা ৰঙৰ "
+"প্ৰতিৰূপ "
 "ইয়ালৈ টানি আনক বা তাত সোঁ বুটাম টিপক আৰু \"ইয়াত ৰং ৰক্ষা কৰক\" নিৰ্বাচন কৰক।"

 #. We emit the response for the Select button manually,
@@ -710,7 +714,7 @@ msgstr "শিল্পী"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:156
+#: ../gtk/gtkaccellabel.c:159
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -720,7 +724,7 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:162
+#: ../gtk/gtkaccellabel.c:165
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -730,7 +734,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:168
+#: ../gtk/gtkaccellabel.c:171
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -740,7 +744,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:802
+#: ../gtk/gtkaccellabel.c:805
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -750,7 +754,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:815
+#: ../gtk/gtkaccellabel.c:818
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -760,17 +764,17 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:829
+#: ../gtk/gtkaccellabel.c:832
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"

-#: ../gtk/gtkaccellabel.c:845
+#: ../gtk/gtkaccellabel.c:848
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Space"

-#: ../gtk/gtkaccellabel.c:848
+#: ../gtk/gtkaccellabel.c:851
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Backslash"
@@ -806,7 +810,7 @@ msgstr "এপ্লিকেচন বিছাৰি পোৱাত ব্য
 msgid "Select an application to open \"%s\""
 msgstr "\"%s\" খুলিবলে এটা এপ্লিকেচন বাছক"

-#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654
+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
 #, c-format
 msgid "No applications available to open \"%s\""
 msgstr "\"%s\" খুলিবলে কোনো এপ্লিকেচন উপলব্ধ নাই"
@@ -827,7 +831,8 @@ msgid ""
 "Click \"Show other applications\", for more options, or \"Find applications "
 "online\" to install a new application"
 msgstr ""
-"অতিৰিক্ত বিকল্পৰ বাবে, ক্লিক কৰক \"বেলেগ এপ্লিকেচনসমূহ দেখুৱা\"  অথবা এটা নতুন "
+"অতিৰিক্ত বিকল্পৰ বাবে, ক্লিক কৰক \"বেলেগ এপ্লিকেচনসমূহ দেখুৱা\"  অথবা এটা "
+"নতুন "
 "এপ্লিকেচন ইনস্টল কৰিবলে ক্লিক কৰক \"এপ্লিকেচনসমূহ অনলাইন বিছাৰক\" "

 #: ../gtk/gtkappchooserdialog.c:492
@@ -838,23 +843,23 @@ msgstr "জোঁট পাহৰি যাওক"
 msgid "Show other applications"
 msgstr "বেলেগ এপ্লিকেচনসমূহ দেখুৱা"

-#: ../gtk/gtkappchooserwidget.c:603
+#: ../gtk/gtkappchooserwidget.c:606
 msgid "Default Application"
 msgstr "অবিকল্পিত এপ্লিকেচন"

-#: ../gtk/gtkappchooserwidget.c:741
+#: ../gtk/gtkappchooserwidget.c:744
 msgid "Recommended Applications"
 msgstr "পৰামৰ্শিত এপ্লিকেচনসমূহ"

-#: ../gtk/gtkappchooserwidget.c:756
+#: ../gtk/gtkappchooserwidget.c:759
 msgid "Related Applications"
 msgstr "আনুষংগিক এপ্লিকেচনসমূহ"

-#: ../gtk/gtkappchooserwidget.c:770
+#: ../gtk/gtkappchooserwidget.c:773
 msgid "Other Applications"
 msgstr "অন্য এপ্লিকেচনসমূহ"

-#: ../gtk/gtkapplication.c:1552
+#: ../gtk/gtkapplication.c:1557
 #, c-format
 msgid ""
 "%s cannot quit at this time:\n"
@@ -865,20 +870,20 @@ msgstr ""
 "\n"
 "%s"

-#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475
+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
 #: ../gtk/gtkprintoperation-win32.c:1445
 msgid "Application"
 msgstr "এপ্লিকেচন"

-#: ../gtk/gtkassistant.c:1004
+#: ../gtk/gtkassistant.c:1008
 msgid "C_ontinue"
 msgstr "চলাই থাকক (_o)"

-#: ../gtk/gtkassistant.c:1007
+#: ../gtk/gtkassistant.c:1011
 msgid "Go _Back"
 msgstr "পিছলৈ যাওক (_B)"

-#: ../gtk/gtkassistant.c:1011
+#: ../gtk/gtkassistant.c:1015
 msgid "_Finish"
 msgstr "সমাপ্ত কৰক (_F)"

@@ -906,7 +911,8 @@ msgstr "%d শাৰিত অবৈধ টাইপ আপেক্ষক: %s"
 #, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
 msgstr ""
-"'%s' অবজেক্ট ID %d শাৰিত দ্বিতীয়বাৰ উল্লিক্ষিত হৈছে (পূৰ্বতে %d শাৰিেত উল্লিক্ষিত)"
+"'%s' অবজেক্ট ID %d শাৰিত দ্বিতীয়বাৰ উল্লিক্ষিত হৈছে (পূৰ্বতে %d শাৰিেত "
+"উল্লিক্ষিত)"

 #: ../gtk/gtkbuilderparser.c:865
 #, c-format
@@ -1018,7 +1024,7 @@ msgstr "অবৈধ"
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #.
-#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745
+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
 msgid "New accelerator..."
 msgstr "নতন বেগবৰ্দ্ধক..."

@@ -1361,15 +1367,15 @@ msgstr "সোঁ ফালৰ (_R):"
 msgid "Paper Margins"
 msgstr "কাগজৰ প্ৰান্তিক অংশ"

-#: ../gtk/gtkentry.c:9140 ../gtk/gtktextview.c:8583
+#: ../gtk/gtkentry.c:9143 ../gtk/gtktextview.c:8583
 msgid "Input _Methods"
 msgstr "নিবেশ পদ্ধতি (_M)"

-#: ../gtk/gtkentry.c:9154 ../gtk/gtktextview.c:8597
+#: ../gtk/gtkentry.c:9157 ../gtk/gtktextview.c:8597
 msgid "_Insert Unicode Control Character"
 msgstr "Unicode নিয়ন্ত্ৰণ আকৰ ভৰাওক (_I)"

-#: ../gtk/gtkentry.c:10107
+#: ../gtk/gtkentry.c:10110
 msgid "Caps Lock is on"
 msgstr "ক্যাপ্সলক সক্ৰিয় হৈ আছে"

@@ -1418,7 +1424,7 @@ msgstr "ক্যাপ্সলক সক্ৰিয় হৈ আছে"
 msgid "Select a File"
 msgstr "এখন ফাইল বাছি লওক"

-#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817
+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1820
 msgid "Desktop"
 msgstr "ডেষ্কট'প"

@@ -1434,50 +1440,51 @@ msgstr "অন্য..."
 msgid "Type name of new folder"
 msgstr "নতুন ফোল্ডাৰৰ নাম লিখক"

-#: ../gtk/gtkfilechooserdefault.c:968
+#: ../gtk/gtkfilechooserdefault.c:971
 msgid "Could not retrieve information about the file"
 msgstr "ফাইলৰ বাবে তথ্য উদ্ধাৰ কৰিব পৰা ন'গ'ল"

-#: ../gtk/gtkfilechooserdefault.c:979
+#: ../gtk/gtkfilechooserdefault.c:982
 msgid "Could not add a bookmark"
 msgstr "পত্ৰচিহ্ন যোগ কৰিব পৰা ন'গ'ল"

-#: ../gtk/gtkfilechooserdefault.c:990
+#: ../gtk/gtkfilechooserdefault.c:993
 msgid "Could not remove bookmark"
 msgstr "পত্ৰচিহ্ন আঁতৰাব পৰা ন'গ'ল"

-#: ../gtk/gtkfilechooserdefault.c:1001
+#: ../gtk/gtkfilechooserdefault.c:1004
 msgid "The folder could not be created"
 msgstr "ফোল্ডাৰ সৃষ্টি কৰিব পৰা ন'গ'ল"

-#: ../gtk/gtkfilechooserdefault.c:1014
+#: ../gtk/gtkfilechooserdefault.c:1017
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
-"ফোল্ডাৰ সৃষ্টি কৰিব পৰা ন'গ'ল কিয়নো একে নামৰ এখন ফাইল ইতিমধ্যে আছে। ফোল্ডাৰৰ বাবে "
+"ফোল্ডাৰ সৃষ্টি কৰিব পৰা ন'গ'ল কিয়নো একে নামৰ এখন ফাইল ইতিমধ্যে আছে। ফোল্ডাৰৰ "
+"বাবে "
 "বেলেগ এটা নাম ব্যৱহাৰ কৰিব'লৈ চেষ্টা কৰক বা ফাইলখন প্ৰথমে পুনঃ নামকৰণ কৰক ।"

-#: ../gtk/gtkfilechooserdefault.c:1028
+#: ../gtk/gtkfilechooserdefault.c:1031
 msgid "You need to choose a valid filename."
 msgstr "আপুনি এটা বৈধ ফাইলৰ নাম নিৰ্বাচন কৰিব লাগে"

-#: ../gtk/gtkfilechooserdefault.c:1031
+#: ../gtk/gtkfilechooserdefault.c:1034
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
 msgstr " %s এটা ফোল্ডাৰ নোহোৱা কাৰনে ইয়াৰ ভিতৰত এটা ফাইল নিৰ্মাণ কৰিব নোৱাৰি "

-#: ../gtk/gtkfilechooserdefault.c:1043
+#: ../gtk/gtkfilechooserdefault.c:1046
 msgid ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."
 msgstr "আপুনি কেবল ফোল্ডাৰ নিৰ্বাচণ কৰিব পাৰিব। "

-#: ../gtk/gtkfilechooserdefault.c:1053
+#: ../gtk/gtkfilechooserdefault.c:1056
 msgid "Invalid file name"
 msgstr "অবৈধ ফাইলৰ নাম"

-#: ../gtk/gtkfilechooserdefault.c:1063
+#: ../gtk/gtkfilechooserdefault.c:1066
 msgid "The folder contents could not be displayed"
 msgstr "ফোল্ডাৰৰ বিষয়বস্তু প্ৰদৰ্শন কৰিব পৰা ন'গ'ল"

@@ -1485,207 +1492,208 @@ msgstr "ফোল্ডাৰৰ বিষয়বস্তু প্ৰদৰ্
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: ../gtk/gtkfilechooserdefault.c:1589
+#: ../gtk/gtkfilechooserdefault.c:1592
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$s ত"

-#: ../gtk/gtkfilechooserdefault.c:1738
+#: ../gtk/gtkfilechooserdefault.c:1741
 msgid "Search"
 msgstr "বিচাৰক"

-#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988
+#: ../gtk/gtkfilechooserdefault.c:1765 ../gtk/gtkfilechooserdefault.c:4991
 msgid "Recently Used"
 msgstr "অলপতে ব্যৱহাৰ কৰা"

-#: ../gtk/gtkfilechooserdefault.c:2361
+#: ../gtk/gtkfilechooserdefault.c:2364
 msgid "Select which types of files are shown"
 msgstr "কেনে ধৰণৰ ফাইল প্ৰদৰ্শন কৰা হ'ব নিৰ্বাচিত কৰক"

-#: ../gtk/gtkfilechooserdefault.c:2720
+#: ../gtk/gtkfilechooserdefault.c:2723
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "'%s' ফোল্ডাৰ পত্ৰচিহ্নলৈ যোগ কৰক"

-#: ../gtk/gtkfilechooserdefault.c:2764
+#: ../gtk/gtkfilechooserdefault.c:2767
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "বৰ্ত্তমানৰ ফোল্ডাৰ পত্ৰচিহ্নলৈ যোগ কৰক"

-#: ../gtk/gtkfilechooserdefault.c:2766
+#: ../gtk/gtkfilechooserdefault.c:2769
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "নিৰ্বাচিত ফোল্ডাৰসমূহ পত্ৰচিহ্নলৈ যোগ কৰক"

-#: ../gtk/gtkfilechooserdefault.c:2804
+#: ../gtk/gtkfilechooserdefault.c:2807
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "'%s' পত্ৰচিহ্ন আঁতৰাই দিয়ক"

-#: ../gtk/gtkfilechooserdefault.c:2806
+#: ../gtk/gtkfilechooserdefault.c:2809
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "পত্ৰচিহ্ন '%s' আঁতৰাব নোৱাৰি"

-#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699
+#: ../gtk/gtkfilechooserdefault.c:2816 ../gtk/gtkfilechooserdefault.c:3702
 msgid "Remove the selected bookmark"
 msgstr "নিৰ্বাচিত পত্ৰচিহ্ন আঁতৰাই দিয়ক"

-#: ../gtk/gtkfilechooserdefault.c:3377
+#: ../gtk/gtkfilechooserdefault.c:3380
 msgid "Remove"
 msgstr "আঁতৰাই দিয়ক"

-#: ../gtk/gtkfilechooserdefault.c:3386
+#: ../gtk/gtkfilechooserdefault.c:3389
 msgid "Rename..."
 msgstr "পুনঃ নামকৰণ..."

 #. Accessible object name for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3550
+#: ../gtk/gtkfilechooserdefault.c:3553
 msgid "Places"
 msgstr "স্থান"

 #. Column header for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3607
+#: ../gtk/gtkfilechooserdefault.c:3610
 msgid "_Places"
 msgstr "স্থান (_P)"

-#: ../gtk/gtkfilechooserdefault.c:3687
+#: ../gtk/gtkfilechooserdefault.c:3690
 msgid "Add the selected folder to the Bookmarks"
 msgstr "নিৰ্বাচিত ফোল্ডাৰ পত্ৰচিহ্নলৈ যোগ কৰক"

-#: ../gtk/gtkfilechooserdefault.c:3948
+#: ../gtk/gtkfilechooserdefault.c:3951
 msgid "Could not select file"
 msgstr "ফাইল নিৰ্বাচন কৰিব নোৱাৰি"

-#: ../gtk/gtkfilechooserdefault.c:4173
+#: ../gtk/gtkfilechooserdefault.c:4176
 msgid "_Visit this file"
 msgstr "এই ফাইল ভ্ৰমণ কৰক (_V)"

-#: ../gtk/gtkfilechooserdefault.c:4176
+#: ../gtk/gtkfilechooserdefault.c:4179
 msgid "_Copy file's location"
 msgstr "ফাইলৰ অৱস্থান কপি কৰক (_C)"

-#: ../gtk/gtkfilechooserdefault.c:4179
+#: ../gtk/gtkfilechooserdefault.c:4182
 msgid "_Add to Bookmarks"
 msgstr "পত্ৰচিহ্নলৈ যোগ কৰক (_A)"

-#: ../gtk/gtkfilechooserdefault.c:4186
+#: ../gtk/gtkfilechooserdefault.c:4189
 msgid "Show _Hidden Files"
 msgstr "গুপ্ত ফাইল দেখুৱাওক (_H)"

-#: ../gtk/gtkfilechooserdefault.c:4189
+#: ../gtk/gtkfilechooserdefault.c:4192
 msgid "Show _Size Column"
 msgstr "মাপ শীৰ্ষক কলাম প্ৰদৰ্শিত হ'ব (_S)"

-#: ../gtk/gtkfilechooserdefault.c:4414
+#: ../gtk/gtkfilechooserdefault.c:4417
 msgid "Files"
 msgstr "ফাইলসমূহ"

-#: ../gtk/gtkfilechooserdefault.c:4465
+#: ../gtk/gtkfilechooserdefault.c:4468
 msgid "Name"
 msgstr "নাম"

-#: ../gtk/gtkfilechooserdefault.c:4488
+#: ../gtk/gtkfilechooserdefault.c:4491
 msgid "Size"
 msgstr "আয়তন"

-#: ../gtk/gtkfilechooserdefault.c:4502
+#: ../gtk/gtkfilechooserdefault.c:4505
 msgid "Modified"
 msgstr "সলনি কৰা হ'ল"

 #. Label
-#: ../gtk/gtkfilechooserdefault.c:4595
+#: ../gtk/gtkfilechooserdefault.c:4598
 msgid "_Name:"
 msgstr "নাম (_N):"

-#: ../gtk/gtkfilechooserdefault.c:4826
+#: ../gtk/gtkfilechooserdefault.c:4829
 msgid "Type a file name"
 msgstr "ফাইলৰ নাম এটা লিখক"

-#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884
+#: ../gtk/gtkfilechooserdefault.c:4876 ../gtk/gtkfilechooserdefault.c:4887
 msgid "Please select a folder below"
 msgstr "অনুগ্ৰহ কৰি তলত এটা ফোল্ডাৰ বাছক"

-#: ../gtk/gtkfilechooserdefault.c:4879
+#: ../gtk/gtkfilechooserdefault.c:4882
 msgid "Please type a file name"
 msgstr "অনুগ্ৰহ এটা ফাইলনাম টাইপ কৰক"

 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:4950
+#: ../gtk/gtkfilechooserdefault.c:4953
 msgid "Create Fo_lder"
 msgstr "ফোল্ডাৰ সৃষ্টি কৰক (_l)"

-#: ../gtk/gtkfilechooserdefault.c:4998
+#: ../gtk/gtkfilechooserdefault.c:5001
 msgid "Search:"
 msgstr "বিচাৰক:"

-#: ../gtk/gtkfilechooserdefault.c:5049
+#: ../gtk/gtkfilechooserdefault.c:5052
 msgid "_Location:"
 msgstr "স্থান (_L):"

-#: ../gtk/gtkfilechooserdefault.c:5500
+#: ../gtk/gtkfilechooserdefault.c:5502
 msgid "Save in _folder:"
 msgstr "ফোল্ডাৰত ৰক্ষা কৰক (_f):"

-#: ../gtk/gtkfilechooserdefault.c:5502
+#: ../gtk/gtkfilechooserdefault.c:5504
 msgid "Create in _folder:"
 msgstr "ফোল্ডাৰত সৃষ্টি কৰক (_f):"

-#: ../gtk/gtkfilechooserdefault.c:6589
+#: ../gtk/gtkfilechooserdefault.c:6597
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "%s - ৰ অন্তৰ্বস্তু পঢিবলে ব্যৰ্থ"

-#: ../gtk/gtkfilechooserdefault.c:6593
+#: ../gtk/gtkfilechooserdefault.c:6601
 msgid "Could not read the contents of the folder"
 msgstr "ফোল্ডাৰৰ অন্তৰ্বস্তু পঢিবলে ব্যৰ্থ"

-#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754
-#: ../gtk/gtkfilechooserdefault.c:6934
+#: ../gtk/gtkfilechooserdefault.c:6694 ../gtk/gtkfilechooserdefault.c:6762
+#: ../gtk/gtkfilechooserdefault.c:6942
 msgid "Unknown"
 msgstr "অজ্ঞাত"

-#: ../gtk/gtkfilechooserdefault.c:6701
+#: ../gtk/gtkfilechooserdefault.c:6709
 msgid "%H:%M"
 msgstr "%H:%M"

-#: ../gtk/gtkfilechooserdefault.c:6703
+#: ../gtk/gtkfilechooserdefault.c:6711
 msgid "Yesterday at %H:%M"
 msgstr "যোৱাকালি %H:%M ত"

-#: ../gtk/gtkfilechooserdefault.c:7405
+#: ../gtk/gtkfilechooserdefault.c:7413
 msgid "Cannot change to folder because it is not local"
 msgstr "ফোল্ডাৰলৈ সলনি কৰিব নোৱাৰি কাৰণ সেইটো স্থানিক নহয়"

-#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030
+#: ../gtk/gtkfilechooserdefault.c:8020 ../gtk/gtkfilechooserdefault.c:8041
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "হ্ৰস্বপথ %s ইতিমধ্যে আছে"

-#: ../gtk/gtkfilechooserdefault.c:8120
+#: ../gtk/gtkfilechooserdefault.c:8131
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "হ্ৰস্বপথ %s নাই"

-#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548
+#: ../gtk/gtkfilechooserdefault.c:8377 ../gtk/gtkprintunixdialog.c:548
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "ফাইলৰ নাম \"%s\" ইতিমধ্যে আছে। আপুনি প্ৰতিস্থাপন কৰিব খোজে নেকি ?"

-#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552
+#: ../gtk/gtkfilechooserdefault.c:8380 ../gtk/gtkprintunixdialog.c:552
 #, c-format
-msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "ফাইল ইতিমধ্যে \"%s\" ত আছে। প্ৰতিস্থাপন কৰিলে বিষয়বস্তু পুনঃ লিখা যাব।"

-#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559
+#: ../gtk/gtkfilechooserdefault.c:8385 ../gtk/gtkprintunixdialog.c:559
 msgid "_Replace"
 msgstr "প্ৰতিস্থাপন কৰক (_R)"

-#: ../gtk/gtkfilechooserdefault.c:9181
+#: ../gtk/gtkfilechooserdefault.c:9192
 msgid "Could not start the search process"
 msgstr "বিচৰা প্ৰক্ৰিয়া আৰম্ভ কৰিব পৰা ন'গ'ল"

-#: ../gtk/gtkfilechooserdefault.c:9182
+#: ../gtk/gtkfilechooserdefault.c:9193
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1693,11 +1701,11 @@ msgstr ""
 "indexer ডেমনলৈ এপ্লিকেচনে সংযোগ সৃষ্টি কৰিব নোৱাৰিলে। সেইটো চলি থকাটো নিশ্চিত "
 "কৰক।"

-#: ../gtk/gtkfilechooserdefault.c:9196
+#: ../gtk/gtkfilechooserdefault.c:9207
 msgid "Could not send the search request"
 msgstr "বিচৰাৰ অনুৰোধ পঠিয়াব নোৱাৰিলো"

-#: ../gtk/gtkfilechooserdefault.c:9806
+#: ../gtk/gtkfilechooserdefault.c:9817
 #, c-format
 msgid "Could not mount %s"
 msgstr "%s তুলি ল'ব পৰা ন'গ'ল"
@@ -1726,7 +1734,8 @@ msgstr "আখৰ"
 #: ../gtk/gtkfontchooserwidget.c:110
 msgid "No fonts matched your search. You can revise your search and try again."
 msgstr ""
-"আপোনাৰ সন্ধানৰ লগত কোনো ফন্ট মিল নাখায়। আপুনি আপোনাৰ সন্ধান পুনঃনিৰীক্ষণ কৰি পুনৰ "
+"আপোনাৰ সন্ধানৰ লগত কোনো ফন্ট মিল নাখায়। আপুনি আপোনাৰ সন্ধান পুনঃনিৰীক্ষণ কৰি "
+"পুনৰ "
 "চেষ্টা কৰিব পাৰে।"

 #: ../gtk/gtkfontchooserwidget.c:557
@@ -1737,12 +1746,12 @@ msgstr "ফন্টৰ নাম সন্ধান কৰক"
 msgid "Font Family"
 msgstr "ফন্টৰ পৰিয়াল"

-#: ../gtk/gtkicontheme.c:1627
+#: ../gtk/gtkicontheme.c:1630
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "'%s'প্ৰতিমুৰ্তি আলোকচিত্ৰত নাই"

-#: ../gtk/gtkicontheme.c:3137
+#: ../gtk/gtkicontheme.c:3138
 msgid "Failed to load icon"
 msgstr "আইকণ তোলাত বিফল"

@@ -1767,22 +1776,22 @@ msgid "System (%s)"
 msgstr "চিস্টেম (%s)"

 #. Open Link
-#: ../gtk/gtklabel.c:6224
+#: ../gtk/gtklabel.c:6183
 msgid "_Open Link"
 msgstr "সংযোগ খোলক (_O)"

 #. Copy Link Address
-#: ../gtk/gtklabel.c:6236
+#: ../gtk/gtklabel.c:6195
 msgid "Copy _Link Address"
 msgstr "সংযোগ ঠিকনা নকল কৰক (  )"

-#: ../gtk/gtk-launch.c:69
+#: ../gtk/gtk-launch.c:71
 msgid "APPLICATION [URI...] - launch an APPLICATION with URI."
 msgstr "APPLICATION [URI...] -  URI ৰ সৈতে এটা APPLICATION লঞ্চ কৰক।"

 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../gtk/gtk-launch.c:73
+#: ../gtk/gtk-launch.c:75
 msgid ""
 "Launch specified application by its desktop file info\n"
 "optionally passing list of URIs as arguments."
@@ -1790,33 +1799,39 @@ msgstr ""
 "ডেস্কটপ ফাইলৰ তথ্যৰ সহায়ত লঞ্চ ধাৰ্য্যত এপ্লিকেচন\n"
 "বিকল্পভাৱে URlসমূহৰ তালিকাক তৰ্ক হিচাপে প্ৰেৰণ কৰাকৈ।"

-#: ../gtk/gtk-launch.c:85
+#: ../gtk/gtk-launch.c:87
 #, c-format
 msgid "Error parsing commandline options: %s\n"
 msgstr "কমান্ডশাৰী বিকল্পসমূহ বিশ্লেষণ কৰোতে ত্ৰুটি: %s\n"

-#: ../gtk/gtk-launch.c:87 ../gtk/gtk-launch.c:100
+#: ../gtk/gtk-launch.c:89 ../gtk/gtk-launch.c:102
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "অধিক তথ্যৰ বাবে \"%s --help\" চেষ্টা কৰক।"

 #. Translators: the %s is the program name. This error message
 #. means the user is calling gtk-launch without any argument.
-#: ../gtk/gtk-launch.c:98
+#: ../gtk/gtk-launch.c:100
 #, c-format
 msgid "%s: missing application name"
 msgstr "%s: সন্ধানহিন এপ্লিকেচনৰ নাম"

+#: ../gtk/gtk-launch.c:121
+#, c-format
+msgid "Creating AppInfo from id not supported on non unix operating systems"
+msgstr ""
+"আইডিৰ পৰা AppInfo সৃষ্টি কৰাটো নন unix অপাৰেটিং চিস্টেমসমূহত সমৰ্থিত নহয়"
+
 #. Translators: the first %s is the program name, the second one
 #. is the application name.
-#: ../gtk/gtk-launch.c:122
+#: ../gtk/gtk-launch.c:129
 #, c-format
 msgid "%s: no such application %s"
 msgstr "%s: এনে কোনো এপ্লিকেচন %s নাই"

 #. Translators: the first %s is the program name, the second one
 #. is the error message.
-#: ../gtk/gtk-launch.c:140
+#: ../gtk/gtk-launch.c:147
 #, c-format
 msgid "%s: error launching application: %s\n"
 msgstr "%s: এপ্লিকেচন লঞ্চ কৰোতে ত্ৰুটি: %s\n"
@@ -1862,27 +1877,27 @@ msgstr ""
 "আপোনাৰ চিস্টেম প্ৰশাসকক যোগাযোগ কৰক"

 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:446
+#: ../gtk/gtkmain.c:447
 msgid "Load additional GTK+ modules"
 msgstr "অতিৰিক্ত GTK+ অংশ তুলি লওক"

 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:447
+#: ../gtk/gtkmain.c:448
 msgid "MODULES"
 msgstr "অংশসমূহ"

 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:449
+#: ../gtk/gtkmain.c:450
 msgid "Make all warnings fatal"
 msgstr "GTK+ ডিবাগৰ পতাকা কৰ্মৰত কৰক"

 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:452
+#: ../gtk/gtkmain.c:453
 msgid "GTK+ debugging flags to set"
 msgstr "GTK+ debugging flags to set"

 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:455
+#: ../gtk/gtkmain.c:456
 msgid "GTK+ debugging flags to unset"
 msgstr "GTK+ ডিবাগৰ পতাকা কৰ্মৰত নকৰিব"

@@ -1891,80 +1906,81 @@ msgstr "GTK+ ডিবাগৰ পতাকা কৰ্মৰত নকৰি
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:706
+#: ../gtk/gtkmain.c:704
 msgid "default:LTR"
 msgstr "default:LTR"

-#: ../gtk/gtkmain.c:774
+#: ../gtk/gtkmain.c:769
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "প্ৰদৰ্শন খুলিব নোৱাৰি: %s"

-#: ../gtk/gtkmain.c:840
+#: ../gtk/gtkmain.c:835
 msgid "GTK+ Options"
 msgstr "GTK+ বিকল্প"

-#: ../gtk/gtkmain.c:840
+#: ../gtk/gtkmain.c:835
 msgid "Show GTK+ Options"
 msgstr "GTK+ বিকল্প দেখুৱাওক"

-#: ../gtk/gtkmountoperation.c:532
+#: ../gtk/gtkmountoperation.c:535
 msgid "Co_nnect"
 msgstr "সংযোগ কৰক (_n)"

-#: ../gtk/gtkmountoperation.c:606
+#: ../gtk/gtkmountoperation.c:609
 msgid "Connect As"
 msgstr "এই ধৰণে সংযোগ কৰক"

-#: ../gtk/gtkmountoperation.c:615
+#: ../gtk/gtkmountoperation.c:618
 msgid "_Anonymous"
 msgstr "বেনামী (_A)"

-#: ../gtk/gtkmountoperation.c:624
+#: ../gtk/gtkmountoperation.c:627
 msgid "Registered U_ser"
 msgstr "ৰেজিস্টাৰ্ড ব্যৱহাৰকাৰী (_s)"

-#: ../gtk/gtkmountoperation.c:635
+#: ../gtk/gtkmountoperation.c:638
 msgid "_Username"
 msgstr "ব্যৱহাৰকাৰীনাম (_U)"

-#: ../gtk/gtkmountoperation.c:640
+#: ../gtk/gtkmountoperation.c:643
 msgid "_Domain"
 msgstr "ডমেইন (_D)"

-#: ../gtk/gtkmountoperation.c:646
+#: ../gtk/gtkmountoperation.c:649
 msgid "_Password"
 msgstr "পাছৱাৰ্ড (_P)"

-#: ../gtk/gtkmountoperation.c:668
+#: ../gtk/gtkmountoperation.c:671
 msgid "Forget password _immediately"
 msgstr "তৎক্ষণাৎ পাছৱাৰ্ড পাহৰি যাওক (_i)"

-#: ../gtk/gtkmountoperation.c:678
+#: ../gtk/gtkmountoperation.c:681
 msgid "Remember password until you _logout"
 msgstr "বাহিৰ হোৱা লৈকে পাছৱাৰ্ড মনত ৰাখিব (_l)"

-#: ../gtk/gtkmountoperation.c:688
+#: ../gtk/gtkmountoperation.c:691
 msgid "Remember _forever"
 msgstr "চিৰকাললৈ মনত ৰাখিব (_f)"

-#: ../gtk/gtkmountoperation.c:1077
+#: ../gtk/gtkmountoperation.c:1080
 #, c-format
 msgid "Unknown Application (PID %d)"
 msgstr "অজ্ঞাত এপ্লিকেচন (PID %d)"

-#: ../gtk/gtkmountoperation.c:1260
+#: ../gtk/gtkmountoperation.c:1263
 msgid "Unable to end process"
 msgstr "প্ৰক্ৰিয়া অন্ত কৰিব নোৱাৰি"

-#: ../gtk/gtkmountoperation.c:1297
+#: ../gtk/gtkmountoperation.c:1300
 msgid "_End Process"
 msgstr "প্ৰক্ৰিয়া অন্ত কৰক (_E)"

 #: ../gtk/gtkmountoperation-stub.c:62
 #, c-format
 msgid "Cannot kill process with PID %d. Operation is not implemented."
-msgstr "PID %d থকা প্ৰক্ৰিয়া অন্ত কৰিব নোৱাৰি। কাৰ্য্য এতিয়াও কাৰ্য্যকৰ কৰা হোৱা নাই।"
+msgstr ""
+"PID %d থকা প্ৰক্ৰিয়া অন্ত কৰিব নোৱাৰি। কাৰ্য্য এতিয়াও কাৰ্য্যকৰ কৰা হোৱা নাই।"

 #. translators: this string is a name for the 'less' command
 #: ../gtk/gtkmountoperation-x11.c:954
@@ -1992,7 +2008,7 @@ msgstr "Z Shell"
 msgid "Cannot end process with PID %d: %s"
 msgstr "PID %d থকা প্ৰক্ৰিয়া অন্ত কৰিব নোৱাৰি: %s"

-#: ../gtk/gtknotebook.c:5051 ../gtk/gtknotebook.c:7705
+#: ../gtk/gtknotebook.c:5067 ../gtk/gtknotebook.c:7721
 #, c-format
 msgid "Page %u"
 msgstr "পৃষ্ঠা %u"
@@ -2000,14 +2016,14 @@ msgstr "পৃষ্ঠা %u"
 #. Translators: the format here is used to build the string that will be rendered
 #. * in the number emblem.
 #.
-#: ../gtk/gtknumerableicon.c:481
+#: ../gtk/gtknumerableicon.c:482
 #, c-format
 msgctxt "Number format"
 msgid "%d"
 msgstr "%d"

-#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846
-#: ../gtk/gtkpapersize.c:886
+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
+#: ../gtk/gtkpapersize.c:888
 msgid "Not a valid page setup file"
 msgstr "বৈধ পৃষ্ঠা প্ৰতিষ্ঠাৰ ফাইল নহয়"

@@ -2066,12 +2082,11 @@ msgstr "তললৈ যোৱা পথ"
 msgid "File System Root"
 msgstr "ফাইলচিস্টেম ৰূট"

-#: ../gtk/gtkprintbackend.c:748
+#: ../gtk/gtkprintbackend.c:750
 msgid "Authentication"
 msgstr "প্ৰমাণীকৰণ"

 #: ../gtk/gtkprinteroptionwidget.c:546
-#| msgid "Select a File"
 msgid "Select a filename"
 msgstr "এখন ফাইলনাম বাছক"

@@ -2133,29 +2148,29 @@ msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "ত্ৰুটিসহ কৰ্ম সমাপ্ত"

-#: ../gtk/gtkprintoperation.c:2352
+#: ../gtk/gtkprintoperation.c:2349
 #, c-format
 msgid "Preparing %d"
 msgstr "%d প্ৰস্তুত কৰা হৈছে"

-#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984
+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
 msgid "Preparing"
 msgstr "প্ৰস্তুত কৰা হৈছে"

-#: ../gtk/gtkprintoperation.c:2357
+#: ../gtk/gtkprintoperation.c:2354
 #, c-format
 msgid "Printing %d"
 msgstr "%d মুদ্ৰণ কৰা হৈছে"

-#: ../gtk/gtkprintoperation.c:3014
+#: ../gtk/gtkprintoperation.c:3013
 msgid "Error creating print preview"
 msgstr "মূদ্ৰণৰ পূৰ্ব-প্ৰদৰ্শন সৃষ্টি কৰোঁতে ভুল"

-#: ../gtk/gtkprintoperation.c:3017
+#: ../gtk/gtkprintoperation.c:3016
 msgid "The most probable reason is that a temporary file could not be created."
 msgstr "খুব সম্ভৱ এটা অস্থায়ী ফাইল সৃষ্টি কৰিব পৰা ন'গ'ল।"

-#: ../gtk/gtkprintoperation-unix.c:302
+#: ../gtk/gtkprintoperation-unix.c:307
 msgid "Error launching preview"
 msgstr "পূৰ্ব-প্ৰদৰ্শন নিক্ষিপ্ত কৰোঁতে ভুলল"

@@ -2633,7 +2648,8 @@ msgstr "URI '%s' ৰ সৈতে কোনো বস্তু পোৱা ন'
 #: ../gtk/gtkrecentmanager.c:2446
 #, c-format
 msgid "No registered application with name '%s' for item with URI '%s' found"
-msgstr "URI '%s' থকা বস্তুৰ বাবে '%s' নামৰ কোনো ৰেজিস্ট্ৰাৰ হোৱা এপ্লিকেচন পোৱা নগল"
+msgstr ""
+"URI '%s' থকা বস্তুৰ বাবে '%s' নামৰ কোনো ৰেজিস্ট্ৰাৰ হোৱা এপ্লিকেচন পোৱা নগল"

 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
 #: ../gtk/gtkstock.c:324
@@ -3228,7 +3244,8 @@ msgstr "\"%s\" এটা বৈধ গুণৰ নাম নহয়"

 #: ../gtk/gtktextbufferserialize.c:1200
 #, c-format
-msgid "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
+msgid ""
+"\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
 msgstr "\"%s\" ক \"%s\" ধৰণৰ মানলৈ সলনি কৰিব পৰা ন'গ'ল \"%s\" গুণৰ বাবে"

 #: ../gtk/gtktextbufferserialize.c:1209
@@ -3265,7 +3282,8 @@ msgid "Serialized data is malformed"
 msgstr "ধাৰাবাহিক তথ্য বিকৃত"

 #: ../gtk/gtktextbufferserialize.c:1868
-msgid "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
+msgid ""
+"Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
 msgstr "ধাৰাবাহিক তথ্য বিকৃত। প্ৰথম খণ্ড GTKTEXTBUFFERCONTENTS-0001 নহয়"

 #: ../gtk/gtktextutil.c:58
@@ -3318,7 +3336,7 @@ msgstr "অপ্ৰত্যাশিত '%s' আৰম্ভনিৰ চি
 msgid "Unexpected character data on line %d char %d"
 msgstr "%d শাৰীৰ %d আখৰত অপ্ৰত্যাশিত আখৰ"

-#: ../gtk/gtkuimanager.c:2738
+#: ../gtk/gtkuimanager.c:2694
 msgid "Empty"
 msgstr "ৰিক্ত"

@@ -4227,7 +4245,8 @@ msgstr "সৃষ্টি কৰা ভাণ্ডাৰ অবৈধ।\n"
 #: ../gtk/updateiconcache.c:1544
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
-msgstr "%s ক %s লৈ পুনঃ নামকৰণ কৰিব পৰা ন'গ'ল: %s, %s ক আঁতৰুৱা হৈছে তেনেহ'লে।\n"
+msgstr ""
+"%s ক %s লৈ পুনঃ নামকৰণ কৰিব পৰা ন'গ'ল: %s, %s ক আঁতৰুৱা হৈছে তেনেহ'লে।\n"

 #: ../gtk/updateiconcache.c:1558
 #, c-format
@@ -4290,7 +4309,8 @@ msgid ""
 "If you really want to create an icon cache here, use --ignore-theme-index.\n"
 msgstr ""
 "'%s' ত কোনো আলোকচিত্ৰ সূচীপত্ৰৰ ফাইল নাই।\n"
-"আপুনি যদি সঁচাকৈ প্ৰতিকৃতিৰ ভাণ্ডাৰ সৃষ্টি কৰিব খোজে, --ignore-theme-index ব্যৱহাৰ "
+"আপুনি যদি সঁচাকৈ প্ৰতিকৃতিৰ ভাণ্ডাৰ সৃষ্টি কৰিব খোজে, --ignore-theme-index "
+"ব্যৱহাৰ "
 "কৰক।\n"

 #. ID
@@ -3,14 +3,14 @@
 # This file is distributed under the same licence as the gtk+ package.
 # Abigail Brady <morwen@evilmagic.org>, Gareth Owen <gowen72@yahoo.com> 2004
 # Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011, 2012.
-# Philip Withnall <philip@tecnocode.co.uk>, 2010.
+# Philip Withnall <philip@tecnocode.co.uk>, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-05 14:09+0100\n"
+"POT-Creation-Date: 2012-11-26 08:58+0000\n"
 "PO-Revision-Date: 2012-09-05 14:10+0100\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr "GDK debugging flags to set"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:453 ../gtk/gtkmain.c:456
+#: ../gdk/gdk.c:214 ../gdk/gdk.c:217 ../gtk/gtkmain.c:454 ../gtk/gtkmain.c:457
 msgid "FLAGS"
 msgstr "FLAGS"

@@ -710,7 +710,7 @@ msgstr "Artwork by"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:156
+#: ../gtk/gtkaccellabel.c:159
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -720,7 +720,7 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:162
+#: ../gtk/gtkaccellabel.c:165
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -730,7 +730,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:168
+#: ../gtk/gtkaccellabel.c:171
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -740,7 +740,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:802
+#: ../gtk/gtkaccellabel.c:805
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -750,7 +750,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:815
+#: ../gtk/gtkaccellabel.c:818
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -760,24 +760,24 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:829
+#: ../gtk/gtkaccellabel.c:832
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"

-#: ../gtk/gtkaccellabel.c:845
+#: ../gtk/gtkaccellabel.c:848
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Space"

-#: ../gtk/gtkaccellabel.c:848
+#: ../gtk/gtkaccellabel.c:851
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Backslash"

 #: ../gtk/gtkappchooserbutton.c:290
-msgid "Other application..."
-msgstr "Other application..."
+msgid "Other application…"
+msgstr "Other application…"

 #: ../gtk/gtkappchooserdialog.c:137
 msgid "Failed to look for applications online"
@@ -806,7 +806,7 @@ msgstr "Could not find application"
 msgid "Select an application to open \"%s\""
 msgstr "Select an application to open \"%s\""

-#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:654
+#: ../gtk/gtkappchooserdialog.c:398 ../gtk/gtkappchooserwidget.c:657
 #, c-format
 msgid "No applications available to open \"%s\""
 msgstr "No applications available to open \"%s\""
@@ -838,23 +838,23 @@ msgstr "Forget association"
 msgid "Show other applications"
 msgstr "Show other applications"

-#: ../gtk/gtkappchooserwidget.c:603
+#: ../gtk/gtkappchooserwidget.c:606
 msgid "Default Application"
 msgstr "Default Application"

-#: ../gtk/gtkappchooserwidget.c:741
+#: ../gtk/gtkappchooserwidget.c:744
 msgid "Recommended Applications"
 msgstr "Recommended Applications"

-#: ../gtk/gtkappchooserwidget.c:756
+#: ../gtk/gtkappchooserwidget.c:759
 msgid "Related Applications"
 msgstr "Related Applications"

-#: ../gtk/gtkappchooserwidget.c:770
+#: ../gtk/gtkappchooserwidget.c:773
 msgid "Other Applications"
 msgstr "Other Applications"

-#: ../gtk/gtkapplication.c:1552
+#: ../gtk/gtkapplication.c:1557
 #, c-format
 msgid ""
 "%s cannot quit at this time:\n"
@@ -865,20 +865,20 @@ msgstr ""
 "\n"
 "%s"

-#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:475
+#: ../gtk/gtkapplicationwindow.c:333 ../gtk/gtkprintoperation-unix.c:480
 #: ../gtk/gtkprintoperation-win32.c:1445
 msgid "Application"
 msgstr "Application"

-#: ../gtk/gtkassistant.c:1004
+#: ../gtk/gtkassistant.c:1008
 msgid "C_ontinue"
 msgstr "C_ontinue"

-#: ../gtk/gtkassistant.c:1007
+#: ../gtk/gtkassistant.c:1011
 msgid "Go _Back"
 msgstr "Go _Back"

-#: ../gtk/gtkassistant.c:1011
+#: ../gtk/gtkassistant.c:1015
 msgid "_Finish"
 msgstr "_Finish"

@@ -1017,8 +1017,8 @@ msgstr "Invalid"
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #.
-#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:745
-msgid "New accelerator..."
+#: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
+msgid "New accelerator…"
 msgstr "New accelerator…"

 #: ../gtk/gtkcellrendererprogress.c:372 ../gtk/gtkcellrendererprogress.c:462
@@ -1320,7 +1320,7 @@ msgid "mm"
 msgstr "mm"

 #: ../gtk/gtkcustompaperunixdialog.c:605
-msgid "Margins from Printer..."
+msgid "Margins from Printer…"
 msgstr "Margins from Printer…"

 #: ../gtk/gtkcustompaperunixdialog.c:771
@@ -1360,15 +1360,15 @@ msgstr "_Right:"
 msgid "Paper Margins"
 msgstr "Paper Margins"

-#: ../gtk/gtkentry.c:9140 ../gtk/gtktextview.c:8583
+#: ../gtk/gtkentry.c:9143 ../gtk/gtktextview.c:8583
 msgid "Input _Methods"
 msgstr "Input _Methods"

-#: ../gtk/gtkentry.c:9154 ../gtk/gtktextview.c:8597
+#: ../gtk/gtkentry.c:9157 ../gtk/gtktextview.c:8597
 msgid "_Insert Unicode Control Character"
 msgstr "_Insert Unicode Control Character"

-#: ../gtk/gtkentry.c:10107
+#: ../gtk/gtkentry.c:10110
 msgid "Caps Lock is on"
 msgstr "Caps Lock is on"

@@ -1417,7 +1417,7 @@ msgstr "Caps Lock is on"
 msgid "Select a File"
 msgstr "Select a File"

-#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1817
+#: ../gtk/gtkfilechooserbutton.c:105 ../gtk/gtkfilechooserdefault.c:1820
 msgid "Desktop"
 msgstr "Desktop"

@@ -1426,30 +1426,30 @@ msgid "(None)"
 msgstr "(None)"

 #: ../gtk/gtkfilechooserbutton.c:2046
-msgid "Other..."
+msgid "Other…"
 msgstr "Other…"

 #: ../gtk/gtkfilechooserdefault.c:152
 msgid "Type name of new folder"
 msgstr "Type name of new folder"

-#: ../gtk/gtkfilechooserdefault.c:968
+#: ../gtk/gtkfilechooserdefault.c:971
 msgid "Could not retrieve information about the file"
 msgstr "Could not retrieve information about the file"

-#: ../gtk/gtkfilechooserdefault.c:979
+#: ../gtk/gtkfilechooserdefault.c:982
 msgid "Could not add a bookmark"
 msgstr "Could not add a bookmark"

-#: ../gtk/gtkfilechooserdefault.c:990
+#: ../gtk/gtkfilechooserdefault.c:993
 msgid "Could not remove bookmark"
 msgstr "Could not remove bookmark"

-#: ../gtk/gtkfilechooserdefault.c:1001
+#: ../gtk/gtkfilechooserdefault.c:1004
 msgid "The folder could not be created"
 msgstr "The folder could not be created"

-#: ../gtk/gtkfilechooserdefault.c:1014
+#: ../gtk/gtkfilechooserdefault.c:1017
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1457,16 +1457,16 @@ msgstr ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."

-#: ../gtk/gtkfilechooserdefault.c:1028
+#: ../gtk/gtkfilechooserdefault.c:1031
 msgid "You need to choose a valid filename."
 msgstr "You need to choose a valid filename."

-#: ../gtk/gtkfilechooserdefault.c:1031
+#: ../gtk/gtkfilechooserdefault.c:1034
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
 msgstr "Cannot create a file under %s as it is not a folder"

-#: ../gtk/gtkfilechooserdefault.c:1043
+#: ../gtk/gtkfilechooserdefault.c:1046
 msgid ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."
@@ -1474,11 +1474,11 @@ msgstr ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."

-#: ../gtk/gtkfilechooserdefault.c:1053
+#: ../gtk/gtkfilechooserdefault.c:1056
 msgid "Invalid file name"
 msgstr "Invalid file name"

-#: ../gtk/gtkfilechooserdefault.c:1063
+#: ../gtk/gtkfilechooserdefault.c:1066
 msgid "The folder contents could not be displayed"
 msgstr "The folder contents could not be displayed"

@@ -1486,209 +1486,209 @@ msgstr "The folder contents could not be displayed"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: ../gtk/gtkfilechooserdefault.c:1589
+#: ../gtk/gtkfilechooserdefault.c:1592
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"

-#: ../gtk/gtkfilechooserdefault.c:1738
+#: ../gtk/gtkfilechooserdefault.c:1741
 msgid "Search"
 msgstr "Search"

-#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4988
+#: ../gtk/gtkfilechooserdefault.c:1765 ../gtk/gtkfilechooserdefault.c:4991
 msgid "Recently Used"
 msgstr "Recently Used"

-#: ../gtk/gtkfilechooserdefault.c:2361
+#: ../gtk/gtkfilechooserdefault.c:2364
 msgid "Select which types of files are shown"
 msgstr "Select which types of files are shown"

-#: ../gtk/gtkfilechooserdefault.c:2720
+#: ../gtk/gtkfilechooserdefault.c:2723
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Add the folder '%s' to the bookmarks"

-#: ../gtk/gtkfilechooserdefault.c:2764
+#: ../gtk/gtkfilechooserdefault.c:2767
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Add the current folder to the bookmarks"

-#: ../gtk/gtkfilechooserdefault.c:2766
+#: ../gtk/gtkfilechooserdefault.c:2769
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Add the selected folders to the bookmarks"

-#: ../gtk/gtkfilechooserdefault.c:2804
+#: ../gtk/gtkfilechooserdefault.c:2807
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Remove the bookmark '%s'"

-#: ../gtk/gtkfilechooserdefault.c:2806
+#: ../gtk/gtkfilechooserdefault.c:2809
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Bookmark '%s' cannot be removed"

-#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3699
+#: ../gtk/gtkfilechooserdefault.c:2816 ../gtk/gtkfilechooserdefault.c:3702
 msgid "Remove the selected bookmark"
 msgstr "Remove the selected bookmark"

-#: ../gtk/gtkfilechooserdefault.c:3377
+#: ../gtk/gtkfilechooserdefault.c:3380
 msgid "Remove"
 msgstr "Remove"

-#: ../gtk/gtkfilechooserdefault.c:3386
-msgid "Rename..."
+#: ../gtk/gtkfilechooserdefault.c:3389
+msgid "Rename…"
 msgstr "Rename…"

 #. Accessible object name for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3550
+#: ../gtk/gtkfilechooserdefault.c:3553
 msgid "Places"
 msgstr "Places"

 #. Column header for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3607
+#: ../gtk/gtkfilechooserdefault.c:3610
 msgid "_Places"
 msgstr "_Places"

-#: ../gtk/gtkfilechooserdefault.c:3687
+#: ../gtk/gtkfilechooserdefault.c:3690
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Add the selected folder to the Bookmarks"

-#: ../gtk/gtkfilechooserdefault.c:3948
+#: ../gtk/gtkfilechooserdefault.c:3951
 msgid "Could not select file"
 msgstr "Could not select file"

-#: ../gtk/gtkfilechooserdefault.c:4173
+#: ../gtk/gtkfilechooserdefault.c:4176
 msgid "_Visit this file"
 msgstr "_Visit this file"

-#: ../gtk/gtkfilechooserdefault.c:4176
+#: ../gtk/gtkfilechooserdefault.c:4179
 msgid "_Copy file's location"
 msgstr "_Copy file's location"

-#: ../gtk/gtkfilechooserdefault.c:4179
+#: ../gtk/gtkfilechooserdefault.c:4182
 msgid "_Add to Bookmarks"
 msgstr "_Add to Bookmarks"

-#: ../gtk/gtkfilechooserdefault.c:4186
+#: ../gtk/gtkfilechooserdefault.c:4189
 msgid "Show _Hidden Files"
 msgstr "Show _Hidden Files"

-#: ../gtk/gtkfilechooserdefault.c:4189
+#: ../gtk/gtkfilechooserdefault.c:4192
 msgid "Show _Size Column"
 msgstr "Show _Size Column"

-#: ../gtk/gtkfilechooserdefault.c:4414
+#: ../gtk/gtkfilechooserdefault.c:4417
 msgid "Files"
 msgstr "Files"

-#: ../gtk/gtkfilechooserdefault.c:4465
+#: ../gtk/gtkfilechooserdefault.c:4468
 msgid "Name"
 msgstr "Name"

-#: ../gtk/gtkfilechooserdefault.c:4488
+#: ../gtk/gtkfilechooserdefault.c:4491
 msgid "Size"
 msgstr "Size"

-#: ../gtk/gtkfilechooserdefault.c:4502
+#: ../gtk/gtkfilechooserdefault.c:4505
 msgid "Modified"
 msgstr "Modified"

 #. Label
-#: ../gtk/gtkfilechooserdefault.c:4595
+#: ../gtk/gtkfilechooserdefault.c:4598
 msgid "_Name:"
 msgstr "_Name:"

-#: ../gtk/gtkfilechooserdefault.c:4826
+#: ../gtk/gtkfilechooserdefault.c:4829
 msgid "Type a file name"
 msgstr "Type a file name"

-#: ../gtk/gtkfilechooserdefault.c:4873 ../gtk/gtkfilechooserdefault.c:4884
+#: ../gtk/gtkfilechooserdefault.c:4876 ../gtk/gtkfilechooserdefault.c:4887
 msgid "Please select a folder below"
 msgstr "Please select a folder below"

-#: ../gtk/gtkfilechooserdefault.c:4879
+#: ../gtk/gtkfilechooserdefault.c:4882
 msgid "Please type a file name"
 msgstr "Please type a file name"

 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:4950
+#: ../gtk/gtkfilechooserdefault.c:4953
 msgid "Create Fo_lder"
 msgstr "Create Fo_lder"

-#: ../gtk/gtkfilechooserdefault.c:4998
+#: ../gtk/gtkfilechooserdefault.c:5001
 msgid "Search:"
 msgstr "Search:"

-#: ../gtk/gtkfilechooserdefault.c:5049
+#: ../gtk/gtkfilechooserdefault.c:5052
 msgid "_Location:"
 msgstr "_Location:"

-#: ../gtk/gtkfilechooserdefault.c:5500
+#: ../gtk/gtkfilechooserdefault.c:5502
 msgid "Save in _folder:"
 msgstr "Save in _folder:"

-#: ../gtk/gtkfilechooserdefault.c:5502
+#: ../gtk/gtkfilechooserdefault.c:5504
 msgid "Create in _folder:"
 msgstr "Create in _folder:"

-#: ../gtk/gtkfilechooserdefault.c:6589
+#: ../gtk/gtkfilechooserdefault.c:6597
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Could not read the contents of %s"

-#: ../gtk/gtkfilechooserdefault.c:6593
+#: ../gtk/gtkfilechooserdefault.c:6601
 msgid "Could not read the contents of the folder"
 msgstr "Could not read the contents of the folder"

-#: ../gtk/gtkfilechooserdefault.c:6686 ../gtk/gtkfilechooserdefault.c:6754
-#: ../gtk/gtkfilechooserdefault.c:6934
+#: ../gtk/gtkfilechooserdefault.c:6694 ../gtk/gtkfilechooserdefault.c:6762
+#: ../gtk/gtkfilechooserdefault.c:6942
 msgid "Unknown"
 msgstr "Unknown"

-#: ../gtk/gtkfilechooserdefault.c:6701
+#: ../gtk/gtkfilechooserdefault.c:6709
 msgid "%H:%M"
 msgstr "%H:%M"

-#: ../gtk/gtkfilechooserdefault.c:6703
+#: ../gtk/gtkfilechooserdefault.c:6711
 msgid "Yesterday at %H:%M"
 msgstr "Yesterday at %H:%M"

-#: ../gtk/gtkfilechooserdefault.c:7405
+#: ../gtk/gtkfilechooserdefault.c:7413
 msgid "Cannot change to folder because it is not local"
 msgstr "Cannot change to folder because it is not local"

-#: ../gtk/gtkfilechooserdefault.c:8009 ../gtk/gtkfilechooserdefault.c:8030
+#: ../gtk/gtkfilechooserdefault.c:8020 ../gtk/gtkfilechooserdefault.c:8041
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "Shortcut %s already exists"

-#: ../gtk/gtkfilechooserdefault.c:8120
+#: ../gtk/gtkfilechooserdefault.c:8131
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Shortcut %s does not exist"

-#: ../gtk/gtkfilechooserdefault.c:8366 ../gtk/gtkprintunixdialog.c:548
+#: ../gtk/gtkfilechooserdefault.c:8377 ../gtk/gtkprintunixdialog.c:548
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "A file named \"%s\" already exists.  Do you want to replace it?"

-#: ../gtk/gtkfilechooserdefault.c:8369 ../gtk/gtkprintunixdialog.c:552
+#: ../gtk/gtkfilechooserdefault.c:8380 ../gtk/gtkprintunixdialog.c:552
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."

-#: ../gtk/gtkfilechooserdefault.c:8374 ../gtk/gtkprintunixdialog.c:559
+#: ../gtk/gtkfilechooserdefault.c:8385 ../gtk/gtkprintunixdialog.c:559
 msgid "_Replace"
 msgstr "_Replace"

-#: ../gtk/gtkfilechooserdefault.c:9181
+#: ../gtk/gtkfilechooserdefault.c:9192
 msgid "Could not start the search process"
 msgstr "Could not start the search process"

-#: ../gtk/gtkfilechooserdefault.c:9182
+#: ../gtk/gtkfilechooserdefault.c:9193
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1696,11 +1696,11 @@ msgstr ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."

-#: ../gtk/gtkfilechooserdefault.c:9196
+#: ../gtk/gtkfilechooserdefault.c:9207
 msgid "Could not send the search request"
 msgstr "Could not send the search request"

-#: ../gtk/gtkfilechooserdefault.c:9806
+#: ../gtk/gtkfilechooserdefault.c:9817
 #, c-format
 msgid "Could not mount %s"
 msgstr "Could not mount %s"
@@ -1739,12 +1739,12 @@ msgstr "Search font name"
 msgid "Font Family"
 msgstr "Font Family"

-#: ../gtk/gtkicontheme.c:1627
+#: ../gtk/gtkicontheme.c:1630
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Icon '%s' not present in theme"

-#: ../gtk/gtkicontheme.c:3137
+#: ../gtk/gtkicontheme.c:3138
 msgid "Failed to load icon"
 msgstr "Failed to load icon"

@@ -1769,22 +1769,22 @@ msgid "System (%s)"
 msgstr "System (%s)"

 #. Open Link
-#: ../gtk/gtklabel.c:6224
+#: ../gtk/gtklabel.c:6183
 msgid "_Open Link"
 msgstr "_Open Link"

 #. Copy Link Address
-#: ../gtk/gtklabel.c:6236
+#: ../gtk/gtklabel.c:6195
 msgid "Copy _Link Address"
 msgstr "Copy _Link Address"

-#: ../gtk/gtk-launch.c:69
-msgid "APPLICATION [URI...] - launch an APPLICATION with URI."
-msgstr "APPLICATION [URI…] - launch an APPLICATION with URI."
+#: ../gtk/gtk-launch.c:71
+msgid "APPLICATION [URI…] — launch an APPLICATION with URI."
+msgstr "APPLICATION [URI…] — launch an APPLICATION with URI."

 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../gtk/gtk-launch.c:73
+#: ../gtk/gtk-launch.c:75
 msgid ""
 "Launch specified application by its desktop file info\n"
 "optionally passing list of URIs as arguments."
@@ -1792,33 +1792,38 @@ msgstr ""
 "Launch specified application by its desktop file info\n"
 "optionally passing list of URIs as arguments."

-#: ../gtk/gtk-launch.c:85
+#: ../gtk/gtk-launch.c:87
 #, c-format
 msgid "Error parsing commandline options: %s\n"
 msgstr "Error parsing commandline options: %s\n"

-#: ../gtk/gtk-launch.c:87 ../gtk/gtk-launch.c:100
+#: ../gtk/gtk-launch.c:89 ../gtk/gtk-launch.c:102
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Try \"%s --help\" for more information."

 #. Translators: the %s is the program name. This error message
 #. means the user is calling gtk-launch without any argument.
-#: ../gtk/gtk-launch.c:98
+#: ../gtk/gtk-launch.c:100
 #, c-format
 msgid "%s: missing application name"
 msgstr "%s: missing application name"

+#: ../gtk/gtk-launch.c:121
+#, c-format
+msgid "Creating AppInfo from id not supported on non unix operating systems"
+msgstr "Creating AppInfo from ID not supported on non-UNIX operating systems"
+
 #. Translators: the first %s is the program name, the second one
 #. is the application name.
-#: ../gtk/gtk-launch.c:122
+#: ../gtk/gtk-launch.c:129
 #, c-format
 msgid "%s: no such application %s"
 msgstr "%s: no such application %s"

 #. Translators: the first %s is the program name, the second one
 #. is the error message.
-#: ../gtk/gtk-launch.c:140
+#: ../gtk/gtk-launch.c:147
 #, c-format
 msgid "%s: error launching application: %s\n"
 msgstr "%s: error launching application: %s\n"
@@ -1864,27 +1869,27 @@ msgstr ""
 "Contact your system administrator"

 #. Description of --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:446
+#: ../gtk/gtkmain.c:447
 msgid "Load additional GTK+ modules"
 msgstr "Load additional GTK+ modules"

 #. Placeholder in --gtk-module=MODULES in --help output
-#: ../gtk/gtkmain.c:447
+#: ../gtk/gtkmain.c:448
 msgid "MODULES"
 msgstr "MODULES"

 #. Description of --g-fatal-warnings in --help output
-#: ../gtk/gtkmain.c:449
+#: ../gtk/gtkmain.c:450
 msgid "Make all warnings fatal"
 msgstr "Make all warnings fatal"

 #. Description of --gtk-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:452
+#: ../gtk/gtkmain.c:453
 msgid "GTK+ debugging flags to set"
 msgstr "GTK+ debugging flags to set"

 #. Description of --gtk-no-debug=FLAGS in --help output
-#: ../gtk/gtkmain.c:455
+#: ../gtk/gtkmain.c:456
 msgid "GTK+ debugging flags to unset"
 msgstr "GTK+ debugging flags to unset"

@@ -1893,73 +1898,73 @@ msgstr "GTK+ debugging flags to unset"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: ../gtk/gtkmain.c:706
+#: ../gtk/gtkmain.c:704
 msgid "default:LTR"
 msgstr "default:LTR"

-#: ../gtk/gtkmain.c:774
+#: ../gtk/gtkmain.c:769
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Cannot open display: %s"

-#: ../gtk/gtkmain.c:840
+#: ../gtk/gtkmain.c:835
 msgid "GTK+ Options"
 msgstr "GTK+ Options"

-#: ../gtk/gtkmain.c:840
+#: ../gtk/gtkmain.c:835
 msgid "Show GTK+ Options"
 msgstr "Show GTK+ Options"

-#: ../gtk/gtkmountoperation.c:532
+#: ../gtk/gtkmountoperation.c:535
 msgid "Co_nnect"
 msgstr "Co_nnect"

-#: ../gtk/gtkmountoperation.c:606
+#: ../gtk/gtkmountoperation.c:609
 msgid "Connect As"
 msgstr "Connect As"

-#: ../gtk/gtkmountoperation.c:615
+#: ../gtk/gtkmountoperation.c:618
 msgid "_Anonymous"
 msgstr "_Anonymous"

-#: ../gtk/gtkmountoperation.c:624
+#: ../gtk/gtkmountoperation.c:627
 msgid "Registered U_ser"
 msgstr "Registered U_ser"

-#: ../gtk/gtkmountoperation.c:635
+#: ../gtk/gtkmountoperation.c:638
 msgid "_Username"
 msgstr "_Username"

-#: ../gtk/gtkmountoperation.c:640
+#: ../gtk/gtkmountoperation.c:643
 msgid "_Domain"
 msgstr "_Domain"

-#: ../gtk/gtkmountoperation.c:646
+#: ../gtk/gtkmountoperation.c:649
 msgid "_Password"
 msgstr "_Password"

-#: ../gtk/gtkmountoperation.c:668
+#: ../gtk/gtkmountoperation.c:671
 msgid "Forget password _immediately"
 msgstr "Forget password _immediately"

-#: ../gtk/gtkmountoperation.c:678
+#: ../gtk/gtkmountoperation.c:681
 msgid "Remember password until you _logout"
 msgstr "Remember password until you _logout"

-#: ../gtk/gtkmountoperation.c:688
+#: ../gtk/gtkmountoperation.c:691
 msgid "Remember _forever"
 msgstr "Remember _forever"

-#: ../gtk/gtkmountoperation.c:1077
+#: ../gtk/gtkmountoperation.c:1080
 #, c-format
 msgid "Unknown Application (PID %d)"
 msgstr "Unknown Application (PID %d)"

-#: ../gtk/gtkmountoperation.c:1260
+#: ../gtk/gtkmountoperation.c:1263
 msgid "Unable to end process"
 msgstr "Unable to end process"

-#: ../gtk/gtkmountoperation.c:1297
+#: ../gtk/gtkmountoperation.c:1300
 msgid "_End Process"
 msgstr "_End Process"

@@ -1994,7 +1999,7 @@ msgstr "Z Shell"
 msgid "Cannot end process with PID %d: %s"
 msgstr "Cannot end process with PID %d: %s"

-#: ../gtk/gtknotebook.c:5051 ../gtk/gtknotebook.c:7705
+#: ../gtk/gtknotebook.c:5067 ../gtk/gtknotebook.c:7721
 #, c-format
 msgid "Page %u"
 msgstr "Page %u"
@@ -2002,14 +2007,14 @@ msgstr "Page %u"
 #. Translators: the format here is used to build the string that will be rendered
 #. * in the number emblem.
 #.
-#: ../gtk/gtknumerableicon.c:481
+#: ../gtk/gtknumerableicon.c:482
 #, c-format
 msgctxt "Number format"
 msgid "%d"
 msgstr "%d"

-#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:846
-#: ../gtk/gtkpapersize.c:886
+#: ../gtk/gtkpagesetup.c:646 ../gtk/gtkpapersize.c:848
+#: ../gtk/gtkpapersize.c:888
 msgid "Not a valid page setup file"
 msgstr "Not a valid page setup file"

@@ -2037,7 +2042,7 @@ msgstr ""
 " Bottom: %s %s"

 #: ../gtk/gtkpagesetupunixdialog.c:845 ../gtk/gtkprintunixdialog.c:3329
-msgid "Manage Custom Sizes..."
+msgid "Manage Custom Sizes…"
 msgstr "Manage Custom Sizes…"

 #: ../gtk/gtkpagesetupunixdialog.c:896
@@ -2068,7 +2073,7 @@ msgstr "Down Path"
 msgid "File System Root"
 msgstr "File System Root"

-#: ../gtk/gtkprintbackend.c:748
+#: ../gtk/gtkprintbackend.c:750
 msgid "Authentication"
 msgstr "Authentication"

@@ -2134,30 +2139,30 @@ msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "Finished with error"

-#: ../gtk/gtkprintoperation.c:2352
+#: ../gtk/gtkprintoperation.c:2349
 #, c-format
 msgid "Preparing %d"
 msgstr "Preparing %d"

-#: ../gtk/gtkprintoperation.c:2354 ../gtk/gtkprintoperation.c:2984
+#: ../gtk/gtkprintoperation.c:2351 ../gtk/gtkprintoperation.c:2983
 msgid "Preparing"
 msgstr "Preparing"

-#: ../gtk/gtkprintoperation.c:2357
+#: ../gtk/gtkprintoperation.c:2354
 #, c-format
 msgid "Printing %d"
 msgstr "Printing %d"

-#: ../gtk/gtkprintoperation.c:3014
+#: ../gtk/gtkprintoperation.c:3013
 msgid "Error creating print preview"
 msgstr "Error creating print preview"

-#: ../gtk/gtkprintoperation.c:3017
+#: ../gtk/gtkprintoperation.c:3016
 msgid "The most probable reason is that a temporary file could not be created."
 msgstr ""
 "The most probable reason is that a temporary file could not be created."

-#: ../gtk/gtkprintoperation-unix.c:302
+#: ../gtk/gtkprintoperation-unix.c:307
 msgid "Error launching preview"
 msgstr "Error launching preview"

@@ -2221,7 +2226,7 @@ msgid "Getting printer information failed"
 msgstr "Getting printer information failed"

 #: ../gtk/gtkprintunixdialog.c:1916
-msgid "Getting printer information..."
+msgid "Getting printer information…"
 msgstr "Getting printer information…"

 #: ../gtk/gtkprintunixdialog.c:2184
@@ -3324,7 +3329,7 @@ msgstr "Unexpected start tag '%s' on line %d char %d"
 msgid "Unexpected character data on line %d char %d"
 msgstr "Unexpected character data on line %d char %d"

-#: ../gtk/gtkuimanager.c:2738
+#: ../gtk/gtkuimanager.c:2694
 msgid "Empty"
 msgstr "Empty"

@@ -4826,9 +4831,6 @@ msgstr "Print to Test Printer"
 #~ msgid "Complete, but not unique"
 #~ msgstr "Complete, but not unique"

-#~ msgid "Completing..."
-#~ msgstr "Completing…"
-
 #~ msgid "Only local files may be selected"
 #~ msgstr "Only local files may be selected"

@@ -5634,9 +5636,6 @@ msgstr "Print to Test Printer"
 #~ msgid "Rename file \"%s\" to:"
 #~ msgstr "Rename file \"%s\" to:"

-#~ msgid "_Rename"
-#~ msgstr "_Rename"
-
 #~ msgid ""
 #~ "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
 #~ "environment variable G_FILENAME_ENCODING): %s"
@@ -5722,13 +5721,11 @@ msgstr "Print to Test Printer"
 #~ msgid "(Empty)"
 #~ msgstr "(Empty)"

-#, fuzzy
 #~ msgid "<b>_Search:</b>"
-#~ msgstr "_Search:"
+#~ msgstr "<b>_Search:</b>"

-#, fuzzy
 #~ msgid "<b>Recently Used</b>"
-#~ msgstr "Recently Used"
+#~ msgstr "<b>Recently Used</b>"

 #~ msgid "directfb arg"
 #~ msgstr "directfb arg"
@@ -6407,9 +6404,8 @@ msgstr "Print to Test Printer"
 #~ msgid "Today"
 #~ msgstr "Today"

-#, fuzzy
 #~ msgid "Location:"
-#~ msgstr "_Location:"
+#~ msgstr "Location:"

 #~ msgid "Line %d, column %d: missing attribute \"%s\""
 #~ msgstr "Line %d, column %d: missing attribute \"%s\""
@@ -6476,9 +6472,8 @@ msgstr "Print to Test Printer"
 #~ msgid "Select All"
 #~ msgstr "Select All"

-#, fuzzy
 #~ msgid "shortcut %s already exists"
-#~ msgstr "Shortcut %s does not exist"
+#~ msgstr "shortcut %s already exists"

 #~ msgid "Cannot handle PNM files with maximum color values greater than 255"
 #~ msgstr "Cannot handle PNM files with maximum colour values greater than 255"
@@ -262,7 +262,7 @@ a ~ :hover {
  int-property: 42;
 }

-:hover.b {
+.b:hover {
  int-property: 42;
 }

@@ -398,7 +398,7 @@ a ~ #b {
  int-property: 42;
 }

-:hover#b {
+#b:hover {
  int-property: 42;
 }

@@ -0,0 +1,255 @@
+/* "Tradition" theme for GTK 3, by John Lindgren */
+/* Last modified: October 21, 2012 */
+/* Public domain */
+
+/* COLORS */
+
+@define-color color_base #c8c4c0;
+@define-color color_sel #406080;
+@define-color color_tip #ffffc0;
+@define-color color_dark shade (@color_base, 0.6);
+
+* {
+    background-color: @color_base;
+    border-color: @color_dark;
+    border-style: solid;
+    color: black;
+}
+
+.cell, .check, .entry, .menu, .radio, GtkTextView, GtkTreeView {
+    background-color: white;
+}
+
+GtkImage, GtkLabel, .menuitem {
+    background-color: transparent;
+}
+
+.tooltip {
+    background-color: @color_tip;
+}
+
+*:insensitive {
+    color: @color_dark;
+}
+
+*:selected, .menuitem:prelight, *:prelight {
+    background-color: @color_sel;
+    color: white;
+}
+
+GtkCheckButton:selected {
+    background-color: @color_base;
+}
+
+.check:prelight, .check:selected, .radio:prelight, .radio:selected {
+    background-color: white;
+    color: black;
+}
+
+.slider, .pane-separator {
+    background-color: alpha (black, 0);
+    color: alpha (black, 0);
+}
+
+/* GRADIENTS */
+
+.button, .notebook tab:active, .slider {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+     from (shade (@color_base, 1.2)), to (@color_base));
+}
+
+.button:active, .notebook tab, .trough {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+     from (shade (@color_base, 0.8)), to (@color_base));
+}
+
+.button.vertical, .slider.vertical {
+    background-image: -gtk-gradient (linear, left top, right top,
+     from (shade (@color_base, 1.2)), to (@color_base));
+}
+
+.button.vertical:active, .trough.vertical {
+    background-image: -gtk-gradient (linear, left top, right top,
+     from (shade (@color_base, 0.8)), to (@color_base));
+}
+
+column-header > .button {
+    background-image: none;
+}
+
+.progressbar {
+    background-image: -gtk-gradient (linear, left top, left bottom,
+     from (shade (@color_sel, 1.2)), to (@color_sel));
+    border-color: shade (@color_sel, 0.7);
+}
+
+.progressbar.vertical {
+    background-image: -gtk-gradient (linear, left top, right top,
+     from (shade (@color_sel, 1.2)), to (@color_sel));
+}
+
+/* SPACING */
+
+* {
+    border-width: 0px;
+    border-radius: 0px;
+    padding: 0px;
+}
+
+.menu {
+    border-width: 1px;
+    padding: 1px;
+}
+
+.menuitem {
+    border-radius: 3px;
+    padding: 1px;
+}
+
+.toolbar {
+    padding: 0px 3px 0px 3px;
+}
+
+.button, .check, .entry, .frame, .notebook, .progressbar, .radio, .scale,
+ .scrollbar, .slider, .trough {
+    border-radius: 2px;
+    border-width: 1px;
+}
+
+.notebook tab {
+    padding: 2px;
+}
+
+.notebook tab:active {
+    padding: 3px;
+}
+
+.button {
+    padding: 3px;
+}
+
+.entry, column-header > .button {
+    padding: 2px;
+}
+
+GtkComboBox .button {
+    padding: 0px 2px 0px 2px;
+}
+
+.combobox-entry > .entry {
+    border-radius: 2px 0px 0px 2px;
+    border-width: 1px 0px 1px 1px;
+}
+
+.combobox-entry > .button {
+    border-radius: 0px 2px 2px 0px;
+}
+
+.spinbutton.button {
+    border-radius: 0px;
+    border-width: 0px 1px 0px 1px;
+}
+
+.spinbutton.button:last-child {
+    border-width: 0px;
+}
+
+column-header > .button {
+    border-radius: 0px;
+    border-width: 0px 0px 1px 0px;
+}
+
+.scrollbar {
+    border-radius: 0px;
+}
+
+.scrollbar.trough {
+    border-width: 1px 1px 0px 1px;
+}
+
+.scrollbar.trough.vertical {
+    border-width: 1px 0px 1px 1px;
+}
+
+.scrollbar.button.left, .scrollbar.button.right {
+    border-width: 1px 0px 0px 0px;
+}
+
+.scrollbar.button.top, .scrollbar.button.bottom {
+    border-width: 0px 0px 0px 1px;
+}
+
+.scrollbars-junction {
+    border-width: 1px 0px 0px 1px;
+}
+
+.scrollbar.slider {
+    border-width: 1px 1px 0px 1px;
+}
+
+.scrollbar.slider.vertical {
+    border-width: 1px 0px 1px 1px;
+}
+
+.separator {
+    border-width: 1px;
+    padding: 1px;
+}
+
+GtkComboBox .separator, GtkFontButton .separator {
+    border-width: 0px;
+    padding: 0px;
+}
+
+.tooltip {
+    border-width: 1px;
+    padding: 2px;
+}
+
+/* MISC SETTINGS */
+
+* {
+    -GtkButton-default-border: 0;
+    -GtkButton-image-spacing: 4;
+    -GtkButtonBox-child-internal-pad-x: 0;
+    -GtkButtonBox-child-internal-pad-y: 0;
+    -GtkButtonBox-child-min-width: 0;
+    -GtkButtonBox-child-min-height: 0;
+    -GtkCheckButton-indicator-size: 12;
+    -GtkCheckMenuItem-indicator-size: 12;
+    -GtkComboBox-arrow-scaling: 0.667;
+    -GtkDialog-action-area-border: 0;
+    -GtkDialog-button-spacing: 6;
+    -GtkDialog-content-area-border: 6;
+    -GtkDialog-content-area-spacing: 6;
+    -GtkEntry-inner-border: 1;
+    -GtkMenu-horizontal-padding: 1;
+    -GtkMenu-horizontal-offset: 0;
+    -GtkMenuBar-internal-padding: 0;
+    -GtkMenuItem-arrow-scaling: 0.667;
+    -GtkMenuItem-toggle-spacing: 6;
+    -GtkNotebook-tab-overlap: 1;
+    -GtkPaned-handle-size: 6;
+    -GtkProgressBar-min-horizontal-bar-height: 12;
+    -GtkProgressBar-min-vertical-bar-width: 12;
+    -GtkRange-slider-width: 12;
+    -GtkRange-trough-border: 0;
+    -GtkScale-slider-length: 30;
+    -GtkScrolledWindow-scrollbar-spacing: 0;
+    -GtkScrolledWindow-scrollbars-within-bevel: 1;
+    -GtkTreeView-horizontal-separator: 0;
+    -GtkTreeView-vertical-separator: 0;
+    -GtkWidget-focus-line-width: 0;
+    -GtkWidget-focus-padding: 0;
+    -GtkWidget-separator-height: 1;
+    -GtkWidget-separator-width: 1;
+    -GtkWidget-wide-separators: TRUE;
+    -GtkWindow-resize-grip-height: 0;
+}
+
+.scrollbar {
+    -GtkRange-slider-width: 17;
+    -GtkRange-stepper-size: 16;
+    -GtkRange-trough-under-steppers: FALSE;
+    -GtkScrollbar-min-slider-length: 18;
+}
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name Cool -->
+      <column type="gboolean"/>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+      <!-- column-name Nick -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">True</col>
+        <col id="1" translatable="yes">Andrea</col>
+        <col id="2" translatable="yes">Cimi</col>
+      </row>
+      <row>
+        <col id="0">False</col>
+        <col id="1" translatable="yes">Otto</col>
+        <col id="2" translatable="yes">chaotic</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkTreeView" id="treeview1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="model">liststore1</property>
+        <child internal-child="selection">
+          <object class="GtkTreeSelection" id="treeview-selection"/>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+            <property name="title" translatable="yes">Cool</property>
+            <property name="sizing">fixed</property>
+            <property name="fixed-width">100</property>
+            <child>
+              <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
+              <attributes>
+                <attribute name="active">0</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+            <property name="title" translatable="yes">Name</property>
+            <property name="sizing">fixed</property>
+            <property name="fixed-width">100</property>
+            <child>
+              <object class="GtkCellRendererText" id="cellrenderertext3"/>
+              <attributes>
+                <attribute name="text">1</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+            <property name="title" translatable="yes">Nick</property>
+            <property name="sizing">fixed</property>
+            <property name="fixed-width">100</property>
+            <child>
+              <object class="GtkCellRendererText" id="cellrenderertext4"/>
+              <attributes>
+                <attribute name="text">2</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name Cool -->
+      <column type="gboolean"/>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+      <!-- column-name Nick -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">True</col>
+        <col id="1" translatable="yes">Andrea</col>
+        <col id="2" translatable="yes">Cimi</col>
+      </row>
+      <row>
+        <col id="0">False</col>
+        <col id="1" translatable="yes">Otto</col>
+        <col id="2" translatable="yes">chaotic</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkTreeView" id="treeview1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="model">liststore1</property>
+        <property name="fixed-height-mode">True</property>
+        <child internal-child="selection">
+          <object class="GtkTreeSelection" id="treeview-selection"/>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+            <property name="title" translatable="yes">Cool</property>
+            <property name="sizing">fixed</property>
+            <property name="fixed-width">100</property>
+            <child>
+              <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
+              <attributes>
+                <attribute name="active">0</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+            <property name="title" translatable="yes">Name</property>
+            <property name="sizing">fixed</property>
+            <property name="fixed-width">100</property>
+            <child>
+              <object class="GtkCellRendererText" id="cellrenderertext3"/>
+              <attributes>
+                <attribute name="text">1</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+            <property name="title" translatable="yes">Nick</property>
+            <property name="sizing">fixed</property>
+            <property name="fixed-width">100</property>
+            <child>
+              <object class="GtkCellRendererText" id="cellrenderertext4"/>
+              <attributes>
+                <attribute name="text">2</attribute>
+              </attributes>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
Author	SHA1	Message	Date
Alexander Larsson	0542d5461f	css: Make test pass The new css tree may change the order of selectors (keeping the same semantics). This affects how the selectors are printed later, which causes some css parsing tests to not match the references. Fortunately the order is consistent between runs given the same css, so we just have to switch around the order in some of the .ref.css files.	2012-11-30 14:18:39 +01:00
Alexander Larsson	28033a25dd	css: Allocate the css tree in a single chunk This gives us several advantages: * Smaller struct on 64bit (32bit indexes vs 64bit pointers) * Less overhead for allocation * Less fragmentation	2012-11-29 22:21:23 +01:00
Alexander Larsson	536e38aef6	css: Fix leak of lists while building tree	2012-11-29 22:21:23 +01:00
Alexander Larsson	867f70586c	css: Add accessor functions for traversing css tree This will let us later change how the tree is stored	2012-11-29 22:21:23 +01:00
Alexander Larsson	8e461c2ecd	css: Add const to _gtk_css_selector_tree_match_all arg	2012-11-29 22:21:23 +01:00
Alexander Larsson	e3930f2342	css: Don't keep around linear selectors Now we use the selector tree everywhere, so there is no need to keep around the linear selectors unless we're using them to verify the tree correctness, so free them.	2012-11-29 22:21:23 +01:00
Alexander Larsson	24f5412b3d	css: Remove gtk_css_ruleset_matches This is only not needed anymore, and only the VERIFY_TREE code should access ->selector.	2012-11-29 22:21:23 +01:00
Alexander Larsson	36200036db	css: Use tree for gtk_css_provider_get_style_property	2012-11-29 22:21:23 +01:00
Alexander Larsson	67c62fff13	css: Implement ruleset_get_change() with the tree We traverse the tree on the matches instead of using the linear selectors.	2012-11-29 22:21:23 +01:00
Alexander Larsson	55f8bb5279	css: Ensure the tree built is always the same We add some "artificial" ordering to the otherwise unordered tree nodes. This means the tree will be the same every time for the same input. This is good because e.g. tree order affects the reordering of the simple selectors, which may affect how css providers are printed, which need to be consistent for the css tests to work.	2012-11-29 22:21:23 +01:00
Alexander Larsson	736d1bccf6	css: Use the tree to print css selectors	2012-11-29 22:21:23 +01:00
Alexander Larsson	ef1dbc7c36	css: Track the tree selector matches	2012-11-29 22:21:23 +01:00
Alexander Larsson	f11013e80a	css: Fix type of GtkCssSelectorRuleSetInfo match The old type was a leftover from a previous version.	2012-11-29 22:21:23 +01:00
Alexander Larsson	d40d532067	css: Track parent in the css tree nodes This way we can reconstruct matched css rules	2012-11-29 22:21:22 +01:00
Alexander Larsson	64d8034164	css: Better tree match verification	2012-11-29 22:21:22 +01:00
Alexander Larsson	d9357402ed	css: Fix up position with region tree matching This was using the wrong result in case of a match (results from the position, not the region. Also, the descendant checks were wrong.	2012-11-29 22:21:22 +01:00
Alexander Larsson	6702974e32	css: Don't reorder some selectors when building selector tree When building the tree we generally reorder the selectors inside the same simple selector in order to pick a good first selector to balance the tree better. However, some kinds of selectors can't really be reordered, even thought they are simple. This is since the matching code for some types handle the existance of a directly preceeding selector differently: REGION and ANY selectors look for a DESCENDANT previous POSITION selector look for a REGION previous	2012-11-29 22:21:22 +01:00
Alexander Larsson	18536fc044	css: Fixed typo in PRINT_TREE debug code	2012-11-28 12:13:09 +01:00
Alexander Larsson	fa2f5eee64	css: Create and use a tree for css selector matching	2012-11-28 11:21:06 +01:00
Alexander Larsson	b70bac8b76	css: Add GtkCssSelectorTree creation and matching From a set of GtkCssSelectors and the rulesets they match to we create a large decision tree that lets us efficitently match against all the rules and return the set of matched rulesets. The tree is created such that at each level we pick the initial rule[1] in all the considered selectors for that level and use put the one that is in most selectors in the node. All selectors matching that are put in the previous part of the tree.	2012-11-28 11:15:53 +01:00
Alexander Larsson	b786ccc6d9	css: Add _gtk_css_matcher_matches_any() This returns true if the matcher matches anything. We need to check this later, because such matchers are dangerous in loops that iterate over all parents/siblings since such loops would not terminate.	2012-11-28 11:07:52 +01:00
Alexander Larsson	af7c38c60c	css: Track which selectors are "simple"	2012-11-27 10:50:59 +01:00
Matej Urbančič	943de24211	Updated Slovenian translation	2012-11-26 21:12:00 +01:00
Matej Urbančič	db6d6fcc84	Updated Slovenian translation	2012-11-26 21:07:25 +01:00
David King	941851fc86	docs: Add gtk-doc comment for GtkTreeRowReference https://bugzilla.gnome.org/show_bug.cgi?id=93381	2012-11-26 14:12:14 +00:00
Christophe Fergeau	e8659679cd	Sanitize memory handling in cups_request_printer_list_cb gtk+ was trying to display already freed strings, leaking memory, ...I noticed this because I was getting weird blinking characters as the status of my cups printers, and valgrind confirmed something was wrong. https://bugzilla.gnome.org/show_bug.cgi?id=683072	2012-11-26 10:19:31 +01:00
Philip Withnall	693581250e	i18n: Update British English translation	2012-11-26 09:00:59 +00:00
Philip Withnall	ceb866dfe6	Bug 595615 — Use proper ellipses Use ‘…’ instead of ‘...’ in translatable strings. Closes: https://bugzilla.gnome.org/show_bug.cgi?id=595615	2012-11-26 08:59:27 +00:00
Piotr Drąg	788f1a0934	Updated POTFILES.skip	2012-11-26 00:46:05 +01:00
Benjamin Otte	6b33ee9c53	reftests: Add reftest for broken fixed height mode https://bugzilla.gnome.org/show_bug.cgi?id=687816	2012-11-26 00:09:35 +01:00
Benjamin Otte	239c631ad3	treeview: Delay computing fixed height In the setter, we only set fixed height mode and queue a revalidation of the row heights. https://bugzilla.gnome.org/show_bug.cgi?id=687816	2012-11-26 00:09:35 +01:00
Emmanuele Bassi	4498ff314e	sizegroup: Use g_hash_table_add() This is the function to use when treating hash tables as a set.	2012-11-25 22:58:19 +01:00
Benjamin Otte	87b351e6e6	styleproperty: Use _gtk_css_initial_value_get() See previous commit(s).	2012-11-25 22:29:14 +01:00
Benjamin Otte	1d805139db	cssvalue: Use _gtk_css_initial_value_get() for the inherit value See previous commit(s).	2012-11-25 22:29:14 +01:00
Benjamin Otte	f204473ee0	cssvalue: Add _gtk_css_initial_value_get() ... so we don't bump a refcount whenever we get the initial singleton. We want to use this function instead of _gtk_css_style_property_get_initial_value() everywhere where we compute values, because some initial values may depend on settings soon.	2012-11-25 15:31:59 +01:00
Benjamin Otte	2ab65ef771	izegroup: Improve performance Keep a list of all groups and avoid groups we already handled. Speeds up GtkToolpalette a lot.	2012-11-25 13:32:21 +01:00
Benjamin Otte	da7a4089fe	widget: Remove an unneeded queue_resize() Resizes are queued via gtk_widget_propagate_state() => gtk_style_context_set_state() => gtk_style_context_queue_invalidate() => gtk_style_context_validate() => _gtk_widget_style_context_invalidated() so there's no need to queue an extra one.	2012-11-25 04:46:36 +01:00
Benjamin Otte	41486895d5	deprecations: Move files into deprecated/ dir	2012-11-25 04:16:43 +01:00
Benjamin Otte	0862afaded	gtkgradient: Deprecate	2012-11-25 03:47:51 +01:00
Benjamin Otte	fb643c1c12	symboliccolor: Deprecate Symbolic colors are an implementation detail of the CSS engine and have been superceded by GtkCssColorValue. We don't want them clobbering the public API. In particular because the only use I could find in the public API is people using it to shade colors.	2012-11-25 03:43:28 +01:00
Benjamin Otte	df25349d63	themingengine: Do shading with GtkHSLA ... instead of with symbolic colors.	2012-11-25 03:34:02 +01:00
Benjamin Otte	9aac4dffc5	hsla: Add _gtk_hsla_shade() We use it in multiple places, so better split it out.	2012-11-25 03:25:15 +01:00
Benjamin Otte	4f9a8e6b3d	symboliccolor: Remove extra includes That header was included in way too many places.	2012-11-25 02:59:15 +01:00
Benjamin Otte	42dc0ea0fd	styleprovider: Change function prototype Make _gtk_style_provider_private_get_color() return a GtkCssValue (a GtkCssColorValue to be exact) instead of GtkSymbolicColor. With this, the symbolic color usage inside GTK is minimized.	2012-11-25 02:45:10 +01:00
Benjamin Otte	08ac1504d2	symboliccolor: Implement using GtkCssValue	2012-11-25 02:41:17 +01:00
Benjamin Otte	b8e58015eb	symboliccolor: symbolic color is no longer a CssValue This is not needed anymore, because we have GtkCssColorValue for that now.	2012-11-25 01:51:18 +01:00
Benjamin Otte	94b80cc774	symboliccolor: Change prototype of function Makes it easier to use the function in the places where it's still used.	2012-11-24 21:56:47 +01:00
Benjamin Otte	5ca35bd5dd	settings: Remove support for color schemes Color schemes were unused and their interaction with CSS3 themes was undefined. So we decided to remove support for them. This commit does that.	2012-11-24 21:27:33 +01:00
Benjamin Otte	932794e105	styleprovider: Remove (broken) implementations of get_style The implementations were broken and get_style() is deprecated and documented to return NULL now.	2012-11-24 21:12:00 +01:00
Benjamin Otte	324ff12553	stylecascade: Remove get_icon_factory() implementation It was redundant.	2012-11-24 21:12:00 +01:00
Benjamin Otte	45b4fb02b1	styleprovider: Deprecate two non-working functions Both of them weren't used inside GTK. And apparently they weren't used outside of GTK either, as alex recently mentioned them being severly broken.	2012-11-24 21:12:00 +01:00
David King	fbdb81bbdf	docs: gtk_file_chooser_get_filename() returns absolute paths The documentation for gtk_file_chooser_get_filenames() states that the returned filenames are absolute paths, and uses g_file_get_path() to construct the filename. The same function is used to construct the filename in gtk_file_chooser_get_filename(), so it should also return absolute paths. https://bugzilla.gnome.org/show_bug.cgi?id=371034	2012-11-24 19:58:10 +00:00
Nilamdyuti Goswami	840f09bdc8	Assamese translation updated	2012-11-23 20:18:36 +05:30
Nilamdyuti Goswami	b05ee6aa29	Assamese translation updated	2012-11-23 20:17:24 +05:30
David King	73c436f43e	docs: Fix typo in gtk_tree_view_set_tooltip_column comment https://bugzilla.gnome.org/show_bug.cgi?id=688884	2012-11-22 22:25:51 +00:00
David King	c627b22126	docs: Improve GtkTreeModel iteration pattern Iterating over the model in this way means that use of continue is less error-prone, as the increment is part of the loop construct. https://bugzilla.gnome.org/show_bug.cgi?id=548793	2012-11-22 21:36:46 +00:00
David King	e677cee28f	docs: Correct GtkWidget::scroll-event mask documentation Since GTK+ 3.3.18, GDK_SCROLL_MASK has been used as the mask for scroll events. Update the documentation to reflect this. https://bugzilla.gnome.org/show_bug.cgi?id=677339	2012-11-22 21:36:40 +00:00
Martin Pitt	2927383b5f	aboutdialog: Fix add_credit_section() annotations The people argument is an array. https://mail.gnome.org/archives/python-hackers-list/2012-November/msg00010.html	2012-11-22 14:51:52 +01:00
Michael Natterer	2d9454363f	gtk: don't let insensitive children eat scroll events when bubbling down When event capturing is enabled, stop propagating scroll events at insensitive widgets, but don't handle them (don't return TRUE), so they can bubble up again and reach their handling widgets.	2012-11-22 13:53:33 +01:00
Wouter Bolsterlee	eb7bf0a2f4	Updated Dutch translation	2012-11-22 12:04:31 +01:00
Camillo Lugaresi	4f6e1fdf16	Bug 688710 - splashscreen shouldn't be always on top on OS X Activate the "hides on deactivate" behavior for splashscreens, torn-off menus, utility windows, tooltips and notifications: when another application is brought to the front, these windows are hidden so as not to obscure it. This is the expected behavior for application-specific floating windows on OS X. (cherry picked from commit `0596f5591f`)	2012-11-20 22:03:40 +01:00
Cosimo Cecchi	ddceddaa84	tree-view: don't use gtk_style_context_set_background() Render a background with gtk_render_background() in draw() instead. Note that we still use gtk_style_context_set_background() for the header window. https://bugzilla.gnome.org/show_bug.cgi?id=688744	2012-11-20 13:41:39 -05:00
Cosimo Cecchi	da09447914	iconview: don't use gtk_style_context_set_background() Render a background with gtk_render_background() during draw instead. https://bugzilla.gnome.org/show_bug.cgi?id=688744	2012-11-20 13:41:39 -05:00
Michael Natterer	d0af25f12c	quartz: fix the mapping of GDK_KP_Enter in known_numeric_keys[] so it will actually be used, instead of delivering GDK_Return when it should be GDK_KP_Enter. (cherry picked from commit `27f3fcf12c`)	2012-11-20 19:14:43 +01:00
Matthias Clasen	6e3d687386	Post-release version bump	2012-11-20 07:00:53 -05:00