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.

gdk/quartz/gdkglobals-quartz.c

@@ -28,14 +28,9 @@ GdkWindow *_gdk_root = NULL;
 GdkOSXVersion
 gdk_quartz_osx_version (void)
 {
-  static gint32 minor = GDK_OSX_UNSUPPORTED;
-
-  if (minor == GDK_OSX_UNSUPPORTED)
-    {
-      OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&minor);
-
-      g_return_val_if_fail (err == noErr, GDK_OSX_UNSUPPORTED);
-    }
+  gint minor;
+  OSErr err = Gestalt (gestaltSystemVersionMinor, &minor);
+  g_return_val_if_fail (err == noErr, GDK_OSX_UNSUPPORTED);
 
   if (minor < GDK_OSX_MIN)
     return GDK_OSX_UNSUPPORTED;

gdk/quartz/gdkquartz.h

@@ -48,8 +48,7 @@ typedef enum
   GDK_OSX_LEOPARD = 5,
   GDK_OSX_SNOW_LEOPARD = 6,
   GDK_OSX_LION = 7,
-  GDK_OSX_MOUNTAIN_LION = 8,
-  GDK_OSX_CURRENT = 8,
+  GDK_OSX_CURRENT = 7,
   GDK_OSX_NEW = 99
 } GdkOSXVersion;
 

gdk/win32/gdkwindow-win32.c

@@ -27,7 +27,6 @@
 
 #include "config.h"
 #include <stdlib.h>
-#include <windows.h>
 
 #include "gdk.h"
 #include "gdkwindowimpl.h"
@@ -1534,7 +1533,7 @@ gdk_win32_window_set_urgency_hint (GdkWindow *window,
 			     gboolean   urgent)
 {
   FLASHWINFO flashwinfo;
-  typedef BOOL (WINAPI *PFN_FlashWindowEx) (FLASHWINFO*);
+  typedef BOOL (*PFN_FlashWindowEx) (FLASHWINFO*);
   PFN_FlashWindowEx flashWindowEx = NULL;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -3265,7 +3264,7 @@ gdk_win32_window_set_opacity (GdkWindow *window,
 			gdouble    opacity)
 {
   LONG exstyle;
-  typedef BOOL (WINAPI *PFN_SetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD);
+  typedef BOOL (*PFN_SetLayeredWindowAttributes) (HWND, COLORREF, BYTE, DWORD);
   PFN_SetLayeredWindowAttributes setLayeredWindowAttributes = NULL;
 
   g_return_if_fail (GDK_IS_WINDOW (window));

gdk/x11/gdksettings.c

@@ -82,8 +82,7 @@ static const char gdk_settings_names[] =
   "Gtk/VisibleFocus\0"        "gtk-visible-focus\0"
   "Gtk/ShellShowsAppMenu\0"   "gtk-shell-shows-app-menu\0"
   "Gtk/ShellShowsMenubar\0"   "gtk-shell-shows-menubar\0"
-  "Gtk/EnablePrimaryPaste\0"  "gtk-enable-primary-paste\0"
-  "Gtk/RecentFilesMaxAge\0"   "gtk-recent-files-max-age\0";
+  "Gtk/EnablePrimaryPaste\0"  "gtk-enable-primary-paste\0";
 
 
 
@@ -141,6 +140,5 @@ static const struct
   { 1767, 1784 },
   { 1802, 1824 },
   { 1849, 1871 },
-  { 1895, 1918 },
-  { 1943, 1965 }
+  { 1895, 1918 }
 };

gtk/a11y/gtkcellaccessible.c

@@ -287,13 +287,10 @@ gtk_cell_accessible_action_do_action (AtkAction *action,
     {
     case 0:
       _gtk_cell_accessible_parent_expand_collapse (parent, cell);
-      break;
     case 1:
       _gtk_cell_accessible_parent_edit (parent, cell);
-      break;
     case 2:
       _gtk_cell_accessible_parent_activate (parent, cell);
-      break;
     default:
       return FALSE;
     }

gtk/a11y/gtkiconviewaccessible.c

@@ -708,7 +708,7 @@ gtk_icon_view_item_accessible_is_showing (GtkIconViewItemAccessible *item)
   if (icon_view->priv->hadjustment)
     visible_rect.x += gtk_adjustment_get_value (icon_view->priv->hadjustment);
   visible_rect.y = 0;
-  if (icon_view->priv->vadjustment)
+  if (icon_view->priv->hadjustment)
     visible_rect.y += gtk_adjustment_get_value (icon_view->priv->vadjustment);
   visible_rect.width = allocation.width;
   visible_rect.height = allocation.height;

gtk/a11y/gtkwidgetaccessible.c

@@ -499,7 +499,6 @@ gtk_widget_accessible_notify_gtk (GObject    *obj,
       gtk_widget_accessible_update_tooltip (GTK_WIDGET_ACCESSIBLE (atk_obj),
                                             widget);
     }
-  else
     return;
 
   atk_object_notify_state_change (atk_obj, state, value);

gtk/gtkaboutdialog.c

@@ -2395,8 +2395,6 @@ create_credits_page (GtkAboutDialog *about)
   gtk_widget_set_valign (grid, GTK_ALIGN_START);
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), grid);
 
-  row = 0;
-
   if (priv->authors != NULL)
     add_credits_section (about, GTK_GRID (grid), &row, _("Created by"), priv->authors);
 

gtk/gtkactionhelper.c

@@ -189,7 +189,7 @@ gtk_action_helper_action_removed (GtkActionHelper *helper)
 
   if (helper->active)
     {
-      helper->active = FALSE;
+      helper->enabled = FALSE;
       gtk_action_helper_report_change (helper, PROP_ACTIVE);
     }
 

gtk/gtkclipboard-quartz.c

@@ -45,7 +45,6 @@ struct _GtkClipboard
   GObject parent_instance;
 
   NSPasteboard *pasteboard;
-  NSInteger change_count;
 
   GdkAtom selection;
 
@@ -77,18 +76,13 @@ struct _GtkClipboardClass
 			GdkEventOwnerChange *event);
 };
 
-static void gtk_clipboard_class_init   (GtkClipboardClass   *class);
-static void gtk_clipboard_finalize     (GObject             *object);
-static void gtk_clipboard_owner_change (GtkClipboard        *clipboard,
-					GdkEventOwnerChange *event);
-
-static void          clipboard_unset      (GtkClipboard     *clipboard);
-static GtkClipboard *clipboard_peek       (GdkDisplay       *display,
-					   GdkAtom           selection,
-					   gboolean          only_if_exists);
-
 @interface GtkClipboardOwner : NSObject {
   GtkClipboard *clipboard;
+
+  GtkClipboardGetFunc get_func;
+  GtkClipboardClearFunc clear_func;
+  gpointer user_data;
+  
 }
 
 @end
@@ -123,15 +117,10 @@ static GtkClipboard *clipboard_peek       (GdkDisplay       *display,
     }
 }
 
-/*  pasteboardChangedOwner is not called immediately, and it's not called
- *  reliably. It is somehow documented in the apple api docs, but the docs
- *  suck and don't really give clear instructions. Therefore we track
- *  changeCount in several places below and clear the clipboard if it
- *  changed.
- */
 - (void)pasteboardChangedOwner:(NSPasteboard *)sender
 {
-  clipboard_unset (clipboard);
+  if (clear_func)
+    clear_func (clipboard, user_data);
 
   [self release];
 }
@@ -150,6 +139,15 @@ static GtkClipboard *clipboard_peek       (GdkDisplay       *display,
 
 @end
 
+static void gtk_clipboard_class_init   (GtkClipboardClass   *class);
+static void gtk_clipboard_finalize     (GObject             *object);
+static void gtk_clipboard_owner_change (GtkClipboard        *clipboard,
+					GdkEventOwnerChange *event);
+
+static void          clipboard_unset      (GtkClipboard     *clipboard);
+static GtkClipboard *clipboard_peek       (GdkDisplay       *display,
+					   GdkAtom           selection,
+					   gboolean          only_if_exists);
 
 static const gchar clipboards_owned_key[] = "gtk-clipboards-owned";
 static GQuark clipboards_owned_key_id = 0;
@@ -362,15 +360,6 @@ gtk_clipboard_set_contents (GtkClipboard         *clipboard,
         }
     }
 
-  /*  call declareTypes before setting the clipboard members because
-   *  declareTypes might clear the clipboard
-   */
-  types = _gtk_quartz_target_entries_to_pasteboard_types (targets, n_targets);
-  clipboard->change_count = [clipboard->pasteboard declareTypes: [types allObjects]
-                                                          owner: owner];
-  [types release];
-  [pool release];
-
   clipboard->user_data = user_data;
   clipboard->have_owner = have_owner;
   if (have_owner)
@@ -382,6 +371,12 @@ gtk_clipboard_set_contents (GtkClipboard         *clipboard,
     gtk_target_list_unref (clipboard->target_list);
   clipboard->target_list = gtk_target_list_new (targets, n_targets);
 
+  types = _gtk_quartz_target_entries_to_pasteboard_types (targets, n_targets);
+
+  [clipboard->pasteboard declareTypes:[types allObjects] owner:owner];
+  [types release];
+  [pool release];
+
   return TRUE;
 }
 
