gtk-demo: Use a default action in the infobars demo

This makes the question infobar activatable by clicking anywhere in it.
Adwaita: Add hover for clickable infobars
2020-01-09 19:04:15 -05:00 · 2020-01-09 19:03:56 -05:00 · 2020-01-09 19:03:38 -05:00
55 changed files with 23471 additions and 45659 deletions
@@ -96,12 +96,11 @@ drawing_area_draw (GtkWidget *widget,
      cairo_pattern_t *pat;
      cairo_matrix_t matrix;
      gdouble angle, scale;
-      gdouble x_center, y_center;
-
-      gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center);

      cairo_get_matrix (cr, &matrix);
-      cairo_matrix_translate (&matrix, x_center, y_center);
+      cairo_matrix_translate (&matrix,
+                              allocation.width / 2,
+                              allocation.height / 2);

      cairo_save (cr);

@@ -396,7 +396,6 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat,
        priv->capabilities |= device_get_capability (GDK_DEVICE (l->data));

      gdk_seat_device_removed (GDK_SEAT (seat), device);
-      g_object_unref (device);
    }
  else if (g_list_find (priv->slave_keyboards, device))
    {
@@ -406,7 +405,6 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat,
        priv->capabilities &= ~GDK_SEAT_CAPABILITY_KEYBOARD;

      gdk_seat_device_removed (GDK_SEAT (seat), device);
-      g_object_unref (device);
    }
 }

@@ -24,7 +24,6 @@
 #include "gdkquartzcursor.h"
 #include "gdkprivate-quartz.h"
 #include "gdkinternal-quartz.h"
-#include "gdkquartz-gtk-only.h"

 #include "xcursors.h"

@@ -88,6 +88,9 @@ _gdk_quartz_display_open (const gchar *display_name)
  if (_gdk_display != NULL)
    return NULL;

+  /* Initialize application */
+  [NSApplication sharedApplication];
+
  _gdk_display = g_object_new (gdk_quartz_display_get_type (), NULL);
  _gdk_display->device_manager = _gdk_device_manager_new (_gdk_display);

@@ -98,8 +101,6 @@ _gdk_quartz_display_open (const gchar *display_name)

  _gdk_quartz_events_init ();

-  /* Initialize application */
-  [NSApplication sharedApplication];
 #if 0
  /* FIXME: Remove the #if 0 when we have these functions */
  _gdk_quartz_dnd_init ();
@@ -28,7 +28,6 @@
 #include "gdkquartzglcontext.h"
 #include "gdkquartzwindow.h"
 #include "gdkprivate-quartz.h"
-#include "gdkquartz-gtk-only.h"

 #include "gdkinternals.h"

@@ -650,6 +650,7 @@ gdk_quartz_keymap_translate_keyboard_state (GdkKeymap       *keymap,
 {
  guint tmp_keyval;
  GdkModifierType bit;
+  guint tmp_modifiers = 0;

  if (keyval)
    *keyval = 0;
@@ -663,23 +664,24 @@ gdk_quartz_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  if (hardware_keycode < 0 || hardware_keycode >= NUM_KEYCODES)
    return FALSE;

+  /* Check if modifiers modify the keyval */
+  for (bit = GDK_SHIFT_MASK; bit < GDK_BUTTON1_MASK; bit <<= 1)
+    {
+      if (translate_keysym (hardware_keycode,
+                            (bit == GDK_MOD1_MASK) ? 0 : group,
+                            state & ~bit,
+                            NULL, NULL) !=
+	  translate_keysym (hardware_keycode,
+                            (bit == GDK_MOD1_MASK) ? 1 : group,
+                            state | bit,
+                            NULL, NULL))
+	tmp_modifiers |= bit;
+    }
+
  tmp_keyval = translate_keysym (hardware_keycode, group, state, level, effective_group);

-  /* Check if modifiers modify the keyval */
  if (consumed_modifiers)
-    {
-      guint tmp_modifiers = (state & GDK_MODIFIER_MASK);
-
-      for (bit = 1; bit <= tmp_modifiers; bit <<= 1)
-        {
-          if ((bit & tmp_modifiers) &&
-              translate_keysym (hardware_keycode, group, state & ~bit,
-                                NULL, NULL) == tmp_keyval)
-            tmp_modifiers &= ~bit;
-        }
-
-      *consumed_modifiers = tmp_modifiers;
-    }
+    *consumed_modifiers = tmp_modifiers;

  if (keyval)
    *keyval = tmp_keyval; 
@@ -2860,8 +2860,8 @@ _gdk_quartz_window_update_fullscreen_state (GdkWindow *window)
  if (gdk_quartz_osx_version() >= GDK_OSX_LION)
    {
      gboolean is_fullscreen = window_is_fullscreen (window);
-      gboolean was_fullscreen = (gdk_window_get_state (window) &
-                                 GDK_WINDOW_STATE_FULLSCREEN) != 0;
+      gboolean was_fullscreen = (gdk_window_get_state (window) &&
+                                 GDK_WINDOW_STATE_FULLSCREEN != 0);

      if (is_fullscreen != was_fullscreen)
        {
@@ -3080,6 +3080,7 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
  impl_class->set_decorations = gdk_quartz_window_set_decorations;
  impl_class->get_decorations = gdk_quartz_window_get_decorations;
  impl_class->set_functions = gdk_quartz_window_set_functions;
+  impl_class->set_functions = gdk_quartz_window_set_functions;
  impl_class->begin_resize_drag = gdk_quartz_window_begin_resize_drag;
  impl_class->begin_move_drag = gdk_quartz_window_begin_move_drag;
  impl_class->set_opacity = gdk_quartz_window_set_opacity;
@@ -992,14 +992,15 @@ gdk_window_impl_wayland_beep (GdkWindow *window)
 static void
 gdk_window_impl_wayland_finalize (GObject *object)
 {
+  GdkWindow *window = GDK_WINDOW (object);
  GdkWindowImplWayland *impl;

  g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (object));

  impl = GDK_WINDOW_IMPL_WAYLAND (object);

-  if (gdk_wayland_window_is_exported (impl->wrapper))
-    gdk_wayland_window_unexport_handle (impl->wrapper);
+  if (gdk_wayland_window_is_exported (window))
+    gdk_wayland_window_unexport_handle (window);

  g_free (impl->title);

@@ -523,6 +523,8 @@ gdk_win32_display_supports_selection_notification (GdkDisplay *display)
  return TRUE;
 }

+static HWND _hwnd_next_viewer = NULL;
+
 /*
 * maybe this should be integrated with the default message loop - or maybe not ;-)
 */
@@ -536,11 +538,24 @@ inner_clipboard_window_procedure (HWND   hwnd,
    {
    case WM_DESTROY: /* remove us from chain */
      {
-        RemoveClipboardFormatListener (hwnd);
+        ChangeClipboardChain (hwnd, _hwnd_next_viewer);
        PostQuitMessage (0);
        return 0;
      }
+    case WM_CHANGECBCHAIN:
+      {
+        HWND hwndRemove = (HWND) wparam; /* handle of window being removed */
+        HWND hwndNext   = (HWND) lparam; /* handle of next window in chain */
+
+        if (hwndRemove == _hwnd_next_viewer)
+          _hwnd_next_viewer = hwndNext == hwnd ? NULL : hwndNext;
+        else if (_hwnd_next_viewer != NULL)
+          return SendMessage (_hwnd_next_viewer, message, wparam, lparam);
+
+        return 0;
+      }
    case WM_CLIPBOARDUPDATE:
+    case WM_DRAWCLIPBOARD:
      {
        HWND hwnd_owner;
        HWND stored_hwnd_owner;
@@ -617,6 +632,9 @@ inner_clipboard_window_procedure (HWND   hwnd,
        event->owner_change.selection_time = GDK_CURRENT_TIME;
        _gdk_win32_append_event (event);

+        if (_hwnd_next_viewer != NULL)
+          return SendMessage (_hwnd_next_viewer, message, wparam, lparam);
+
        /* clear error to avoid confusing SetClipboardViewer() return */
        SetLastError (0);
        return 0;
@@ -676,10 +694,16 @@ register_clipboard_notification (GdkDisplay *display)
    goto failed;

  SetLastError (0);
+  _hwnd_next_viewer = SetClipboardViewer (display_win32->clipboard_hwnd);

-  if (AddClipboardFormatListener (display_win32->clipboard_hwnd) == FALSE)
+  if (_hwnd_next_viewer == NULL && GetLastError() != 0)
    goto failed;

+  /* FIXME: http://msdn.microsoft.com/en-us/library/ms649033(v=VS.85).aspx */
+  /* This is only supported by Vista, and not yet by mingw64 */
+  /* if (AddClipboardFormatListener (hwnd) == FALSE) */
+  /*   goto failed; */
+
  return TRUE;

 failed:
@@ -826,6 +850,7 @@ gdk_win32_display_dispose (GObject *object)
    {
      DestroyWindow (display_win32->clipboard_hwnd);
      display_win32->clipboard_hwnd = NULL;
+      _hwnd_next_viewer = NULL;
    }

  if (display_win32->have_at_least_win81)
@@ -643,14 +643,14 @@ remove_device (GdkX11DeviceManagerXI2 *device_manager,
  if (device)
    {
      detach_from_seat (device);
+      device_manager->devices = g_list_remove (device_manager->devices, device);
+
+      g_signal_emit_by_name (device_manager, "device-removed", device);
+
+      g_object_run_dispose (G_OBJECT (device));

      g_hash_table_remove (device_manager->id_table,
                           GINT_TO_POINTER (device_id));
-
-      device_manager->devices = g_list_remove (device_manager->devices, device);
-      g_signal_emit_by_name (device_manager, "device-removed", device);
-      g_object_run_dispose (G_OBJECT (device));
-      g_object_unref (device);
    }
 }

@@ -66,27 +66,19 @@ gdk_x11_monitor_get_workarea (GdkMonitor   *monitor,

  gdk_monitor_get_geometry (monitor, dest);

-  if (_gdk_x11_screen_get_monitor_work_area (screen, monitor, &workarea))
+  /* The EWMH constrains workarea to be a rectangle, so it
+   * can't adequately deal with L-shaped monitor arrangements.
+   * As a workaround, we ignore the workarea for anything
+   * but the primary monitor. Since that is where the 'desktop
+   * chrome' usually lives, this works ok in practice.
+   */
+  if (gdk_monitor_is_primary (monitor) &&
+      !gdk_monitor_has_fullscreen_window (monitor))
    {
-      if (!gdk_monitor_has_fullscreen_window (monitor))
+      gdk_x11_screen_get_work_area (screen, &workarea);
+      if (gdk_rectangle_intersect (dest, &workarea, &workarea))
        *dest = workarea;
    }
-  else
-    {
-      /* The EWMH constrains workarea to be a rectangle, so it
-       * can't adequately deal with L-shaped monitor arrangements.
-       * As a workaround, we ignore the workarea for anything
-       * but the primary monitor. Since that is where the 'desktop
-       * chrome' usually lives, this works ok in practice.
-       */
-      if (gdk_monitor_is_primary (monitor) &&
-          !gdk_monitor_has_fullscreen_window (monitor))
-        {
-          gdk_x11_screen_get_work_area (screen, &workarea);
-          if (gdk_rectangle_intersect (dest, &workarea, &workarea))
-            *dest = workarea;
-        }
-    }
 }

 static void
@@ -234,106 +234,6 @@ get_current_desktop (GdkScreen *screen)
  return workspace;
 }

-gboolean
-_gdk_x11_screen_get_monitor_work_area (GdkScreen    *screen,
-                                       GdkMonitor   *monitor,
-                                       GdkRectangle *area)
-{
-  GdkX11Screen *x11_screen;
-  GdkAtom net_workareas;
-  GdkDisplay *display;
-  Display *xdisplay;
-  int current_desktop;
-  char *workareas_dn_name;
-  Atom workareas_dn;
-  int screen_number;
-  Window xroot;
-  int result;
-  Atom type;
-  int format;
-  gulong num;
-  gulong leftovers;
-  guchar *ret_workarea;
-  long *workareas;
-  GdkRectangle geometry;
-  int i;
-
-  x11_screen = GDK_X11_SCREEN (screen);
-
-  net_workareas = gdk_atom_intern_static_string ("_GTK_WORKAREAS");
-  if (!gdk_x11_screen_supports_net_wm_hint (screen, net_workareas))
-    return FALSE;
-
-  display = gdk_screen_get_display (screen);
-  xdisplay = gdk_x11_display_get_xdisplay (display);
-
-  current_desktop = get_current_desktop (screen);
-  workareas_dn_name = g_strdup_printf ("_GTK_WORKAREAS_D%d", current_desktop);
-  workareas_dn = XInternAtom (xdisplay, workareas_dn_name, True);
-  g_free (workareas_dn_name);
-
-  if (workareas_dn == None)
-    return FALSE;
-
-  screen_number = gdk_x11_screen_get_screen_number (screen);
-  xroot = XRootWindow (xdisplay, screen_number);
-
-  gdk_x11_display_error_trap_push (display);
-
-  ret_workarea = NULL;
-  result = XGetWindowProperty (xdisplay,
-                               xroot,
-                               workareas_dn,
-                               0,
-                               G_MAXLONG,
-                               False,
-                               AnyPropertyType,
-                               &type,
-                               &format,
-                               &num,
-                               &leftovers,
-                               &ret_workarea);
-
-  gdk_x11_display_error_trap_pop_ignored (display);
-
-  if (result != Success ||
-      type == None ||
-      format == 0 ||
-      leftovers ||
-      num % 4 != 0)
-    {
-      XFree (ret_workarea);
-
-      return FALSE;
-    }
-
-  workareas = (long *) ret_workarea;
-
-  gdk_monitor_get_geometry (monitor, &geometry);
-  *area = geometry;
-
-  for (i = 0; i < num / 4; i++)
-    {
-      GdkRectangle work_area;
-
-      work_area = (GdkRectangle) {
-        .x = workareas[0] / x11_screen->window_scale,
-        .y = workareas[1] / x11_screen->window_scale,
-        .width = workareas[2] / x11_screen->window_scale,
-        .height = workareas[3] / x11_screen->window_scale,
-      };
-
-      if (gdk_rectangle_intersect (area, &work_area, &work_area))
-        *area = work_area;
-
-      workareas += 4;
-    }
-
-  XFree (ret_workarea);
-
-  return TRUE;
-}
-
 void
 gdk_x11_screen_get_work_area (GdkScreen    *screen,
                              GdkRectangle *area)
@@ -1107,10 +1007,6 @@ _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen,
  root = x11_screen->root_window;
  GDK_WINDOW_IMPL_X11 (root->impl)->window_scale = scale;

-  if (GDK_WINDOW_IMPL_X11 (root->impl)->cairo_surface)
-    cairo_surface_set_device_scale (GDK_WINDOW_IMPL_X11 (root->impl)->cairo_surface,
-                                    scale, scale);
-
  toplevels = gdk_screen_get_toplevel_windows (GDK_SCREEN (x11_screen));

  for (l = toplevels; l != NULL; l = l->next)
@@ -119,9 +119,6 @@ void _gdk_x11_screen_get_edge_monitors      (GdkScreen *screen,
 					     gint      *right);
 void _gdk_x11_screen_set_window_scale       (GdkX11Screen *x11_screen,
 					     int        scale);
-gboolean _gdk_x11_screen_get_monitor_work_area (GdkScreen    *screen,
-                                                GdkMonitor   *monitor,
-                                                GdkRectangle *area);
 void gdk_x11_screen_get_work_area           (GdkScreen    *screen,
                                             GdkRectangle *area);
 gint gdk_x11_screen_get_width               (GdkScreen *screen);
@@ -393,15 +393,8 @@ menu_item_removed (gint     position,
                   gpointer user_data)
 {
  GNSMenu *menu = user_data;
-  @try
-  {
-    [menu removeItemAtIndex:position];
-  }
-  @catch(NSException *err)
-    {
-      g_critical("GNSMenu removeItemAtIndex: %d raised exception %s", position,
-                 [[err reason] UTF8String]);
-    }
+
+  [menu removeItemAtIndex:position];
 }

@implementation GNSMenu
@@ -376,18 +376,6 @@ static void
 gtk_application_after_emit (GApplication *application,
                            GVariant     *platform_data)
 {
-  const char *startup_notification_id = NULL;
-
-  g_variant_lookup (platform_data, "desktop-startup-id", "&s", &startup_notification_id);
-  if (startup_notification_id)
-    {
-      GdkDisplay *display;
-
-      display = gdk_display_get_default ();
-      if (display)
-        gdk_display_notify_startup_complete (display, startup_notification_id);
-    }
-
  gdk_threads_leave ();
 }

@@ -140,8 +140,6 @@ gtk_css_image_surface_dispose (GObject *object)
      surface->surface = NULL;
    }

-  g_clear_pointer (&surface->cache, cairo_surface_destroy);
-
  G_OBJECT_CLASS (_gtk_css_image_surface_parent_class)->dispose (object);
 }

@@ -444,7 +444,7 @@ gtk_drag_dest_set (GtkWidget            *widget,

  old_site = g_object_get_data (G_OBJECT (widget), "gtk-drag-dest");

-  site = g_new0 (GtkDragDestSite, 1);
+  site = g_new (GtkDragDestSite, 1);
  site->flags = flags;
  site->have_drag = FALSE;
  if (targets)
@@ -519,7 +519,6 @@ gtk_drag_dest_unset (GtkWidget *widget)
 /**
 * gtk_drag_dest_get_target_list: (method)
 * @widget: a #GtkWidget
- * Returns: (nullable) (transfer none): the #GtkTargetList, or %NULL if none
 */
 GtkTargetList*
 gtk_drag_dest_get_target_list (GtkWidget *widget)
@@ -1203,8 +1202,7 @@ gtk_drag_begin_internal (GtkWidget         *widget,

  window = [(id<GdkNSView>)[nswindow contentView] gdkWindow];
  g_return_val_if_fail (nsevent != NULL, NULL);
-  g_return_val_if_fail (target_list != NULL, NULL);
-  
+
  context = gdk_drag_begin (window, g_list_copy (target_list->list));
  g_return_val_if_fail (context != NULL, NULL);

@@ -11093,9 +11093,6 @@ gtk_entry_insert_emoji (GtkEntry *entry)
  GtkWidget *chooser;
  GdkRectangle rect;

-  if (gtk_entry_get_input_hints (entry) & GTK_INPUT_HINT_NO_EMOJI)
-    return;
-
  if (gtk_widget_get_ancestor (GTK_WIDGET (entry), GTK_TYPE_EMOJI_CHOOSER) != NULL)
    return;

@@ -112,7 +112,6 @@ struct _GtkFontChooserWidgetPrivate
  gchar           *preview_text;
  gboolean         show_preview_entry;

-  GtkWidget *size_label;
  GtkWidget *size_spin;
  GtkWidget *size_slider;
  GtkWidget *size_slider2;
@@ -716,7 +715,6 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
  gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, filter_model);
  gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, preview);
  gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, preview2);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, size_label);
  gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, size_spin);
  gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, size_slider);
  gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, size_slider2);