@@ -425,12 +420,6 @@ gtk_clipboard_get_owner (GtkClipboard *clipboard)
 {
   g_return_val_if_fail (clipboard != NULL, NULL);
 
-  if (clipboard->change_count < [clipboard->pasteboard changeCount])
-    {
-      clipboard_unset (clipboard);
-      clipboard->change_count = [clipboard->pasteboard changeCount];
-    }
-
   if (clipboard->have_owner)
     return clipboard->user_data;
   else
@@ -484,8 +473,6 @@ clipboard_unset (GtkClipboard *clipboard)
 void
 gtk_clipboard_clear (GtkClipboard *clipboard)
 {
-  clipboard_unset (clipboard);
-
   [clipboard->pasteboard declareTypes:nil owner:nil];
 }
 
@@ -669,12 +656,6 @@ gtk_clipboard_wait_for_contents (GtkClipboard *clipboard,
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   GtkSelectionData *selection_data = NULL;
 
-  if (clipboard->change_count < [clipboard->pasteboard changeCount])
-    {
-      clipboard_unset (clipboard);
-      clipboard->change_count = [clipboard->pasteboard changeCount];
-    }
-
   if (target == gdk_atom_intern_static_string ("TARGETS")) 
     {
       NSArray *types = [clipboard->pasteboard types];

gtk/gtkcolorbutton.c

@@ -584,42 +584,36 @@ dialog_response (GtkDialog *dialog,
     }
 }
 
-/* Create the dialog and connects its buttons */
-static void
-ensure_dialog (GtkColorButton *button)
-{
-  GtkWidget *parent, *dialog;
-
-  if (button->priv->cs_dialog != NULL)
-    return;
-
-  parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
-
-  button->priv->cs_dialog = dialog = gtk_color_chooser_dialog_new (button->priv->title, NULL);
-
-  if (gtk_widget_is_toplevel (parent) && GTK_IS_WINDOW (parent))
-  {
-    if (GTK_WINDOW (parent) != gtk_window_get_transient_for (GTK_WINDOW (dialog)))
-      gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
-
-    gtk_window_set_modal (GTK_WINDOW (dialog),
-                            gtk_window_get_modal (GTK_WINDOW (parent)));
-  }
-
-  g_signal_connect (dialog, "response",
-                    G_CALLBACK (dialog_response), button);
-  g_signal_connect (dialog, "destroy",
-                    G_CALLBACK (dialog_destroy), button);
-}
-
-
 static void
 gtk_color_button_clicked (GtkButton *b)
 {
   GtkColorButton *button = GTK_COLOR_BUTTON (b);
+  GtkWidget *dialog;
 
   /* if dialog already exists, make sure it's shown and raised */
-  ensure_dialog (button);
+  if (!button->priv->cs_dialog)
+    {
+      /* Create the dialog and connects its buttons */
+      GtkWidget *parent;
+
+      parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
+
+      button->priv->cs_dialog = dialog = gtk_color_chooser_dialog_new (button->priv->title, NULL);
+
+      if (gtk_widget_is_toplevel (parent) && GTK_IS_WINDOW (parent))
+        {
+          if (GTK_WINDOW (parent) != gtk_window_get_transient_for (GTK_WINDOW (dialog)))
+            gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
+
+          gtk_window_set_modal (GTK_WINDOW (dialog),
+                                gtk_window_get_modal (GTK_WINDOW (parent)));
+        }
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (dialog_response), button);
+      g_signal_connect (dialog, "destroy",
+                        G_CALLBACK (dialog_destroy), button);
+    }
 
   gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
                                    button->priv->use_alpha);
@@ -968,9 +962,8 @@ gtk_color_button_add_palette (GtkColorChooser *chooser,
 {
   GtkColorButton *button = GTK_COLOR_BUTTON (chooser);
 
-  ensure_dialog (button);
-
-  gtk_color_chooser_add_palette (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
+  if (button->priv->cs_dialog)
+    gtk_color_chooser_add_palette (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
                                    orientation, colors_per_line, n_colors, colors);
 }
 

gtk/gtkcssarrayvalue.c

@@ -51,51 +51,32 @@ gtk_css_value_array_compute (GtkCssValue             *value,
                              GtkCssDependencies      *dependencies)
 {
   GtkCssValue *result;
-  GtkCssValue *i_value;
-  guint i, j;
+  gboolean changed = FALSE;
+  guint i;
   GtkCssDependencies child_deps;
 
-  result = NULL;
+  if (value->n_values == 0)
+    return _gtk_css_value_ref (value);
+
+  result = _gtk_css_array_value_new_from_array (value->values, value->n_values);
   for (i = 0; i < value->n_values; i++)
     {
-      i_value =  _gtk_css_value_compute (value->values[i], property_id, provider, values, parent_values, &child_deps);
+      result->values[i] = _gtk_css_value_compute (value->values[i], property_id, provider, values, parent_values, &child_deps);
 
       *dependencies = _gtk_css_dependencies_union (*dependencies, child_deps);
 
-      if (result == NULL &&
-	  i_value != value->values[i])
-	{
-	  result = _gtk_css_array_value_new_from_array (value->values, value->n_values);
-	  for (j = 0; j < i; j++)
-	    _gtk_css_value_ref (result->values[j]);
-	}
-
-      if (result != NULL)
-	result->values[i] = i_value;
-      else
-	_gtk_css_value_unref (i_value);
+      changed |= (result->values[i] != value->values[i]);
     }
 
-  if (result == NULL)
-    return _gtk_css_value_ref (value);
+  if (!changed)
+    {
+      _gtk_css_value_unref (result);
+      return _gtk_css_value_ref (value);
+    }
 
   return result;
 }
 
-static gboolean
-gtk_css_value_array_needs_compute (const GtkCssValue *value)
-{
-  guint i;
-
-  for (i = 0; i < value->n_values; i++)
-    {
-      if (_gtk_css_value_needs_compute (value->values[i]))
-	return TRUE;
-    }
-
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_array_equal (const GtkCssValue *value1,
                            const GtkCssValue *value2)
@@ -337,7 +318,6 @@ gtk_css_value_array_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_ARRAY = {
   gtk_css_value_array_free,
   gtk_css_value_array_compute,
-  gtk_css_value_array_needs_compute,
   gtk_css_value_array_equal,
   gtk_css_value_array_transition,
   gtk_css_value_array_print

gtk/gtkcssbgsizevalue.c

@@ -69,20 +69,12 @@ gtk_css_value_bg_size_compute (GtkCssValue             *value,
                                      value->y ? y : NULL);
 }
 
-static gboolean
-gtk_css_value_bg_size_needs_compute (const GtkCssValue *value)
-{
-  return
-    _gtk_css_value_needs_compute (value->x) ||
-    _gtk_css_value_needs_compute (value->y);
-}
-
 static gboolean
 gtk_css_value_bg_size_equal (const GtkCssValue *value1,
                              const GtkCssValue *value2)
 {
   return value1->cover == value2->cover &&
-         value1->contain == value2->contain &&
+         value2->contain == value2->contain &&
          (value1->x == value2->x ||
           (value1->x != NULL && value2->x != NULL &&
            _gtk_css_value_equal (value1->x, value2->x))) &&
@@ -158,7 +150,6 @@ gtk_css_value_bg_size_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_BG_SIZE = {
   gtk_css_value_bg_size_free,
   gtk_css_value_bg_size_compute,
-  gtk_css_value_bg_size_needs_compute,
   gtk_css_value_bg_size_equal,
   gtk_css_value_bg_size_transition,
   gtk_css_value_bg_size_print

gtk/gtkcssbordervalue.c

@@ -76,20 +76,6 @@ gtk_css_value_border_compute (GtkCssValue             *value,
   return computed;
 }
 
-static gboolean
-gtk_css_value_border_needs_compute (const GtkCssValue *value)
-{
-  guint i;
-
-  for (i = 0; i < 4; i++)
-    {
-      if (_gtk_css_value_needs_compute (value->values[i]))
-	return TRUE;
-    }
-
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_border_equal (const GtkCssValue *value1,
                             const GtkCssValue *value2)
@@ -150,7 +136,6 @@ gtk_css_value_border_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_BORDER = {
   gtk_css_value_border_free,
   gtk_css_value_border_compute,
-  gtk_css_value_border_needs_compute,
   gtk_css_value_border_equal,
   gtk_css_value_border_transition,
   gtk_css_value_border_print

gtk/gtkcsscolorvalue.c

@@ -334,12 +334,6 @@ gtk_css_value_color_compute (GtkCssValue             *value,
   return resolved;
 }
 
-static gboolean
-gtk_css_value_color_needs_compute (const GtkCssValue  *value)
-{
-  return TRUE;
-}
-
 static gboolean
 gtk_css_value_color_equal (const GtkCssValue *value1,
                            const GtkCssValue *value2)
@@ -455,7 +449,6 @@ gtk_css_value_color_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_COLOR = {
   gtk_css_value_color_free,
   gtk_css_value_color_compute,
-  gtk_css_value_color_needs_compute,
   gtk_css_value_color_equal,
   gtk_css_value_color_transition,
   gtk_css_value_color_print

gtk/gtkcsscomputedvalues.c

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "gtkprivate.h"
 #include "gtkcsscomputedvaluesprivate.h"
 
 #include "gtkcssanimationprivate.h"
@@ -121,9 +120,9 @@ _gtk_css_computed_values_compute_value (GtkCssComputedValues    *values,
   GtkCssDependencies dependencies;
   GtkCssValue *value;
 
-  gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
-  gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider));
-  gtk_internal_return_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values));
+  g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
+  g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider));
+  g_return_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values));
 
   /* http://www.w3.org/TR/css3-cascade/#cascade
    * Then, for every element, the value for each property can be found
@@ -137,7 +136,7 @@ _gtk_css_computed_values_compute_value (GtkCssComputedValues    *values,
       if (_gtk_css_style_property_is_inherit (prop))
         specified = _gtk_css_inherit_value_new ();
       else
-        specified = _gtk_css_initial_value_new (prop);
+        specified = _gtk_css_initial_value_new ();
     }
   else
     _gtk_css_value_ref (specified);
@@ -155,8 +154,8 @@ _gtk_css_computed_values_set_animated_value (GtkCssComputedValues *values,
                                              guint                 id,
                                              GtkCssValue          *value)
 {
-  gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
-  gtk_internal_return_if_fail (value != NULL);
+  g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
+  g_return_if_fail (value != NULL);
 
   if (values->animated_values == NULL)
     values->animated_values = g_ptr_array_new_with_free_func ((GDestroyNotify)_gtk_css_value_unref);
@@ -176,11 +175,10 @@ _gtk_css_computed_values_set_value (GtkCssComputedValues *values,
                                     GtkCssDependencies    dependencies,
                                     GtkCssSection        *section)
 {
-  gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
+  g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
 
   if (values->values == NULL)
-    values->values = g_ptr_array_new_full (_gtk_css_style_property_get_n_properties (),
-					   (GDestroyNotify)_gtk_css_value_unref);
+    values->values = g_ptr_array_new_with_free_func ((GDestroyNotify)_gtk_css_value_unref);
   if (id >= values->values->len)
    g_ptr_array_set_size (values->values, id + 1);
 
@@ -218,7 +216,7 @@ GtkCssValue *
 _gtk_css_computed_values_get_value (GtkCssComputedValues *values,
                                     guint                 id)
 {
-  gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
+  g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
 
   if (values->animated_values &&
       id < values->animated_values->len &&
@@ -232,7 +230,7 @@ GtkCssValue *
 _gtk_css_computed_values_get_intrinsic_value (GtkCssComputedValues *values,
                                               guint                 id)
 {
-  gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
+  g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
 
   if (values->values == NULL ||
       id >= values->values->len)
@@ -245,7 +243,7 @@ GtkCssSection *
 _gtk_css_computed_values_get_section (GtkCssComputedValues *values,
                                       guint                 id)
 {
-  gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
+  g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
 
   if (values->sections == NULL ||
       id >= values->sections->len)
@@ -530,8 +528,8 @@ _gtk_css_computed_values_advance (GtkCssComputedValues *values,
   GSList *list;
   guint i;
 
-  gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
-  gtk_internal_return_val_if_fail (timestamp >= values->current_time, NULL);
+  g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
+  g_return_val_if_fail (timestamp >= values->current_time, NULL);
 
   values->current_time = timestamp;
   old_computed_values = values->animated_values;
@@ -580,7 +578,7 @@ _gtk_css_computed_values_is_static (GtkCssComputedValues *values)
 {
   GSList *list;
 
-  gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), TRUE);
+  g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), TRUE);
 
   for (list = values->animations; list; list = list->next)
     {
@@ -594,7 +592,7 @@ _gtk_css_computed_values_is_static (GtkCssComputedValues *values)
 void
 _gtk_css_computed_values_cancel_animations (GtkCssComputedValues *values)
 {
-  gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
+  g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values));
 
   if (values->animated_values)
     {
@@ -612,7 +610,7 @@ _gtk_css_computed_values_compute_dependencies (GtkCssComputedValues *values,
 {
   GtkBitmask *changes;
 
-  gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), _gtk_bitmask_new ());
+  g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), _gtk_bitmask_new ());
 
   changes = _gtk_bitmask_copy (parent_changes);
   changes = _gtk_bitmask_intersect (changes, values->depends_on_parent);

gtk/gtkcsscornervalue.c

@@ -60,14 +60,6 @@ gtk_css_value_corner_compute (GtkCssValue             *corner,
   return _gtk_css_corner_value_new (x, y);
 }
 
-static gboolean
-gtk_css_value_corner_needs_compute (const GtkCssValue *corner)
-{
-  return
-    _gtk_css_value_needs_compute (corner->x) ||
-    _gtk_css_value_needs_compute (corner->y);
-}
-
 static gboolean
 gtk_css_value_corner_equal (const GtkCssValue *corner1,
                             const GtkCssValue *corner2)
@@ -112,7 +104,6 @@ gtk_css_value_corner_print (const GtkCssValue *corner,
 static const GtkCssValueClass GTK_CSS_VALUE_CORNER = {
   gtk_css_value_corner_free,
   gtk_css_value_corner_compute,
-  gtk_css_value_corner_needs_compute,
   gtk_css_value_corner_equal,
   gtk_css_value_corner_transition,
   gtk_css_value_corner_print

gtk/gtkcsscustomproperty.c

@@ -211,8 +211,6 @@ gtk_css_custom_property_create_initial_value (GParamSpec *pspec)
  * </note>
  *
  * Since: 3.0
- *
- * Deprecated: 3.8: Code should use the default properties provided by CSS.
  **/
 void
 gtk_theming_engine_register_property (const gchar            *name_space,
@@ -262,8 +260,6 @@ gtk_theming_engine_register_property (const gchar            *name_space,
  * a theming engine, you want to use that function instead.
  *
  * Since: 3.0
- *
- * Deprecated: 3.8: Code should use the default properties provided by CSS.
  **/
 void
 gtk_style_properties_register_property (GtkStylePropertyParser  parse_func,
@@ -307,9 +303,6 @@ gtk_style_properties_register_property (GtkStylePropertyParser  parse_func,
  * Returns: %TRUE if the property is registered, %FALSE otherwise
  *
  * Since: 3.0
- *
- * Deprecated: 3.8: This code could only look up custom properties and
- *     those are deprecated.
  **/
 gboolean
 gtk_style_properties_lookup_property (const gchar             *property_name,

gtk/gtkcsseasevalue.c

@@ -60,12 +60,6 @@ gtk_css_value_ease_compute (GtkCssValue             *value,
   return _gtk_css_value_ref (value);
 }
 
-static gboolean
-gtk_css_value_ease_needs_compute (const GtkCssValue  *value)
-{
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_ease_equal (const GtkCssValue *ease1,
                           const GtkCssValue *ease2)
@@ -144,7 +138,6 @@ gtk_css_value_ease_print (const GtkCssValue *ease,
 static const GtkCssValueClass GTK_CSS_VALUE_EASE = {
   gtk_css_value_ease_free,
   gtk_css_value_ease_compute,
-  gtk_css_value_ease_needs_compute,
   gtk_css_value_ease_equal,
   gtk_css_value_ease_transition,
   gtk_css_value_ease_print

gtk/gtkcssenginevalue.c

@@ -45,12 +45,6 @@ gtk_css_value_engine_compute (GtkCssValue             *value,
   return _gtk_css_value_ref (value);
 }
 
-static gboolean
-gtk_css_value_engine_needs_compute (const GtkCssValue *value)
-{
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_engine_equal (const GtkCssValue *value1,
                             const GtkCssValue *value2)
@@ -86,7 +80,6 @@ gtk_css_value_engine_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_ENGINE = {
   gtk_css_value_engine_free,
   gtk_css_value_engine_compute,
-  gtk_css_value_engine_needs_compute,
   gtk_css_value_engine_equal,
   gtk_css_value_engine_transition,
   gtk_css_value_engine_print

gtk/gtkcssenumvalue.c

@@ -19,9 +19,7 @@
 
 #include "gtkcssenumvalueprivate.h"
 
-#include "gtkcsscomputedvaluesprivate.h"
-#include "gtkcssnumbervalueprivate.h"
-#include "gtkstyleproviderprivate.h"
+#include "gtkstylepropertyprivate.h"
 
 /* repeated API */
 
@@ -48,12 +46,6 @@ gtk_css_value_enum_compute (GtkCssValue             *value,
   return _gtk_css_value_ref (value);
 }
 
-static gboolean
-gtk_css_value_enum_needs_compute (const GtkCssValue  *value)
-{
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_enum_equal (const GtkCssValue *enum1,
                           const GtkCssValue *enum2)
@@ -82,7 +74,6 @@ gtk_css_value_enum_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_BORDER_STYLE = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print
@@ -133,165 +124,11 @@ _gtk_css_border_style_value_get (const GtkCssValue *value)
   return value->value;
 }
 
-/* GtkCssFontSize */
-
-/* XXX: Kinda bad to have that machinery here, nobody expects vital font
- * size code to appear in gtkcssvalueenum.c.
- */
-#define DEFAULT_FONT_SIZE 10
-
-double
-_gtk_css_font_size_get_default (GtkStyleProviderPrivate *provider)
-{
-  GtkSettings *settings;
-  PangoFontDescription *description;
-  char *font_name;
-  double font_size;
-
-  settings = _gtk_style_provider_private_get_settings (provider);
-  if (settings == NULL)
-    return DEFAULT_FONT_SIZE;
-  
-  g_object_get (settings, "gtk-font-name", &font_name, NULL);
-  description = pango_font_description_from_string (font_name);
-  g_free (font_name);
-  if (description == NULL)
-    return DEFAULT_FONT_SIZE;
-
-  if (pango_font_description_get_set_fields (description) & PANGO_FONT_MASK_SIZE)
-    font_size = (double) pango_font_description_get_size (description) / PANGO_SCALE;
-  else
-    font_size = DEFAULT_FONT_SIZE;
-
-  pango_font_description_free (description);
-  return font_size;
-}
-
-static GtkCssValue *
-gtk_css_value_font_size_compute (GtkCssValue             *value,
-                                 guint                    property_id,
-                                 GtkStyleProviderPrivate *provider,
-                                 GtkCssComputedValues    *values,
-                                 GtkCssComputedValues    *parent_values,
-                                 GtkCssDependencies      *dependencies)
-{
-  double font_size;
-
-  switch (value->value)
-    {
-    case GTK_CSS_FONT_SIZE_XX_SMALL:
-      font_size = _gtk_css_font_size_get_default (provider) * 3. / 5;
-      break;
-    case GTK_CSS_FONT_SIZE_X_SMALL:
-      font_size = _gtk_css_font_size_get_default (provider) * 3. / 4;
-      break;
-    case GTK_CSS_FONT_SIZE_SMALL:
-      font_size = _gtk_css_font_size_get_default (provider) * 8. / 9;
-      break;
-    default:
-      g_assert_not_reached ();
-      /* fall thru */
-    case GTK_CSS_FONT_SIZE_MEDIUM:
-      font_size = _gtk_css_font_size_get_default (provider);
-      break;
-    case GTK_CSS_FONT_SIZE_LARGE:
-      font_size = _gtk_css_font_size_get_default (provider) * 6. / 5;
-      break;
-    case GTK_CSS_FONT_SIZE_X_LARGE:
-      font_size = _gtk_css_font_size_get_default (provider) * 3. / 2;
-      break;
-    case GTK_CSS_FONT_SIZE_XX_LARGE:
-      font_size = _gtk_css_font_size_get_default (provider) * 2;
-      break;
-    case GTK_CSS_FONT_SIZE_SMALLER:
-      *dependencies = GTK_CSS_DEPENDS_ON_PARENT;
-      if (parent_values)
-        font_size = _gtk_css_number_value_get (_gtk_css_computed_values_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100);
-      else
-        font_size = _gtk_css_font_size_get_default (provider);
-      /* XXX: This is what WebKit does... */
-      font_size /= 1.2;
-      break;
-    case GTK_CSS_FONT_SIZE_LARGER:
-      *dependencies = GTK_CSS_DEPENDS_ON_PARENT;
-      if (parent_values)
-        font_size = _gtk_css_number_value_get (_gtk_css_computed_values_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100);
-      else
-        font_size = _gtk_css_font_size_get_default (provider);
-      /* XXX: This is what WebKit does... */
-      font_size *= 1.2;
-      break;
-  }
-
-  return _gtk_css_number_value_new (font_size, GTK_CSS_PX);
-}
-
-static gboolean
-gtk_css_value_font_size_needs_compute (const GtkCssValue *value)
-{
-  return TRUE;
-}
-
-
-static const GtkCssValueClass GTK_CSS_VALUE_FONT_SIZE = {
-  gtk_css_value_enum_free,
-  gtk_css_value_font_size_compute,
-  gtk_css_value_font_size_needs_compute,
-  gtk_css_value_enum_equal,
-  gtk_css_value_enum_transition,
-  gtk_css_value_enum_print
-};
-
-static GtkCssValue font_size_values[] = {
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_SMALLER, "smaller" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_LARGER, "larger" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_XX_SMALL, "xx-small" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_X_SMALL, "x-small" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_SMALL, "small" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_MEDIUM, "medium" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_LARGE, "large" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_X_LARGE, "x-large" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, GTK_CSS_FONT_SIZE_XX_LARGE, "xx-large" }
-};
-
-GtkCssValue *
-_gtk_css_font_size_value_new (GtkCssFontSize font_size)
-{
-  g_return_val_if_fail (font_size < G_N_ELEMENTS (font_size_values), NULL);
-
-  return _gtk_css_value_ref (&font_size_values[font_size]);
-}
-
-GtkCssValue *
-_gtk_css_font_size_value_try_parse (GtkCssParser *parser)
-{
-  guint i;
-
-  g_return_val_if_fail (parser != NULL, NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (font_size_values); i++)
-    {
-      if (_gtk_css_parser_try (parser, font_size_values[i].name, TRUE))
-        return _gtk_css_value_ref (&font_size_values[i]);
-    }
-
-  return NULL;
-}
-
-GtkCssFontSize
-_gtk_css_font_size_value_get (const GtkCssValue *value)
-{
-  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_FONT_SIZE, GTK_CSS_FONT_SIZE_MEDIUM);
-
-  return value->value;
-}
-
 /* PangoStyle */
 
 static const GtkCssValueClass GTK_CSS_VALUE_FONT_STYLE = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print
@@ -340,7 +177,6 @@ _gtk_css_font_style_value_get (const GtkCssValue *value)
 static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print
@@ -388,7 +224,6 @@ _gtk_css_font_variant_value_get (const GtkCssValue *value)
 static const GtkCssValueClass GTK_CSS_VALUE_FONT_WEIGHT = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print
@@ -457,7 +292,6 @@ _gtk_css_font_weight_value_get (const GtkCssValue *value)
 static const GtkCssValueClass GTK_CSS_VALUE_AREA = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print
@@ -512,7 +346,6 @@ _gtk_css_area_value_get (const GtkCssValue *value)
 static const GtkCssValueClass GTK_CSS_VALUE_DIRECTION = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print
@@ -568,7 +401,6 @@ _gtk_css_direction_value_get (const GtkCssValue *value)
 static const GtkCssValueClass GTK_CSS_VALUE_PLAY_STATE = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print
@@ -622,7 +454,6 @@ _gtk_css_play_state_value_get (const GtkCssValue *value)
 static const GtkCssValueClass GTK_CSS_VALUE_FILL_MODE = {
   gtk_css_value_enum_free,
   gtk_css_value_enum_compute,
-  gtk_css_value_enum_needs_compute,
   gtk_css_value_enum_equal,
   gtk_css_value_enum_transition,
   gtk_css_value_enum_print

gtk/gtkcssenumvalueprivate.h

@@ -31,11 +31,6 @@ GtkCssValue *   _gtk_css_border_style_value_new       (GtkBorderStyle     border
 GtkCssValue *   _gtk_css_border_style_value_try_parse (GtkCssParser      *parser);
 GtkBorderStyle  _gtk_css_border_style_value_get       (const GtkCssValue *value);
 
-GtkCssValue *   _gtk_css_font_size_value_new          (GtkCssFontSize     size);
-GtkCssValue *   _gtk_css_font_size_value_try_parse    (GtkCssParser      *parser);
-GtkCssFontSize  _gtk_css_font_size_value_get          (const GtkCssValue *value);
-double          _gtk_css_font_size_get_default        (GtkStyleProviderPrivate *provider);
-
 GtkCssValue *   _gtk_css_font_style_value_new         (PangoStyle         style);
 GtkCssValue *   _gtk_css_font_style_value_try_parse   (GtkCssParser      *parser);
 PangoStyle      _gtk_css_font_style_value_get         (const GtkCssValue *value);

gtk/gtkcssimagevalue.c

@@ -59,12 +59,6 @@ gtk_css_value_image_compute (GtkCssValue             *value,
   return _gtk_css_image_value_new (computed);
 }
 
-static gboolean
-gtk_css_value_image_needs_compute (const GtkCssValue *value)
-{
-  return _gtk_css_image_value_get_image (value) != NULL;
-}
-
 static gboolean
 gtk_css_value_image_equal (const GtkCssValue *value1,
                            const GtkCssValue *value2)
@@ -101,7 +95,6 @@ gtk_css_value_image_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_IMAGE = {
   gtk_css_value_image_free,
   gtk_css_value_image_compute,
-  gtk_css_value_image_needs_compute,
   gtk_css_value_image_equal,
   gtk_css_value_image_transition,
   gtk_css_value_image_print

gtk/gtkcssinheritvalue.c

@@ -48,7 +48,7 @@ gtk_css_value_inherit_compute (GtkCssValue             *value,
     }
   else
     {
-      return _gtk_css_value_compute (_gtk_css_initial_value_get (_gtk_css_style_property_lookup_by_id (property_id)),
+      return _gtk_css_value_compute (_gtk_css_initial_value_get (),
                                      property_id,
                                      provider,
                                      values,
@@ -57,12 +57,6 @@ gtk_css_value_inherit_compute (GtkCssValue             *value,
     }
 }
 
-static gboolean
-gtk_css_value_inherit_needs_compute (const GtkCssValue *value)
-{
-  return TRUE;
-}
-
 static gboolean
 gtk_css_value_inherit_equal (const GtkCssValue *value1,
                              const GtkCssValue *value2)
@@ -89,7 +83,6 @@ gtk_css_value_inherit_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_INHERIT = {
   gtk_css_value_inherit_free,
   gtk_css_value_inherit_compute,
-  gtk_css_value_inherit_needs_compute,
   gtk_css_value_inherit_equal,
   gtk_css_value_inherit_transition,
   gtk_css_value_inherit_print

gtk/gtkcssinitialvalue.c

@@ -19,16 +19,10 @@
 
 #include "gtkcssinitialvalueprivate.h"
 
-#include "gtkcssarrayvalueprivate.h"
-#include "gtkcssnumbervalueprivate.h"
-#include "gtkcssstringvalueprivate.h"
 #include "gtkcssstylepropertyprivate.h"
-#include "gtkstyleproviderprivate.h"
 
 struct _GtkCssValue {
   GTK_CSS_VALUE_BASE
-  GtkCssStyleProperty *property;
-  gboolean needs_compute;
 };
 
 static void
@@ -46,43 +40,7 @@ gtk_css_value_initial_compute (GtkCssValue             *value,
                                GtkCssComputedValues    *parent_values,
                                GtkCssDependencies      *dependencies)
 {
-  GtkSettings *settings;
-
-  if (!value->needs_compute)
-    return _gtk_css_value_ref (_gtk_css_style_property_get_initial_value (value->property));
-
-  switch (property_id)
-    {
-    case GTK_CSS_PROPERTY_FONT_FAMILY:
-      settings = _gtk_style_provider_private_get_settings (provider);
-      if (settings)
-        {
-          PangoFontDescription *description;
-          char *font_name;
-          GtkCssValue *value;
-
-          g_object_get (settings, "gtk-font-name", &font_name, NULL);
-          description = pango_font_description_from_string (font_name);
-          g_free (font_name);
-          if (description == NULL)
-            break;
-
-          if (pango_font_description_get_set_fields (description) & PANGO_FONT_MASK_FAMILY)
-            {
-              value = _gtk_css_array_value_new (_gtk_css_string_value_new (pango_font_description_get_family (description)));
-              pango_font_description_free (description);
-              return value;
-            }
- 
-          pango_font_description_free (description);
-        }
-      break;
-
-    default:
-      break;
-    }
-
-  return _gtk_css_value_compute (_gtk_css_style_property_get_initial_value (value->property),
+  return _gtk_css_value_compute (_gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (property_id)),
                                  property_id,
                                  provider,
                                  values,
@@ -90,12 +48,6 @@ gtk_css_value_initial_compute (GtkCssValue             *value,
                                  dependencies);
 }
 
-static gboolean
-gtk_css_value_initial_needs_compute (const GtkCssValue *value)
-{
-  return TRUE;
-}
-
 static gboolean
 gtk_css_value_initial_equal (const GtkCssValue *value1,
                              const GtkCssValue *value2)
@@ -122,7 +74,6 @@ gtk_css_value_initial_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_INITIAL = {
   gtk_css_value_initial_free,
   gtk_css_value_initial_compute,
-  gtk_css_value_initial_needs_compute,
   gtk_css_value_initial_equal,
   gtk_css_value_initial_transition,
   gtk_css_value_initial_print
@@ -131,21 +82,13 @@ static const GtkCssValueClass GTK_CSS_VALUE_INITIAL = {
 static GtkCssValue initial = { &GTK_CSS_VALUE_INITIAL, 1 };
 
 GtkCssValue *
-_gtk_css_initial_value_new (GtkCssStyleProperty *property)
+_gtk_css_initial_value_new (void)
 {
-  return _gtk_css_value_ref (_gtk_css_initial_value_get (property));
+  return _gtk_css_value_ref (&initial);
 }
 
 GtkCssValue *
-_gtk_css_initial_value_get (GtkCssStyleProperty *property)
+_gtk_css_initial_value_get (void)
 {
-  if (property->css_initial_value == NULL)
-    {
-      property->css_initial_value = g_new0 (GtkCssValue, 1);
-      *property->css_initial_value = initial;
-      property->css_initial_value->property = property;
-      property->css_initial_value->needs_compute =
-	_gtk_css_value_needs_compute (_gtk_css_style_property_get_initial_value (property));
-    }
-  return property->css_initial_value;
+  return &initial;
 }

gtk/gtkcssinitialvalueprivate.h

@@ -21,11 +21,11 @@
 #define __GTK_CSS_INITIAL_VALUE_PRIVATE_H__
 
 #include "gtkcssvalueprivate.h"
-#include "gtkcssstylepropertyprivate.h"
+
 G_BEGIN_DECLS
 
-GtkCssValue *   _gtk_css_initial_value_new            (GtkCssStyleProperty *property);
-GtkCssValue *   _gtk_css_initial_value_get            (GtkCssStyleProperty *property);
+GtkCssValue *   _gtk_css_initial_value_new            (void);
+GtkCssValue *   _gtk_css_initial_value_get            (void);
 
 G_END_DECLS
 

gtk/gtkcssnumbervalue.c

@@ -20,7 +20,6 @@
 #include "gtkcssnumbervalueprivate.h"
 
 #include "gtkcssenumvalueprivate.h"
-#include "gtkcssinitialvalueprivate.h"
 #include "gtkstylepropertyprivate.h"
 
 struct _GtkCssValue {
@@ -35,26 +34,6 @@ gtk_css_value_number_free (GtkCssValue *value)
   g_slice_free (GtkCssValue, value);
 }
 
-static double
-get_base_font_size (guint                    property_id,
-                    GtkStyleProviderPrivate *provider,
-                    GtkCssComputedValues    *values,
-                    GtkCssComputedValues    *parent_values,
-                    GtkCssDependencies      *dependencies)
-{
-  if (property_id == GTK_CSS_PROPERTY_FONT_SIZE)
-    {
-      *dependencies = GTK_CSS_DEPENDS_ON_PARENT;
-      if (parent_values)
-        return _gtk_css_number_value_get (_gtk_css_computed_values_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100);
-      else
-        return _gtk_css_font_size_get_default (provider);
-    }
-
-  *dependencies = GTK_CSS_DEPENDS_ON_FONT_SIZE;
-  return _gtk_css_number_value_get (_gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_FONT_SIZE), 100);
-}
-                    
 static GtkCssValue *
 gtk_css_value_number_compute (GtkCssValue             *number,
                               guint                    property_id,
@@ -69,11 +48,6 @@ gtk_css_value_number_compute (GtkCssValue             *number,
       g_assert_not_reached();
       /* fall through */
     case GTK_CSS_PERCENT:
-      /* percentages for font sizes are computed, other percentages aren't */
-      if (property_id == GTK_CSS_PROPERTY_FONT_SIZE)
-        return _gtk_css_number_value_new (number->value / 100.0 * 
-                                          get_base_font_size (property_id, provider, values, parent_values, dependencies),
-                                          GTK_CSS_PX);
     case GTK_CSS_NUMBER:
     case GTK_CSS_PX:
     case GTK_CSS_DEG:
@@ -99,14 +73,16 @@ gtk_css_value_number_compute (GtkCssValue             *number,
                                         GTK_CSS_PX);
       break;
     case GTK_CSS_EM:
+      *dependencies = GTK_CSS_DEPENDS_ON_FONT_SIZE;
       return _gtk_css_number_value_new (number->value *
-                                        get_base_font_size (property_id, provider, values, parent_values, dependencies),
+                                        _gtk_css_number_value_get (_gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_FONT_SIZE), 100),
                                         GTK_CSS_PX);
       break;
     case GTK_CSS_EX:
       /* for now we pretend ex is half of em */
+      *dependencies = GTK_CSS_DEPENDS_ON_FONT_SIZE;
       return _gtk_css_number_value_new (number->value * 0.5 * 
-                                        get_base_font_size (property_id, provider, values, parent_values, dependencies),
+                                        _gtk_css_number_value_get (_gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_FONT_SIZE), 100),
                                         GTK_CSS_PX);
     case GTK_CSS_RAD:
       return _gtk_css_number_value_new (number->value * 360.0 / (2 * G_PI),
@@ -123,38 +99,6 @@ gtk_css_value_number_compute (GtkCssValue             *number,
     }
 }
 
-static gboolean
-gtk_css_value_number_needs_compute (const GtkCssValue *number)
-{
-  switch (number->unit)
-    {
-    default:
-      g_assert_not_reached();
-      /* fall through */
-    case GTK_CSS_PERCENT:
-      /* percentages for font sizes are computed, other percentages aren't */
-      return TRUE;
-    case GTK_CSS_NUMBER:
-    case GTK_CSS_PX:
-    case GTK_CSS_DEG:
-    case GTK_CSS_S:
-      return FALSE;
-
-    case GTK_CSS_PT:
-    case GTK_CSS_PC:
-    case GTK_CSS_IN:
-    case GTK_CSS_CM:
-    case GTK_CSS_MM:
-    case GTK_CSS_EM:
-    case GTK_CSS_EX:
-    case GTK_CSS_RAD:
-    case GTK_CSS_GRAD:
-    case GTK_CSS_TURN:
-    case GTK_CSS_MS:
-      return TRUE;
-    }
-}
-
 static gboolean
 gtk_css_value_number_equal (const GtkCssValue *number1,
                             const GtkCssValue *number2)
@@ -212,7 +156,6 @@ gtk_css_value_number_print (const GtkCssValue *number,
 static const GtkCssValueClass GTK_CSS_VALUE_NUMBER = {
   gtk_css_value_number_free,
   gtk_css_value_number_compute,
-  gtk_css_value_number_needs_compute,
   gtk_css_value_number_equal,
   gtk_css_value_number_transition,
   gtk_css_value_number_print

gtk/gtkcssparser.c

@@ -257,7 +257,7 @@ gtk_css_parser_skip_comment (GtkCssParser *parser)
 
       parser->data++;
 
-      if (len > 0 && parser->data[-2] == '*')
+      if (parser->data[-2] == '*')
         return TRUE;
       if (parser->data[0] == '*')
         _gtk_css_parser_error (parser, "'/*' in comment block");

gtk/gtkcsspositionvalue.c

@@ -60,14 +60,6 @@ gtk_css_value_position_compute (GtkCssValue             *position,
   return _gtk_css_position_value_new (x, y);
 }
 
-static gboolean
-gtk_css_value_position_needs_compute (const GtkCssValue *position)
-{
-  return
-    _gtk_css_value_needs_compute (position->x) ||
-    _gtk_css_value_needs_compute (position->y);
-}
-
 static gboolean
 gtk_css_value_position_equal (const GtkCssValue *position1,
                               const GtkCssValue *position2)
@@ -163,7 +155,6 @@ done:
 static const GtkCssValueClass GTK_CSS_VALUE_POSITION = {
   gtk_css_value_position_free,
   gtk_css_value_position_compute,
-  gtk_css_value_position_needs_compute,
   gtk_css_value_position_equal,
   gtk_css_value_position_transition,
   gtk_css_value_position_print

gtk/gtkcssrepeatvalue.c

@@ -44,12 +44,6 @@ gtk_css_value_repeat_compute (GtkCssValue             *value,
   return _gtk_css_value_ref (value);
 }
 
-static gboolean
-gtk_css_value_repeat_needs_compute (const GtkCssValue *value)
-{
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_repeat_equal (const GtkCssValue *repeat1,
                             const GtkCssValue *repeat2)
@@ -122,7 +116,6 @@ gtk_css_value_border_repeat_print (const GtkCssValue *repeat,
 static const GtkCssValueClass GTK_CSS_VALUE_BACKGROUND_REPEAT = {
   gtk_css_value_repeat_free,
   gtk_css_value_repeat_compute,
-  gtk_css_value_repeat_needs_compute,
   gtk_css_value_repeat_equal,
   gtk_css_value_repeat_transition,
   gtk_css_value_background_repeat_print
@@ -131,7 +124,6 @@ static const GtkCssValueClass GTK_CSS_VALUE_BACKGROUND_REPEAT = {
 static const GtkCssValueClass GTK_CSS_VALUE_BORDER_REPEAT = {
   gtk_css_value_repeat_free,
   gtk_css_value_repeat_compute,
-  gtk_css_value_repeat_needs_compute,
   gtk_css_value_repeat_equal,
   gtk_css_value_repeat_transition,
   gtk_css_value_border_repeat_print

gtk/gtkcssrgbavalue.c

@@ -44,12 +44,6 @@ gtk_css_value_rgba_compute (GtkCssValue             *value,
   return _gtk_css_value_ref (value);
 }
 
-static gboolean
-gtk_css_value_rgba_needs_compute (const GtkCssValue *value)
-{
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_rgba_equal (const GtkCssValue *rgba1,
                           const GtkCssValue *rgba2)
@@ -86,7 +80,6 @@ gtk_css_value_rgba_print (const GtkCssValue *rgba,
 static const GtkCssValueClass GTK_CSS_VALUE_RGBA = {
   gtk_css_value_rgba_free,
   gtk_css_value_rgba_compute,
-  gtk_css_value_rgba_needs_compute,
   gtk_css_value_rgba_equal,
   gtk_css_value_rgba_transition,
   gtk_css_value_rgba_print

gtk/gtkcssshadowsvalue.c

@@ -72,20 +72,6 @@ gtk_css_value_shadows_compute (GtkCssValue             *value,
   return result;
 }
 
-static gboolean
-gtk_css_value_shadows_needs_compute (const GtkCssValue *value)
-{
-  guint i;
-
-  for (i = 0; i < value->len; i++)
-    {
-      if (_gtk_css_value_needs_compute (value->values[i]))
-	  return TRUE;
-    }
-
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_shadows_equal (const GtkCssValue *value1,
                              const GtkCssValue *value2)
@@ -195,7 +181,6 @@ gtk_css_value_shadows_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_SHADOWS = {
   gtk_css_value_shadows_free,
   gtk_css_value_shadows_compute,
-  gtk_css_value_shadows_needs_compute,
   gtk_css_value_shadows_equal,
   gtk_css_value_shadows_transition,
   gtk_css_value_shadows_print

gtk/gtkcssshadowvalue.c

@@ -94,18 +94,6 @@ gtk_css_value_shadow_compute (GtkCssValue             *shadow,
   return gtk_css_shadow_value_new (hoffset, voffset, radius, spread, shadow->inset, color);
 }
 
-static gboolean
-gtk_css_value_shadow_needs_compute (const GtkCssValue *shadow)
-{
-  return
-    _gtk_css_value_needs_compute (shadow->hoffset) ||
-    _gtk_css_value_needs_compute (shadow->voffset) ||
-    _gtk_css_value_needs_compute (shadow->radius) ||
-    _gtk_css_value_needs_compute (shadow->spread) ||
-    _gtk_css_value_needs_compute (shadow->color);
-}
-
-
 static gboolean
 gtk_css_value_shadow_equal (const GtkCssValue *shadow1,
                             const GtkCssValue *shadow2)
@@ -166,7 +154,6 @@ gtk_css_value_shadow_print (const GtkCssValue *shadow,
 static const GtkCssValueClass GTK_CSS_VALUE_SHADOW = {
   gtk_css_value_shadow_free,
   gtk_css_value_shadow_compute,
-  gtk_css_value_shadow_needs_compute,
   gtk_css_value_shadow_equal,
   gtk_css_value_shadow_transition,
   gtk_css_value_shadow_print

gtk/gtkcssshorthandproperty.c

@@ -102,7 +102,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
        */
       for (i = 0; i < shorthand->subproperties->len; i++)
         {
-          data[i] = _gtk_css_initial_value_new (shorthand->subproperties->pdata[i]);
+          data[i] = _gtk_css_initial_value_new ();
         }
     }
   else if (_gtk_css_parser_try (parser, "inherit", TRUE))
@@ -135,7 +135,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
   for (i = 0; i < shorthand->subproperties->len; i++)
     {
       if (data[i] == NULL)
-        data[i] = _gtk_css_initial_value_new (shorthand->subproperties->pdata[i]);
+        data[i] = _gtk_css_initial_value_new ();
     }
 
   result = _gtk_css_array_value_new_from_array (data, shorthand->subproperties->len);

gtk/gtkcssshorthandpropertyimpl.c

@@ -565,8 +565,8 @@ parse_background (GtkCssShorthandProperty  *shorthand,
           {
             g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
             g_ptr_array_unref (arrays[i]);
+            return FALSE;
           }
-        return FALSE;
       }
 
       for (i = 0; i < 6; i++)
@@ -668,8 +668,8 @@ parse_transition (GtkCssShorthandProperty  *shorthand,
           {
             g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
             g_ptr_array_unref (arrays[i]);
+            return FALSE;
           }
-        return FALSE;
       }
 
       for (i = 0; i < 4; i++)
@@ -784,8 +784,8 @@ parse_animation (GtkCssShorthandProperty  *shorthand,
           {
             g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
             g_ptr_array_unref (arrays[i]);
+            return FALSE;
           }
-        return FALSE;
       }
 
       for (i = 0; i < 6; i++)

gtk/gtkcssstringvalue.c

@@ -44,12 +44,6 @@ gtk_css_value_string_compute (GtkCssValue             *value,
   return _gtk_css_value_ref (value);
 }
 
-static gboolean
-gtk_css_value_string_needs_compute (const GtkCssValue *value)
-{
-  return FALSE;
-}
-
 static gboolean
 gtk_css_value_string_equal (const GtkCssValue *value1,
                             const GtkCssValue *value2)
@@ -156,7 +150,6 @@ gtk_css_value_ident_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_STRING = {
   gtk_css_value_string_free,
   gtk_css_value_string_compute,
-  gtk_css_value_string_needs_compute,
   gtk_css_value_string_equal,
   gtk_css_value_string_transition,
   gtk_css_value_string_print
@@ -165,7 +158,6 @@ static const GtkCssValueClass GTK_CSS_VALUE_STRING = {
 static const GtkCssValueClass GTK_CSS_VALUE_IDENT = {
   gtk_css_value_string_free,
   gtk_css_value_string_compute,
-  gtk_css_value_string_needs_compute,
   gtk_css_value_string_equal,
   gtk_css_value_string_transition,
   gtk_css_value_ident_print

gtk/gtkcssstyleproperty.c

@@ -38,7 +38,6 @@
 enum {
   PROP_0,
   PROP_ANIMATED,
-  PROP_AFFECTS_SIZE,
   PROP_ID,
   PROP_INHERIT,
   PROP_INITIAL
@@ -46,8 +45,6 @@ enum {
 
 G_DEFINE_TYPE (GtkCssStyleProperty, _gtk_css_style_property, GTK_TYPE_STYLE_PROPERTY)
 
-static GtkBitmask *_properties_affecting_size = NULL;
-
 static void
 gtk_css_style_property_constructed (GObject *object)
 {
@@ -57,9 +54,6 @@ gtk_css_style_property_constructed (GObject *object)
   property->id = klass->style_properties->len;
   g_ptr_array_add (klass->style_properties, property);
 
-  if (property->affects_size)
-    _properties_affecting_size = _gtk_bitmask_set (_properties_affecting_size, property->id, TRUE);
-
   G_OBJECT_CLASS (_gtk_css_style_property_parent_class)->constructed (object);
 }
 
@@ -76,9 +70,6 @@ gtk_css_style_property_set_property (GObject      *object,
     case PROP_ANIMATED:
       property->animated = g_value_get_boolean (value);
       break;
-    case PROP_AFFECTS_SIZE:
-      property->affects_size = g_value_get_boolean (value);
-      break;
     case PROP_INHERIT:
       property->inherit = g_value_get_boolean (value);
       break;
@@ -105,9 +96,6 @@ gtk_css_style_property_get_property (GObject    *object,
     case PROP_ANIMATED:
       g_value_set_boolean (value, property->animated);
       break;
-    case PROP_AFFECTS_SIZE:
-      g_value_set_boolean (value, property->affects_size);
-      break;
     case PROP_ID:
       g_value_set_boolean (value, property->id);
       break;
@@ -230,7 +218,7 @@ gtk_css_style_property_parse_value (GtkStyleProperty *property,
       /* the initial value can be explicitly specified with the
        * ‘initial’ keyword which all properties accept.
        */
-      return _gtk_css_initial_value_new (style_property);
+      return _gtk_css_initial_value_new ();
     }
   else if (_gtk_css_parser_try (parser, "inherit", TRUE))
     {
@@ -263,13 +251,6 @@ _gtk_css_style_property_class_init (GtkCssStylePropertyClass *klass)
                                                          P_("Set if the value can be animated"),
                                                          FALSE,
                                                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-  g_object_class_install_property (object_class,
-                                   PROP_AFFECTS_SIZE,
-                                   g_param_spec_boolean ("affects-size",
-                                                         P_("Affects size"),
-                                                         P_("Set if the value affects the sizing of elements"),
-                                                         TRUE,
-                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   g_object_class_install_property (object_class,
                                    PROP_ID,
                                    g_param_spec_uint ("id",
@@ -297,8 +278,6 @@ _gtk_css_style_property_class_init (GtkCssStylePropertyClass *klass)
   property_class->parse_value = gtk_css_style_property_parse_value;
 
   klass->style_properties = g_ptr_array_new ();
-
-  _properties_affecting_size = _gtk_bitmask_new ();
 }
 
 static GtkCssValue *
@@ -402,23 +381,6 @@ _gtk_css_style_property_is_animated (GtkCssStyleProperty *property)
   return property->animated;
 }
 
-/**
- * _gtk_css_style_property_affects_size:
- * @property: the property
- *
- * Queries if the given @property affects the size of elements. This is
- * used for optimizations inside GTK, where a gtk_widget_queue_resize()
- * can be avoided if the property does not affect size.
- *
- * Returns: %TRUE if the property affects sizing of elements.
- **/
-gboolean
-_gtk_css_style_property_affects_size (GtkCssStyleProperty *property)
-{
-  g_return_val_if_fail (GTK_IS_CSS_STYLE_PROPERTY (property), FALSE);
-
-  return property->affects_size;
-}
 /**
  * _gtk_css_style_property_get_id:
  * @property: the property
@@ -453,9 +415,3 @@ _gtk_css_style_property_get_initial_value (GtkCssStyleProperty *property)
 
   return property->initial_value;
 }
-
-gboolean
-_gtk_css_style_property_changes_affect_size (const GtkBitmask *changes)
-{
-  return _gtk_bitmask_intersects (changes, _properties_affecting_size);
-}

gtk/gtkcssstylepropertyimpl.c

@@ -65,8 +65,7 @@
 
 typedef enum {
   GTK_STYLE_PROPERTY_INHERIT = (1 << 0),
-  GTK_STYLE_PROPERTY_ANIMATED = (1 << 1),
-  GTK_STYLE_PROPERTY_NO_RESIZE = (1 << 2)
+  GTK_STYLE_PROPERTY_ANIMATED = (1 << 1)
 } GtkStylePropertyFlags;
 
 static void
@@ -88,7 +87,6 @@ gtk_css_style_property_register (const char *                   name,
 
   node = g_object_new (GTK_TYPE_CSS_STYLE_PROPERTY,
                        "value-type", value_type,
-                       "affects-size", (flags & GTK_STYLE_PROPERTY_NO_RESIZE) ? FALSE : TRUE,
                        "animated", (flags & GTK_STYLE_PROPERTY_ANIMATED) ? TRUE : FALSE,
                        "inherit", (flags & GTK_STYLE_PROPERTY_INHERIT) ? TRUE : FALSE,
                        "initial-value", initial_value,
@@ -162,7 +160,7 @@ assign_border (GtkCssStyleProperty *property,
   const GtkBorder *border = g_value_get_boxed (value);
 
   if (border == NULL)
-    return _gtk_css_initial_value_new (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),
@@ -648,17 +646,15 @@ static GtkCssValue *
 font_size_parse (GtkCssStyleProperty *property,
                  GtkCssParser        *parser)
 {
-  GtkCssValue *value;
+  gdouble d;
 
-  value = _gtk_css_font_size_value_try_parse (parser);
-  if (value)
-    return value;
+  if (!_gtk_css_parser_try_double (parser, &d))
+    {
+      _gtk_css_parser_error (parser, "Expected a number");
+      return NULL;
+    }
 
-  return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_PARSE_LENGTH
-                                      | GTK_CSS_PARSE_PERCENT
-                                      | GTK_CSS_POSITIVE_ONLY
-                                      | GTK_CSS_NUMBER_AS_PIXELS);
+  return _gtk_css_number_value_new (d, GTK_CSS_PX);
 }
 
 static GtkCssValue *
@@ -868,7 +864,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("color",
                                           GTK_CSS_PROPERTY_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
                                           color_parse,
                                           color_query,
                                           color_assign,
@@ -880,14 +876,15 @@ _gtk_css_style_property_init_properties (void)
                                           font_size_parse,
                                           query_length_as_double,
                                           assign_length_from_double,
-                                          _gtk_css_font_size_value_new (GTK_CSS_FONT_SIZE_MEDIUM));
+                                          /* XXX: This should be 'normal' */
+                                          _gtk_css_number_value_new (10.0, GTK_CSS_PX));
 
   /* properties that aren't referenced when computing values
    * start here */
   gtk_css_style_property_register        ("background-color",
                                           GTK_CSS_PROPERTY_BACKGROUND_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           color_parse,
                                           color_query,
                                           color_assign,
@@ -929,7 +926,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("text-shadow",
                                           GTK_CSS_PROPERTY_TEXT_SHADOW,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
                                           shadow_value_parse,
                                           NULL,
                                           NULL,
@@ -938,7 +935,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("icon-shadow",
                                           GTK_CSS_PROPERTY_ICON_SHADOW,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
                                           shadow_value_parse,
                                           NULL,
                                           NULL,
@@ -947,7 +944,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("box-shadow",
                                           GTK_CSS_PROPERTY_BOX_SHADOW,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           shadow_value_parse,
                                           NULL,
                                           NULL,
@@ -1023,7 +1020,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-top-style",
                                           GTK_CSS_PROPERTY_BORDER_TOP_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_border_style,
                                           query_border_style,
                                           assign_border_style,
@@ -1039,7 +1036,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-left-style",
                                           GTK_CSS_PROPERTY_BORDER_LEFT_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_border_style,
                                           query_border_style,
                                           assign_border_style,
@@ -1055,7 +1052,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-bottom-style",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_border_style,
                                           query_border_style,
                                           assign_border_style,
@@ -1071,7 +1068,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-right-style",
                                           GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_border_style,
                                           query_border_style,
                                           assign_border_style,
@@ -1088,7 +1085,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-top-left-radius",
                                           GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
@@ -1097,7 +1094,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-top-right-radius",
                                           GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
@@ -1106,7 +1103,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-bottom-right-radius",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
@@ -1115,7 +1112,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-bottom-left-radius",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           border_corner_radius_value_parse,
                                           NULL,
                                           NULL,
@@ -1125,7 +1122,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("outline-style",
                                           GTK_CSS_PROPERTY_OUTLINE_STYLE,
                                           GTK_TYPE_BORDER_STYLE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_border_style,
                                           query_border_style,
                                           assign_border_style,
@@ -1141,7 +1138,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("outline-offset",
                                           GTK_CSS_PROPERTY_OUTLINE_OFFSET,
                                           G_TYPE_INT,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           outline_parse,
                                           query_length_as_int,
                                           assign_length_from_int,
@@ -1150,7 +1147,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("background-clip",
                                           GTK_CSS_PROPERTY_BACKGROUND_CLIP,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_css_area,
                                           NULL,
                                           NULL,
@@ -1158,7 +1155,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("background-origin",
                                           GTK_CSS_PROPERTY_BACKGROUND_ORIGIN,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_css_area,
                                           NULL,
                                           NULL,
@@ -1166,7 +1163,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("background-size",
                                           GTK_CSS_PROPERTY_BACKGROUND_SIZE,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           background_size_parse,
                                           NULL,
                                           NULL,
@@ -1174,7 +1171,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("background-position",
                                           GTK_CSS_PROPERTY_BACKGROUND_POSITION,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           background_position_parse,
                                           NULL,
                                           NULL,
@@ -1184,7 +1181,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-top-color",
                                           GTK_CSS_PROPERTY_BORDER_TOP_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           color_parse,
                                           color_query,
                                           color_assign,
@@ -1192,7 +1189,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-right-color",
                                           GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           color_parse,
                                           color_query,
                                           color_assign,
@@ -1200,7 +1197,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-bottom-color",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           color_parse,
                                           color_query,
                                           color_assign,
@@ -1208,7 +1205,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-left-color",
                                           GTK_CSS_PROPERTY_BORDER_LEFT_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           color_parse,
                                           color_query,
                                           color_assign,
@@ -1216,7 +1213,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("outline-color",
                                           GTK_CSS_PROPERTY_OUTLINE_COLOR,
                                           GDK_TYPE_RGBA,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           color_parse,
                                           color_query,
                                           color_assign,
@@ -1225,7 +1222,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("background-repeat",
                                           GTK_CSS_PROPERTY_BACKGROUND_REPEAT,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           background_repeat_value_parse,
                                           NULL,
                                           NULL,
@@ -1234,7 +1231,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("background-image",
                                           GTK_CSS_PROPERTY_BACKGROUND_IMAGE,
                                           CAIRO_GOBJECT_TYPE_PATTERN,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           background_image_value_parse,
                                           background_image_value_query,
                                           background_image_value_assign,
@@ -1243,7 +1240,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-image-source",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE,
                                           CAIRO_GOBJECT_TYPE_PATTERN,
-                                          GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          GTK_STYLE_PROPERTY_ANIMATED,
                                           css_image_value_parse,
                                           css_image_value_query,
                                           css_image_value_assign,
@@ -1251,7 +1248,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-image-repeat",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           border_image_repeat_parse,
                                           NULL,
                                           NULL,
@@ -1261,7 +1258,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-image-slice",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE,
                                           GTK_TYPE_BORDER,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           border_image_slice_parse,
                                           query_border,
                                           assign_border,
@@ -1272,7 +1269,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("border-image-width",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH,
                                           GTK_TYPE_BORDER,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           border_image_width_parse,
                                           query_border,
                                           assign_border,
@@ -1284,7 +1281,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("transition-property",
                                           GTK_CSS_PROPERTY_TRANSITION_PROPERTY,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_property_parse,
                                           NULL,
                                           NULL,
@@ -1292,7 +1289,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("transition-duration",
                                           GTK_CSS_PROPERTY_TRANSITION_DURATION,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_time_parse,
                                           NULL,
                                           NULL,
@@ -1300,7 +1297,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("transition-timing-function",
                                           GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_timing_function_parse,
                                           NULL,
                                           NULL,
@@ -1309,7 +1306,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("transition-delay",
                                           GTK_CSS_PROPERTY_TRANSITION_DELAY,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_time_parse,
                                           NULL,
                                           NULL,
@@ -1318,7 +1315,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-name",
                                           GTK_CSS_PROPERTY_ANIMATION_NAME,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_property_parse,
                                           NULL,
                                           NULL,
@@ -1326,7 +1323,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-duration",
                                           GTK_CSS_PROPERTY_ANIMATION_DURATION,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_time_parse,
                                           NULL,
                                           NULL,
@@ -1334,7 +1331,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-timing-function",
                                           GTK_CSS_PROPERTY_ANIMATION_TIMING_FUNCTION,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_timing_function_parse,
                                           NULL,
                                           NULL,
@@ -1343,7 +1340,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-iteration-count",
                                           GTK_CSS_PROPERTY_ANIMATION_ITERATION_COUNT,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           iteration_count_parse,
                                           NULL,
                                           NULL,
@@ -1351,7 +1348,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-direction",
                                           GTK_CSS_PROPERTY_ANIMATION_DIRECTION,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_css_direction,
                                           NULL,
                                           NULL,
@@ -1359,7 +1356,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-play-state",
                                           GTK_CSS_PROPERTY_ANIMATION_PLAY_STATE,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_css_play_state,
                                           NULL,
                                           NULL,
@@ -1367,7 +1364,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-delay",
                                           GTK_CSS_PROPERTY_ANIMATION_DELAY,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           transition_time_parse,
                                           NULL,
                                           NULL,
@@ -1375,7 +1372,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("animation-fill-mode",
                                           GTK_CSS_PROPERTY_ANIMATION_FILL_MODE,
                                           G_TYPE_NONE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           parse_css_fill_mode,
                                           NULL,
                                           NULL,
@@ -1384,7 +1381,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("engine",
                                           GTK_CSS_PROPERTY_ENGINE,
                                           GTK_TYPE_THEMING_ENGINE,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           engine_parse,
                                           engine_query,
                                           engine_assign,
@@ -1394,7 +1391,7 @@ _gtk_css_style_property_init_properties (void)
   gtk_css_style_property_register        ("gtk-key-bindings",
                                           GTK_CSS_PROPERTY_GTK_KEY_BINDINGS,
                                           G_TYPE_PTR_ARRAY,
-                                          GTK_STYLE_PROPERTY_NO_RESIZE,
+                                          0,
                                           bindings_value_parse,
                                           bindings_value_query,
                                           bindings_value_assign,

gtk/gtkcssstylepropertyprivate.h

@@ -49,9 +49,6 @@ struct _GtkCssStyleProperty
   guint id;
   guint inherit :1;
   guint animated :1;
-  guint affects_size :1;
-
-  GtkCssValue *css_initial_value; /* Used to quickly find the GCssInitialValue for a property */
 
   GtkCssStylePropertyParseFunc parse_value;
   GtkCssStylePropertyQueryFunc query_value;
@@ -74,7 +71,6 @@ GtkCssStyleProperty *   _gtk_css_style_property_lookup_by_id    (guint
 
 gboolean                _gtk_css_style_property_is_inherit      (GtkCssStyleProperty    *property);
 gboolean                _gtk_css_style_property_is_animated     (GtkCssStyleProperty    *property);
-gboolean                _gtk_css_style_property_affects_size    (GtkCssStyleProperty    *property);
 guint                   _gtk_css_style_property_get_id          (GtkCssStyleProperty    *property);
 GtkCssValue  *          _gtk_css_style_property_get_initial_value
                                                                 (GtkCssStyleProperty    *property);
@@ -82,9 +78,6 @@ GtkCssValue  *          _gtk_css_style_property_get_initial_value
 void                    _gtk_css_style_property_print_value     (GtkCssStyleProperty    *property,
                                                                  GtkCssValue            *value,
                                                                  GString                *string);
-
-gboolean                _gtk_css_style_property_changes_affect_size
-                                                                (const GtkBitmask       *changes);
                                                                  
 
 G_END_DECLS

gtk/gtkcsstypedvalue.c

@@ -47,12 +47,6 @@ gtk_css_value_typed_compute (GtkCssValue             *value,
   return _gtk_css_style_compute_value (provider, values, parent_values, custom->pspec->value_type, value, dependencies);
 }
 
-static gboolean
-gtk_css_value_typed_needs_compute (const GtkCssValue *value)
-{
-  return TRUE;
-}
-
 static gboolean
 gtk_css_value_typed_equal (const GtkCssValue *value1,
                            const GtkCssValue *value2)
@@ -79,7 +73,6 @@ gtk_css_value_typed_print (const GtkCssValue *value,
 static const GtkCssValueClass GTK_CSS_VALUE_TYPED = {
   gtk_css_value_typed_free,
   gtk_css_value_typed_compute,
-  gtk_css_value_typed_needs_compute,
   gtk_css_value_typed_equal,
   gtk_css_value_typed_transition,
   gtk_css_value_typed_print

gtk/gtkcsstypesprivate.h

@@ -161,20 +161,6 @@ typedef enum /*< skip >*/ {
   GTK_CSS_FILL_BOTH
 } GtkCssFillMode;
 
-typedef enum /*< skip >*/ {
-  /* relative font sizes */
-  GTK_CSS_FONT_SIZE_SMALLER,
-  GTK_CSS_FONT_SIZE_LARGER,
-  /* absolute font sizes */
-  GTK_CSS_FONT_SIZE_XX_SMALL,
-  GTK_CSS_FONT_SIZE_X_SMALL,
-  GTK_CSS_FONT_SIZE_SMALL,
-  GTK_CSS_FONT_SIZE_MEDIUM,
-  GTK_CSS_FONT_SIZE_LARGE,
-  GTK_CSS_FONT_SIZE_X_LARGE,
-  GTK_CSS_FONT_SIZE_XX_LARGE
-} GtkCssFontSize;
-
 /* for the order in arrays */
 typedef enum /*< skip >*/ {
   GTK_CSS_TOP,

gtk/gtkcssvalue.c

@@ -17,7 +17,6 @@
 
 #include "config.h"
 
-#include "gtkprivate.h"
 #include "gtkcssvalueprivate.h"
 
 #include "gtkcsscomputedvaluesprivate.h"
@@ -46,7 +45,7 @@ _gtk_css_value_alloc (const GtkCssValueClass *klass,
 GtkCssValue *
 _gtk_css_value_ref (GtkCssValue *value)
 {
-  gtk_internal_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (value != NULL, NULL);
 
   g_atomic_int_add (&value->ref_count, 1);
 
@@ -94,10 +93,10 @@ _gtk_css_value_compute (GtkCssValue             *value,
 {
   GtkCssDependencies fallback;
 
-  gtk_internal_return_val_if_fail (value != NULL, NULL);
-  gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
-  gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
-  gtk_internal_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values), NULL);
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
+  g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
+  g_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values), NULL);
 
   if (dependencies == NULL)
     dependencies = &fallback;
@@ -106,33 +105,12 @@ _gtk_css_value_compute (GtkCssValue             *value,
   return value->class->compute (value, property_id, provider, values, parent_values, dependencies);
 }
 
-/**
- * _gtk_css_value_needs_compute:
- * @value: the value to check or %null
- *
- * Checks whether a particular css value *really* needs computation.
- * A lot of css values are "absolute" (like say "10 px") and never need
- * any computation done. Such a value would always just return itself
- * as the computed value. This can be used in some cases to avoid
- * repeated computations.
- *
- * Returns: %false if computing this value always returns itself, %false otherwise
- **/
-gboolean
-_gtk_css_value_needs_compute (GtkCssValue  *value)
-{
-  if (value == NULL)
-    return FALSE;
-
-  return value->class->needs_compute (value);
-}
-
 gboolean
 _gtk_css_value_equal (const GtkCssValue *value1,
                       const GtkCssValue *value2)
 {
-  gtk_internal_return_val_if_fail (value1 != NULL, FALSE);
-  gtk_internal_return_val_if_fail (value2 != NULL, FALSE);
+  g_return_val_if_fail (value1 != NULL, FALSE);
+  g_return_val_if_fail (value2 != NULL, FALSE);
 
   if (value1 == value2)
     return TRUE;
@@ -163,8 +141,8 @@ _gtk_css_value_transition (GtkCssValue *start,
                            guint        property_id,
                            double       progress)
 {
-  gtk_internal_return_val_if_fail (start != NULL, FALSE);
-  gtk_internal_return_val_if_fail (end != NULL, FALSE);
+  g_return_val_if_fail (start != NULL, FALSE);
+  g_return_val_if_fail (end != NULL, FALSE);
 
   if (start->class != end->class)
     return NULL;
@@ -177,7 +155,7 @@ _gtk_css_value_to_string (const GtkCssValue *value)
 {
   GString *string;
 
-  gtk_internal_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (value != NULL, NULL);
 
   string = g_string_new (NULL);
   _gtk_css_value_print (value, string);
@@ -197,8 +175,8 @@ void
 _gtk_css_value_print (const GtkCssValue *value,
                       GString           *string)
 {
-  gtk_internal_return_if_fail (value != NULL);
-  gtk_internal_return_if_fail (string != NULL);
+  g_return_if_fail (value != NULL);
+  g_return_if_fail (string != NULL);
 
   value->class->print (value, string);
 }

gtk/gtkcssvalueprivate.h

@@ -46,7 +46,6 @@ struct _GtkCssValueClass {
                                                        GtkCssComputedValues       *values,
                                                        GtkCssComputedValues       *parent_values,
                                                        GtkCssDependencies         *dependencies);
-  gboolean      (* needs_compute)                     (const GtkCssValue          *value);
   gboolean      (* equal)                             (const GtkCssValue          *value1,
                                                        const GtkCssValue          *value2);
   GtkCssValue * (* transition)                        (GtkCssValue                *start,
@@ -72,7 +71,6 @@ GtkCssValue *_gtk_css_value_compute                   (GtkCssValue
                                                        GtkCssComputedValues       *values,
                                                        GtkCssComputedValues       *parent_values,
                                                        GtkCssDependencies         *dependencies);
-gboolean     _gtk_css_value_needs_compute             (GtkCssValue                *value);
 gboolean     _gtk_css_value_equal                     (const GtkCssValue          *value1,
                                                        const GtkCssValue          *value2);
 gboolean     _gtk_css_value_equal0                    (const GtkCssValue          *value1,

gtk/gtkexpander.c

@@ -1251,7 +1251,6 @@ get_next_site (GtkExpander      *expander,
         case GTK_DIR_RIGHT:
           return FOCUS_WIDGET;
         }
-      break;
     case FOCUS_WIDGET:
       switch (direction)
         {
@@ -1265,8 +1264,8 @@ get_next_site (GtkExpander      *expander,
           return FOCUS_LABEL;
         case GTK_DIR_RIGHT:
           return ltr ? FOCUS_LABEL : FOCUS_NONE;
+          break;
         }
-      break;
     case FOCUS_LABEL:
       switch (direction)
         {
@@ -1280,8 +1279,8 @@ get_next_site (GtkExpander      *expander,
           return FOCUS_CHILD;
         case GTK_DIR_RIGHT:
           return ltr ? FOCUS_CHILD : FOCUS_WIDGET;
+          break;
         }
-      break;
     case FOCUS_CHILD:
       switch (direction)
         {
@@ -1294,7 +1293,6 @@ get_next_site (GtkExpander      *expander,
         case GTK_DIR_RIGHT:
           return FOCUS_NONE;
         }
-      break;
     }
 
   g_assert_not_reached ();

gtk/gtkfilechooserdefault.c

@@ -3865,7 +3865,7 @@ copy_file_clear_cb (GtkClipboard *clipboard,
   g_slist_free (selected_files);
 }
 
-/* Callback used when the "Copy file’s location" menu item is activated */
+/* Callback used when the "Copy file's location" menu item is activated */
 static void
 copy_file_location_cb (GtkMenuItem           *item,
                        GtkFileChooserDefault *impl)
@@ -4107,7 +4107,7 @@ file_list_drag_motion_cb (GtkWidget             *widget,
   return TRUE;
 }
 
-/* Sensitizes the "Copy file’s location" context menu item if there is actually
+/* Sensitizes the "Copy file's location" context menu item if there is actually
  * a selection active.
  */
 static void
@@ -4176,7 +4176,7 @@ file_list_build_popup_menu (GtkFileChooserDefault *impl)
   impl->browse_files_popup_menu_visit_file_item		= file_list_add_image_menu_item (impl, GTK_STOCK_DIRECTORY, _("_Visit this file"),
 											 G_CALLBACK (visit_file_cb));
 
-  impl->browse_files_popup_menu_copy_file_location_item	= file_list_add_image_menu_item (impl, GTK_STOCK_COPY, _("_Copy file’s location"),
+  impl->browse_files_popup_menu_copy_file_location_item	= file_list_add_image_menu_item (impl, GTK_STOCK_COPY, _("_Copy file's location"),
 											 G_CALLBACK (copy_file_location_cb));
 
   impl->browse_files_popup_menu_add_shortcut_item	= file_list_add_image_menu_item (impl, GTK_STOCK_ADD, _("_Add to Bookmarks"),

gtk/gtkicontheme.c

@@ -24,7 +24,6 @@
 #endif
 #include <string.h>
 #include <stdlib.h>
-#include <math.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 
@@ -161,18 +160,9 @@ typedef enum
   HAS_ICON_FILE = 1 << 3
 } IconSuffix;
 
-#define INFO_CACHE_LRU_SIZE 32
-#if 0
-#define DEBUG_CACHE(args) g_print args
-#else
-#define DEBUG_CACHE(args)
-#endif
 
 struct _GtkIconThemePrivate
 {
-  GHashTable *info_cache;
-  GList *info_cache_lru;
-
   gchar *current_theme;
   gchar *fallback_theme;
   gchar **search_path;
@@ -207,31 +197,10 @@ struct _GtkIconThemePrivate
   gulong reset_styles_idle;
 };
 
-typedef struct {
-  gchar **icon_names;
-  gint size;
-  GtkIconLookupFlags flags;
-} IconInfoKey;
-
-typedef struct _SymbolicPixbufCache SymbolicPixbufCache;
-
-struct _SymbolicPixbufCache {
-  GdkPixbuf *pixbuf;
-  GdkPixbuf *proxy_pixbuf;
-  GdkRGBA  fg;
-  GdkRGBA  success_color;
-  GdkRGBA  warning_color;
-  GdkRGBA  error_color;
-  SymbolicPixbufCache *next;
-};
-
 struct _GtkIconInfo
 {
   /* Information about the source
    */
-  IconInfoKey key;
-  GtkIconTheme *in_cache;
-
   gchar *filename;
   GFile *icon_file;
   GLoadableIcon *loadable;
@@ -262,12 +231,9 @@ struct _GtkIconInfo
    * the icon.
    */
   GdkPixbuf *pixbuf;
-  GdkPixbuf *proxy_pixbuf;
   GError *load_error;
   gdouble scale;
 
-  SymbolicPixbufCache *symbolic_pixbuf_cache;
-
   GtkRequisition *symbolic_pixbuf_size;
 };
 
@@ -364,8 +330,6 @@ static BuiltinIcon *find_builtin_icon (const gchar *icon_name,
 				       gint        size,
 				       gint        *min_difference_p,
 				       gboolean    *has_larger_p);
-static void remove_from_lru_cache (GtkIconTheme *icon_theme,
-				   GtkIconInfo *icon_info);
 
 static guint signal_changed = 0;
 
@@ -375,46 +339,6 @@ static GHashTable *icon_theme_builtin_icons;
 GtkIconCache *_builtin_cache = NULL;
 static GList *builtin_dirs = NULL;
 
-static guint
-icon_info_key_hash (gconstpointer _key)
-{
-  const IconInfoKey *key = _key;
-  guint h = 0;
-  int i;
-  for (i = 0; key->icon_names[i] != NULL; i++)
-    h ^= g_str_hash (key->icon_names[i]);
-
-  h ^= key->size * 0x10001;
-  h ^= key->flags * 0x1000010;
-
-  return h;
-}
-
-static gboolean
-icon_info_key_equal (gconstpointer  _a,
-		     gconstpointer  _b)
-{
-  const IconInfoKey *a = _a;
-  const IconInfoKey *b = _b;
-  int i;
-
-  if (a->size != b->size)
-    return FALSE;
-
-  if (a->flags != b->flags)
-    return FALSE;
-
-  for (i = 0;
-       a->icon_names[i] != NULL &&
-       b->icon_names[i] != NULL; i++)
-    {
-      if (strcmp (a->icon_names[i], b->icon_names[i]) != 0)
-	return FALSE;
-    }
-
-  return a->icon_names[i] == NULL && b->icon_names[i] == NULL;
-}
-
 G_DEFINE_TYPE (GtkIconTheme, gtk_icon_theme, G_TYPE_OBJECT)
 
 /**
@@ -717,25 +641,6 @@ pixbuf_supports_svg (void)
   return found_svg;
 }
 
-/* The icon info was removed from the icon_info_hash hash table */
-static void
-icon_info_uncached (GtkIconInfo *icon_info)
-{
-  GtkIconTheme *icon_theme = icon_info->in_cache;
-
-  DEBUG_CACHE (("removing %p (%s %d 0x%x) from cache (icon_them: %p)  (cache size %d)\n",
-		icon_info,
-		g_strjoinv (",", icon_info->key.icon_names),
-		icon_info->key.size, icon_info->key.flags,
-		icon_theme,
-		icon_theme != NULL ? g_hash_table_size (icon_theme->priv->info_cache) : 0));
-
-  icon_info->in_cache = NULL;
-
-  if (icon_theme != NULL)
-    remove_from_lru_cache (icon_theme, icon_info);
-}
-
 static void
 gtk_icon_theme_init (GtkIconTheme *icon_theme)
 {
@@ -748,9 +653,6 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
                                       GtkIconThemePrivate);
   icon_theme->priv = priv;
 
-  priv->info_cache = g_hash_table_new_full (icon_info_key_hash, icon_info_key_equal, NULL,
-					    (GDestroyNotify)icon_info_uncached);
-
   priv->custom_theme = FALSE;
 
   xdg_data_dirs = g_get_system_data_dirs ();
@@ -810,8 +712,6 @@ do_theme_change (GtkIconTheme *icon_theme)
 {
   GtkIconThemePrivate *priv = icon_theme->priv;
 
-  g_hash_table_remove_all (priv->info_cache);
-
   if (!priv->themes_valid)
     return;
   
@@ -855,9 +755,6 @@ gtk_icon_theme_finalize (GObject *object)
   icon_theme = GTK_ICON_THEME (object);
   priv = icon_theme->priv;
 
-  g_hash_table_destroy (priv->info_cache);
-  g_assert (priv->info_cache_lru == NULL);
-
   if (priv->reset_styles_idle)
     {
       g_source_remove (priv->reset_styles_idle);
@@ -1409,173 +1306,6 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
   priv->loading_themes = FALSE;
 }
 
-/* The LRU cache is a short list of IconInfos that are kept
-   alive even though their IconInfo would otherwise have
-   been freed, so that we can avoid reloading these
-   constantly.
-   We put infos on the lru list when nothing otherwise
-   references the info. So, when we get a cache hit
-   we remove it from the list, and when the proxy
-   pixmap is released we put it on the list.
-*/
-
-static void
-ensure_lru_cache_space (GtkIconTheme *icon_theme)
-{
-  GtkIconThemePrivate *priv = icon_theme->priv;
-  GList *l;
-
-  /* Remove last item if LRU full */
-  l = g_list_nth (priv->info_cache_lru, INFO_CACHE_LRU_SIZE - 1);
-  if (l)
-    {
-      GtkIconInfo *icon_info = l->data;
-
-      DEBUG_CACHE (("removing (due to out of space) %p (%s %d 0x%x) from LRU cache (cache size %d)\n",
-		    icon_info,
-		    g_strjoinv (",", icon_info->key.icon_names),
-		    icon_info->key.size, icon_info->key.flags,
-		    g_list_length (priv->info_cache_lru)));
-
-      priv->info_cache_lru = g_list_delete_link (priv->info_cache_lru, l);
-      gtk_icon_info_free (icon_info);
-    }
-}
-
-static void
-add_to_lru_cache (GtkIconTheme *icon_theme,
-		  GtkIconInfo *icon_info)
-{
-  GtkIconThemePrivate *priv = icon_theme->priv;
-
-  DEBUG_CACHE (("adding  %p (%s %d 0x%x) to LRU cache (cache size %d)\n",
-		icon_info,
-		g_strjoinv (",", icon_info->key.icon_names),
-		icon_info->key.size, icon_info->key.flags,
-		g_list_length (priv->info_cache_lru)));
-
-  g_assert (g_list_find (priv->info_cache_lru, icon_info) == NULL);
-
-  ensure_lru_cache_space (icon_theme);
-  /* prepend new info to LRU */
-  priv->info_cache_lru = g_list_prepend (priv->info_cache_lru,
-					 gtk_icon_info_copy (icon_info));
-}
-
-static void
-ensure_in_lru_cache (GtkIconTheme *icon_theme,
-		     GtkIconInfo *icon_info)
-{
-  GtkIconThemePrivate *priv = icon_theme->priv;
-  GList *l;
-
-  l = g_list_find (priv->info_cache_lru, icon_info);
-  if (l)
-    {
-      /* Move to front of LRU if already in it */
-      priv->info_cache_lru = g_list_remove_link (priv->info_cache_lru, l);
-      priv->info_cache_lru = g_list_concat (l, priv->info_cache_lru);
-    }
-  else
-    add_to_lru_cache (icon_theme, icon_info);
-}
-
-static void
-remove_from_lru_cache (GtkIconTheme *icon_theme,
-		       GtkIconInfo *icon_info)
-{
-  GtkIconThemePrivate *priv = icon_theme->priv;
-  if (g_list_find (priv->info_cache_lru, icon_info))
-    {
-      DEBUG_CACHE (("removing %p (%s %d 0x%x) from LRU cache (cache size %d)\n",
-		    icon_info,
-		    g_strjoinv (",", icon_info->key.icon_names),
-		    icon_info->key.size, icon_info->key.flags,
-		    g_list_length (priv->info_cache_lru)));
-
-      priv->info_cache_lru = g_list_remove (priv->info_cache_lru, icon_info);
-      gtk_icon_info_free (icon_info);
-    }
-}
-
-static SymbolicPixbufCache *
-symbolic_pixbuf_cache_new (GdkPixbuf *pixbuf,
-			   const GdkRGBA  *fg,
-			   const GdkRGBA  *success_color,
-			   const GdkRGBA  *warning_color,
-			   const GdkRGBA  *error_color,
-			   SymbolicPixbufCache *next)
-{
-  SymbolicPixbufCache *cache;
-
-  cache = g_new0 (SymbolicPixbufCache, 1);
-  cache->pixbuf = g_object_ref (pixbuf);
-  if (fg)
-    cache->fg = *fg;
-  if (success_color)
-    cache->success_color = *success_color;
-  if (warning_color)
-    cache->warning_color = *warning_color;
-  if (error_color)
-    cache->error_color = *error_color;
-  cache->next = next;
-  return cache;
-}
-
-static gboolean
-rgba_matches (const GdkRGBA  *a, const GdkRGBA  *b)
-{
-  GdkRGBA transparent = { 0 };
-
-  /* For matching we treat unset colors as transparent rather
-     than default, which works as well, because transparent
-     will never be used for real symbolic icon colors */
-  if (a == NULL)
-    a = &transparent;
-
-  return
-    fabs(a->red - b->red) < 0.0001 &&
-    fabs(a->green - b->green) < 0.0001 &&
-    fabs(a->blue - b->blue) < 0.0001 &&
-    fabs(a->alpha - b->alpha) < 0.0001;
-}
-
-static SymbolicPixbufCache *
-symbolic_pixbuf_cache_matches (SymbolicPixbufCache *cache,
-			       const GdkRGBA  *fg,
-			       const GdkRGBA  *success_color,
-			       const GdkRGBA  *warning_color,
-			       const GdkRGBA  *error_color)
-{
-  while (cache != NULL)
-    {
-      if (rgba_matches (fg, &cache->fg) &&
-	  rgba_matches (success_color, &cache->success_color) &&
-	  rgba_matches (warning_color, &cache->warning_color) &&
-	  rgba_matches (error_color, &cache->error_color))
-	return cache;
-
-      cache = cache->next;
-    }
-
-  return NULL;
-}
-
-static void
-symbolic_pixbuf_cache_free (SymbolicPixbufCache *cache)
-{
-  SymbolicPixbufCache *next;
-
-  while (cache != NULL)
-    {
-      next = cache->next;
-      g_object_unref (cache->pixbuf);
-      g_free (cache);
-
-      cache = next;
-    }
-}
-
 static GtkIconInfo *
 choose_icon (GtkIconTheme       *icon_theme,
 	     const gchar        *icon_names[],
@@ -1589,31 +1319,9 @@ choose_icon (GtkIconTheme       *icon_theme,
   gboolean allow_svg;
   gboolean use_builtin;
   gint i;
-  IconInfoKey key;
 
   priv = icon_theme->priv;
 
-  ensure_valid_themes (icon_theme);
-
-  key.icon_names = (char **)icon_names;
-  key.size = size;
-  key.flags = flags;
-
-  icon_info = g_hash_table_lookup (priv->info_cache, &key);
-  if (icon_info != NULL)
-    {
-      DEBUG_CACHE (("cache hit %p (%s %d 0x%x) (cache size %d)\n",
-		    icon_info,
-		    g_strjoinv (",", icon_info->key.icon_names),
-		    icon_info->key.size, icon_info->key.flags,
-		    g_hash_table_size (priv->info_cache)));
-
-      icon_info = gtk_icon_info_copy (icon_info);
-      remove_from_lru_cache (icon_theme, icon_info);
-
-      return icon_info;
-    }
-
   if (flags & GTK_ICON_LOOKUP_NO_SVG)
     allow_svg = FALSE;
   else if (flags & GTK_ICON_LOOKUP_FORCE_SVG)
@@ -1622,6 +1330,8 @@ choose_icon (GtkIconTheme       *icon_theme,
     allow_svg = priv->pixbuf_supports_svg;
 
   use_builtin = flags & GTK_ICON_LOOKUP_USE_BUILTIN;
+  
+  ensure_valid_themes (icon_theme);
 
   /* for symbolic icons, do a search in all registered themes first;
    * a theme that inherits them from a parent theme might provide
@@ -1707,21 +1417,10 @@ choose_icon (GtkIconTheme       *icon_theme,
     }
 
  out:
-  if (icon_info)
+  if (icon_info) 
     {
       icon_info->desired_size = size;
       icon_info->forced_size = (flags & GTK_ICON_LOOKUP_FORCE_SIZE) != 0;
-
-      icon_info->key.icon_names = g_strdupv ((char **)icon_names);
-      icon_info->key.size = size;
-      icon_info->key.flags = flags;
-      icon_info->in_cache = icon_theme;
-      DEBUG_CACHE (("adding %p (%s %d 0x%x) to cache (cache size %d)\n",
-		    icon_info,
-		    g_strjoinv (",", icon_info->key.icon_names),
-		    icon_info->key.size, icon_info->key.flags,
-		    g_hash_table_size (priv->info_cache)));
-     g_hash_table_insert (priv->info_cache, &icon_info->key, icon_info);
     }
   else
     {
@@ -3036,12 +2735,7 @@ gtk_icon_info_free (GtkIconInfo *icon_info)
   icon_info->ref_count--;
   if (icon_info->ref_count > 0)
     return;
-
-  if (icon_info->in_cache)
-    g_hash_table_remove (icon_info->in_cache->priv->info_cache, &icon_info->key);
-
-  g_strfreev (icon_info->key.icon_names);
-
+ 
   g_free (icon_info->filename);
   g_clear_object (&icon_info->icon_file);
 
@@ -3055,8 +2749,6 @@ gtk_icon_info_free (GtkIconInfo *icon_info)
   if (icon_info->symbolic_pixbuf_size)
     gtk_requisition_free (icon_info->symbolic_pixbuf_size);
 
-  symbolic_pixbuf_cache_free (icon_info->symbolic_pixbuf_cache);
-
   g_slice_free (GtkIconInfo, icon_info);
 }
 
@@ -3403,22 +3095,6 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo  *icon_info,
   return TRUE;
 }
 
-static void
-proxy_pixbuf_destroy (guchar *pixels, gpointer data)
-{
-  GtkIconInfo *icon_info = data;
-  GtkIconTheme *icon_theme = icon_info->in_cache;
-
-  g_assert (icon_info->proxy_pixbuf != NULL);
-  icon_info->proxy_pixbuf = NULL;
-
-  /* Keep it alive a bit longer */
-  if (icon_theme != NULL)
-    ensure_in_lru_cache (icon_theme, icon_info);
-
-  gtk_icon_info_free (icon_info);
-}
-
 /**
  * gtk_icon_info_load_icon:
  * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
@@ -3464,28 +3140,7 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
       return NULL;
     }
 
-  /* Instead of returning the pixbuf directly we
-     return a proxy to it that we don't own (but that
-     shares the data with the one we own). This way
-     we can know when it is freed and ensure the
-     IconInfo is alive (and thus cached) while
-     the pixbuf is still alive. */
-
-  if (icon_info->proxy_pixbuf != NULL)
-    return g_object_ref (icon_info->proxy_pixbuf);
-
-  icon_info->proxy_pixbuf =
-    gdk_pixbuf_new_from_data (gdk_pixbuf_get_pixels (icon_info->pixbuf),
-			      gdk_pixbuf_get_colorspace (icon_info->pixbuf),
-			      gdk_pixbuf_get_has_alpha (icon_info->pixbuf),
-			      gdk_pixbuf_get_bits_per_sample (icon_info->pixbuf),
-			      gdk_pixbuf_get_width (icon_info->pixbuf),
-			      gdk_pixbuf_get_height (icon_info->pixbuf),
-			      gdk_pixbuf_get_rowstride (icon_info->pixbuf),
-			      proxy_pixbuf_destroy,
-			      gtk_icon_info_copy (icon_info));
-
-  return icon_info->proxy_pixbuf;
+  return g_object_ref (icon_info->pixbuf);
 }
 
 static gchar *
@@ -3507,109 +3162,40 @@ gdk_rgba_to_css (const GdkRGBA *color)
                           (gint)(color->blue * 255));
 }
 
-static void
-proxy_symbolic_pixbuf_destroy (guchar *pixels, gpointer data)
-{
-  GtkIconInfo *icon_info = data;
-  GtkIconTheme *icon_theme = icon_info->in_cache;
-  SymbolicPixbufCache *symbolic_cache;
-
-  for (symbolic_cache = icon_info->symbolic_pixbuf_cache;
-       symbolic_cache != NULL;
-       symbolic_cache = symbolic_cache->next)
-    {
-      if (symbolic_cache->proxy_pixbuf != NULL &&
-	  gdk_pixbuf_get_pixels (symbolic_cache->proxy_pixbuf) == pixels)
-	break;
-    }
-
-  g_assert (symbolic_cache != NULL);
-  g_assert (symbolic_cache->proxy_pixbuf != NULL);
-
-  symbolic_cache->proxy_pixbuf = NULL;
-
-  /* Keep it alive a bit longer */
-  if (icon_theme != NULL)
-    ensure_in_lru_cache (icon_theme, icon_info);
-
-  gtk_icon_info_free (icon_info);
-}
-
-static GdkPixbuf *
-symbolic_cache_get_proxy (SymbolicPixbufCache *symbolic_cache,
-			  GtkIconInfo  *icon_info)
-{
-  if (symbolic_cache->proxy_pixbuf)
-    return g_object_ref (symbolic_cache->proxy_pixbuf);
-
-  symbolic_cache->proxy_pixbuf =
-    gdk_pixbuf_new_from_data (gdk_pixbuf_get_pixels (symbolic_cache->pixbuf),
-			      gdk_pixbuf_get_colorspace (symbolic_cache->pixbuf),
-			      gdk_pixbuf_get_has_alpha (symbolic_cache->pixbuf),
-			      gdk_pixbuf_get_bits_per_sample (symbolic_cache->pixbuf),
-			      gdk_pixbuf_get_width (symbolic_cache->pixbuf),
-			      gdk_pixbuf_get_height (symbolic_cache->pixbuf),
-			      gdk_pixbuf_get_rowstride (symbolic_cache->pixbuf),
-			      proxy_symbolic_pixbuf_destroy,
-			      gtk_icon_info_copy (icon_info));
-
-  return symbolic_cache->proxy_pixbuf;
-}
-
 static GdkPixbuf *
 _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
-				       const GdkRGBA  *fg,
-				       const GdkRGBA  *success_color,
-				       const GdkRGBA  *warning_color,
-				       const GdkRGBA  *error_color,
+                                       const gchar  *css_fg,
+                                       const gchar  *css_success,
+                                       const gchar  *css_warning,
+                                       const gchar  *css_error,
                                        GError      **error)
 {
   GInputStream *stream;
   GdkPixbuf *pixbuf;
-  gchar *css_fg;
-  gchar *css_success;
-  gchar *css_warning;
-  gchar *css_error;
   gchar *data;
+  gchar *success, *warning, *err;
   gchar *width, *height, *uri;
-  SymbolicPixbufCache *symbolic_cache;
-
-  symbolic_cache = symbolic_pixbuf_cache_matches (icon_info->symbolic_pixbuf_cache,
-						  fg, success_color, warning_color, error_color);
-  if (symbolic_cache)
-    return symbolic_cache_get_proxy (symbolic_cache, icon_info);
 
   /* css_fg can't possibly have failed, otherwise
    * that would mean we have a broken style */
-  g_return_val_if_fail (fg != NULL, NULL);
+  g_return_val_if_fail (css_fg != NULL, NULL);
 
-  css_fg = gdk_rgba_to_css (fg);
-
-  css_success = css_warning = css_error = NULL;
-
-  if (warning_color)
-    css_warning = gdk_rgba_to_css (warning_color);
-
-  if (error_color)
-    css_error = gdk_rgba_to_css (error_color);
-
-  if (success_color)
-    css_success = gdk_rgba_to_css (success_color);
+  success = warning = err = NULL;
 
   if (!css_success)
     {
       GdkColor success_default_color = { 0, 0x4e00, 0x9a00, 0x0600 };
-      css_success = gdk_color_to_css (&success_default_color);
+      success = gdk_color_to_css (&success_default_color);
     }
   if (!css_warning)
     {
       GdkColor warning_default_color = { 0, 0xf500, 0x7900, 0x3e00 };
-      css_warning = gdk_color_to_css (&warning_default_color);
+      warning = gdk_color_to_css (&warning_default_color);
     }
   if (!css_error)
     {
       GdkColor error_default_color = { 0, 0xcc00, 0x0000, 0x0000 };
-      css_error = gdk_color_to_css (&error_default_color);
+      err = gdk_color_to_css (&error_default_color);
     }
 
   if (!icon_info->symbolic_pixbuf_size)
@@ -3647,22 +3233,21 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
                       "      fill: ", css_fg," !important;\n"
                       "    }\n"
                       "    .warning {\n"
-                      "      fill: ", css_warning, " !important;\n"
+                      "      fill: ", css_warning ? css_warning : warning," !important;\n"
                       "    }\n"
                       "    .error {\n"
-                      "      fill: ", css_error ," !important;\n"
+                      "      fill: ", css_error ? css_error : err," !important;\n"
                       "    }\n"
                       "    .success {\n"
-                      "      fill: ", css_success, " !important;\n"
+                      "      fill: ", css_success ? css_success : success," !important;\n"
                       "    }\n"
                       "  </style>\n"
                       "  <xi:include href=\"", uri, "\"/>\n"
                       "</svg>",
                       NULL);
-  g_free (css_fg);
-  g_free (css_warning);
-  g_free (css_error);
-  g_free (css_success);
+  g_free (warning);
+  g_free (err);
+  g_free (success);
   g_free (width);
   g_free (height);
   g_free (uri);
@@ -3676,16 +3261,7 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
                                                 error);
   g_object_unref (stream);
 
-  if (pixbuf != NULL)
-    {
-      icon_info->symbolic_pixbuf_cache =
-	symbolic_pixbuf_cache_new (pixbuf, fg, success_color, warning_color, error_color,
-				   icon_info->symbolic_pixbuf_cache);
-
-      return symbolic_cache_get_proxy (icon_info->symbolic_pixbuf_cache, icon_info);
-    }
-
-  return NULL;
+  return pixbuf;
 }
 
 /**
@@ -3734,6 +3310,11 @@ gtk_icon_info_load_symbolic (GtkIconInfo    *icon_info,
                              gboolean       *was_symbolic,
                              GError        **error)
 {
+  GdkPixbuf *pixbuf;
+  gchar *css_fg;
+  gchar *css_success;
+  gchar *css_warning;
+  gchar *css_error;
   gchar *icon_uri;
   gboolean is_symbolic;
 
@@ -3753,10 +3334,29 @@ gtk_icon_info_load_symbolic (GtkIconInfo    *icon_info,
   if (!is_symbolic)
     return gtk_icon_info_load_icon (icon_info, error);
 
-  return _gtk_icon_info_load_symbolic_internal (icon_info,
-						fg, success_color,
-						warning_color, error_color,
-						error);
+  css_fg = gdk_rgba_to_css (fg);
+
+  css_success = css_warning = css_error = NULL;
+
+  if (warning_color)
+    css_warning = gdk_rgba_to_css (warning_color);
+
+  if (error_color)
+    css_error = gdk_rgba_to_css (error_color);
+
+  if (success_color)
+    css_success = gdk_rgba_to_css (success_color);
+
+  pixbuf = _gtk_icon_info_load_symbolic_internal (icon_info,
+                                                  css_fg, css_success,
+                                                  css_warning, css_error,
+                                                  error);
+  g_free (css_fg);
+  g_free (css_warning);
+  g_free (css_success);
+  g_free (css_error);
+
+  return pixbuf;
 }
 
 /**
@@ -3790,15 +3390,11 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
                                          gboolean         *was_symbolic,
                                          GError          **error)
 {
+  GdkPixbuf *pixbuf;
   GdkRGBA *color = NULL;
-  GdkRGBA fg;
-  GdkRGBA *fgp;
-  GdkRGBA success_color;
-  GdkRGBA *success_colorp;
-  GdkRGBA warning_color;
-  GdkRGBA *warning_colorp;
-  GdkRGBA error_color;
-  GdkRGBA *error_colorp;
+  GdkRGBA rgba;
+  gchar *css_fg = NULL, *css_success;
+  gchar *css_warning, *css_error;
   GtkStateFlags state;
   gchar *icon_uri;
   gboolean is_symbolic;
@@ -3819,40 +3415,36 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
   if (!is_symbolic)
     return gtk_icon_info_load_icon (icon_info, error);
 
-  fgp = success_colorp = warning_colorp = error_colorp = NULL;
-
   state = gtk_style_context_get_state (context);
   gtk_style_context_get (context, state, "color", &color, NULL);
   if (color)
     {
-      fg = *color;
-      fgp = &fg;
+      css_fg = gdk_rgba_to_css (color);
       gdk_rgba_free (color);
     }
 
-  if (gtk_style_context_lookup_color (context, "success_color", &success_color))
-    success_colorp = &success_color;
+  css_success = css_warning = css_error = NULL;
 
-  if (gtk_style_context_lookup_color (context, "warning_color", &warning_color))
-    warning_colorp = &warning_color;
+  if (gtk_style_context_lookup_color (context, "success_color", &rgba))
+    css_success = gdk_rgba_to_css (&rgba);
 
-  if (gtk_style_context_lookup_color (context, "error_color", &error_color))
-    error_colorp = &error_color;
+  if (gtk_style_context_lookup_color (context, "warning_color", &rgba))
+    css_warning = gdk_rgba_to_css (&rgba);
 
-  return _gtk_icon_info_load_symbolic_internal (icon_info,
-						fgp, success_colorp,
-						warning_colorp, error_colorp,
-						error);
-}
+  if (gtk_style_context_lookup_color (context, "error_color", &rgba))
+    css_error = gdk_rgba_to_css (&rgba);
 
-static GdkRGBA *
-color_to_rgba (GdkColor *color, GdkRGBA *rgba)
-{
-  rgba->red = color->red / 65535.0;
-  rgba->green = color->green / 65535.0;
-  rgba->blue = color->blue / 65535.0;
-  rgba->alpha = 1.0;
-  return rgba;
+  pixbuf = _gtk_icon_info_load_symbolic_internal (icon_info,
+                                                  css_fg, css_success,
+                                                  css_warning, css_error,
+                                                  error);
+
+  g_free (css_fg);
+  g_free (css_success);
+  g_free (css_warning);
+  g_free (css_error);
+
+  return pixbuf;
 }
 
 /**
@@ -3887,14 +3479,13 @@ gtk_icon_info_load_symbolic_for_style (GtkIconInfo   *icon_info,
                                        gboolean      *was_symbolic,
                                        GError       **error)
 {
-  GdkColor color;
-  GdkRGBA fg;
-  GdkRGBA success_color;
-  GdkRGBA *success_colorp;
-  GdkRGBA warning_color;
-  GdkRGBA *warning_colorp;
-  GdkRGBA error_color;
-  GdkRGBA *error_colorp;
+  GdkPixbuf *pixbuf;
+  GdkColor success_color;
+  GdkColor warning_color;
+  GdkColor error_color;
+  GdkColor *fg;
+  gchar *css_fg, *css_success;
+  gchar *css_warning, *css_error;
   gchar *icon_uri;
   gboolean is_symbolic;
 
@@ -3914,23 +3505,31 @@ gtk_icon_info_load_symbolic_for_style (GtkIconInfo   *icon_info,
   if (!is_symbolic)
     return gtk_icon_info_load_icon (icon_info, error);
 
-  color_to_rgba (&style->fg[state], &fg);
+  fg = &style->fg[state];
+  css_fg = gdk_color_to_css (fg);
 
-  success_colorp = warning_colorp = error_colorp = NULL;
+  css_success = css_warning = css_error = NULL;
 
-  if (gtk_style_lookup_color (style, "success_color", &color))
-    success_colorp = color_to_rgba (&color, &success_color);
+  if (gtk_style_lookup_color (style, "success_color", &success_color))
+    css_success = gdk_color_to_css (&success_color);
 
-  if (gtk_style_lookup_color (style, "warning_color", &color))
-    warning_colorp = color_to_rgba (&color, &warning_color);
+  if (gtk_style_lookup_color (style, "warning_color", &warning_color))
+    css_warning = gdk_color_to_css (&warning_color);
 
-  if (gtk_style_lookup_color (style, "error_color", &color))
-    error_colorp = color_to_rgba (&color, &error_color);
+  if (gtk_style_lookup_color (style, "error_color", &error_color))
+    css_error = gdk_color_to_css (&error_color);
 
-  return _gtk_icon_info_load_symbolic_internal (icon_info,
-						&fg, success_colorp,
-						warning_colorp, error_colorp,
-						error);
+  pixbuf = _gtk_icon_info_load_symbolic_internal (icon_info,
+                                                  css_fg, css_success,
+                                                  css_warning, css_error,
+                                                  error);
+
+  g_free (css_fg);
+  g_free (css_success);
+  g_free (css_warning);
+  g_free (css_error);
+
+  return pixbuf;
 }
 
 /**

gtk/gtkimcontextsimple.c

@@ -371,52 +371,26 @@ check_quartz_special_cases (GtkIMContextSimple *context_simple,
                             gint                n_compose)
 {
   GtkIMContextSimplePrivate *priv = context_simple->priv;
-  guint value = 0;
 
-  if (n_compose == 2)
+  if (n_compose == 2 &&
+      priv->compose_buffer[1] == GDK_KEY_space)
     {
+      gunichar value = 0;
+
       switch (priv->compose_buffer[0])
         {
         case GDK_KEY_dead_doubleacute:
-          switch (priv->compose_buffer[1])
-            {
-            case GDK_KEY_dead_doubleacute:
-            case GDK_KEY_space:
-              value = GDK_KEY_quotedbl; break;
-
-            case 'a': value = GDK_KEY_adiaeresis; break;
-            case 'A': value = GDK_KEY_Adiaeresis; break;
-            case 'e': value = GDK_KEY_ediaeresis; break;
-            case 'E': value = GDK_KEY_Ediaeresis; break;
-            case 'i': value = GDK_KEY_idiaeresis; break;
-            case 'I': value = GDK_KEY_Idiaeresis; break;
-            case 'o': value = GDK_KEY_odiaeresis; break;
-            case 'O': value = GDK_KEY_Odiaeresis; break;
-            case 'u': value = GDK_KEY_udiaeresis; break;
-            case 'U': value = GDK_KEY_Udiaeresis; break;
-            case 'y': value = GDK_KEY_ydiaeresis; break;
-            case 'Y': value = GDK_KEY_Ydiaeresis; break;
-            }
-          break;
-
-        case GDK_KEY_dead_acute:
-          switch (priv->compose_buffer[1])
-            {
-            case 'c': value = GDK_KEY_ccedilla; break;
-            case 'C': value = GDK_KEY_Ccedilla; break;
-            }
-          break;
+          value = '"'; break;
         }
-    }
 
-  if (value > 0)
-    {
-      gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple),
-                                         gdk_keyval_to_unicode (value));
-      priv->compose_buffer[0] = 0;
+      if (value > 0)
+        {
+          gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple), value);
+          priv->compose_buffer[0] = 0;
 
-      GTK_NOTE (MISC, g_print ("quartz: U+%04X\n", value));
-      return TRUE;
+          GTK_NOTE (MISC, g_print ("quartz: U+%04X\n", value));
+          return TRUE;
+        }
     }
 
   return FALSE;

gtk/gtklabel.c

@@ -3384,7 +3384,7 @@ gtk_label_ensure_layout (GtkLabel *label)
               pango_attr_list_insert (attrs, attribute);
             }
         }
-      else if (priv->markup_attrs || priv->attrs)
+      else if (priv->markup_attrs && priv->markup_attrs)
         attrs = pango_attr_list_new ();
       else
         attrs = NULL;

gtk/gtkliststore.c

@@ -2437,12 +2437,10 @@ list_store_start_element (GMarkupParseContext *context,
   else if (strcmp (element_name, "row") == 0)
     ;
   else if (strcmp (element_name, "column") == 0)
-    {
-      for (i = 0; names[i]; i++)
-        if (strcmp (names[i], "type") == 0)
-          data->column_type_names = g_slist_prepend (data->column_type_names,
-                                                     g_strdup (values[i]));
-    }
+    for (i = 0; names[i]; i++)
+      if (strcmp (names[i], "type") == 0)
+	data->column_type_names = g_slist_prepend (data->column_type_names,
+						   g_strdup (values[i]));
   else if (strcmp (element_name, "columns") == 0)
     ;
   else if (strcmp (element_name, "data") == 0)

gtk/gtkmenu.c

@@ -641,6 +641,15 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                      -1, G_MAXINT, -1,
                                                      GTK_PARAM_READWRITE));
 
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("vertical-padding",
+                                                             P_("Vertical Padding"),
+                                                             P_("Extra space at the top and bottom of the menu"),
+                                                             0,
+                                                             G_MAXINT,
+                                                             1,
+                                                             GTK_PARAM_READABLE));
+
   /**
    * GtkMenu:reserve-toggle-size:
    *
@@ -662,15 +671,6 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                          TRUE,
                                                          GTK_PARAM_READWRITE));
 
-  /**
-   * GtkMenu:horizontal-padding:
-   *
-   * Extra space at the left and right edges of the menu.
-   *
-   * Deprecated: 3.8: use the standard padding CSS property (through objects
-   *   like #GtkStyleContext and #GtkCssProvider); the value of this style
-   *   property is ignored.
-   */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("horizontal-padding",
                                                              P_("Horizontal Padding"),
@@ -678,27 +678,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                              0,
                                                              G_MAXINT,
                                                              0,
-                                                             GTK_PARAM_READABLE |
-                                                             G_PARAM_DEPRECATED));
-
-  /**
-   * GtkMenu:vertical-padding:
-   *
-   * Extra space at the top and bottom of the menu.
-   *
-   * Deprecated: 3.8: use the standard padding CSS property (through objects
-   *   like #GtkStyleContext and #GtkCssProvider); the value of this style
-   *   property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("vertical-padding",
-                                                             P_("Vertical Padding"),
-                                                             P_("Extra space at the top and bottom of the menu"),
-                                                             0,
-                                                             G_MAXINT,
-                                                             1,
-                                                             GTK_PARAM_READABLE |
-                                                             G_PARAM_DEPRECATED));
+                                                             GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("vertical-offset",
@@ -2530,6 +2510,8 @@ gtk_menu_realize (GtkWidget *widget)
   gint border_width;
   GtkWidget *child;
   GList *children;
+  guint vertical_padding;
+  guint horizontal_padding;
   GtkBorder arrow_border, padding;
 
   g_return_if_fail (GTK_IS_MENU (widget));
@@ -2560,14 +2542,19 @@ gtk_menu_realize (GtkWidget *widget)
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
   context = gtk_widget_get_style_context (widget);
 
+  gtk_widget_style_get (GTK_WIDGET (menu),
+                        "vertical-padding", &vertical_padding,
+                        "horizontal-padding", &horizontal_padding,
+                        NULL);
+
   gtk_widget_get_allocation (widget, &allocation);
 
-  attributes.x = border_width + padding.left;
-  attributes.y = border_width + padding.top;
+  attributes.x = border_width + padding.left + horizontal_padding;
+  attributes.y = border_width + padding.top + vertical_padding;
   attributes.width = allocation.width -
-    (2 * border_width) - padding.left - padding.right;
+    (2 * (border_width + horizontal_padding)) - padding.left - padding.right;
   attributes.height = allocation.height -
-    (2 * border_width) - padding.top - padding.bottom;
+    (2 * (border_width + vertical_padding)) - padding.top - padding.bottom;
 
   get_arrows_border (menu, &arrow_border);
   attributes.y += arrow_border.top;
@@ -2585,9 +2572,9 @@ gtk_menu_realize (GtkWidget *widget)
 
   attributes.x = 0;
   attributes.y = 0;
-  attributes.width = allocation.width + (2 * border_width) +
+  attributes.width = allocation.width + (2 * (border_width + horizontal_padding)) +
     padding.left + padding.right;
-  attributes.height = priv->requested_height - (2 * border_width) +
+  attributes.height = priv->requested_height - (2 * (border_width + vertical_padding)) +
     padding.top + padding.bottom;
 
   attributes.width = MAX (1, attributes.width);
@@ -2703,6 +2690,7 @@ calculate_line_heights (GtkMenu *menu,
   GtkMenuShell   *menu_shell;
   GtkWidget      *child, *widget;
   GList          *children;
+  guint           horizontal_padding;
   guint           border_width;
   guint           n_columns;
   gint            n_heights;
@@ -2720,10 +2708,13 @@ calculate_line_heights (GtkMenu *menu,
   n_columns    = gtk_menu_get_n_columns (menu);
   avail_width  = for_width - (2 * priv->toggle_size + priv->accel_size) * n_columns;
 
+  gtk_widget_style_get (GTK_WIDGET (menu),
+                        "horizontal-padding", &horizontal_padding,
+                        NULL);
   get_menu_padding (widget, &padding);
 
   border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
-  avail_width -= (border_width) * 2 + padding.left + padding.right;
+  avail_width -= (border_width + horizontal_padding) * 2 + padding.left + padding.right;
 
   for (children = menu_shell->priv->children; children; children = children->next)
     {
@@ -2779,6 +2770,8 @@ gtk_menu_size_allocate (GtkWidget     *widget,
   gint x, y, i;
   gint width, height;
   guint border_width;
+  guint vertical_padding;
+  guint horizontal_padding;
   GtkBorder padding;
 
   g_return_if_fail (GTK_IS_MENU (widget));
@@ -2790,6 +2783,11 @@ gtk_menu_size_allocate (GtkWidget     *widget,
 
   gtk_widget_set_allocation (widget, allocation);
 
+  gtk_widget_style_get (GTK_WIDGET (menu),
+                        "vertical-padding", &vertical_padding,
+                        "horizontal-padding", &horizontal_padding,
+                        NULL);
+
   get_menu_padding (widget, &padding);
   border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
 
@@ -2800,15 +2798,16 @@ gtk_menu_size_allocate (GtkWidget     *widget,
                                                  NULL);
 
   /* refresh our cached height request */
-  priv->requested_height = (2 * border_width) + padding.top + padding.bottom;
+  priv->requested_height = (2 * (border_width + vertical_padding)) +
+    padding.top + padding.bottom;
   for (i = 0; i < priv->heights_length; i++)
     priv->requested_height += priv->heights[i];
 
-  x = border_width + padding.left;
-  y = border_width + padding.top;
-  width = allocation->width - (2 * border_width) -
+  x = border_width + padding.left + horizontal_padding;
+  y = border_width + padding.top + vertical_padding;
+  width = allocation->width - (2 * (border_width + horizontal_padding)) -
     padding.left - padding.right;
-  height = allocation->height - (2 * border_width) -
+  height = allocation->height - (2 * (border_width + vertical_padding)) -
     padding.top - padding.bottom;
 
   if (menu_shell->priv->active)
@@ -2938,18 +2937,22 @@ get_arrows_visible_area (GtkMenu      *menu,
   GtkArrowPlacement arrow_placement;
   GtkWidget *widget = GTK_WIDGET (menu);
   guint border_width;
+  guint vertical_padding;
+  guint horizontal_padding;
   gint scroll_arrow_height;
   GtkBorder menu_padding;
 
   gtk_widget_style_get (widget,
+                        "vertical-padding", &vertical_padding,
+                        "horizontal-padding", &horizontal_padding,
                         "scroll-arrow-vlength", &scroll_arrow_height,
                         "arrow-placement", &arrow_placement,
                         NULL);
 
   get_menu_padding (widget, &menu_padding);
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  border->x = border_width + menu_padding.left;
-  border->y = border_width + menu_padding.top;
+  border->x = border_width + menu_padding.left + horizontal_padding;
+  border->y = border_width + menu_padding.top + vertical_padding;
   border->width = gdk_window_get_width (gtk_widget_get_window (widget));
   border->height = gdk_window_get_height (gtk_widget_get_window (widget));
 
@@ -3134,6 +3137,7 @@ gtk_menu_get_preferred_width (GtkWidget *widget,
   GList          *children;
   guint           max_toggle_size;
   guint           max_accel_width;
+  guint           horizontal_padding;
   guint           border_width;
   gint            child_min, child_nat;
   gint            min_width, nat_width;
@@ -3222,10 +3226,16 @@ gtk_menu_get_preferred_width (GtkWidget *widget,
   nat_width += 2 * max_toggle_size + max_accel_width;
   nat_width *= gtk_menu_get_n_columns (menu);
 
+  gtk_widget_style_get (GTK_WIDGET (menu),
+                        "horizontal-padding", &horizontal_padding,
+                        NULL);
+
   get_menu_padding (widget, &padding);
   border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
-  min_width   += (2 * border_width) + padding.left + padding.right;
-  nat_width   += (2 * border_width) + padding.left + padding.right;
+  min_width   += (2 * (border_width + horizontal_padding)) +
+    padding.left + padding.right;
+  nat_width   += (2 * (border_width + horizontal_padding)) +
+    padding.left + padding.right;
 
   priv->toggle_size = max_toggle_size;
   priv->accel_size  = max_accel_width;
@@ -3267,14 +3277,16 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
   GtkMenu        *menu = GTK_MENU (widget);
   GtkMenuPrivate *priv = menu->priv;
   guint          *min_heights, *nat_heights;
-  guint           border_width;
+  guint           vertical_padding, border_width;
   gint            n_heights, i;
   gint            min_height, nat_height;
 
+  gtk_widget_style_get (widget, "vertical-padding", &vertical_padding, NULL);
   border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
   get_menu_padding (widget, &padding);
 
-  min_height = nat_height = (2 * border_width) + padding.top + padding.bottom;
+  min_height = nat_height = (border_width + vertical_padding) * 2 +
+	  padding.top + padding.bottom;
 
   n_heights =
     calculate_line_heights (menu, for_size, &min_heights, &nat_heights);
@@ -3856,6 +3868,7 @@ get_arrows_sensitive_area (GtkMenu      *menu,
   GdkWindow *window;
   gint width, height;
   guint border;
+  guint vertical_padding;
   gint win_x, win_y;
   gint scroll_arrow_height;
   GtkBorder padding;
@@ -3865,11 +3878,12 @@ get_arrows_sensitive_area (GtkMenu      *menu,
   height = gdk_window_get_height (window);
 
   gtk_widget_style_get (widget,
+                        "vertical-padding", &vertical_padding,
                         "scroll-arrow-vlength", &scroll_arrow_height,
                         "arrow-placement", &arrow_placement,
                         NULL);
 
-  border = gtk_container_get_border_width (GTK_CONTAINER (menu));
+  border = gtk_container_get_border_width (GTK_CONTAINER (menu)) + vertical_padding;
   get_menu_padding (widget, &padding);
 
   gdk_window_get_position (window, &win_x, &win_y);
@@ -4831,6 +4845,8 @@ gtk_menu_scroll_to (GtkMenu *menu,
   gint view_width, view_height;
   gint border_width;
   gint menu_height;
+  guint vertical_padding;
+  guint horizontal_padding;
   gboolean double_arrows;
 
   widget = GTK_WIDGET (menu);
@@ -4842,17 +4858,23 @@ gtk_menu_scroll_to (GtkMenu *menu,
   view_width = gtk_widget_get_allocated_width (widget);
   view_height = gtk_widget_get_allocated_height (widget);
 
+  gtk_widget_style_get (GTK_WIDGET (menu),
+                        "vertical-padding", &vertical_padding,
+                        "horizontal-padding", &horizontal_padding,
+                        NULL);
+
   get_menu_padding (widget, &padding);
   double_arrows = get_double_arrows (menu);
 
   border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
 
-  view_width -= (2 * border_width) + padding.left + padding.right;
-  view_height -= (2 * border_width) + padding.top + padding.bottom;
-  menu_height = priv->requested_height - (2 * border_width) - padding.top - padding.bottom;
+  view_width -= (2 * (border_width + horizontal_padding)) + padding.left + padding.right;
+  view_height -= (2 * (border_width + vertical_padding)) + padding.top + padding.bottom;
+  menu_height = priv->requested_height - (2 * (border_width + vertical_padding)) -
+    padding.top - padding.bottom;
 
-  x = border_width + padding.left;
-  y = border_width + padding.top;
+  x = border_width + padding.left + horizontal_padding;
+  y = border_width + padding.top + vertical_padding;
 
   if (double_arrows && !priv->tearoff_active)
     {
@@ -5049,18 +5071,23 @@ gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
   if (compute_child_offset (menu, menu_item,
                             &child_offset, &child_height, &last_child))
     {
+      guint vertical_padding;
       gboolean double_arrows;
       GtkBorder padding;
 
       y = priv->scroll_offset;
       height = gdk_window_get_height (gtk_widget_get_window (widget));
 
+      gtk_widget_style_get (widget,
+                            "vertical-padding", &vertical_padding,
+                            NULL);
+
       double_arrows = get_double_arrows (menu);
       get_menu_padding (widget, &padding);
 
       height -= 2 * gtk_container_get_border_width (GTK_CONTAINER (menu)) +
-        padding.top + padding.bottom;
-
+                padding.top + padding.bottom +
+                2 * vertical_padding;
       if (child_offset < y)
         {
           /* Ignore the enter event we might get if the pointer

gtk/gtkmenubar.c

@@ -51,6 +51,9 @@
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 
+#define BORDER_SPACING  0
+#define DEFAULT_IPADDING 1
+
 /* Properties */
 enum {
   PROP_0,
@@ -216,24 +219,14 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                               GTK_SHADOW_OUT,
                                                               GTK_PARAM_READABLE));
 
-  /**
-   * GtkMenuBar:internal-padding:
-   *
-   * Amount of border space between the menubar shadow and the menu items
-   *
-   * Deprecated: 3.8: use the standard padding CSS property (through objects
-   *   like #GtkStyleContext and #GtkCssProvider); the value of this style
-   *   property is ignored.
-   */
   gtk_widget_class_install_style_property (widget_class,
 					   g_param_spec_int ("internal-padding",
 							     P_("Internal padding"),
 							     P_("Amount of border space between the menubar shadow and the menu items"),
 							     0,
 							     G_MAXINT,
-                                                             0,
-                                                             GTK_PARAM_READABLE |
-                                                             G_PARAM_DEPRECATED));
+                                                             DEFAULT_IPADDING,
+                                                             GTK_PARAM_READABLE));
 
   g_type_class_add_private (gobject_class, sizeof (GtkMenuBarPrivate));
 }
@@ -339,12 +332,10 @@ gtk_menu_bar_size_request (GtkWidget      *widget,
   GtkMenuShell *menu_shell;
   GtkWidget *child;
   GList *children;
+  gint ipadding;
   guint border_width;
   gboolean use_toggle_size, use_maximize;
   gint child_minimum, child_natural;
-  GtkStyleContext *context;
-  GtkBorder border;
-  GtkStateFlags flags;
 
   *minimum = 0;
   *natural = 0;
@@ -400,28 +391,19 @@ gtk_menu_bar_size_request (GtkWidget      *widget,
         }
     }
 
-  context = gtk_widget_get_style_context (widget);
-  flags = gtk_widget_get_state_flags (widget);
-  gtk_style_context_get_padding (context, flags, &border);
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      *minimum += border.left + border.right;
-      *natural += border.left + border.right;
-    }
-  else
-    {
-      *minimum += border.top + border.bottom;
-      *natural += border.top + border.bottom;
-    }
-
+  gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
   border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
-  *minimum += border_width * 2;
-  *natural += border_width * 2;
+  *minimum += (border_width + ipadding + BORDER_SPACING) * 2;
+  *natural += (border_width + ipadding + BORDER_SPACING) * 2;
 
   if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
     {
-      gtk_style_context_get_border (context, flags, &border);
+      GtkStyleContext *context;
+      GtkBorder border;
+
+      context = gtk_widget_get_style_context (widget);
+      gtk_style_context_get_border (context, gtk_widget_get_state_flags (widget),
+                                    &border);
 
       if (orientation == GTK_ORIENTATION_HORIZONTAL)
         {
@@ -480,6 +462,7 @@ gtk_menu_bar_size_allocate (GtkWidget     *widget,
   GtkWidget *child;
   GList *children;
   GtkAllocation remaining_space;
+  gint ipadding;
   guint border_width;
   GArray *requested_sizes;
   gint toggle_size;
@@ -501,26 +484,28 @@ gtk_menu_bar_size_allocate (GtkWidget     *widget,
 
   if (menu_shell->priv->children)
     {
-      GtkStyleContext *context;
-      GtkStateFlags flags;
-      GtkBorder border;
-
-      context = gtk_widget_get_style_context (widget);
-      flags = gtk_widget_get_state_flags (widget);
-      gtk_style_context_get_padding (context, flags, &border);
-
+      gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
+  
       border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
-
-      remaining_space.x = (border_width + border.left);
-      remaining_space.y = (border_width + border.top);
+      remaining_space.x = (border_width +
+			    ipadding + 
+			    BORDER_SPACING);
+      remaining_space.y = (border_width +
+                            ipadding +
+			    BORDER_SPACING);
       remaining_space.width = allocation->width -
-        2 * (border_width) - border.left - border.right;
+                               2 * (border_width + ipadding + BORDER_SPACING);
       remaining_space.height = allocation->height -
-        2 * (border_width) - border.top - border.bottom;
-
+                                2 * (border_width + ipadding + BORDER_SPACING);
+    
       if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
 	{
-          gtk_style_context_get_border (context, flags, &border);
+          GtkStyleContext *context;
+          GtkBorder border;
+
+          context = gtk_widget_get_style_context (widget);
+          gtk_style_context_get_border (context, gtk_widget_get_state_flags (widget),
+                                        &border);
 
           remaining_space.x += border.left;
           remaining_space.y += border.top;

gtk/gtkmenuitem.c

@@ -464,24 +464,14 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                                                                      GTK_PARAM_READABLE),
                                                   gtk_rc_property_parse_enum);
 
-  /**
-   * GtkMenuItem:horizontal-padding:
-   *
-   * Padding to left and right of the menu item.
-   *
-   * Deprecated: 3.8: use the standard padding CSS property (through objects
-   *   like #GtkStyleContext and #GtkCssProvider); the value of this style
-   *   property is ignored.
-   */
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("horizontal-padding",
                                                              "Horizontal Padding",
                                                              "Padding to left and right of the menu item",
                                                              0,
                                                              G_MAXINT,
-                                                             0,
-                                                             GTK_PARAM_READABLE |
-                                                             G_PARAM_DEPRECATED));
+                                                             3,
+                                                             GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("toggle-spacing",
@@ -849,16 +839,35 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
   GtkWidget *child;
   GtkWidget *parent;
   guint accel_width;
+  guint horizontal_padding;
   guint border_width;
+  GtkPackDirection pack_dir;
+  GtkPackDirection child_pack_dir;
   gint  min_width, nat_width;
   GtkStyleContext *context;
   GtkStateFlags state;
   GtkBorder padding;
 
   min_width = nat_width = 0;
+
+  gtk_widget_style_get (widget,
+                        "horizontal-padding", &horizontal_padding,
+                        NULL);
+
   bin = GTK_BIN (widget);
   parent = gtk_widget_get_parent (widget);
 
+  if (GTK_IS_MENU_BAR (parent))
+    {
+      pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (parent));
+      child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
+    }
+  else
+    {
+      pack_dir = GTK_PACK_DIRECTION_LTR;
+      child_pack_dir = GTK_PACK_DIRECTION_LTR;
+    }
+
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   context = gtk_widget_get_style_context (widget);
@@ -866,8 +875,13 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
   gtk_style_context_get_padding (context, state, &padding);
 
   min_width = (border_width * 2) + padding.left + padding.right;
-  nat_width = min_width;
 
+  if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) &&
+      (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL))
+    min_width += 2 * horizontal_padding;
+
+  nat_width = min_width;
+	  
   child = gtk_bin_get_child (bin);
 
   if (child != NULL && gtk_widget_get_visible (child))
@@ -922,7 +936,10 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
   GtkWidget *child;
   GtkWidget *parent;
   guint accel_width;
+  guint horizontal_padding;
   guint border_width;
+  GtkPackDirection pack_dir;
+  GtkPackDirection child_pack_dir;
   gint min_height, nat_height;
   gint avail_size = 0;
 
@@ -932,16 +949,39 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
   state = gtk_widget_get_state_flags (widget);
   gtk_style_context_get_padding (context, state, &padding);
 
+  gtk_widget_style_get (widget,
+                        "horizontal-padding", &horizontal_padding,
+                        NULL);
+
   bin = GTK_BIN (widget);
   parent = gtk_widget_get_parent (widget);
 
+  if (GTK_IS_MENU_BAR (parent))
+    {
+      pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (parent));
+      child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
+    }
+  else
+    {
+      pack_dir = GTK_PACK_DIRECTION_LTR;
+      child_pack_dir = GTK_PACK_DIRECTION_LTR;
+    }
+
   border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
   min_height   = (border_width * 2) + padding.top + padding.bottom;
 
+  if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&
+      (child_pack_dir == GTK_PACK_DIRECTION_TTB || child_pack_dir == GTK_PACK_DIRECTION_BTT))
+    min_height += 2 * horizontal_padding;
+
   if (for_size != -1)
     {
       avail_size = for_size;
       avail_size -= (border_width * 2) + padding.left + padding.right;
+
+      if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) &&
+          (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL))
+        avail_size -= 2 * horizontal_padding;
     }
 
   nat_height = min_height;
@@ -1452,6 +1492,7 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
   GtkBin *bin;
   GtkAllocation child_allocation;
   GtkTextDirection direction;
+  GtkPackDirection pack_dir;
   GtkPackDirection child_pack_dir;
   GtkWidget *child;
   GtkWidget *parent;
@@ -1466,10 +1507,12 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
   parent = gtk_widget_get_parent (widget);
   if (GTK_IS_MENU_BAR (parent))
     {
+      pack_dir = gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (parent));
       child_pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent));
     }
   else
     {
+      pack_dir = GTK_PACK_DIRECTION_LTR;
       child_pack_dir = GTK_PACK_DIRECTION_LTR;
     }
 
@@ -1481,12 +1524,17 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
       GtkStyleContext *context;
       GtkStateFlags state;
       GtkBorder padding;
+      guint horizontal_padding;
       guint border_width;
 
       context = gtk_widget_get_style_context (widget);
       state = gtk_widget_get_state_flags (widget);
       gtk_style_context_get_padding (context, state, &padding);
 
+      gtk_widget_style_get (widget,
+                            "horizontal-padding", &horizontal_padding,
+                            NULL);
+
       border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
       child_allocation.x = border_width + padding.left;
       child_allocation.y = border_width + padding.top;
@@ -1496,6 +1544,19 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
       child_allocation.height = allocation->height - (border_width * 2) -
         padding.top - padding.bottom;
 
+      if ((pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) &&
+          (child_pack_dir == GTK_PACK_DIRECTION_LTR || child_pack_dir == GTK_PACK_DIRECTION_RTL))
+        {
+          child_allocation.x += horizontal_padding;
+          child_allocation.width -= 2 * horizontal_padding;
+        }
+      else if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&
+               (child_pack_dir == GTK_PACK_DIRECTION_TTB || child_pack_dir == GTK_PACK_DIRECTION_BTT))
+        {
+          child_allocation.y += horizontal_padding;
+          child_allocation.height -= 2 * horizontal_padding;
+        }
+
       if (child_pack_dir == GTK_PACK_DIRECTION_LTR ||
           child_pack_dir == GTK_PACK_DIRECTION_RTL)
         {
@@ -1665,20 +1726,26 @@ gtk_menu_item_draw (GtkWidget *widget,
     {
       gint arrow_x, arrow_y;
       gint arrow_size;
+      guint horizontal_padding;
       GtkTextDirection direction;
       gdouble angle;
 
       direction = gtk_widget_get_direction (widget);
+
+      gtk_widget_style_get (widget,
+                            "horizontal-padding", &horizontal_padding,
+                            NULL);
+
       get_arrow_size (widget, child, &arrow_size, NULL);
 
       if (direction == GTK_TEXT_DIR_LTR)
         {
-          arrow_x = x + w - arrow_size;
+          arrow_x = x + w - horizontal_padding - arrow_size;
           angle = G_PI / 2;
         }
       else
         {
-          arrow_x = x;
+          arrow_x = x + horizontal_padding;
           angle = (3 * G_PI) / 2;
         }
 
@@ -1690,22 +1757,24 @@ gtk_menu_item_draw (GtkWidget *widget,
     {
       gboolean wide_separators;
       gint     separator_height;
+      guint    horizontal_padding;
 
       gtk_widget_style_get (widget,
                             "wide-separators",    &wide_separators,
                             "separator-height",   &separator_height,
+                            "horizontal-padding", &horizontal_padding,
                             NULL);
       if (wide_separators)
         gtk_render_frame (context, cr,
-                          x + padding.left,
+                          x + horizontal_padding + padding.left,
                           y + padding.top,
-                          w - padding.left - padding.right,
+                          w - (2 * horizontal_padding) - padding.left - padding.right,
                           separator_height);
       else
         gtk_render_line (context, cr,
-                         x + padding.left,
+                         x + horizontal_padding + padding.left,
                          y + padding.top,
-                         x + w - padding.right - 1,
+                         x + w - horizontal_padding - padding.right - 1,
                          y + padding.top);
     }
 
@@ -2056,6 +2125,8 @@ get_offsets (GtkMenu *menu,
              gint    *horizontal_offset,
              gint    *vertical_offset)
 {
+  gint vertical_padding;
+  gint horizontal_padding;
   GtkStyleContext *context;
   GtkStateFlags state;
   GtkBorder padding;
@@ -2063,6 +2134,8 @@ get_offsets (GtkMenu *menu,
   gtk_widget_style_get (GTK_WIDGET (menu),
                         "horizontal-offset", horizontal_offset,
                         "vertical-offset", vertical_offset,
+                        "horizontal-padding", &horizontal_padding,
+                        "vertical-padding", &vertical_padding,
                         NULL);
 
   context = gtk_widget_get_style_context (GTK_WIDGET (menu));
@@ -2070,7 +2143,8 @@ get_offsets (GtkMenu *menu,
   gtk_style_context_get_padding (context, state, &padding);
 
   *vertical_offset -= padding.top;
-  *horizontal_offset += padding.left;
+  *vertical_offset -= vertical_padding;
+  *horizontal_offset += horizontal_padding;
 }
 
 static void

gtk/gtkmenushell.c

@@ -1107,7 +1107,7 @@ gtk_menu_shell_leave_notify (GtkWidget        *widget,
                              GdkEventCrossing *event)
 {
   if (event->mode == GDK_CROSSING_GTK_GRAB ||
-      event->mode == GDK_CROSSING_GTK_UNGRAB ||
+      event->mode == GDK_CROSSING_GTK_GRAB ||
       event->mode == GDK_CROSSING_STATE_CHANGED)
     return TRUE;
 

gtk/gtknotebook.c

@@ -2504,7 +2504,6 @@ gtk_notebook_size_allocate (GtkWidget     *widget,
                 {
                 case GTK_POS_TOP:
                   child_allocation.y += priv->cur_page->requisition.height;
-                  /* fall thru */
                 case GTK_POS_BOTTOM:
                   child_allocation.height =
                     MAX (1, child_allocation.height -
@@ -2512,7 +2511,6 @@ gtk_notebook_size_allocate (GtkWidget     *widget,
                   break;
                 case GTK_POS_LEFT:
                   child_allocation.x += priv->cur_page->requisition.width;
-                  /* fall thru */
                 case GTK_POS_RIGHT:
                   child_allocation.width =
                     MAX (1, child_allocation.width -

gtk/gtkprivate.h

@@ -37,16 +37,6 @@ G_BEGIN_DECLS
 #define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 #define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 
-#ifdef G_DISABLE_CAST_CHECKS
-/* This is true for debug no and minimum */
-#define gtk_internal_return_if_fail(__expr) G_STMT_START{ (void)0; }G_STMT_END
-#define gtk_internal_return_val_if_fail(__expr, __val) G_STMT_START{ (void)0; }G_STMT_END
-#else
-/* This is true for debug yes */
-#define gtk_internal_return_if_fail(__expr) g_return_if_fail(__expr)
-#define gtk_internal_return_val_if_fail(__expr, __val) g_return_val_if_fail(__expr, __val)
-#endif
-
 const gchar * _gtk_get_datadir            (void);
 const gchar * _gtk_get_libdir             (void);
 const gchar * _gtk_get_sysconfdir         (void);

gtk/gtkroundedbox.c

@@ -284,7 +284,7 @@ _gtk_rounded_box_guess_length (const GtkRoundedBox *box,
                                GtkCssSide           side)
 {
   double length;
-  GtkCssSide before, after;
+  GtkCssCorner before, after;
 
   before = side;
   after = (side + 1) % 4;

gtk/gtksettings.c

@@ -114,6 +114,7 @@ struct _GtkSettingsPrivate
   GdkScreen *screen;
   GtkCssProvider *theme_provider;
   GtkCssProvider *key_theme_provider;
+  GtkStyleProperties *style;
 };
 
 typedef enum
@@ -1409,21 +1410,98 @@ gtk_settings_class_init (GtkSettingsClass *class)
   g_type_class_add_private (class, sizeof (GtkSettingsPrivate));
 }
 
+static void
+settings_ensure_style (GtkSettings *settings)
+{
+  GtkSettingsPrivate *priv = settings->priv;
+  PangoFontDescription *font_desc;
+  gchar *font_name;
+
+  if (priv->style)
+    return;
+
+  priv->style = gtk_style_properties_new ();
+
+  g_object_get (settings,
+                "gtk-font-name", &font_name,
+                NULL);
+
+  font_desc = pango_font_description_from_string (font_name);
+
+  /* Unset normal attributes from this description,
+   * so they do not override theme values */
+  if (pango_font_description_get_weight (font_desc) == PANGO_WEIGHT_NORMAL)
+    pango_font_description_unset_fields (font_desc,
+                                         PANGO_FONT_MASK_WEIGHT);
+
+  if (pango_font_description_get_stretch (font_desc) == PANGO_STRETCH_NORMAL)
+    pango_font_description_unset_fields (font_desc,
+                                         PANGO_FONT_MASK_STRETCH);
+
+  if (pango_font_description_get_variant (font_desc) == PANGO_VARIANT_NORMAL)
+    pango_font_description_unset_fields (font_desc,
+                                         PANGO_FONT_MASK_VARIANT);
+
+  if (pango_font_description_get_style (font_desc) == PANGO_STYLE_NORMAL)
+    pango_font_description_unset_fields (font_desc,
+                                         PANGO_FONT_MASK_STYLE);
+
+  gtk_style_properties_set (priv->style, 0,
+                            "font", font_desc,
+                            NULL);
+
+  pango_font_description_free (font_desc);
+  g_free (font_name);
+}
+
 static void
 gtk_settings_provider_iface_init (GtkStyleProviderIface *iface)
 {
 }
 
-static GtkSettings *
-gtk_settings_style_provider_get_settings (GtkStyleProviderPrivate *provider)
+static GtkCssValue *
+gtk_settings_style_provider_get_color (GtkStyleProviderPrivate *provider,
+                                       const char              *name)
 {
-  return GTK_SETTINGS (provider);
+  GtkSettings *settings = GTK_SETTINGS (provider);
+
+  settings_ensure_style (settings);
+
+  return _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (settings->priv->style), name);
+}
+
+static void
+gtk_settings_style_provider_lookup (GtkStyleProviderPrivate *provider,
+                                    const GtkCssMatcher     *matcher,
+                                    GtkCssLookup            *lookup)
+{
+  GtkSettings *settings = GTK_SETTINGS (provider);
+
+  settings_ensure_style (settings);
+
+  _gtk_style_provider_private_lookup (GTK_STYLE_PROVIDER_PRIVATE (settings->priv->style),
+                                      matcher,
+                                      lookup);
+}
+
+static GtkCssChange
+gtk_settings_style_provider_get_change (GtkStyleProviderPrivate *provider,
+                                        const GtkCssMatcher     *matcher)
+{
+  GtkSettings *settings = GTK_SETTINGS (provider);
+
+  settings_ensure_style (settings);
+
+  return _gtk_style_provider_private_get_change (GTK_STYLE_PROVIDER_PRIVATE (settings->priv->style),
+                                                 matcher);
 }
 
 static void
 gtk_settings_provider_private_init (GtkStyleProviderPrivateInterface *iface)
 {
-  iface->get_settings = gtk_settings_style_provider_get_settings;
+  iface->get_color = gtk_settings_style_provider_get_color;
+  iface->lookup = gtk_settings_style_provider_lookup;
+  iface->get_change = gtk_settings_style_provider_get_change;
 }
 
 static void
@@ -1444,6 +1522,8 @@ gtk_settings_finalize (GObject *object)
   settings_update_provider (priv->screen, &priv->theme_provider, NULL);
   settings_update_provider (priv->screen, &priv->key_theme_provider, NULL);
 
+  g_clear_object (&priv->style);
+
   G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
 }
 
@@ -1649,6 +1729,14 @@ gtk_settings_get_property (GObject     *object,
 static void
 settings_invalidate_style (GtkSettings *settings)
 {
+  GtkSettingsPrivate *priv = settings->priv;
+
+  if (priv->style)
+    {
+      g_object_unref (priv->style);
+      priv->style = NULL;
+    }
+
   _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (settings));
 }
 

gtk/gtkstylecascade.c

@@ -123,29 +123,6 @@ gtk_style_cascade_provider_iface_init (GtkStyleProviderIface *iface)
   iface->get_style_property = gtk_style_cascade_get_style_property;
 }
 
-static GtkSettings *
-gtk_style_cascade_get_settings (GtkStyleProviderPrivate *provider)
-{
-  GtkStyleCascade *cascade = GTK_STYLE_CASCADE (provider);
-  GtkStyleCascadeIter iter;
-  GtkSettings *settings;
-  GtkStyleProvider *item;
-
-  for (item = gtk_style_cascade_iter_init (cascade, &iter);
-       item;
-       item = gtk_style_cascade_iter_next (cascade, &iter))
-    {
-      if (!GTK_IS_STYLE_PROVIDER_PRIVATE (item))
-        continue;
-          
-      settings = _gtk_style_provider_private_get_settings (GTK_STYLE_PROVIDER_PRIVATE (item));
-      if (settings)
-        return settings;
-    }
-
-  return NULL;
-}
-
 static GtkCssValue *
 gtk_style_cascade_get_color (GtkStyleProviderPrivate *provider,
                              const char              *name)
@@ -256,7 +233,6 @@ static void
 gtk_style_cascade_provider_private_iface_init (GtkStyleProviderPrivateInterface *iface)
 {
   iface->get_color = gtk_style_cascade_get_color;
-  iface->get_settings = gtk_style_cascade_get_settings;
   iface->get_keyframes = gtk_style_cascade_get_keyframes;
   iface->lookup = gtk_style_cascade_lookup;
   iface->get_change = gtk_style_cascade_get_change;

gtk/gtkstylecontext.c

@@ -372,7 +372,7 @@ struct _GtkStyleContextPrivate
   GtkCssChange relevant_changes;
   GtkCssChange pending_changes;
 
-  const GtkBitmask *invalidating_context;
+  guint invalidating_context : 1;
   guint invalid : 1;
 };
 
@@ -2222,6 +2222,17 @@ _gtk_style_context_peek_property (GtkStyleContext *context,
   return _gtk_css_computed_values_get_value (data->store, property_id);
 }
 
+double
+_gtk_style_context_get_number (GtkStyleContext *context,
+                               guint            property_id,
+                               double           one_hundred_percent)
+{
+  GtkCssValue *value;
+  
+  value = _gtk_style_context_peek_property (context, property_id);
+  return _gtk_css_number_value_get (value, one_hundred_percent);
+}
+
 const GValue *
 _gtk_style_context_peek_style_property (GtkStyleContext *context,
                                         GType            widget_type,
@@ -2960,8 +2971,7 @@ gtk_style_context_update_cache (GtkStyleContext  *context,
 }
 
 static void
-gtk_style_context_do_invalidate (GtkStyleContext  *context,
-                                 const GtkBitmask *changes)
+gtk_style_context_do_invalidate (GtkStyleContext *context)
 {
   GtkStyleContextPrivate *priv;
 
@@ -2973,11 +2983,11 @@ gtk_style_context_do_invalidate (GtkStyleContext  *context,
   if (priv->invalidating_context)
     return;
 
-  priv->invalidating_context = changes;
+  priv->invalidating_context = TRUE;
 
   g_signal_emit (context, signals[CHANGED], 0);
 
-  priv->invalidating_context = NULL;
+  priv->invalidating_context = FALSE;
 }
 
 static GtkBitmask *
@@ -3167,7 +3177,7 @@ _gtk_style_context_validate (GtkStyleContext  *context,
     }
 
   if (!_gtk_bitmask_is_empty (changes) || (change & GTK_CSS_CHANGE_FORCE_INVALIDATE))
-    gtk_style_context_do_invalidate (context, changes);
+    gtk_style_context_do_invalidate (context);
 
   change = _gtk_css_change_for_child (change);
   for (list = priv->children; list; list = list->next)
@@ -3216,18 +3226,10 @@ _gtk_style_context_queue_invalidate (GtkStyleContext *context,
 void
 gtk_style_context_invalidate (GtkStyleContext *context)
 {
-  GtkBitmask *changes;
-
   g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
 
   gtk_style_context_clear_cache (context);
-
-  changes = _gtk_bitmask_new ();
-  changes = _gtk_bitmask_invert_range (changes,
-                                       0,
-                                       _gtk_css_style_property_get_n_properties ());
-  gtk_style_context_do_invalidate (context, changes);
-  _gtk_bitmask_free (changes);
+  gtk_style_context_do_invalidate (context);
 }
 
 /**
@@ -4501,26 +4503,6 @@ gtk_draw_insertion_cursor (GtkWidget          *widget,
                          draw_arrow);
 }
 
-/**
- * _gtk_style_context_get_changes:
- * @context: the context to query
- *
- * Queries the context for the changes for the currently executing
- * GtkStyleContext::invalidate signal. If no signal is currently
- * emitted, this function returns %NULL.
- *
- * FIXME 4.0: Make this part of the signal.
- *
- * Returns: %NULL or the currently invalidating changes
- **/
-const GtkBitmask *
-_gtk_style_context_get_changes (GtkStyleContext *context)
-{
-  g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
-
-  return context->priv->invalidating_context;
-}
-
 static AtkAttributeSet *
 add_attribute (AtkAttributeSet  *attributes,
                AtkTextAttribute  attr,

gtk/gtkstylecontextprivate.h

@@ -27,11 +27,11 @@ G_BEGIN_DECLS
 
 void            _gtk_style_context_set_widget                (GtkStyleContext *context,
                                                               GtkWidget       *widget);
-const GtkBitmask *
-                _gtk_style_context_get_changes               (GtkStyleContext *context);
-
 GtkCssValue   * _gtk_style_context_peek_property             (GtkStyleContext *context,
                                                               guint            property_id);
+double         _gtk_style_context_get_number                 (GtkStyleContext *context,
+                                                              guint            property_id,
+                                                              double           one_hundred_percent);
 const GValue * _gtk_style_context_peek_style_property        (GtkStyleContext *context,
                                                               GType            widget_type,
                                                               GtkStateFlags    state,

gtk/gtkstyleproperties.h

@@ -66,10 +66,8 @@ typedef gboolean (* GtkStylePropertyParser) (const gchar  *string,
 GType gtk_style_properties_get_type (void) G_GNUC_CONST;
 
 /* Next 2 are implemented in gtkcsscustomproperty.c */
-GDK_DEPRECATED_IN_3_8
 void     gtk_style_properties_register_property (GtkStylePropertyParser  parse_func,
                                                  GParamSpec             *pspec);
-GDK_DEPRECATED_IN_3_8
 gboolean gtk_style_properties_lookup_property   (const gchar             *property_name,
                                                  GtkStylePropertyParser  *parse_func,
                                                  GParamSpec             **pspec);

gtk/gtkstyleproviderprivate.c

@@ -125,18 +125,3 @@ _gtk_style_provider_private_changed (GtkStyleProviderPrivate *provider)
   g_signal_emit (provider, signals[CHANGED], 0);
 }
 
-GtkSettings *
-_gtk_style_provider_private_get_settings (GtkStyleProviderPrivate *provider)
-{
-  GtkStyleProviderPrivateInterface *iface;
-
-  g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL);
-
-  iface = GTK_STYLE_PROVIDER_PRIVATE_GET_INTERFACE (provider);
-
-  if (!iface->get_settings)
-    return NULL;
-
-  return iface->get_settings (provider);
-}
-

gtk/gtkstyleproviderprivate.h

@@ -41,7 +41,6 @@ struct _GtkStyleProviderPrivateInterface
 
   GtkCssValue *         (* get_color)           (GtkStyleProviderPrivate *provider,
                                                  const char              *name);
-  GtkSettings *         (* get_settings)        (GtkStyleProviderPrivate *provider);
   GtkCssKeyframes *     (* get_keyframes)       (GtkStyleProviderPrivate *provider,
                                                  const char              *name);
   void                  (* lookup)              (GtkStyleProviderPrivate *provider,
@@ -56,7 +55,6 @@ struct _GtkStyleProviderPrivateInterface
 
 GType                   _gtk_style_provider_private_get_type     (void) G_GNUC_CONST;
 
-GtkSettings *           _gtk_style_provider_private_get_settings (GtkStyleProviderPrivate *provider);
 GtkCssValue *           _gtk_style_provider_private_get_color    (GtkStyleProviderPrivate *provider,
                                                                   const char              *name);
 GtkCssKeyframes *       _gtk_style_provider_private_get_keyframes(GtkStyleProviderPrivate *provider,

gtk/gtkthemingengine.c

@@ -355,6 +355,16 @@ _gtk_theming_engine_peek_property (GtkThemingEngine *engine,
   return _gtk_style_context_peek_property (engine->priv->context, property_id);
 }
 
+double
+_gtk_theming_engine_get_number (GtkThemingEngine *engine,
+                                guint             property_id,
+                                double            one_hundred_percent)
+{
+  g_return_val_if_fail (GTK_IS_THEMING_ENGINE (engine), 0.0);
+
+  return _gtk_style_context_get_number (engine->priv->context, property_id, one_hundred_percent);
+}
+
 /**
  * gtk_theming_engine_get_property:
  * @engine: a #GtkThemingEngine
@@ -1646,7 +1656,6 @@ render_border (cairo_t       *cr,
                                      2 * other_border[GTK_CSS_LEFT]);
             render_frame_fill (cr, &other_box, other_border, colors, dont_draw);
           }
-          break;
         case GTK_BORDER_STYLE_GROOVE:
         case GTK_BORDER_STYLE_RIDGE:
           {

gtk/gtkthemingengine.h

@@ -182,7 +182,6 @@ struct _GtkThemingEngineClass
 GType gtk_theming_engine_get_type (void) G_GNUC_CONST;
 
 /* function implemented in gtkcsscustomproperty.c */
-GDK_DEPRECATED_IN_3_8
 void gtk_theming_engine_register_property (const gchar            *name_space,
                                            GtkStylePropertyParser  parse_func,
                                            GParamSpec             *pspec);

gtk/gtkthemingengineprivate.h

@@ -29,6 +29,9 @@ void _gtk_theming_engine_paint_spinner (cairo_t       *cr,
 
 GtkCssValue  *_gtk_theming_engine_peek_property (GtkThemingEngine *engine,
                                                  guint             property_id);
+double        _gtk_theming_engine_get_number    (GtkThemingEngine *engine,
+                                                 guint             property_id,
+                                                 double            one_hundred_percent);
 void          _gtk_theming_engine_set_context   (GtkThemingEngine *engine,
                                                  GtkStyleContext  *context);
 GtkStyleContext *_gtk_theming_engine_get_context   (GtkThemingEngine *engine);

gtk/gtkwidget.c

@@ -35,7 +35,6 @@
 #include "gtkcontainer.h"
 #include "gtkaccelmapprivate.h"
 #include "gtkclipboard.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
@@ -854,8 +853,6 @@ gtk_widget_draw_marshallerv (GClosure     *closure,
 				param_types);
 
   cairo_restore (cr);
-
-  va_end (args_copy);
 }
 
 static void
@@ -4654,9 +4651,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
   if (gtk_widget_get_realized (widget))
     gtk_widget_queue_draw (widget);
 
-  if (gtk_widget_get_visible (widget) ||
-      widget->priv->have_size_groups)
-    _gtk_size_group_queue_resize (widget, 0);
+  _gtk_size_group_queue_resize (widget, 0);
 }
 
 /**
@@ -6719,27 +6714,15 @@ gtk_widget_real_style_updated (GtkWidget *widget)
 
   if (widget->priv->context)
     {
-      const GtkBitmask *changes = _gtk_style_context_get_changes (widget->priv->context);
-
       if (gtk_widget_get_realized (widget) &&
           gtk_widget_get_has_window (widget) &&
           !gtk_widget_get_app_paintable (widget))
         gtk_style_context_set_background (widget->priv->context,
                                           widget->priv->window);
+    }
 
-      if (widget->priv->anchored)
-        {
-          if (changes && _gtk_css_style_property_changes_affect_size (changes))
-            gtk_widget_queue_resize (widget);
-          else
-            gtk_widget_queue_draw (widget);
-        }
-    }
-  else
-    {
-      if (widget->priv->anchored)
-        gtk_widget_queue_resize (widget);
-    }
+  if (widget->priv->anchored)
+    gtk_widget_queue_resize (widget);
 }
 
 static gboolean
@@ -13967,6 +13950,9 @@ _gtk_widget_style_context_invalidated (GtkWidget *widget)
        */
       widget->priv->style_update_pending = TRUE;
     }
+
+  if (widget->priv->anchored)
+    gtk_widget_queue_resize (widget);
 }
 
 /**

gtk/gtkwindow.c

@@ -5735,6 +5735,7 @@ gtk_window_style_updated (GtkWidget *widget)
                               rect.width, rect.height);
 
       set_grip_shape (window);
+      gtk_widget_queue_resize (widget);
     }
 }
 

modules/printbackends/cups/gtkprintbackendcups.c

@@ -2210,8 +2210,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
      as inactive if it is in the list, emitting a printer_removed signal */
   if (removed_printer_checklist != NULL)
     {
-      g_list_foreach (removed_printer_checklist, (GFunc) mark_printer_inactive, backend);
-      g_list_free (removed_printer_checklist);
+      g_list_free_full (removed_printer_checklist, (GDestroyNotify) mark_printer_inactive);
       list_has_changed = TRUE;
     }
 
@@ -3170,7 +3169,7 @@ value_is_off (const char *value)
 static char *
 ppd_group_name (ppd_group_t *group)
 {
-  return group->name;
+  return group->text;
 }
 
 static int

po-properties/POTFILES.skip

@@ -53,8 +53,6 @@ tests/reftests/css-multi-state.ref.ui
 tests/reftests/css-multi-state.ui
 tests/reftests/entry-progress-coloring.ref.ui
 tests/reftests/entry-progress-coloring.ui
-tests/reftests/font-sizes-names.ref.ui
-tests/reftests/font-sizes-names.ui
 tests/reftests/grid-empty-with-spacing.ui
 tests/reftests/grid-wfh.ref.ui
 tests/reftests/grid-wfh.ui

po/POTFILES.skip

@@ -54,8 +54,6 @@ tests/reftests/css-multi-state.ref.ui
 tests/reftests/css-multi-state.ui
 tests/reftests/entry-progress-coloring.ref.ui
 tests/reftests/entry-progress-coloring.ui
-tests/reftests/font-sizes-names.ref.ui
-tests/reftests/font-sizes-names.ui
 tests/reftests/grid-empty-with-spacing.ui
 tests/reftests/grid-wfh.ref.ui
 tests/reftests/grid-wfh.ui

po/ar.po

@@ -1566,7 +1566,7 @@ msgid "_Visit this file"
 msgstr "_زُر هذا الملف"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "ا_نسخ موقع الملف"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/as.po

@@ -11,8 +11,8 @@ 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-11-26 20:07+0000\n"
-"PO-Revision-Date: 2012-11-28 13:46+0530\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: as_IN\n"
@@ -780,9 +780,8 @@ msgid "Backslash"
 msgstr "Backslash"
 
 #: ../gtk/gtkappchooserbutton.c:290
-#| msgid "Other application..."
-msgid "Other application…"
-msgstr "অন্য এপ্লিকেচন…"
+msgid "Other application..."
+msgstr "বেলেগ এপ্লিকেচন..."
 
 #: ../gtk/gtkappchooserdialog.c:137
 msgid "Failed to look for applications online"
@@ -1026,9 +1025,8 @@ msgstr "অবৈধ"
 #. * acelerator.
 #.
 #: ../gtk/gtkcellrendereraccel.c:416 ../gtk/gtkcellrendereraccel.c:747
-#| msgid "New accelerator..."
-msgid "New accelerator…"
-msgstr "নতুন ত্বৰক…"
+msgid "New accelerator..."
+msgstr "নতন বেগবৰ্দ্ধক..."
 
 #: ../gtk/gtkcellrendererprogress.c:372 ../gtk/gtkcellrendererprogress.c:462
 #, c-format
@@ -1329,9 +1327,8 @@ msgid "mm"
 msgstr "mm"
 
 #: ../gtk/gtkcustompaperunixdialog.c:605
-#| msgid "Margins from Printer..."
-msgid "Margins from Printer…"
-msgstr "প্ৰিন্টাৰৰ পৰা সীমা…"
+msgid "Margins from Printer..."
+msgstr "মুদ্ৰকৰ পৰা প্ৰান্তিক অংশ..."
 
 #: ../gtk/gtkcustompaperunixdialog.c:771
 #, c-format
@@ -1436,9 +1433,8 @@ msgid "(None)"
 msgstr "(একো নাই)"
 
 #: ../gtk/gtkfilechooserbutton.c:2046
-#| msgid "Other..."
-msgid "Other…"
-msgstr "অন্য…"
+msgid "Other..."
+msgstr "অন্য..."
 
 #: ../gtk/gtkfilechooserdefault.c:152
 msgid "Type name of new folder"
@@ -1547,9 +1543,8 @@ msgid "Remove"
 msgstr "আঁতৰাই দিয়ক"
 
 #: ../gtk/gtkfilechooserdefault.c:3389
-#| msgid "Rename..."
-msgid "Rename…"
-msgstr "পুনঃ নামকৰণ কৰক…"
+msgid "Rename..."
+msgstr "পুনঃ নামকৰণ..."
 
 #. Accessible object name for the file chooser's shortcuts pane
 #: ../gtk/gtkfilechooserdefault.c:3553
@@ -1574,7 +1569,7 @@ msgid "_Visit this file"
 msgstr "এই ফাইল ভ্ৰমণ কৰক (_V)"
 
 #: ../gtk/gtkfilechooserdefault.c:4179
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "ফাইলৰ অৱস্থান কপি কৰক (_C)"
 
 #: ../gtk/gtkfilechooserdefault.c:4182
@@ -1791,9 +1786,8 @@ msgid "Copy _Link Address"
 msgstr "সংযোগ ঠিকনা নকল কৰক (  )"
 
 #: ../gtk/gtk-launch.c:71
-#| msgid "APPLICATION [URI...] - launch an APPLICATION with URI."
-msgid "APPLICATION [URI…] — launch an APPLICATION with URI."
-msgstr "APPLICATION [URI…] —  URI ৰ সৈতে এটা APPLICATION লঞ্চ কৰক।"
+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.
@@ -2057,9 +2051,8 @@ msgstr ""
 " তল: %s %s"
 
 #: ../gtk/gtkpagesetupunixdialog.c:845 ../gtk/gtkprintunixdialog.c:3329
-#| msgid "Manage Custom Sizes"
-msgid "Manage Custom Sizes…"
-msgstr "স্বনিৰ্বাচিত আকাৰসমূহ ব্যৱস্থাপনা কৰক…"
+msgid "Manage Custom Sizes..."
+msgstr "পছন্দৰ আয়তন পৰিচালনা কৰক..."
 
 #: ../gtk/gtkpagesetupunixdialog.c:896
 msgid "_Format for:"
@@ -2241,9 +2234,8 @@ msgid "Getting printer information failed"
 msgstr "প্ৰিনটাৰৰ তথ্য পোৱাত ব্যৰ্থ"
 
 #: ../gtk/gtkprintunixdialog.c:1916
-#| msgid "Getting printer information..."
-msgid "Getting printer information…"
-msgstr "প্ৰিন্টাৰ তথ্য প্ৰাপ্ত কৰা হৈছে…"
+msgid "Getting printer information..."
+msgstr "মূদ্ৰকৰ তথ্য পোৱা হৈছে"
 
 #: ../gtk/gtkprintunixdialog.c:2184
 msgid "Printer"
@@ -2319,42 +2311,42 @@ msgstr "সাধাৰণ"
 #. * multiple pages on a sheet when printing
 #.
 #: ../gtk/gtkprintunixdialog.c:3058
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
 msgid "Left to right, top to bottom"
 msgstr "বাওঁ ফালৰ পৰা সোঁ ফাললৈ, ওপৰৰ পৰা তললৈ"
 
 #: ../gtk/gtkprintunixdialog.c:3058
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
 msgid "Left to right, bottom to top"
 msgstr "বাওঁ ফালৰ পৰা সোঁ ফাললৈ, তলৰ পৰা ওপৰলৈ"
 
 #: ../gtk/gtkprintunixdialog.c:3059
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3692
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
 msgid "Right to left, top to bottom"
 msgstr "সোঁ ফালৰ পৰা বাওঁ ফাললৈ, ওপৰৰ পৰা তললৈ"
 
 #: ../gtk/gtkprintunixdialog.c:3059
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3692
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
 msgid "Right to left, bottom to top"
 msgstr "সোঁ ফালৰ পৰা বাওঁ ফাললৈ, তলৰ পৰা ওপৰলৈ"
 
 #: ../gtk/gtkprintunixdialog.c:3060
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3693
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688
 msgid "Top to bottom, left to right"
 msgstr "ওপৰৰ পৰা তললৈ, বাওঁ ফালৰ পৰা সোঁ ফাললৈ"
 
 #: ../gtk/gtkprintunixdialog.c:3060
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3693
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3688
 msgid "Top to bottom, right to left"
 msgstr "ওপৰৰ পৰা তললৈ, সোঁ ফালৰ পৰা বাওঁ ফাললৈ"
 
 #: ../gtk/gtkprintunixdialog.c:3061
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3694
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689
 msgid "Bottom to top, left to right"
 msgstr "তলৰ পৰা ওপৰলৈ, বাওঁ ফালৰ পৰা সোঁ ফাললৈ"
 
 #: ../gtk/gtkprintunixdialog.c:3061
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3694
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3689
 msgid "Bottom to top, right to left"
 msgstr "তলৰ পৰা ওপৰলৈ, সোঁ ফালৰ পৰা বাওঁ ফাললৈ"
 
@@ -2362,7 +2354,7 @@ msgstr "তলৰ পৰা ওপৰলৈ, সোঁ ফালৰ পৰা
 #. * dialog that controls in what order multiple pages are arranged
 #.
 #: ../gtk/gtkprintunixdialog.c:3065 ../gtk/gtkprintunixdialog.c:3078
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3771
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3766
 msgid "Page Ordering"
 msgstr "পৃষ্ঠা শৃংখলাবদ্ধ কৰা"
 
@@ -4527,169 +4519,169 @@ msgstr "ৰখোৱা হৈছে ; কাৰ্য্য গ্ৰহণ ক
 msgid "Rejecting Jobs"
 msgstr "কাৰ্য্য গ্ৰহণ কৰা হোৱা নাই"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2914
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2909
 msgid "Two Sided"
 msgstr "দ্বিপাৰ্শ্বিক"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2915
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2910
 msgid "Paper Type"
 msgstr "কাগজৰ ধৰণ"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2916
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2911
 msgid "Paper Source"
 msgstr "কাগজৰ উৎস"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2917
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2912
 msgid "Output Tray"
 msgstr "নিৰ্গমৰ ডলা"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2918
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2913
 msgid "Resolution"
 msgstr "বিশ্লেষণ"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2919
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2914
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript প্ৰি-ফিল্টাৰিং"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2928
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2923
 msgid "One Sided"
 msgstr "একপাক্ষিক"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2930
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2925
 msgid "Long Edge (Standard)"
 msgstr "দীৰ্ঘ প্ৰান্ত (প্ৰমিত মান)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2932
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2927
 msgid "Short Edge (Flip)"
 msgstr "ক্ষুদ্ৰ প্ৰান্ত (উলট)"
 
 #. Translators: this is an option of "Paper Source"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2934
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2936
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2944
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2929
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2931
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2939
 msgid "Auto Select"
 msgstr "স্বয়ং বাছক"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2938
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2940
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2942
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2946
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3434
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2933
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2935
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2937
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2941
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3429
 msgid "Printer Default"
 msgstr "মুদ্ৰক অবিকল্পিত"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2948
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2943
 msgid "Embed GhostScript fonts only"
 msgstr "শুধুমাত্ৰ GhostScript ফন্ট এমবেড কৰা হ'ব"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2950
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2945
 msgid "Convert to PS level 1"
 msgstr "PS লেভেল ১এ ৰূপান্তৰ কৰা হ'ব"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2952
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2947
 msgid "Convert to PS level 2"
 msgstr "PS লেভেল ২এ ৰূপান্তৰ কৰা হ'ব"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2954
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2949
 msgid "No pre-filtering"
 msgstr "প্ৰি-ফিল্টাৰিং বিহীন"
 
 #. Translators: "Miscellaneous" is the label for a button, that opens
 #. up an extra panel of settings in a print dialog.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2963
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2958
 msgid "Miscellaneous"
 msgstr "বিবিধ"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
 msgid "Urgent"
 msgstr "অতি আৱশ্যক"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
 msgid "High"
 msgstr "তীব্ৰ"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
 msgid "Medium"
 msgstr "মধ্যমীয়া"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3681
 msgid "Low"
 msgstr "নিম্ন"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3716
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3711
 msgid "Job Priority"
 msgstr "কাৰ্য্যৰ শ্ৰেষ্ঠতা"
 
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3727
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3722
 msgid "Billing Info"
 msgstr "সাধনীৰ তথ্য"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
 msgid "None"
 msgstr "একো নাই"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
 msgid "Classified"
 msgstr "শ্ৰেণীভুক্ত"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
 msgid "Confidential"
 msgstr "গুপুত"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
 msgid "Secret"
 msgstr "গোপণীয়"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
 msgid "Standard"
 msgstr "মানদণ্ড স্বৰূপ"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
 msgid "Top Secret"
 msgstr "পৰম গোপণীয়"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3742
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3737
 msgid "Unclassified"
 msgstr "শ্ৰেণীভুক্ত নকৰা"
 
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3753
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3748
 msgid "Pages per Sheet"
 msgstr "প্ৰতিটো পাতৰ পৃষ্ঠা"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3813
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3808
 msgid "Before"
 msgstr "আগৰ"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3828
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3823
 msgid "After"
 msgstr "পিছৰ"
 
@@ -4697,14 +4689,14 @@ msgstr "পিছৰ"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3848
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3843
 msgid "Print at"
 msgstr "-ইয়াত মুদ্ৰণ"
 
 #. Translators: this is the name of the option that allows the user
 #. * to specify a time when a print job will be printed.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3859
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3854
 msgid "Print at time"
 msgstr "এই সময়ত মুদ্ৰণ কৰক"
 
@@ -4712,17 +4704,17 @@ msgstr "এই সময়ত মুদ্ৰণ কৰক"
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3894
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3889
 #, c-format
 msgid "Custom %sx%s"
 msgstr "নিজৰ পছন্দৰ %sx%s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3975
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3970
 msgid "Printer Profile"
 msgstr "প্ৰিন্টাৰ আলেখ্য"
 
 #. TRANSLATORS: this is when color profile information is unavailable
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3982
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3977
 msgid "Unavailable"
 msgstr "উপলব্ধ নাই"
 
@@ -4822,9 +4814,6 @@ msgstr "test-output.%s"
 msgid "Print to Test Printer"
 msgstr "পৰীক্ষণ মূদ্ৰকলৈ মূদ্ৰণ কৰক"
 
-#~ msgid "Manage Custom Sizes..."
-#~ msgstr "পছন্দৰ আয়তন পৰিচালনা কৰক..."
-
 #~ msgid "Select a folder"
 #~ msgstr "এটা ফোল্ডাৰ বাছক"
 

po/be.po

@@ -1559,7 +1559,7 @@ msgid "_Visit this file"
 msgstr "_Наведаць гэты файл"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Скапіраваць размяшчэнне файла"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/bg.po

@@ -1577,7 +1577,7 @@ msgid "_Visit this file"
 msgstr "_Отваряне на файла"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Копиране на _местоположението на файла"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/bn_IN.po

@@ -1609,7 +1609,7 @@ msgstr "চিহ্নিত ফাইল পরিদর্শন করুন
 
 #: ../gtk/gtkfilechooserdefault.c:4176
 #| msgid "Copy _Location"
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "ফাইলের অবস্থান কপি করুন (_C)"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/br.po

@@ -1264,7 +1264,7 @@ msgstr ""
 
 #: ../gtk/gtkfilechooserdefault.c:4176
 #, fuzzy
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Eilañ al lec'hiadur"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/ca.po

@@ -1596,7 +1596,7 @@ msgid "_Visit this file"
 msgstr "_Visita aquest fitxer"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Copia la ubicació del fitxer"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/ca@valencia.po

@@ -1595,7 +1595,7 @@ msgid "_Visit this file"
 msgstr "_Visita este fitxer"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Copia la ubicació del fitxer"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/crh.po

@@ -1654,7 +1654,7 @@ msgid "_Visit this file"
 msgstr "Bu dosyeni _ziyaret et"
 
 #: ../gtk/gtkfilechooserdefault.c:4174
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Dosyeniñ qonumnı _kopiyala"
 
 #: ../gtk/gtkfilechooserdefault.c:4177

po/cs.po

@@ -1571,7 +1571,7 @@ msgid "_Visit this file"
 msgstr "Podí_vat se na tento soubor"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Kopírovat _umístění souboru"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/da.po

@@ -1595,7 +1595,7 @@ msgid "_Visit this file"
 msgstr "_Gå til denne fil"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Kopiér filens _placering"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/de.po

@@ -1594,7 +1594,7 @@ msgid "_Visit this file"
 msgstr "Zu dieser Datei _gehen"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "O_rt der Datei kopieren"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/el.po

@@ -1574,7 +1574,7 @@ msgid "_Visit this file"
 msgstr "_Επίσκεψη αυτού του αρχείου"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Αντιγραφή τοποθεσίας αρχείου"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/en_GB.po

@@ -1563,8 +1563,8 @@ msgid "_Visit this file"
 msgstr "_Visit this file"
 
 #: ../gtk/gtkfilechooserdefault.c:4179
-msgid "_Copy file’s location"
-msgstr "_Copy file’s location"
+msgid "_Copy file's location"
+msgstr "_Copy file's location"
 
 #: ../gtk/gtkfilechooserdefault.c:4182
 msgid "_Add to Bookmarks"

po/eo.po

@@ -1570,7 +1570,7 @@ msgid "_Visit this file"
 msgstr "_Viziti ĉi tiun dosieron"
 
 #: ../gtk/gtkfilechooserdefault.c:4174
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Kopii lokon de dosiero"
 
 #: ../gtk/gtkfilechooserdefault.c:4177

po/es.po

@@ -1578,7 +1578,7 @@ msgid "_Visit this file"
 msgstr "_Visitar este archivo"
 
 #: ../gtk/gtkfilechooserdefault.c:4178
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Copiar la ubicación del archivo"
 
 #: ../gtk/gtkfilechooserdefault.c:4181

po/et.po

@@ -1281,7 +1281,7 @@ msgstr "Faili pole võimalik valida"
 msgid "_Visit this file"
 msgstr "_Külasta seda faili"
 
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Kopeeri _asukoht"
 
 msgid "_Add to Bookmarks"

po/eu.po

@@ -1567,7 +1567,7 @@ msgid "_Visit this file"
 msgstr "_Bisitatu fitxategi hau"
 
 #: ../gtk/gtkfilechooserdefault.c:4173
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Kopiatu fitxategiaren helbidea"
 
 #: ../gtk/gtkfilechooserdefault.c:4176

po/fa.po

@@ -1566,7 +1566,7 @@ msgid "_Visit this file"
 msgstr "_مشاهده این پرونده"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_رونوشت از مکان پرونده"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/fi.po

@@ -1595,7 +1595,7 @@ msgid "_Visit this file"
 msgstr "Näytä tie_dosto tiedostonhallinnassa"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Ko_pioi tiedoston sijainti"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/fr.po

@@ -1584,7 +1584,7 @@ msgid "_Visit this file"
 msgstr "C_onsulter ce fichier"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Copier l'emplacement du fichier"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/gl.po

@@ -1576,7 +1576,7 @@ msgid "_Visit this file"
 msgstr "_Visitar este ficheiro"
 
 #: ../gtk/gtkfilechooserdefault.c:4178
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "_Copiar a localización do ficheiro"
 
 #: ../gtk/gtkfilechooserdefault.c:4181

po/gu.po

@@ -1588,7 +1588,7 @@ msgid "_Visit this file"
 msgstr "આ ફાઇલની મુલાકાત લો (_V)"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "ફાઇલનાં સ્થાનની નકલ કરો (_C)"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/he.po

@@ -1549,7 +1549,7 @@ msgid "_Visit this file"
 msgstr "_ביקור בקובץ זה"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "הע_תקת מיקום הקובץ"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/hi.po

@@ -1599,7 +1599,7 @@ msgid "_Visit this file"
 msgstr "इस फ़ाइल को देखें (_V)"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "फ़ाइल की अवस्थिति की नक़ल लें (_C)"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/hu.po

@@ -1571,7 +1571,7 @@ msgid "_Visit this file"
 msgstr "_Fájl megjelenítése"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Fájl _helyének másolása"
 
 #: ../gtk/gtkfilechooserdefault.c:4179

po/id.po

@@ -1570,7 +1570,7 @@ msgid "_Visit this file"
 msgstr "Kunjungi _berkas ini"
 
 #: ../gtk/gtkfilechooserdefault.c:4178
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Salin _lokasi berkas"
 
 #: ../gtk/gtkfilechooserdefault.c:4181

po/it.po

@@ -1614,7 +1614,7 @@ msgid "_Visit this file"
 msgstr "_Visita questo file"
 
 #: ../gtk/gtkfilechooserdefault.c:4176
-msgid "_Copy file’s location"
+msgid "_Copy file's location"
 msgstr "Copia _posizione del file"
 
 #: ../gtk/gtkfilechooserdefault.c:4179