@@ -2468,13 +2466,11 @@ gtk_font_chooser_widget_set_level (GtkFontChooserWidget *fontchooser,
    {
      gtk_widget_show (priv->size_slider);
      gtk_widget_show (priv->size_spin);
-      gtk_widget_show (priv->size_label);
    }
  else
   {
      gtk_widget_hide (priv->size_slider);
      gtk_widget_hide (priv->size_spin);
-      gtk_widget_hide (priv->size_label);
   }

  gtk_font_chooser_widget_load_fonts (fontchooser, TRUE);
@@ -1455,19 +1455,12 @@ gtk_gesture_get_bounding_box_center (GtkGesture *gesture,
                                     gdouble    *x,
                                     gdouble    *y)
 {
-  const GdkEvent *last_event;
  GdkRectangle rect;
-  GdkEventSequence *sequence;

  g_return_val_if_fail (GTK_IS_GESTURE (gesture), FALSE);
  g_return_val_if_fail (x != NULL && y != NULL, FALSE);

-  sequence = gtk_gesture_get_last_updated_sequence (gesture);
-  last_event = gtk_gesture_get_last_event (gesture, sequence);
-
-  if (EVENT_IS_TOUCHPAD_GESTURE (last_event))
-    return gtk_gesture_get_point (gesture, sequence, x, y);
-  else if (!gtk_gesture_get_bounding_box (gesture, &rect))
+  if (!gtk_gesture_get_bounding_box (gesture, &rect))
    return FALSE;

  *x = rect.x + rect.width / 2;
@@ -608,10 +608,9 @@ unset_screen (GtkIconTheme *icon_theme)
      g_signal_handlers_disconnect_by_func (display,
                                            (gpointer) display_closed,
                                            icon_theme);
-      if (settings)
-        g_signal_handlers_disconnect_by_func (settings,
-                                              (gpointer) theme_changed,
-                                              icon_theme);
+      g_signal_handlers_disconnect_by_func (settings,
+                                            (gpointer) theme_changed,
+                                            icon_theme);

      priv->screen = NULL;
    }
@@ -4027,8 +4026,8 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info)
  else
    {
      icon_info->pixbuf = gdk_pixbuf_scale_simple (source_pixbuf,
-                                                   MAX (1, 0.5 + image_width * icon_info->scale),
-                                                   MAX (1, 0.5 + image_height * icon_info->scale),
+                                                   0.5 + image_width * icon_info->scale,
+                                                   0.5 + image_height * icon_info->scale,
                                                   GDK_INTERP_BILINEAR);
      g_object_unref (source_pixbuf);
    }
@@ -3343,20 +3343,17 @@ menu_grab_transfer_window_get (GtkMenu *menu)
 static void
 menu_grab_transfer_window_destroy (GtkMenu *menu)
 {
-  GtkMenuPrivate *priv = menu->priv;
  GdkWindow *window = g_object_get_data (G_OBJECT (menu), "gtk-menu-transfer-window");
  if (window)
    {
-      GdkWindow *toplevel_window;
+      GdkWindow *widget_window;

      gtk_widget_unregister_window (GTK_WIDGET (menu), window);
      gdk_window_destroy (window);
      g_object_set_data (G_OBJECT (menu), I_("gtk-menu-transfer-window"), NULL);

-      toplevel_window = gtk_widget_get_window (priv->toplevel);
-
-      if (toplevel_window != NULL)
-        g_object_set_data (G_OBJECT (toplevel_window), I_("gdk-attached-grab-window"), NULL);
+      widget_window = gtk_widget_get_window (GTK_WIDGET (menu));
+      g_object_set_data (G_OBJECT (widget_window), I_("gdk-attached-grab-window"), window);
    }
 }

@@ -247,15 +247,6 @@ gtk_model_button_update_state (GtkModelButton *button)
    gtk_css_gadget_set_state (button->gadget, state);

  gtk_css_gadget_set_state (button->indicator_gadget, indicator_state);
-
-  if (button->role == GTK_BUTTON_ROLE_CHECK ||
-      button->role == GTK_BUTTON_ROLE_RADIO)
-    {
-      AtkObject *object = _gtk_widget_peek_accessible (GTK_WIDGET (button));
-      if (object)
-        atk_object_notify_state_change (object, ATK_STATE_CHECKED,
-                                        (indicator_state & GTK_STATE_FLAG_CHECKED));
-    }
 }

 static void
@@ -1099,18 +1090,6 @@ gtk_model_button_finalize (GObject *object)
  G_OBJECT_CLASS (gtk_model_button_parent_class)->finalize (object);
 }

-static AtkObject *
-gtk_model_button_get_accessible (GtkWidget *widget)
-{
-  AtkObject *object;
-
-  object = GTK_WIDGET_CLASS (gtk_model_button_parent_class)->get_accessible (widget);
-
-  gtk_model_button_update_state (GTK_MODEL_BUTTON (widget));
-
-  return object;
-}
-
 static void
 gtk_model_button_class_init (GtkModelButtonClass *class)
 {
@@ -1132,7 +1111,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
  widget_class->destroy = gtk_model_button_destroy;
  widget_class->state_flags_changed = gtk_model_button_state_flags_changed;
  widget_class->direction_changed = gtk_model_button_direction_changed;
-  widget_class->get_accessible = gtk_model_button_get_accessible;

  button_class->clicked = gtk_model_button_clicked;

@@ -463,10 +463,10 @@ display_closed_cb (GdkDisplay *display,

  screen = gdk_display_get_default_screen (display);
  settings = gtk_settings_get_for_screen (screen);
-  if (settings)
-    g_object_set_data_full (G_OBJECT (settings),
-			    I_("gtk-modules"),
-			    NULL, NULL);
+
+  g_object_set_data_full (G_OBJECT (settings),
+			  I_("gtk-modules"),
+			  NULL, NULL);
 }
 		   

@@ -59,7 +59,7 @@
 #include "deprecated/gtkrc.h"

 #ifdef GDK_WINDOWING_QUARTZ
-#define PRINT_PREVIEW_COMMAND "open -b com.apple.Preview %f"
+#define PRINT_PREVIEW_COMMAND "open -a /Applications/Preview.app %f"
 #else
 #define PRINT_PREVIEW_COMMAND "evince --unlink-tempfile --preview --print-settings %s %f"
 #endif
@@ -1900,29 +1900,6 @@ settings_init_style (GtkSettings *settings)
  settings_update_key_theme (settings);
 }

-static void
-settings_display_closed (GdkDisplay *display,
-                         gboolean    is_error,
-                         gpointer    data)
-{
-  DisplaySettings *ds;
-  int i;
-
-  if (G_UNLIKELY (display_settings == NULL))
-    return;
-
-  ds = (DisplaySettings *)display_settings->data;
-  for (i = 0; i < display_settings->len; i++)
-    {
-      if (ds[i].display == display)
-        {
-          g_clear_object (&ds[i].settings);
-          display_settings = g_array_remove_index_fast (display_settings, i);
-          break;
-        }
-    }
-}
-
 static GtkSettings *
 gtk_settings_create_for_display (GdkDisplay *display)
 {
@@ -1978,9 +1955,7 @@ gtk_settings_create_for_display (GdkDisplay *display)

  v.display = display;
  v.settings = settings;
-  display_settings = g_array_append_val (display_settings, v);
-  g_signal_connect (display, "closed",
-                    G_CALLBACK (settings_display_closed), NULL);
+  g_array_append_val (display_settings, v);

  settings_init_style (settings);
  settings_update_xsettings (settings);
@@ -2000,10 +1975,6 @@ gtk_settings_get_for_display (GdkDisplay *display)
  DisplaySettings *ds;
  int i;

-  /* If the display is closed, we don't want to recreate the settings! */
-  if G_UNLIKELY (gdk_display_is_closed (display))
-    return NULL;
-
  if G_UNLIKELY (display_settings == NULL)
    display_settings = g_array_new (FALSE, TRUE, sizeof (DisplaySettings));

@@ -11462,9 +11462,6 @@ gtk_text_view_insert_emoji (GtkTextView *text_view)
  GdkRectangle rect;
  GtkTextBuffer *buffer;

-  if (gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_NO_EMOJI)
-    return;
-
  if (gtk_widget_get_ancestor (GTK_WIDGET (text_view), GTK_TYPE_EMOJI_CHOOSER) != NULL)
    return;

@@ -511,8 +511,7 @@ add_device (GtkInspectorGeneral *gen,
    "Keyboard",
    "Touchscreen",
    "Touchpad",
-    "Trackpoint",
-    "Pad"
+    "Trackpoint"
  };

  name = gdk_device_get_name (device);
@@ -267,47 +267,6 @@ spinner {
  }
 }

-/**********************
- * General Typography *
- **********************/
-
-.large-title {
-   font-weight: 300;
-   font-size: 24pt;
-   letter-spacing: 0.2rem;
-}
-.title-1 {
-   font-weight: 800;
-   font-size: 20pt;
-}
-.title-2 {
-   font-weight: 800;
-   font-size: 15pt;
-}
-.title-3 {
-   font-weight: 700;
-   font-size: 15pt;
-}
-.title-4 {
-   font-weight: 700;
-   font-size: 13pt;
-}
-.heading {
-   font-weight: 700;
-   font-size: 11pt;
-}
-.body {
-   font-weight: 400;
-   font-size: 11pt;
-}
-.caption-heading {
-   font-weight: 700;
-   font-size: 9pt;
-}
-.caption {
-   font-weight: 400;
-   font-size: 9pt;
-}

 /****************
 * Text Entries *
@@ -1018,7 +977,6 @@ toolbar.inline-toolbar toolbutton:backdrop {
 %linked_middle {
  border-radius: 0;
  border-right-style: none;
-  -gtk-outline-radius: 0;
 }

 %linked_left {
@@ -1027,10 +985,6 @@ toolbar.inline-toolbar toolbutton:backdrop {
    border-top-right-radius: 0;
    border-bottom-right-radius: 0;
    border-right-style: none;
-    -gtk-outline-bottom-left-radius: $button_radius;
-    -gtk-outline-top-left-radius: $button_radius;
-    -gtk-outline-top-right-radius: 0;
-    -gtk-outline-bottom-right-radius: 0;
 }

 %linked_right {
@@ -1039,16 +993,11 @@ toolbar.inline-toolbar toolbutton:backdrop {
    border-top-right-radius: $button_radius;
    border-bottom-right-radius: $button_radius;
    border-right-style: solid;
-    -gtk-outline-bottom-right-radius: $button_radius;
-    -gtk-outline-top-right-radius: $button_radius;
-    -gtk-outline-bottom-left-radius: 0;
-    -gtk-outline-top-left-radius: 0;
 }

 %linked_only_child {
    border-radius: $button_radius;
    border-style: solid;
-    -gtk-outline-radius: $button_radius;
 }

 // .linked assumes Box, which reverses nodes in RTL, so 1st child is always left
@@ -1192,29 +1141,28 @@ list row button.image-button:not(.flat) {
  &:visited {
    color: $link_visited_color;

-    *:selected & { color: mix($selected_fg_color, $link_visited_color, 60%); }
+    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); }
  }

  &:hover {
-    $_fg: lighten($link_color, 10%);
-    color: $_fg;
+    color: lighten($link_color,10%);

-    *:selected & { color: mix($selected_fg_color, $_fg, 90%); }
+    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); }
  }

  &:active {
    color: $link_color;

-    *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
+    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
  }

-  &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color, 100%), 0.2); }
+  &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color,100%), 0.2); }

-  &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: transparentize($link_color, 0.1); }}
+  &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: $selected_bg_color; }}

  @at-root %link_selected,
  &:selected,
-  *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
+  *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
 }

 button:link,
@@ -1899,11 +1847,11 @@ headerbar { // headerbar border rounding
 window.devel {
  headerbar.titlebar:not(.selection-mode) {
    $c: darken($bg_color, 10%);
-    $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+    $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat,
               linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8)),
               linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%));
    @if $variant == 'dark' {
-      $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+      $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat,
                 linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9)),
                 linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%));
    }
@@ -1911,7 +1859,7 @@ window.devel {
    background: $bg_color $gradient;

    &:backdrop {
-      background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
+      background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat,
                  image($bg_color); /* background-color would flash */
    }
  }
@@ -3992,31 +3940,15 @@ messagedialog { // Message Dialog styling
      border-right-style: none;
      border-bottom-style: none;

-      &:first-child:not(:only-child) {
+      &:first-child{
        border-left-style: none;
-        border-bottom-left-radius: $button_radius + 2;
-        -gtk-outline-bottom-left-radius: $button_radius + 2;
-        -gtk-outline-top-left-radius: 0px;
-        -gtk-outline-top-right-radius: 0px;
-        -gtk-outline-bottom-right-radius: 0px;
+        border-bottom-left-radius: 7px;
+        -gtk-outline-bottom-left-radius: 5px;
      }
-  
-      &:last-child:not(:only-child) {
-        border-bottom-right-radius: $button_radius + 2;
-        -gtk-outline-bottom-right-radius: $button_radius + 2;
-        -gtk-outline-top-right-radius: 0px;
-        -gtk-outline-bottom-left-radius: 0px;
-        -gtk-outline-top-left-radius: 0px;
-      }
-      &:only-child {
-        border-top-right-radius: 0;
-        border-top-left-radius: 0;
-        border-bottom-left-radius: $button_radius + 2;
-        border-bottom-right-radius: $button_radius + 2;
-        -gtk-outline-top-right-radius: 0px;
-        -gtk-outline-top-left-radius: 0px;
-        -gtk-outline-bottom-left-radius: $button_radius + 2;
-        -gtk-outline-bottom-right-radius: $button_radius + 2;
+
+      &:last-child {
+        border-bottom-right-radius: 7px;
+        -gtk-outline-bottom-right-radius: 5px;
      }
    }
  }
@@ -17,7 +17,7 @@
   height="14"
   id="svg7384"
   version="1.1"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   inkscape:version="0.91 r13725"
   width="14">
  <metadata
     id="metadata90">
@@ -37,8 +37,8 @@
     bordercolor="#666666"
     borderopacity="1"
     inkscape:current-layer="layer9"
-     inkscape:cx="6.1684486"
-     inkscape:cy="5.9327595"
+     inkscape:cx="9.6493349"
+     inkscape:cy="5.5864571"
     gridtolerance="10"
     inkscape:guide-bbox="true"
     guidetolerance="10"
@@ -47,10 +47,10 @@
     inkscape:object-paths="false"
     objecttolerance="10"
     pagecolor="#3a3b39"
-     inkscape:pageopacity="0"
+     inkscape:pageopacity="1"
     inkscape:pageshadow="2"
     showborder="true"
-     showgrid="true"
+     showgrid="false"
     showguides="true"
     inkscape:snap-bbox="true"
     inkscape:snap-bbox-midpoints="false"
@@ -59,12 +59,12 @@
     inkscape:snap-nodes="false"
     inkscape:snap-others="false"
     inkscape:snap-to-guides="true"
-     inkscape:window-height="1376"
+     inkscape:window-height="1016"
     inkscape:window-maximized="1"
-     inkscape:window-width="3440"
+     inkscape:window-width="1920"
     inkscape:window-x="0"
-     inkscape:window-y="639"
-     inkscape:zoom="62.240778"
+     inkscape:window-y="27"
+     inkscape:zoom="22.005438"
     inkscape:showpageshadow="false">
    <inkscape:grid
       dotted="false"
@@ -74,8 +74,8 @@
       originx="-139.99995"
       originy="120"
       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
+       spacingx="1px"
+       spacingy="1px"
       type="xygrid"
       visible="true" />
  </sodipodi:namedview>
@@ -101,10 +101,10 @@
     transform="translate(-381.00015,-339)">
    <path
       inkscape:connector-curvature="0"
-       d="m 388.00015,341.99995 c -2.20743,0 -4.00005,1.79261 -4.00005,4.00005 0,2.20743 1.79262,4.00005 4.00005,4.00005 2.20743,0 4.00005,-1.79262 4.00005,-4.00005 0,-2.20744 -1.79262,-4.00005 -4.00005,-4.00005 z"
+       d="m 388.00015,343.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 -2.98246,-2.98246 z"
       id="path9555"
       sodipodi:nodetypes="csssc"
-       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';text-indent:0pt;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.38899732;marker:none" />
+       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';text-indent:0pt;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none" />
  </g>
  <g
     inkscape:groupmode="layer"
@@ -11,13 +11,13 @@
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   sodipodi:docname="check-symbolic.svg"
-   inkscape:export-filename="/home/jimmac/Projects/gtk/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
   height="14"
   id="svg7384"
   version="1.1"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   inkscape:version="0.91 r13725"
   width="14">
  <metadata
     id="metadata90">
@@ -37,8 +37,8 @@
     bordercolor="#666666"
     borderopacity="1"
     inkscape:current-layer="layer9"
-     inkscape:cx="7.0525573"
-     inkscape:cy="8.5476141"
+     inkscape:cx="-15.966869"
+     inkscape:cy="8.8415069"
     gridtolerance="10"
     inkscape:guide-bbox="true"
     guidetolerance="10"
@@ -47,10 +47,10 @@
     inkscape:object-paths="false"
     objecttolerance="10"
     pagecolor="#3a3b39"
-     inkscape:pageopacity="0"
+     inkscape:pageopacity="1"
     inkscape:pageshadow="2"
     showborder="true"
-     showgrid="true"
+     showgrid="false"
     showguides="true"
     inkscape:snap-bbox="true"
     inkscape:snap-bbox-midpoints="false"
@@ -59,12 +59,12 @@
     inkscape:snap-nodes="false"
     inkscape:snap-others="false"
     inkscape:snap-to-guides="true"
-     inkscape:window-height="791"
-     inkscape:window-maximized="0"
-     inkscape:window-width="1611"
-     inkscape:window-x="1011"
-     inkscape:window-y="1032"
-     inkscape:zoom="1"
+     inkscape:window-height="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="15.238496"
     inkscape:showpageshadow="false">
    <inkscape:grid
       dotted="false"
@@ -74,8 +74,8 @@
       originx="-159.99995"
       originy="120"
       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
+       spacingx="1px"
+       spacingy="1px"
       type="xygrid"
       visible="true" />
  </sodipodi:namedview>
@@ -100,11 +100,10 @@
     style="display:inline;opacity:1"
     transform="translate(-401.00015,-339)">
    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       d="m 411.89132,341.94772 -4.39702,4.34915 -3.3125,-3.1875 -2.39063,2.45313 5.21718,5.46025 6.77589,-7.31969 c 1.13568,-1.31246 -0.63533,-3.01292 -1.89292,-1.75534 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
+       d="m 415.00015,339.98047 -6.5,6.39453 -2.9375,-2.9375 -2.125,2.125 5.0625,5.0625 6.5,-6.60547 0,-4.03906 z"
       id="path8913-6-7-1-5-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       inkscape:connector-curvature="0" />
  </g>
  <g
     inkscape:groupmode="layer"
@@ -84,25 +84,6 @@ spinner:checked { opacity: 1; animation: spin 1s linear infinite; }

 spinner:checked:disabled { opacity: 0.5; }

-/********************** General Typography * */
-.large-title { font-weight: 300; font-size: 24pt; letter-spacing: 0.2rem; }
-
-.title-1 { font-weight: 800; font-size: 20pt; }
-
-.title-2 { font-weight: 800; font-size: 15pt; }
-
-.title-3 { font-weight: 700; font-size: 15pt; }
-
-.title-4 { font-weight: 700; font-size: 13pt; }
-
-.heading { font-weight: 700; font-size: 11pt; }
-
-.body { font-weight: 400; font-size: 11pt; }
-
-.caption-heading { font-weight: 700; font-size: 9pt; }
-
-.caption { font-weight: 400; font-size: 9pt; }
-
 /**************** Text Entries * */
 spinbutton:not(.vertical), entry { min-height: 32px; padding-left: 8px; padding-right: 8px; border: 1px solid; border-radius: 5px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: white; border-color: #1b1b1b; background-color: #2d2d2d; box-shadow: inset 0 0 0 1px rgba(21, 83, 158, 0); }

@@ -392,13 +373,13 @@ button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {

 .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { color: #5b5b5b; border-color: #202020; background-image: image(#2a2a2a); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; -gtk-outline-radius: 0; }
+toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; }

-toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; -gtk-outline-bottom-left-radius: 5px; -gtk-outline-top-left-radius: 5px; -gtk-outline-top-right-radius: 0; -gtk-outline-bottom-right-radius: 0; }
+toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }

-toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-right-style: solid; -gtk-outline-bottom-right-radius: 5px; -gtk-outline-top-right-radius: 5px; -gtk-outline-bottom-left-radius: 0; -gtk-outline-top-left-radius: 0; }
+toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-right-style: solid; }

-toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; -gtk-outline-radius: 5px; }
+toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; }

 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; }

@@ -440,21 +421,21 @@ button:link, button:visited, button:link > label, button:visited > label, *:link

 button:visited, button:link > label:visited, button:visited > label:visited, *:link:visited { color: #1b6acb; }

-*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > label:visited, *:selected *:link:visited { color: #a4c4ea; }
+*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > label:visited, *:selected *:link:visited { color: #a1bad8; }

 button:hover:link, button:hover:visited, button:link > label:hover, button:visited > label:hover, *:link:hover { color: #629fea; }

-*:selected button:hover:link, *:selected button:hover:visited, *:selected button:link > label:hover, *:selected button:visited > label:hover, *:selected *:link:hover { color: #eff5fd; }
+*:selected button:hover:link, *:selected button:hover:visited, *:selected button:link > label:hover, *:selected button:visited > label:hover, *:selected *:link:hover { color: #e8eef5; }

 button:active:link, button:active:visited, button:link > label:active, button:visited > label:active, *:link:active { color: #3584e4; }

-*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, *:selected button:visited > label:active, *:selected *:link:active { color: #d7e6fa; }
+*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, *:selected button:visited > label:active, *:selected *:link:active { color: #d0ddec; }

 button:disabled:link, button:disabled:visited, button:link > label:disabled, button:visited > label:disabled, button:disabled:backdrop:link, button:disabled:backdrop:visited, button:link > label:disabled:backdrop, button:visited > label:disabled:backdrop, *:link:disabled, *:link:disabled:backdrop { color: rgba(141, 141, 141, 0.8); }

-button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, *:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: rgba(53, 132, 228, 0.9); }
+button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, *:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: #15539e; }

-.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, *:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited > label, *:link:selected, *:selected *:link { color: #d7e6fa; }
+.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, *:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited > label, *:link:selected, *:selected *:link { color: #d0ddec; }

 button:link, button:visited { text-shadow: none; }

@@ -654,9 +635,9 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen

 .titlebar:not(headerbar) separator { background-color: #1b1b1b; }

-window.devel headerbar.titlebar:not(.selection-mode) { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(21, 83, 158, 0.1)), linear-gradient(to top, #232323 3px, #282828); }
+window.devel headerbar.titlebar:not(.selection-mode) { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(21, 83, 158, 0.1)), linear-gradient(to top, #232323 3px, #282828); }

-window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#353535); /* background-color would flash */ }
+window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #353535 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, image(#353535); /* background-color would flash */ }

 /************ Pathbars * */
 .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; }
@@ -1596,11 +1577,9 @@ messagedialog.csd.background { border-bottom-left-radius: 9px; border-bottom-rig

 messagedialog.csd .dialog-action-area button { padding: 10px 14px; border-radius: 0; border-left-style: solid; border-right-style: none; border-bottom-style: none; }

-messagedialog.csd .dialog-action-area button:first-child:not(:only-child) { border-left-style: none; border-bottom-left-radius: 7px; -gtk-outline-bottom-left-radius: 7px; -gtk-outline-top-left-radius: 0px; -gtk-outline-top-right-radius: 0px; -gtk-outline-bottom-right-radius: 0px; }
+messagedialog.csd .dialog-action-area button:first-child { border-left-style: none; border-bottom-left-radius: 7px; -gtk-outline-bottom-left-radius: 5px; }

-messagedialog.csd .dialog-action-area button:last-child:not(:only-child) { border-bottom-right-radius: 7px; -gtk-outline-bottom-right-radius: 7px; -gtk-outline-top-right-radius: 0px; -gtk-outline-bottom-left-radius: 0px; -gtk-outline-top-left-radius: 0px; }
-
-messagedialog.csd .dialog-action-area button:only-child { border-top-right-radius: 0; border-top-left-radius: 0; border-bottom-left-radius: 7px; border-bottom-right-radius: 7px; -gtk-outline-top-right-radius: 0px; -gtk-outline-top-left-radius: 0px; -gtk-outline-bottom-left-radius: 7px; -gtk-outline-bottom-right-radius: 7px; }
+messagedialog.csd .dialog-action-area button:last-child { border-bottom-right-radius: 7px; -gtk-outline-bottom-right-radius: 5px; }

 filechooser .dialog-action-box { border-top: 1px solid #1b1b1b; }

@@ -84,25 +84,6 @@ spinner:checked { opacity: 1; animation: spin 1s linear infinite; }

 spinner:checked:disabled { opacity: 0.5; }

-/********************** General Typography * */
-.large-title { font-weight: 300; font-size: 24pt; letter-spacing: 0.2rem; }
-
-.title-1 { font-weight: 800; font-size: 20pt; }
-
-.title-2 { font-weight: 800; font-size: 15pt; }
-
-.title-3 { font-weight: 700; font-size: 15pt; }
-
-.title-4 { font-weight: 700; font-size: 13pt; }
-
-.heading { font-weight: 700; font-size: 11pt; }
-
-.body { font-weight: 400; font-size: 11pt; }
-
-.caption-heading { font-weight: 700; font-size: 9pt; }
-
-.caption { font-weight: 400; font-size: 9pt; }
-
 /**************** Text Entries * */
 spinbutton:not(.vertical), entry { min-height: 32px; padding-left: 8px; padding-right: 8px; border: 1px solid; border-radius: 5px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: black; border-color: #cdc7c2; background-color: #ffffff; box-shadow: inset 0 0 0 1px rgba(53, 132, 228, 0); }

@@ -394,13 +375,13 @@ button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {

 .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { color: #d4cfca; border-color: #d5d0cc; background-image: image(#e4e4e0); box-shadow: inset 0 1px rgba(255, 255, 255, 0); }

-toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; -gtk-outline-radius: 0; }
+toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) { border-radius: 0; border-right-style: none; }

-toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; -gtk-outline-bottom-left-radius: 5px; -gtk-outline-top-left-radius: 5px; -gtk-outline-top-right-radius: 0; -gtk-outline-bottom-right-radius: 0; }
+toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:dir(ltr):first-child, filechooser .path-bar.linked > button:dir(rtl):last-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo { border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; border-right-style: none; }

-toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-right-style: solid; -gtk-outline-bottom-right-radius: 5px; -gtk-outline-top-right-radius: 5px; -gtk-outline-bottom-left-radius: 0; -gtk-outline-top-left-radius: 0; }
+toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > button:dir(ltr):last-child, filechooser .path-bar.linked > button:dir(rtl):first-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-right-style: solid; }

-toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; -gtk-outline-radius: 5px; }
+toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo { border-radius: 5px; border-style: solid; }

 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > box > button.combo { border-style: solid solid none solid; border-radius: 0; }

@@ -448,7 +429,7 @@ button:link, button:visited, button:link > label, button:visited > label, *:link

 button:visited, button:link > label:visited, button:visited > label:visited, *:link:visited { color: #15539e; }

-*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > label:visited, *:selected *:link:visited { color: #a1bad8; }
+*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > label:visited, *:selected *:link:visited { color: #aecef4; }

 button:hover:link, button:hover:visited, button:link > label:hover, button:visited > label:hover, *:link:hover { color: #3584e4; }

@@ -456,13 +437,13 @@ button:hover:link, button:hover:visited, button:link > label:hover, button:visit

 button:active:link, button:active:visited, button:link > label:active, button:visited > label:active, *:link:active { color: #1b6acb; }

-*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, *:selected button:visited > label:active, *:selected *:link:active { color: #d1e1f5; }
+*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, *:selected button:visited > label:active, *:selected *:link:active { color: #d7e6fa; }

 button:disabled:link, button:disabled:visited, button:link > label:disabled, button:visited > label:disabled, button:disabled:backdrop:link, button:disabled:backdrop:visited, button:link > label:disabled:backdrop, button:visited > label:disabled:backdrop, *:link:disabled, *:link:disabled:backdrop { color: rgba(115, 115, 115, 0.8); }

-button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, *:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: rgba(27, 106, 203, 0.9); }
+button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, *:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: #3584e4; }

-.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, *:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited > label, *:link:selected, *:selected *:link { color: #d1e1f5; }
+.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, *:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited > label, *:link:selected, *:selected *:link { color: #d7e6fa; }

 button:link, button:visited { text-shadow: none; }

@@ -662,9 +643,9 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen

 .titlebar:not(headerbar) separator { background-color: #cdc7c2; }

-window.devel headerbar.titlebar:not(.selection-mode) { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(53, 132, 228, 0.2)), linear-gradient(to top, #d8d4d0, #dfdcd8 3px, #edebe9); }
+window.devel headerbar.titlebar:not(.selection-mode) { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(53, 132, 228, 0.2)), linear-gradient(to top, #d8d4d0, #dfdcd8 3px, #edebe9); }

-window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#f6f5f4); /* background-color would flash */ }
+window.devel headerbar.titlebar:not(.selection-mode):backdrop { background: #f6f5f4 cross-fade(10% -gtk-icontheme("system-run-symbolic")) 90% 0/256px 256px no-repeat, image(#f6f5f4); /* background-color would flash */ }

 /************ Pathbars * */
 .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; }
@@ -1612,11 +1593,9 @@ messagedialog.csd.background { border-bottom-left-radius: 9px; border-bottom-rig

 messagedialog.csd .dialog-action-area button { padding: 10px 14px; border-radius: 0; border-left-style: solid; border-right-style: none; border-bottom-style: none; }

-messagedialog.csd .dialog-action-area button:first-child:not(:only-child) { border-left-style: none; border-bottom-left-radius: 7px; -gtk-outline-bottom-left-radius: 7px; -gtk-outline-top-left-radius: 0px; -gtk-outline-top-right-radius: 0px; -gtk-outline-bottom-right-radius: 0px; }
+messagedialog.csd .dialog-action-area button:first-child { border-left-style: none; border-bottom-left-radius: 7px; -gtk-outline-bottom-left-radius: 5px; }

-messagedialog.csd .dialog-action-area button:last-child:not(:only-child) { border-bottom-right-radius: 7px; -gtk-outline-bottom-right-radius: 7px; -gtk-outline-top-right-radius: 0px; -gtk-outline-bottom-left-radius: 0px; -gtk-outline-top-left-radius: 0px; }
-
-messagedialog.csd .dialog-action-area button:only-child { border-top-right-radius: 0; border-top-left-radius: 0; border-bottom-left-radius: 7px; border-bottom-right-radius: 7px; -gtk-outline-top-right-radius: 0px; -gtk-outline-top-left-radius: 0px; -gtk-outline-bottom-left-radius: 7px; -gtk-outline-bottom-right-radius: 7px; }
+messagedialog.csd .dialog-action-area button:last-child { border-bottom-right-radius: 7px; -gtk-outline-bottom-right-radius: 5px; }

 filechooser .dialog-action-box { border-top: 1px solid #cdc7c2; }

@@ -582,8 +582,7 @@ gtk_im_context_wayland_get_preedit_string (GtkIMContext   *context,
  if (str)
    *str = g_strdup (preedit_str);
  if (cursor_pos)
-    *cursor_pos = g_utf8_strlen (preedit_str,
-                                 context_wayland->current_preedit.cursor_begin);
+    *cursor_pos = context_wayland->current_preedit.cursor_begin;

  if (attrs)
    {
@@ -3210,7 +3210,7 @@ avahi_service_resolver_cb (GObject      *source_object,
              g_strcanon (printer_name, PRINTER_NAME_ALLOWED_CHARACTERS, '-');

              printer_name_strv = g_strsplit_set (printer_name, "-", -1);
-              printer_name_compressed_strv = g_new0 (gchar *, g_strv_length (printer_name_strv) + 1);
+              printer_name_compressed_strv = g_new0 (gchar *, g_strv_length (printer_name_strv));
              for (i = 0, j = 0; printer_name_strv[i] != NULL; i++)
                {
                  if (printer_name_strv[i][0] != '\0')
@@ -111,6 +111,7 @@ if print_backends.contains('file')
                'file/gtkprintbackendfile.c',
                c_args: printbackends_args,
                dependencies: libgtk_dep,
+                name_suffix: module_suffix,
                install_dir: printbackends_install_dir,
                name_suffix: module_suffix,
                install : true)
@@ -121,6 +122,7 @@ if print_backends.contains('lpr')
                'lpr/gtkprintbackendlpr.c',
                c_args: printbackends_args,
                dependencies: libgtk_dep,
+                name_suffix: module_suffix,
                install_dir: printbackends_install_dir,
                name_suffix: module_suffix,
                install : true)
@@ -131,6 +133,7 @@ if print_backends.contains('test')
                'test/gtkprintbackendtest.c',
                c_args: printbackends_args,
                dependencies: libgtk_dep,
+                name_suffix: module_suffix,
                install_dir: printbackends_install_dir,
                name_suffix: module_suffix,
                install : true)
@@ -143,6 +146,7 @@ if print_backends.contains('cloudprint')
                  'cloudprint/gtkcloudprintaccount.c',
                  c_args: printbackends_args,
                  dependencies: [ libgtk_dep, rest_dep, json_glib_dep ],
+                  name_suffix: module_suffix,
                  install_dir: printbackends_install_dir,
                  name_suffix: module_suffix,
                  install : true)
@@ -156,6 +160,7 @@ if print_backends.contains('cups')
                'cups/gtkcupssecretsutils.c',
                c_args: printbackends_args,
                dependencies: [libgtk_dep, cups_dep] + cups_extra_deps,
+                name_suffix: module_suffix,
                install_dir: printbackends_install_dir,
                name_suffix: module_suffix,
                install : true)
@@ -23,7 +23,6 @@ br
 bs
 ca
 ca@valencia
-ckb
 crh
 cs
 cy
@@ -660,7 +660,7 @@ msgstr "Aspecte de l'ombra que envolta el contenidor"

 #: gtk/deprecated/gtkhandlebox.c:232
 msgid "Handle position"
-msgstr "Posició de la nansa"
+msgstr "Gestiona posició"

 #: gtk/deprecated/gtkhandlebox.c:233
 msgid "Position of the handle relative to the child widget"
@@ -2945,7 +2945,7 @@ msgstr "Dibuixa com a element de menú de ràdio"

 #: gtk/gtkcheckmenuitem.c:226
 msgid "Whether the menu item looks like a radio menu item"
-msgstr "Si l'element del menú sembla un element de menú de ràdio"
+msgstr "Si l'element del menú és seleccionat"

 #: gtk/gtkcolorbutton.c:168 gtk/gtkcolorchooser.c:87
 msgid "Use alpha"
@@ -4033,7 +4033,7 @@ msgstr ""

 #: gtk/gtkfilechoosernative.c:826
 msgid "Accept label"
-msgstr "Etiqueta d'accepta"
+msgstr "Accepta etiqueta"

 #: gtk/gtkfilechoosernative.c:827
 msgid "The label on the accept button"
@@ -4041,7 +4041,7 @@ msgstr "L'etiqueta del botó accepta"

 #: gtk/gtkfilechoosernative.c:839
 msgid "Cancel label"
-msgstr "Etiqueta de cancel·la"
+msgstr "Cancel·la l'etiqueta"

 #: gtk/gtkfilechoosernative.c:840
 msgid "The label on the cancel button"
@@ -23,7 +23,6 @@ br
 bs
 ca
 ca@valencia
-ckb
 crh
 cs
 cy
@@ -20,23 +20,23 @@
 # Felipe Braga <fbobraga@gmail.com>, 2015.
 # Fabrício Godoy <skarllot@gmail.com>, 2010, 2016.
 # Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
-# Ricardo Silva Veloso <ricvelozo@gmail.com>, 2018-2020.
+# Ricardo Silva Veloso <ricvelozo@gmail.com>, 2018.
 # Rafael Fontenelle <rafaelff@gnome.org>, 2013-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GTK\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-10 21:08+0000\n"
-"PO-Revision-Date: 2020-01-13 13:39-0300\n"
-"Last-Translator: Ricardo Silva Veloso <ricvelozo@gmail.com>\n"
+"POT-Creation-Date: 2019-09-27 20:01+0000\n"
+"PO-Revision-Date: 2019-09-28 15:03-0300\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Gtranslator 3.32.0\n"

 # Não encontrei tradução melhor para broadway
 #: gdk/broadway/gdkbroadway-server.c:144
@@ -695,15 +695,15 @@ msgctxt "Stock label"
 msgid "_Close"
 msgstr "_Fechar"

-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9313
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9298
 msgid "Minimize"
 msgstr "Minimizar"

-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9322
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9307
 msgid "Maximize"
 msgstr "Maximizar"

-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9279
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9264
 msgid "Restore"
 msgstr "Restaurar"

@@ -1262,7 +1262,7 @@ msgstr ""
 #: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
 #: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
 #: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
-#: gtk/gtkwindow.c:12783 gtk/inspector/css-editor.c:201
+#: gtk/gtkwindow.c:12768 gtk/inspector/css-editor.c:201
 #: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
 #: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
 msgid "_Cancel"
@@ -1311,7 +1311,7 @@ msgid "_Apply"
 msgstr "_Aplicar"

 #: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12784
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12769
 msgid "_OK"
 msgstr "_OK"

@@ -2231,54 +2231,54 @@ msgstr "_Direita:"
 msgid "Paper Margins"
 msgstr "Margens do papel"

-#: gtk/gtkentry.c:9590 gtk/gtklabel.c:6680 gtk/gtktextview.c:9502
+#: gtk/gtkentry.c:9583 gtk/gtklabel.c:6680 gtk/gtktextview.c:9502
 msgid "Cu_t"
 msgstr "Recor_tar"

-#: gtk/gtkentry.c:9594 gtk/gtklabel.c:6681 gtk/gtktextview.c:9506
+#: gtk/gtkentry.c:9587 gtk/gtklabel.c:6681 gtk/gtktextview.c:9506
 msgid "_Copy"
 msgstr "_Copiar"

-#: gtk/gtkentry.c:9598 gtk/gtklabel.c:6682 gtk/gtktextview.c:9508
+#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6682 gtk/gtktextview.c:9508
 msgid "_Paste"
 msgstr "C_olar"

-#: gtk/gtkentry.c:9601 gtk/gtkfilechooserwidget.c:1495
+#: gtk/gtkentry.c:9594 gtk/gtkfilechooserwidget.c:1495
 #: gtk/gtkfilechooserwidget.c:2321 gtk/gtklabel.c:6684 gtk/gtktextview.c:9511
 msgid "_Delete"
 msgstr "E_xcluir"

-#: gtk/gtkentry.c:9612 gtk/gtklabel.c:6693 gtk/gtktextview.c:9525
+#: gtk/gtkentry.c:9605 gtk/gtklabel.c:6693 gtk/gtktextview.c:9525
 msgid "Select _All"
 msgstr "_Selecionar tudo"

-#: gtk/gtkentry.c:9622 gtk/gtktextview.c:9535
+#: gtk/gtkentry.c:9615 gtk/gtktextview.c:9535
 msgid "Insert _Emoji"
-msgstr "Inserir _emoji"
+msgstr "Inserir _Emoji"

-#: gtk/gtkentry.c:9798 gtk/gtktextview.c:9755
+#: gtk/gtkentry.c:9791 gtk/gtktextview.c:9755
 msgid "Select all"
 msgstr "Selecionar tudo"

-#: gtk/gtkentry.c:9801 gtk/gtktextview.c:9758
+#: gtk/gtkentry.c:9794 gtk/gtktextview.c:9758
 msgid "Cut"
 msgstr "Recortar"

-#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9761
+#: gtk/gtkentry.c:9797 gtk/gtktextview.c:9761
 msgid "Copy"
 msgstr "Copiar"

-#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9764
+#: gtk/gtkentry.c:9800 gtk/gtktextview.c:9764
 msgid "Paste"
 msgstr "Colar"

-#: gtk/gtkentry.c:10879
+#: gtk/gtkentry.c:10872
 msgid "Caps Lock is on"
 msgstr "A tecla Caps Lock está ativa"

-#: gtk/gtkentry.c:11157
+#: gtk/gtkentry.c:11147
 msgid "Insert Emoji"
-msgstr "Inserir emoji"
+msgstr "Inserir Emoji"

 #: gtk/gtkfilechooserbutton.c:112
 msgid "Select a File"
@@ -2313,7 +2313,7 @@ msgstr "A_brir"
 msgid "_Save"
 msgstr "_Salvar"

-#: gtk/gtkfilechoosernativequartz.c:331 gtk/ui/gtkfilechooserwidget.ui:404
+#: gtk/gtkfilechoosernativequartz.c:332 gtk/ui/gtkfilechooserwidget.ui:404
 msgid "Select which types of files are shown"
 msgstr "Seleciona quais tipos de arquivos são mostrados"

@@ -2493,6 +2493,7 @@ msgid "Show _Size Column"
 msgstr "Mostrar coluna _Tamanho"

 #: gtk/gtkfilechooserwidget.c:2328
+#| msgid "Show _Size Column"
 msgid "Show T_ype Column"
 msgstr "Mostrar coluna _Tipo"

@@ -2571,6 +2572,8 @@ msgid "Program"
 msgstr "Programa"

 #: gtk/gtkfilechooserwidget.c:4992
+#| msgctxt "keyboard label"
+#| msgid "AudioMute"
 msgid "Audio"
 msgstr "Áudio"

@@ -2584,6 +2587,8 @@ msgid "Image"
 msgstr "Imagem"

 #: gtk/gtkfilechooserwidget.c:4995
+#| msgctxt "paper size"
+#| msgid "Arch A"
 msgid "Archive"
 msgstr "Arquivo"

@@ -2604,14 +2609,17 @@ msgid "Contacts"
 msgstr "Contatos"

 #: gtk/gtkfilechooserwidget.c:5002
+#| msgid "calendar:MY"
 msgid "Calendar"
 msgstr "Calendário"

 #: gtk/gtkfilechooserwidget.c:5003
+#| msgid "Documented by"
 msgid "Document"
 msgstr "Documentado"

 #: gtk/gtkfilechooserwidget.c:5004
+#| msgid "_Orientation:"
 msgid "Presentation"
 msgstr "Apresentação"

@@ -2747,7 +2755,7 @@ msgstr "Criação de contexto OpenGL falhou"
 msgid "Application menu"
 msgstr "Menu aplicativo"

-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9349
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9334
 msgid "Close"
 msgstr "Fechar"

@@ -2756,7 +2764,7 @@ msgstr "Fechar"
 msgid "Icon '%s' not present in theme %s"
 msgstr "O ícone “%s” não está presente no tema %s"

-#: gtk/gtkicontheme.c:4100 gtk/gtkicontheme.c:4467
+#: gtk/gtkicontheme.c:4096 gtk/gtkicontheme.c:4463
 msgid "Failed to load icon"
 msgstr "Falha ao carregar ícone"

@@ -2932,16 +2940,16 @@ msgstr "Ativa sinalizadores de depuração GTK+"
 msgid "GTK+ debugging flags to unset"
 msgstr "Desativa sinalizadores de depuração GTK+"

-#: gtk/gtkmain.c:810 gtk/gtkmain.c:1004
+#: gtk/gtkmain.c:808 gtk/gtkmain.c:1002
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Não foi possível abrir a tela: %s"

-#: gtk/gtkmain.c:922
+#: gtk/gtkmain.c:920
 msgid "GTK+ Options"
 msgstr "Opções do GTK+"

-#: gtk/gtkmain.c:922
+#: gtk/gtkmain.c:920
 msgid "Show GTK+ Options"
 msgstr "Mostra as opções do GTK+"

@@ -2950,7 +2958,7 @@ msgstr "Mostra as opções do GTK+"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: gtk/gtkmain.c:1272
+#: gtk/gtkmain.c:1270
 msgid "default:LTR"
 msgstr "default:LTR"

@@ -3547,7 +3555,7 @@ msgstr "Sem papel"

 #. Translators: this is a printer status.
 #: gtk/gtkprintoperation-win32.c:621
-#: modules/printbackends/cups/gtkprintbackendcups.c:2624
+#: modules/printbackends/cups/gtkprintbackendcups.c:2614
 msgid "Paused"
 msgstr "Pausada"

@@ -3616,42 +3624,42 @@ msgstr "Obtendo informações da impressora…"
 #. * multiple pages on a sheet when printing
 #.
 #: gtk/gtkprintunixdialog.c:3120
-#: modules/printbackends/cups/gtkprintbackendcups.c:5493
+#: modules/printbackends/cups/gtkprintbackendcups.c:5440
 msgid "Left to right, top to bottom"
 msgstr "Esquerda para direita, cima para baixo"

 #: gtk/gtkprintunixdialog.c:3120
-#: modules/printbackends/cups/gtkprintbackendcups.c:5493
+#: modules/printbackends/cups/gtkprintbackendcups.c:5440
 msgid "Left to right, bottom to top"
 msgstr "Esquerda para direita, baixo para cima"

 #: gtk/gtkprintunixdialog.c:3121
-#: modules/printbackends/cups/gtkprintbackendcups.c:5494
+#: modules/printbackends/cups/gtkprintbackendcups.c:5441
 msgid "Right to left, top to bottom"
 msgstr "Direita para esquerda, cima para baixo"

 #: gtk/gtkprintunixdialog.c:3121
-#: modules/printbackends/cups/gtkprintbackendcups.c:5494
+#: modules/printbackends/cups/gtkprintbackendcups.c:5441
 msgid "Right to left, bottom to top"
 msgstr "Direita para esquerda, baixo para cima"

 #: gtk/gtkprintunixdialog.c:3122
-#: modules/printbackends/cups/gtkprintbackendcups.c:5495
+#: modules/printbackends/cups/gtkprintbackendcups.c:5442
 msgid "Top to bottom, left to right"
 msgstr "Cima para baixo, esquerda para direita"

 #: gtk/gtkprintunixdialog.c:3122
-#: modules/printbackends/cups/gtkprintbackendcups.c:5495
+#: modules/printbackends/cups/gtkprintbackendcups.c:5442
 msgid "Top to bottom, right to left"
 msgstr "Cima para baixo, direita para esquerda"

 #: gtk/gtkprintunixdialog.c:3123
-#: modules/printbackends/cups/gtkprintbackendcups.c:5496
+#: modules/printbackends/cups/gtkprintbackendcups.c:5443
 msgid "Bottom to top, left to right"
 msgstr "Baixo para cima, esquerda para direita"

 #: gtk/gtkprintunixdialog.c:3123
-#: modules/printbackends/cups/gtkprintbackendcups.c:5496
+#: modules/printbackends/cups/gtkprintbackendcups.c:5443
 msgid "Bottom to top, right to left"
 msgstr "Baixo para cima, direita para esquerda"

@@ -4057,24 +4065,24 @@ msgctxt "volume percentage"
 msgid "%d %%"
 msgstr "%d %%"

-#: gtk/gtkwindow.c:9297
+#: gtk/gtkwindow.c:9282
 msgid "Move"
 msgstr "Mover"

-#: gtk/gtkwindow.c:9305
+#: gtk/gtkwindow.c:9290
 msgid "Resize"
 msgstr "Redimensionar"

-#: gtk/gtkwindow.c:9336
+#: gtk/gtkwindow.c:9321
 msgid "Always on Top"
 msgstr "Sempre no topo"

-#: gtk/gtkwindow.c:12771
+#: gtk/gtkwindow.c:12756
 #, c-format
 msgid "Do you want to use GTK+ Inspector?"
 msgstr "Você deseja usar Inspetor GTK+?"

-#: gtk/gtkwindow.c:12773
+#: gtk/gtkwindow.c:12758
 #, c-format
 msgid ""
 "GTK+ Inspector is an interactive debugger that lets you explore and modify "
@@ -4085,7 +4093,7 @@ msgstr ""
 "modifique o estado interno de qualquer aplicativo GTK+. Usá-lo pode fazer "
 "que o aplicativo se encerre ou falhe."

-#: gtk/gtkwindow.c:12778
+#: gtk/gtkwindow.c:12763
 msgid "Don't show this message again"
 msgstr "Não mostre essa mensagem novamente"

@@ -7753,7 +7761,7 @@ msgctxt "input method menu"
 msgid "Multipress"
 msgstr "Pressionamento múltiplo"

-#: modules/input/imquartz.c:61
+#: modules/input/imquartz.c:58
 msgctxt "input method menu"
 msgid "Mac OS X Quartz"
 msgstr "Mac OS X Quartz"
@@ -7825,290 +7833,290 @@ msgstr "Dormente"
 msgid "Pages per _sheet:"
 msgstr "Páginas por _folha:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1129
-#: modules/printbackends/cups/gtkprintbackendcups.c:1438
+#: modules/printbackends/cups/gtkprintbackendcups.c:1128
+#: modules/printbackends/cups/gtkprintbackendcups.c:1437
 msgid "Username:"
 msgstr "Nome de usuário:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1130
-#: modules/printbackends/cups/gtkprintbackendcups.c:1447
+#: modules/printbackends/cups/gtkprintbackendcups.c:1129
+#: modules/printbackends/cups/gtkprintbackendcups.c:1446
 msgid "Password:"
 msgstr "Senha:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1169
-#: modules/printbackends/cups/gtkprintbackendcups.c:1460
+#: modules/printbackends/cups/gtkprintbackendcups.c:1168
+#: modules/printbackends/cups/gtkprintbackendcups.c:1459
 #, c-format
 msgid "Authentication is required to print document “%s” on printer %s"
 msgstr ""
 "É necessário autenticar-se para imprimir o documento “%s” na impressora %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1171
+#: modules/printbackends/cups/gtkprintbackendcups.c:1170
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "É necessário autenticar-se para imprimir um documento em %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1175
+#: modules/printbackends/cups/gtkprintbackendcups.c:1174
 #, c-format
 msgid "Authentication is required to get attributes of job “%s”"
 msgstr "É necessário autenticar-se para obter os atributos do trabalho “%s”"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1177
+#: modules/printbackends/cups/gtkprintbackendcups.c:1176
 msgid "Authentication is required to get attributes of a job"
 msgstr "É necessário autenticar-se para obter os atributos de um trabalho"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1181
+#: modules/printbackends/cups/gtkprintbackendcups.c:1180
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "É necessário autenticar-se para obter os atributos da impressora %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1183
+#: modules/printbackends/cups/gtkprintbackendcups.c:1182
 msgid "Authentication is required to get attributes of a printer"
 msgstr "É necessário autenticar-se para obter os atributos de uma impressora"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1186
+#: modules/printbackends/cups/gtkprintbackendcups.c:1185
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "É necessário autenticar-se para obter a impressora padrão de %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1189
+#: modules/printbackends/cups/gtkprintbackendcups.c:1188
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "É necessário autenticar-se para obter impressoras a partir de %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1194
+#: modules/printbackends/cups/gtkprintbackendcups.c:1193
 #, c-format
 msgid "Authentication is required to get a file from %s"
 msgstr "É necessário autenticar-se para obter o arquivo a partir de %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1196
+#: modules/printbackends/cups/gtkprintbackendcups.c:1195
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "É necessário autenticar-se em %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1432
+#: modules/printbackends/cups/gtkprintbackendcups.c:1431
 msgid "Domain:"
 msgstr "Domínio:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1462
+#: modules/printbackends/cups/gtkprintbackendcups.c:1461
 #, c-format
 msgid "Authentication is required to print document “%s”"
 msgstr "É necessário autenticar-se para imprimir o documento “%s”"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1467
+#: modules/printbackends/cups/gtkprintbackendcups.c:1466
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr ""
 "É necessário autenticar-se para imprimir este documento na impressora %s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1469
+#: modules/printbackends/cups/gtkprintbackendcups.c:1468
 msgid "Authentication is required to print this document"
 msgstr "É necessário autenticar-se para imprimir este documento"

-#: modules/printbackends/cups/gtkprintbackendcups.c:2553
+#: modules/printbackends/cups/gtkprintbackendcups.c:2543
 #, c-format
 msgid "Printer “%s” is low on toner."
 msgstr "A impressora “%s” está com pouco toner."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2557
+#: modules/printbackends/cups/gtkprintbackendcups.c:2547
 #, c-format
 msgid "Printer “%s” has no toner left."
 msgstr "A impressora “%s” está sem toner."

 # Photo developer = relevador, substância usada na revelação de fotografias
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:2562
+#: modules/printbackends/cups/gtkprintbackendcups.c:2552
 #, c-format
 msgid "Printer “%s” is low on developer."
 msgstr "A impressora “%s” está com pouco revelador."

 # Photo developer = relevador, substância usada na revelação de fotografias
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:2567
+#: modules/printbackends/cups/gtkprintbackendcups.c:2557
 #, c-format
 msgid "Printer “%s” is out of developer."
 msgstr "A impressora “%s” está sem revelador."

 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:2572
+#: modules/printbackends/cups/gtkprintbackendcups.c:2562
 #, c-format
 msgid "Printer “%s” is low on at least one marker supply."
 msgstr "A impressora “%s” está com pouca tinta em pelo menos um cartucho."

 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:2577
+#: modules/printbackends/cups/gtkprintbackendcups.c:2567
 #, c-format
 msgid "Printer “%s” is out of at least one marker supply."
 msgstr "A impressora “%s” está sem tinta em pelo menos um cartucho."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2581
+#: modules/printbackends/cups/gtkprintbackendcups.c:2571
 #, c-format
 msgid "The cover is open on printer “%s”."
 msgstr "A tampa da impressora “%s” está aberta."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2585
+#: modules/printbackends/cups/gtkprintbackendcups.c:2575
 #, c-format
 msgid "The door is open on printer “%s”."
 msgstr "A porta da impressora “%s” está aberta."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2589
+#: modules/printbackends/cups/gtkprintbackendcups.c:2579
 #, c-format
 msgid "Printer “%s” is low on paper."
 msgstr "A impressora “%s” está com pouco papel."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2593
+#: modules/printbackends/cups/gtkprintbackendcups.c:2583
 #, c-format
 msgid "Printer “%s” is out of paper."
 msgstr "A impressora “%s” está sem papel."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2597
+#: modules/printbackends/cups/gtkprintbackendcups.c:2587
 #, c-format
 msgid "Printer “%s” is currently offline."
 msgstr "A impressora “%s” está desligada."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2601
+#: modules/printbackends/cups/gtkprintbackendcups.c:2591
 #, c-format
 msgid "There is a problem on printer “%s”."
 msgstr "Há um problema na impressora “%s”."

 # Esse parece ser um status da impressora
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2621
+#: modules/printbackends/cups/gtkprintbackendcups.c:2611
 msgid "Paused; Rejecting Jobs"
 msgstr "Em pausa; Rejeitando trabalhos"

 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2627
+#: modules/printbackends/cups/gtkprintbackendcups.c:2617
 msgid "Rejecting Jobs"
 msgstr "Rejeitando trabalhos"

 #. Translators: this string connects multiple printer states together.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2668
+#: modules/printbackends/cups/gtkprintbackendcups.c:2658
 msgid "; "
 msgstr "; "

-#: modules/printbackends/cups/gtkprintbackendcups.c:4439
-#: modules/printbackends/cups/gtkprintbackendcups.c:4506
+#: modules/printbackends/cups/gtkprintbackendcups.c:4386
+#: modules/printbackends/cups/gtkprintbackendcups.c:4453
 msgctxt "printing option"
 msgid "Two Sided"
 msgstr "Dois lados"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4440
+#: modules/printbackends/cups/gtkprintbackendcups.c:4387
 msgctxt "printing option"
 msgid "Paper Type"
 msgstr "Tipo de papel"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4441
+#: modules/printbackends/cups/gtkprintbackendcups.c:4388
 msgctxt "printing option"
 msgid "Paper Source"
 msgstr "Origem do papel"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4442
-#: modules/printbackends/cups/gtkprintbackendcups.c:4507
+#: modules/printbackends/cups/gtkprintbackendcups.c:4389
+#: modules/printbackends/cups/gtkprintbackendcups.c:4454
 msgctxt "printing option"
 msgid "Output Tray"
 msgstr "Bandeja de saída"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4443
+#: modules/printbackends/cups/gtkprintbackendcups.c:4390
 msgctxt "printing option"
 msgid "Resolution"
 msgstr "Resolução"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4444
+#: modules/printbackends/cups/gtkprintbackendcups.c:4391
 msgctxt "printing option"
 msgid "GhostScript pre-filtering"
 msgstr "Pré-filtragem GhostScript"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4453
+#: modules/printbackends/cups/gtkprintbackendcups.c:4400
 msgctxt "printing option value"
 msgid "One Sided"
 msgstr "Um lado"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4455
+#: modules/printbackends/cups/gtkprintbackendcups.c:4402
 msgctxt "printing option value"
 msgid "Long Edge (Standard)"
 msgstr "Virar na borda maior (padrão)"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4457
+#: modules/printbackends/cups/gtkprintbackendcups.c:4404
 msgctxt "printing option value"
 msgid "Short Edge (Flip)"
 msgstr "Virar na borda menor"

 #. Translators: this is an option of "Paper Source"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4459
-#: modules/printbackends/cups/gtkprintbackendcups.c:4461
-#: modules/printbackends/cups/gtkprintbackendcups.c:4469
+#: modules/printbackends/cups/gtkprintbackendcups.c:4406
+#: modules/printbackends/cups/gtkprintbackendcups.c:4408
+#: modules/printbackends/cups/gtkprintbackendcups.c:4416
 msgctxt "printing option value"
 msgid "Auto Select"
 msgstr "Selecionar automaticamente"

 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4463
-#: modules/printbackends/cups/gtkprintbackendcups.c:4465
-#: modules/printbackends/cups/gtkprintbackendcups.c:4467
-#: modules/printbackends/cups/gtkprintbackendcups.c:4471
+#: modules/printbackends/cups/gtkprintbackendcups.c:4410
+#: modules/printbackends/cups/gtkprintbackendcups.c:4412
+#: modules/printbackends/cups/gtkprintbackendcups.c:4414
+#: modules/printbackends/cups/gtkprintbackendcups.c:4418
 msgctxt "printing option value"
 msgid "Printer Default"
 msgstr "Padrão da impressora"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4473
+#: modules/printbackends/cups/gtkprintbackendcups.c:4420
 msgctxt "printing option value"
 msgid "Embed GhostScript fonts only"
 msgstr "Somente para fontes GhostScript embutidas"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4475
+#: modules/printbackends/cups/gtkprintbackendcups.c:4422
 msgctxt "printing option value"
 msgid "Convert to PS level 1"
 msgstr "Converter para PS nível 1"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4477
+#: modules/printbackends/cups/gtkprintbackendcups.c:4424
 msgctxt "printing option value"
 msgid "Convert to PS level 2"
 msgstr "Converter para PS nível 2"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4479
+#: modules/printbackends/cups/gtkprintbackendcups.c:4426
 msgctxt "printing option value"
 msgid "No pre-filtering"
 msgstr "Sem pré-filtragem"

 #. 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:4488
+#: modules/printbackends/cups/gtkprintbackendcups.c:4435
 msgctxt "printing option group"
 msgid "Miscellaneous"
 msgstr "Outras opções"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4515
+#: modules/printbackends/cups/gtkprintbackendcups.c:4462
 msgctxt "sides"
 msgid "One Sided"
 msgstr "Um lado"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4517
+#: modules/printbackends/cups/gtkprintbackendcups.c:4464
 msgctxt "sides"
 msgid "Long Edge (Standard)"
 msgstr "Borda maior (padrão)"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4519
+#: modules/printbackends/cups/gtkprintbackendcups.c:4466
 msgctxt "sides"
 msgid "Short Edge (Flip)"
 msgstr "Borda menor (Virar)"

 #. Translators: Top output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4522
+#: modules/printbackends/cups/gtkprintbackendcups.c:4469
 msgctxt "output-bin"
 msgid "Top Bin"
 msgstr "Bandeja superior"

 #. Translators: Middle output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4524
+#: modules/printbackends/cups/gtkprintbackendcups.c:4471
 msgctxt "output-bin"
 msgid "Middle Bin"
 msgstr "Bandeja do meio"
@@ -8117,157 +8125,157 @@ msgstr "Bandeja do meio"
 # Traduzir de forma consistente com "_Top".
 # "_Fim"?
 #. Translators: Bottom output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4526
+#: modules/printbackends/cups/gtkprintbackendcups.c:4473
 msgctxt "output-bin"
 msgid "Bottom Bin"
 msgstr "Bandeja inferior"

 #. Translators: Side output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4528
+#: modules/printbackends/cups/gtkprintbackendcups.c:4475
 msgctxt "output-bin"
 msgid "Side Bin"
 msgstr "Bandeja lateral"

 #. Translators: Left output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4530
+#: modules/printbackends/cups/gtkprintbackendcups.c:4477
 msgctxt "output-bin"
 msgid "Left Bin"
 msgstr "Bandeja esquerda"

 #. Translators: Right output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4532
+#: modules/printbackends/cups/gtkprintbackendcups.c:4479
 msgctxt "output-bin"
 msgid "Right Bin"
 msgstr "Bandeja direita"

 #. Translators: Center output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4534
+#: modules/printbackends/cups/gtkprintbackendcups.c:4481
 msgctxt "output-bin"
 msgid "Center Bin"
 msgstr "Bandeja central"

 #. Translators: Rear output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4536
+#: modules/printbackends/cups/gtkprintbackendcups.c:4483
 msgctxt "output-bin"
 msgid "Rear Bin"
 msgstr "Bandeja traseira"

 #. Translators: Output bin where one sided output is oriented in the face-up position
-#: modules/printbackends/cups/gtkprintbackendcups.c:4538
+#: modules/printbackends/cups/gtkprintbackendcups.c:4485
 msgctxt "output-bin"
 msgid "Face Up Bin"
 msgstr "Bandeja virada para cima"

 #. Translators: Output bin where one sided output is oriented in the face-down position
-#: modules/printbackends/cups/gtkprintbackendcups.c:4540
+#: modules/printbackends/cups/gtkprintbackendcups.c:4487
 msgctxt "output-bin"
 msgid "Face Down Bin"
 msgstr "Bandeja virada para baixo"

 #. Translators: Large capacity output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4542
+#: modules/printbackends/cups/gtkprintbackendcups.c:4489
 msgctxt "output-bin"
 msgid "Large Capacity Bin"
 msgstr "Bandeja de alta capacidade"

 #. Translators: Output stacker number %d
-#: modules/printbackends/cups/gtkprintbackendcups.c:4564
+#: modules/printbackends/cups/gtkprintbackendcups.c:4511
 #, c-format
 msgctxt "output-bin"
 msgid "Stacker %d"
 msgstr "Empilhador %d"

 #. Translators: Output mailbox number %d
-#: modules/printbackends/cups/gtkprintbackendcups.c:4568
+#: modules/printbackends/cups/gtkprintbackendcups.c:4515
 #, c-format
 msgctxt "output-bin"
 msgid "Mailbox %d"
 msgstr "Caixa de correio %d"

 #. Translators: Private mailbox
-#: modules/printbackends/cups/gtkprintbackendcups.c:4572
+#: modules/printbackends/cups/gtkprintbackendcups.c:4519
 msgctxt "output-bin"
 msgid "My Mailbox"
 msgstr "Minha caixa de correio"

 #. Translators: Output tray number %d
-#: modules/printbackends/cups/gtkprintbackendcups.c:4576
+#: modules/printbackends/cups/gtkprintbackendcups.c:4523
 #, c-format
 msgctxt "output-bin"
 msgid "Tray %d"
 msgstr "Bandeja %d"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5047
+#: modules/printbackends/cups/gtkprintbackendcups.c:4994
 msgid "Printer Default"
 msgstr "Padrão da impressora"

 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5488
+#: modules/printbackends/cups/gtkprintbackendcups.c:5435
 msgid "Urgent"
 msgstr "Urgente"

 # prioridade de impressão
-#: modules/printbackends/cups/gtkprintbackendcups.c:5488
+#: modules/printbackends/cups/gtkprintbackendcups.c:5435
 msgid "High"
 msgstr "Alta"

 # prioridade de impressão
-#: modules/printbackends/cups/gtkprintbackendcups.c:5488
+#: modules/printbackends/cups/gtkprintbackendcups.c:5435
 msgid "Medium"
 msgstr "Média"

 # prioridade de impressão
-#: modules/printbackends/cups/gtkprintbackendcups.c:5488
+#: modules/printbackends/cups/gtkprintbackendcups.c:5435
 msgid "Low"
 msgstr "Baixa"

 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5518
+#: modules/printbackends/cups/gtkprintbackendcups.c:5465
 msgid "Job Priority"
 msgstr "Prioridade do trabalho"

 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5529
+#: modules/printbackends/cups/gtkprintbackendcups.c:5476
 msgid "Billing Info"
 msgstr "Inf. de faturamento"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5553
+#: modules/printbackends/cups/gtkprintbackendcups.c:5500
 msgctxt "cover page"
 msgid "None"
 msgstr "Nenhuma"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5554
+#: modules/printbackends/cups/gtkprintbackendcups.c:5501
 msgctxt "cover page"
 msgid "Classified"
 msgstr "Restrito"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5555
+#: modules/printbackends/cups/gtkprintbackendcups.c:5502
 msgctxt "cover page"
 msgid "Confidential"
 msgstr "Confidencial"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5556
+#: modules/printbackends/cups/gtkprintbackendcups.c:5503
 msgctxt "cover page"
 msgid "Secret"
 msgstr "Secreto"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5557
+#: modules/printbackends/cups/gtkprintbackendcups.c:5504
 msgctxt "cover page"
 msgid "Standard"
 msgstr "Padrão"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5558
+#: modules/printbackends/cups/gtkprintbackendcups.c:5505
 msgctxt "cover page"
 msgid "Top Secret"
 msgstr "Ultra secreto"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5559
+#: modules/printbackends/cups/gtkprintbackendcups.c:5506
 msgctxt "cover page"
 msgid "Unclassified"
 msgstr "Irrestrito"
@@ -8275,7 +8283,7 @@ msgstr "Irrestrito"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5571
+#: modules/printbackends/cups/gtkprintbackendcups.c:5518
 msgctxt "printer option"
 msgid "Pages per Sheet"
 msgstr "Páginas por folha"
@@ -8283,7 +8291,7 @@ msgstr "Páginas por folha"
 #. Translators, this string is used to label the option in the print
 #. * dialog that controls in what order multiple pages are arranged
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5588
+#: modules/printbackends/cups/gtkprintbackendcups.c:5535
 msgctxt "printer option"
 msgid "Page Ordering"
 msgstr "Ordem das páginas"
@@ -8291,7 +8299,7 @@ msgstr "Ordem das páginas"
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5630
+#: modules/printbackends/cups/gtkprintbackendcups.c:5577
 msgctxt "printer option"
 msgid "Before"
 msgstr "Antes"
@@ -8299,7 +8307,7 @@ msgstr "Antes"
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5645
+#: modules/printbackends/cups/gtkprintbackendcups.c:5592
 msgctxt "printer option"
 msgid "After"
 msgstr "Depois"
@@ -8308,7 +8316,7 @@ msgstr "Depois"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5665
+#: modules/printbackends/cups/gtkprintbackendcups.c:5612
 msgctxt "printer option"
 msgid "Print at"
 msgstr "Imprimir em"
@@ -8316,7 +8324,7 @@ msgstr "Imprimir em"
 #. 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:5676
+#: modules/printbackends/cups/gtkprintbackendcups.c:5623
 msgctxt "printer option"
 msgid "Print at time"
 msgstr "Imprimir na hora"
@@ -8326,18 +8334,18 @@ msgstr "Imprimir na hora"
 #. * the width and height in points. E.g: "Custom
 #. * 230.4x142.9"
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5721
+#: modules/printbackends/cups/gtkprintbackendcups.c:5668
 #, c-format
 msgid "Custom %s×%s"
 msgstr "Personalizado %sx%s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5831
+#: modules/printbackends/cups/gtkprintbackendcups.c:5778
 msgctxt "printer option"
 msgid "Printer Profile"
 msgstr "Perfil da impressora"

 #. TRANSLATORS: this is when color profile information is unavailable
-#: modules/printbackends/cups/gtkprintbackendcups.c:5838
+#: modules/printbackends/cups/gtkprintbackendcups.c:5785
 msgctxt "printer option value"
 msgid "Unavailable"
 msgstr "Não disponível"
Author	SHA1	Message	Date
Matthias Clasen	d8c5e86b30	gtk-demo: Use a default action in the infobars demo This makes the question infobar activatable by clicking anywhere in it.	2020-01-09 19:04:15 -05:00
Matthias Clasen	035f874ca4	Adwaita: Add hover for clickable infobars	2020-01-09 19:03:56 -05:00
Matthias Clasen	155fe56bf2	infobar: Activate default action on clicks When we have a default action set on the infobar, activate it for clicks anywhere in the infobar. Also add an .action style class in this case, so we can add a hover highlight to the infobar just for this case.	2020-01-09 19:03:38 -05:00