Fix compilation

Signed-off-by: Federico Mena Quintero <federico@gnome.org>
Load the file chooser's widgets from the .ui file
2013-04-15 18:30:10 -05:00 · 2013-04-12 20:42:24 -05:00 · 2013-04-12 19:58:16 -05:00 · 2013-04-12 19:57:35 -05:00 · 2013-04-12 12:29:40 -05:00
147 changed files with 9316 additions and 29323 deletions
@@ -43,7 +43,6 @@ demos =						\
 	search_entry.c				\
 	sizegroup.c				\
 	spinner.c				\
-	stack.c					\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
@@ -111,7 +110,6 @@ RESOURCES=	$(demos)			\
 		application.ui			\
 		demo.ui				\
 		menus.ui			\
-		stack.ui			\
 		theming.ui			\
 		alphatest.png			\
 		apple-red.png			\
@@ -55,9 +55,6 @@
    <file preprocess="to-pixdata">gnome-fs-directory.png</file>
    <file preprocess="to-pixdata">gnome-fs-regular.png</file>
  </gresource>
-  <gresource prefix="/stack">
-    <file>stack.ui</file>
-  </gresource>
  <gresource prefix="/images">
    <file>alphatest.png</file>
    <file>floppybuddy.gif</file>
@@ -113,7 +110,6 @@
    <file>rotated_text.c</file>
    <file>search_entry.c</file>
    <file>sizegroup.c</file>
-    <file>stack.c</file>
    <file>spinner.c</file>
    <file>stock_browser.c</file>
    <file>textview.c</file>
@@ -1,48 +0,0 @@
-/* Stack
- *
- * GtkStack is a container that shows a single child at a time,
- * with nice transitions when the visible child changes.
- *
- * GtkStackSwitcher adds buttons to control which child is visible.
- */
-
-#include <gtk/gtk.h>
-
-static GtkBuilder *builder;
-
-GtkWidget *
-do_stack (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GError *err = NULL;
-
-  if (!window)
-    {
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/stack/stack.ui", &err);
-      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
-      gtk_builder_connect_signals (builder, NULL);
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-
-  return window;
-}
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">GtkStack</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkStackSwitcher" id="switcher">
-            <property name="visible">True</property>
-            <property name="stack">stack</property>
-            <property name="halign">center</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="transition-type">crossfade</property>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin-top">20</property>
-                <property name="margin-bottom">20</property>
-                <property name="resource">/application/gtk-logo-48.png</property>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Page 1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton1">
-                <property name="label" translatable="yes">Page 2</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">Page 2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinner" id="spinner1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="active">True</property>
-              </object>
-              <packing>
-                <property name="name">page3</property>
-                <property name="icon-name">face-laugh-symbolic</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -85,7 +85,7 @@ scroll_to_bottom (GtkTextView *textview)
  gtk_text_iter_set_line_offset (&iter, 0);

  /* and place the mark at iter. the mark will stay there after we
-   * insert some text at the end because it has left gravity.
+   * insert some text at the end because it has right gravity.
   */
  mark = gtk_text_buffer_get_mark (buffer, "scroll");
  gtk_text_buffer_move_mark (buffer, mark, &iter);
@@ -234,8 +234,6 @@
      <xi:include href="xml/gtkpaned.xml" />
      <xi:include href="xml/gtklayout.xml" />
      <xi:include href="xml/gtknotebook.xml" />
-      <xi:include href="xml/gtkstack.xml" />
-      <xi:include href="xml/gtkstackswitcher.xml" />
      <xi:include href="xml/gtkexpander.xml" />
      <xi:include href="xml/gtkoverlay.xml" />
      <xi:include href="xml/gtkheaderbar.xml" />
@@ -7564,33 +7564,3 @@ GTK_HEADER_BAR_GET_CLASS
 <SUBSECTION Private>
 gtk_header_bar_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkstack</FILE>
-<TITLE>GtkStack</TITLE>
-GtkStack
-gtk_stack_new
-gtk_stack_add_named
-gtk_stack_add_titled
-gtk_stack_set_visible_child
-gtk_stack_get_visible_child
-gtk_stack_set_visible_child_name
-gtk_stack_get_visible_child_name
-gtk_stack_set_visible_child_full
-gtk_stack_set_homogeneous
-gtk_stack_get_homogeneous
-gtk_stack_set_transition_duration
-gtk_stack_get_transition_duration
-GtkStackTransitionType
-gtk_stack_set_transition_type
-gtk_stack_get_transition_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkstackswitcher</FILE>
-<TITLE>GtkStackSwitcher</TITLE>
-GtkStackSwitcher
-gtk_stack_switcher_new
-gtk_stack_switcher_set_stack
-gtk_stack_switcher_get_stack
-</SECTION>
@@ -134,7 +134,6 @@ gdk_c_sources = 				\
 	gdkframeclockidle.c			\
 	gdkpango.c				\
 	gdkpixbuf-drawable.c			\
-	gdkproperty.c				\
 	gdkrectangle.c				\
 	gdkrgba.c				\
 	gdkscreen.c				\
@@ -60,7 +60,9 @@ libgdk_broadway_la_SOURCES =		\
 	gdkeventsource.c	\
 	gdkeventsource.h	\
 	gdkglobals-broadway.c	\
+	gdkim-broadway.c	\
 	gdkkeys-broadway.c	\
+	gdkmain-broadway.c	\
 	gdkproperty-broadway.c	\
 	gdkscreen-broadway.c	\
 	gdkscreen-broadway.h	\
@@ -55,6 +55,8 @@ G_DEFINE_TYPE (GdkBroadwayDisplay, gdk_broadway_display, GDK_TYPE_DISPLAY)
 static void
 gdk_broadway_display_init (GdkBroadwayDisplay *display)
 {
+  _gdk_broadway_display_manager_add_display (gdk_display_manager_get (),
+					     GDK_DISPLAY_OBJECT (display));
  display->id_ht = g_hash_table_new (NULL, NULL);
 }

@@ -171,6 +173,7 @@ _gdk_broadway_display_open (const gchar *display_name)
    }

  g_signal_emit_by_name (display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get (), "display-opened", display);

  return display;
 }
@@ -236,6 +239,9 @@ gdk_broadway_display_dispose (GObject *object)
 {
  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (object);

+  _gdk_broadway_display_manager_remove_display (gdk_display_manager_get (),
+						GDK_DISPLAY_OBJECT (object));
+
  g_list_foreach (broadway_display->input_devices, (GFunc) g_object_run_dispose, NULL);

  _gdk_screen_close (broadway_display->screens[0]);
@@ -34,6 +34,9 @@ struct _GdkBroadwayDisplayManager
 {
  GdkDisplayManager parent;

+  GdkDisplay *default_display;
+  GSList *displays;
+
  gboolean init_failed;
 };

@@ -81,9 +84,56 @@ g_initable_iface_init (GInitableIface *iface)
  iface->init = gdk_broadway_display_manager_initable_init;
 }

+static GdkDisplay *
+gdk_broadway_display_manager_open_display (GdkDisplayManager *manager,
+                                         const gchar       *name)
+{
+  return _gdk_broadway_display_open (name);
+}
+
+static GSList *
+gdk_broadway_display_manager_list_displays (GdkDisplayManager *manager)
+{
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  return g_slist_copy (manager_broadway->displays);
+}
+
+static GdkDisplay *
+gdk_broadway_display_manager_get_default_display (GdkDisplayManager *manager)
+{
+  return GDK_BROADWAY_DISPLAY_MANAGER (manager)->default_display;
+}
+
+static void
+gdk_broadway_display_manager_set_default_display (GdkDisplayManager *manager,
+                                                GdkDisplay        *display)
+{
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  manager_broadway->default_display = display;
+}
+
+#include "../gdkkeynames.c"
+
+static gchar *
+gdk_broadway_display_manager_get_keyval_name (GdkDisplayManager *manager,
+                                            guint              keyval)
+{
+  return _gdk_keyval_name (keyval);
+}
+
+static guint
+gdk_broadway_display_manager_lookup_keyval (GdkDisplayManager *manager,
+                                          const gchar       *name)
+{
+  return _gdk_keyval_from_name (name);
+}
+
 static void
 gdk_broadway_display_manager_init (GdkBroadwayDisplayManager *manager)
 {
+  _gdk_broadway_windowing_init ();
 }

 static void
@@ -98,6 +148,45 @@ static void
 gdk_broadway_display_manager_class_init (GdkBroadwayDisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_broadway_display_manager_finalize;
+
+  manager_class->open_display = gdk_broadway_display_manager_open_display;
+  manager_class->list_displays = gdk_broadway_display_manager_list_displays;
+  manager_class->set_default_display = gdk_broadway_display_manager_set_default_display;
+  manager_class->get_default_display = gdk_broadway_display_manager_get_default_display;
+  manager_class->atom_intern = _gdk_broadway_display_manager_atom_intern;
+  manager_class->get_atom_name = _gdk_broadway_display_manager_get_atom_name;
+  manager_class->lookup_keyval = gdk_broadway_display_manager_lookup_keyval;
+  manager_class->get_keyval_name = gdk_broadway_display_manager_get_keyval_name;
+}
+
+void
+_gdk_broadway_display_manager_add_display (GdkDisplayManager *manager,
+					   GdkDisplay        *display)
+{
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  if (manager_broadway->displays == NULL)
+    gdk_display_manager_set_default_display (manager, display);
+
+  manager_broadway->displays = g_slist_prepend (manager_broadway->displays, display);
+}
+
+void
+_gdk_broadway_display_manager_remove_display (GdkDisplayManager *manager,
+					      GdkDisplay        *display)
+{
+  GdkBroadwayDisplayManager *manager_broadway = GDK_BROADWAY_DISPLAY_MANAGER (manager);
+
+  manager_broadway->displays = g_slist_remove (manager_broadway->displays, display);
+
+  if (manager_broadway->default_display == display)
+    {
+      if (manager_broadway->displays)
+        gdk_display_manager_set_default_display (manager, manager_broadway->displays->data);
+      else
+        gdk_display_manager_set_default_display (manager, NULL);
+    }
 }
@@ -0,0 +1,38 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
+
+#include "gdkmain.h"
+#include "gdkinternals.h"
+#include "gdkdisplay-broadway.h"
+
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
+void
+_gdk_broadway_initialize_locale (void)
+{
+}
@@ -0,0 +1,44 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
+
+#include "gdkdisplay-broadway.h"
+#include "gdkinternals.h"
+#include "gdkprivate-broadway.h"
+#include "gdkintl.h"
+#include "gdkdeviceprivate.h"
+
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#include <errno.h>
+
+void
+_gdk_broadway_windowing_init (void)
+{
+  _gdk_broadway_initialize_locale ();
+}
@@ -40,6 +40,20 @@
 #include "gdkbroadwaywindow.h"

 void _gdk_broadway_resync_windows (void);
+void _gdk_broadway_windowing_init (void);
+
+gchar * _gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager,
+						     GdkAtom atom);
+void _gdk_broadway_display_manager_add_display (GdkDisplayManager *manager,
+						GdkDisplay        *display);
+void _gdk_broadway_display_manager_remove_display (GdkDisplayManager *manager,
+						   GdkDisplay        *display);
+GdkAtom _gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager,
+								 const gchar *atom_name);
+GdkAtom _gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager,
+						   const gchar *atom_name, 
+						   gboolean     only_if_exists);
+

 void     _gdk_broadway_window_register_dnd (GdkWindow      *window);
 GdkDragContext * _gdk_broadway_window_drag_begin (GdkWindow *window,
@@ -89,6 +103,8 @@ void _gdk_keymap_add_virtual_modifiers_compat (GdkKeymap       *keymap,
 gboolean _gdk_keymap_key_is_modifier   (GdkKeymap       *keymap,
 					guint            keycode);

+void _gdk_broadway_initialize_locale (void);
+
 void _gdk_broadway_screen_events_init   (GdkScreen *screen);
 GdkVisual *_gdk_broadway_screen_get_system_visual (GdkScreen * screen);
 gint _gdk_broadway_screen_visual_get_best_depth (GdkScreen * screen);
@@ -203,6 +219,9 @@ void _gdk_broadway_window_resize_surface        (GdkWindow *window);
 void _gdk_broadway_cursor_update_theme (GdkCursor *cursor);
 void _gdk_broadway_cursor_display_finalize (GdkDisplay *display);

+#define GDK_SCREEN_DISPLAY(screen)    (GDK_BROADWAY_SCREEN (screen)->display)
+#define GDK_WINDOW_SCREEN(win)	      (GDK_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl)->screen)
+#define GDK_WINDOW_DISPLAY(win)       (GDK_BROADWAY_SCREEN (GDK_WINDOW_SCREEN (win))->display)
 #define GDK_WINDOW_IS_BROADWAY(win)   (GDK_IS_WINDOW_IMPL_BROADWAY (((GdkWindow *)win)->impl))

 #endif /* __GDK_PRIVATE_BROADWAY_H__ */
@@ -35,6 +35,34 @@

 #include <string.h>

+GdkAtom
+_gdk_broadway_display_manager_atom_intern (GdkDisplayManager *manager,
+					   const gchar *atom_name, 
+					   gboolean     only_if_exists)
+{
+  return _GDK_MAKE_ATOM (g_quark_from_string (atom_name));
+}
+
+GdkAtom
+_gdk_broadway_display_manager_atom_intern_static_string (GdkDisplayManager *manager,
+							 const gchar *atom_name)
+{
+  return _GDK_MAKE_ATOM (g_quark_from_static_string (atom_name));
+}
+
+static const char *
+get_atom_name (GdkAtom atom)
+{
+  return g_quark_to_string (GPOINTER_TO_UINT(atom));
+}
+
+gchar *
+_gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager,
+					     GdkAtom atom)
+{
+  return g_strdup (get_atom_name (atom));
+}
+
 gboolean
 _gdk_broadway_window_get_property (GdkWindow   *window,
 				   GdkAtom      property,
@@ -1379,7 +1379,7 @@ gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
    return;

-  mv_resize = get_move_resize_data (gdk_window_get_display (window), TRUE);
+  mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window), TRUE);

  mv_resize->is_resize = TRUE;
  mv_resize->moveresize_button = button;
@@ -25,7 +25,6 @@
 #include "gdkdisplayprivate.h"

 #include "gdkdeviceprivate.h"
-#include "gdkdisplaymanagerprivate.h"
 #include "gdkevents.h"
 #include "gdkwindowimpl.h"
 #include "gdkinternals.h"
@@ -82,36 +81,6 @@ static guint signals[LAST_SIGNAL] = { 0 };

 G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT)

-static void
-gdk_display_real_make_default (GdkDisplay *display)
-{
-}
-
-static void
-device_removed_cb (GdkDeviceManager *device_manager,
-                   GdkDevice        *device,
-                   GdkDisplay       *display)
-{
-  g_hash_table_remove (display->multiple_click_info, device);
-  g_hash_table_remove (display->device_grabs, device);
-  g_hash_table_remove (display->pointers_info, device);
-
-  /* FIXME: change core pointer and remove from device list */
-}
-
-static void
-gdk_display_real_opened (GdkDisplay *display)
-{
-  GdkDeviceManager *device_manager;
-
-  device_manager = gdk_display_get_device_manager (display);
-
-  g_signal_connect (device_manager, "device-removed",
-                    G_CALLBACK (device_removed_cb), display);
-
-  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
-}
-
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
@@ -123,9 +92,6 @@ gdk_display_class_init (GdkDisplayClass *class)
  class->get_app_launch_context = gdk_display_real_get_app_launch_context;
  class->window_type = GDK_TYPE_WINDOW;

-  class->opened = gdk_display_real_opened;
-  class->make_default = gdk_display_real_make_default;
-
  /**
   * GdkDisplay::opened:
   * @display: the object on which the signal is emitted
@@ -137,8 +103,7 @@ gdk_display_class_init (GdkDisplayClass *class)
    g_signal_new (g_intern_static_string ("opened"),
 		  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (GdkDisplayClass, opened),
-                  NULL, NULL,
+                  0, NULL, NULL,
                  g_cclosure_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);

@@ -192,6 +157,29 @@ free_device_grabs_foreach (gpointer key,
  return TRUE;
 }

+static void
+device_removed_cb (GdkDeviceManager *device_manager,
+                   GdkDevice        *device,
+                   GdkDisplay       *display)
+{
+  g_hash_table_remove (display->multiple_click_info, device);
+  g_hash_table_remove (display->device_grabs, device);
+  g_hash_table_remove (display->pointers_info, device);
+
+  /* FIXME: change core pointer and remove from device list */
+}
+
+static void
+gdk_display_opened (GdkDisplay *display)
+{
+  GdkDeviceManager *device_manager;
+
+  device_manager = gdk_display_get_device_manager (display);
+
+  g_signal_connect (device_manager, "device-removed",
+                    G_CALLBACK (device_removed_cb), display);
+}
+
 static void
 gdk_display_init (GdkDisplay *display)
 {
@@ -208,6 +196,9 @@ gdk_display_init (GdkDisplay *display)

  display->multiple_click_info = g_hash_table_new_full (NULL, NULL, NULL,
                                                        (GDestroyNotify) g_free);
+
+  g_signal_connect (display, "opened",
+                    G_CALLBACK (gdk_display_opened), NULL);
 }

 static void
@@ -218,8 +209,6 @@ gdk_display_dispose (GObject *object)

  device_manager = gdk_display_get_device_manager (GDK_DISPLAY (object));

-  _gdk_display_manager_remove_display (gdk_display_manager_get (), display);
-
  g_list_free_full (display->queued_events, (GDestroyNotify) gdk_event_free);
  display->queued_events = NULL;
  display->queued_tail = NULL;
@@ -26,7 +26,6 @@

 #include "gdkconfig.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkdisplayprivate.h"
 #include "gdkinternals.h"
 #include "gdkkeysprivate.h"
 #include "gdkmarshalers.h"
@@ -34,7 +33,6 @@

 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
-#include "x11/gdkprivate-x11.h"
 #endif

 #ifdef GDK_WINDOWING_QUARTZ
@@ -43,22 +41,18 @@
 * "generic" GDK source code.
 */
 #include "quartz/gdkquartzdisplaymanager.h"
-#include "quartz/gdkprivate-quartz.h"
 #endif

 #ifdef GDK_WINDOWING_BROADWAY
 #include "broadway/gdkbroadwaydisplaymanager.h"
-#include "broadway/gdkprivate-broadway.h"
 #endif

 #ifdef GDK_WINDOWING_WIN32
 #include "win32/gdkwin32.h"
-#include "win32/gdkprivate-win32.h"
 #endif

 #ifdef GDK_WINDOWING_WAYLAND
 #include "wayland/gdkwayland.h"
-#include "wayland/gdkprivate-wayland.h"
 #endif

 /**
@@ -158,6 +152,8 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
  object_class->set_property = gdk_display_manager_set_property;
  object_class->get_property = gdk_display_manager_get_property;

+  klass->keyval_convert_case = _gdk_display_manager_real_keyval_convert_case;
+
  /**
   * GdkDisplayManager::display-opened:
   * @manager: the object on which the signal is emitted
@@ -301,34 +297,6 @@ gdk_display_manager_get (void)
  return manager;
 }

-typedef struct _GdkBackend GdkBackend;
-
-struct _GdkBackend {
-  const char *name;
-  GType (* get_backend_type) (void);
-  GdkDisplay * (* open_display) (const char *name);
-};
-
-GdkBackend gdk_backends[] = {
-#ifdef GDK_WINDOWING_QUARTZ
-  { "quartz",   gdk_quartz_display_manager_get_type,    _gdk_quartz_display_open },
-#endif
-#ifdef GDK_WINDOWING_WIN32
-  { "win32",    gdk_win32_display_manager_get_type,     _gdk_win32_display_open },
-#endif
-#ifdef GDK_WINDOWING_X11
-  { "x11",      gdk_x11_display_manager_get_type,       _gdk_x11_display_open },
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-  { "wayland",  gdk_wayland_display_manager_get_type,   _gdk_wayland_display_open },
-#endif
-#ifdef GDK_WINDOWING_BROADWAY
-  { "broadway", gdk_broadway_display_manager_get_type,  _gdk_broadway_display_open },
-#endif
-  /* NULL-terminating this array so we can use commas above */
-  { NULL, NULL }
-};
-
 /**
 * gdk_display_manager_peek:
 *
@@ -348,7 +316,7 @@ gdk_display_manager_peek (void)
    {
      const gchar *backend_list;
      gchar **backends;
-      gint i, j;
+      gint i;
      gboolean allow_any;

      if (allowed_backends == NULL)
@@ -368,18 +336,61 @@ gdk_display_manager_peek (void)
          if (!allow_any && !any && !strstr (allowed_backends, backend))
            continue;

-          for (j = 0; gdk_backends[j].name != NULL; j++)
+#ifdef GDK_WINDOWING_QUARTZ
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "quartz")) ||
+              g_str_equal (backend, "quartz"))
            {
-              if ((any && allow_any) ||
-                  (any && strstr (allowed_backends, gdk_backends[j].name)) ||
-                  g_str_equal (backend, gdk_backends[j].name))
-                {
-                  GDK_NOTE (MISC, g_message ("Trying %s backend", gdk_backends[j].name));
-                  manager = g_initable_new (gdk_backends[j].get_backend_type (), NULL, NULL, NULL);
-                  if (manager)
-                    break;
-                }
+              GDK_NOTE (MISC, g_message ("Trying quartz backend"));
+              manager = g_initable_new (gdk_quartz_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
            }
+#endif
+#ifdef GDK_WINDOWING_WIN32
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "win32")) ||
+              g_str_equal (backend, "win32"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying win32 backend"));
+              manager = g_initable_new (gdk_win32_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
+#ifdef GDK_WINDOWING_X11
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "x11")) ||
+              g_str_equal (backend, "x11"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying x11 backend"));
+              manager = g_initable_new (gdk_x11_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
+#ifdef GDK_WINDOWING_WAYLAND
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "wayland")) ||
+              g_str_equal (backend, "wayland"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying wayland backend"));
+              manager = g_initable_new (gdk_wayland_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
+#ifdef GDK_WINDOWING_BROADWAY
+          if ((any && allow_any) ||
+              (any && strstr (allowed_backends, "broadway")) ||
+              g_str_equal (backend, "broadway"))
+            {
+              GDK_NOTE (MISC, g_message ("Trying broadway backend"));
+              manager = g_initable_new (gdk_broadway_display_manager_get_type (), NULL, NULL, NULL);
+              if (manager)
+                break;
+            }
+#endif
        }
      g_strfreev (backends);
    }
@@ -387,6 +398,15 @@ gdk_display_manager_peek (void)
  return manager;
 }

+/* Used for cases where we don't actually want to instantiate a
+ * display manager if none exists.  Internal only.
+ */
+GdkDisplayManager *
+_gdk_display_manager_get_nocreate (void)
+{
+  return manager;
+}
+
 /**
 * gdk_display_manager_get_default_display:
 * @manager: a #GdkDisplayManager
@@ -401,7 +421,7 @@ gdk_display_manager_peek (void)
 GdkDisplay *
 gdk_display_manager_get_default_display (GdkDisplayManager *manager)
 {
-  return manager->default_display;
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_default_display (manager);
 }

 /**
@@ -458,10 +478,7 @@ void
 gdk_display_manager_set_default_display (GdkDisplayManager *manager,
                                         GdkDisplay        *display)
 {
-  manager->default_display = display;
-
-  if (display)
-    GDK_DISPLAY_GET_CLASS (display)->make_default (display);
+  GDK_DISPLAY_MANAGER_GET_CLASS (manager)->set_default_display (manager, display);

  g_object_notify (G_OBJECT (manager), "default-display");
 }
@@ -481,7 +498,7 @@ gdk_display_manager_set_default_display (GdkDisplayManager *manager,
 GSList *
 gdk_display_manager_list_displays (GdkDisplayManager *manager)
 {
-  return g_slist_copy (manager->displays);
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->list_displays (manager);
 }

 /**
@@ -500,45 +517,71 @@ GdkDisplay *
 gdk_display_manager_open_display (GdkDisplayManager *manager,
                                  const gchar       *name)
 {
-  guint i;
-
-  for (i = 0; gdk_backends[i].name != NULL; i++)
-    {
-      if (G_OBJECT_TYPE (manager) == gdk_backends[i].get_backend_type ())
-        {
-          return gdk_backends[i].open_display (name);
-        }
-    }
-
-  g_assert_not_reached ();
-
-  return NULL;
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->open_display (manager, name);
 }

-void
-_gdk_display_manager_add_display (GdkDisplayManager *manager,
-                                  GdkDisplay        *display)
+/**
+ * gdk_atom_intern:
+ * @atom_name: a string.
+ * @only_if_exists: if %TRUE, GDK is allowed to not create a new atom, but
+ *   just return %GDK_NONE if the requested atom doesn't already
+ *   exists. Currently, the flag is ignored, since checking the
+ *   existance of an atom is as expensive as creating it.
+ *
+ * Finds or creates an atom corresponding to a given string.
+ *
+ * Returns: (transfer none): the atom corresponding to @atom_name.
+ */
+GdkAtom
+gdk_atom_intern (const gchar *atom_name,
+                 gboolean     only_if_exists)
 {
-  if (manager->displays == NULL)
-    gdk_display_manager_set_default_display (manager, display);
+  GdkDisplayManager *manager = gdk_display_manager_get ();

-  manager->displays = g_slist_prepend (manager->displays, display);
-
-  g_signal_emit (manager, signals[DISPLAY_OPENED], 0, display);
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->atom_intern (manager, atom_name, TRUE);
 }

-/* NB: This function can be called multiple times per display. */
-void
-_gdk_display_manager_remove_display (GdkDisplayManager *manager,
-                                     GdkDisplay        *display)
+/**
+ * gdk_atom_intern_static_string:
+ * @atom_name: a static string
+ *
+ * Finds or creates an atom corresponding to a given string.
+ *
+ * Note that this function is identical to gdk_atom_intern() except
+ * that if a new #GdkAtom is created the string itself is used rather
+ * than a copy. This saves memory, but can only be used if the string
+ * will <emphasis>always</emphasis> exist. It can be used with statically
+ * allocated strings in the main program, but not with statically
+ * allocated memory in dynamically loaded modules, if you expect to
+ * ever unload the module again (e.g. do not use this function in
+ * GTK+ theme engines).
+ *
+ * Returns: (transfer none): the atom corresponding to @atom_name
+ *
+ * Since: 2.10
+ */
+GdkAtom
+gdk_atom_intern_static_string (const gchar *atom_name)
 {
-  manager->displays = g_slist_remove (manager->displays, display);
+  GdkDisplayManager *manager = gdk_display_manager_get ();

-  if (manager->default_display == display)
-    {
-      if (manager->displays)
-        gdk_display_manager_set_default_display (manager, manager->displays->data);
-      else
-        gdk_display_manager_set_default_display (manager, NULL);
-    }
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->atom_intern (manager, atom_name, FALSE);
+}
+
+/**
+ * gdk_atom_name:
+ * @atom: a #GdkAtom.
+ *
+ * Determines the string corresponding to an atom.
+ *
+ * Returns: a newly-allocated string containing the string
+ *   corresponding to @atom. When you are done with the
+ *   return value, you should free it using g_free().
+ */
+gchar *
+gdk_atom_name (GdkAtom atom)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_atom_name (manager, atom);
 }
@@ -31,25 +31,41 @@ typedef struct _GdkDisplayManagerClass GdkDisplayManagerClass;
 struct _GdkDisplayManager
 {
  GObject parent_instance;
-
-  GdkDisplay *default_display;
-
-  GSList *displays;
 };

 struct _GdkDisplayManagerClass
 {
  GObjectClass parent_class;

+  GSList *     (*list_displays)       (GdkDisplayManager *manager);
+  GdkDisplay * (*get_default_display) (GdkDisplayManager *manager);
+  void         (*set_default_display) (GdkDisplayManager *manager,
+                                       GdkDisplay        *display);
+  GdkDisplay * (*open_display)        (GdkDisplayManager *manager,
+                                       const gchar       *name);
+
+  /* FIXME the following should really be frontend-only, not vfuncs */
+  GdkAtom      (*atom_intern)         (GdkDisplayManager *manager,
+                                       const gchar       *atom_name,
+                                       gboolean           copy_name);
+  gchar *      (*get_atom_name)       (GdkDisplayManager *manager,
+                                       GdkAtom            atom);
+  guint        (*lookup_keyval)       (GdkDisplayManager *manager,
+                                       const gchar       *name);
+  gchar *      (*get_keyval_name)     (GdkDisplayManager *manager,
+                                       guint              keyval);
+  void         (*keyval_convert_case) (GdkDisplayManager *manager,
+                                       guint              keyval,
+                                       guint             *lower,
+                                       guint             *upper);
+
  /* signals */
  void         (*display_opened)      (GdkDisplayManager *manager,
                                       GdkDisplay        *display);
 };

-void            _gdk_display_manager_add_display        (GdkDisplayManager      *manager,
-                                                         GdkDisplay             *display);
-void            _gdk_display_manager_remove_display     (GdkDisplayManager      *manager,
-                                                         GdkDisplay             *display);
+GdkDisplayManager *
+_gdk_display_manager_get_nocreate (void);

 G_END_DECLS

@@ -142,7 +142,6 @@ struct _GdkDisplayClass
  void                       (*flush)              (GdkDisplay *display);
  gboolean                   (*has_pending)        (GdkDisplay *display);
  void                       (*queue_events)       (GdkDisplay *display);
-  void                       (*make_default)       (GdkDisplay *display);
  GdkWindow *                (*get_default_group)  (GdkDisplay *display);
  gboolean                   (*supports_selection_notification) (GdkDisplay *display);
  gboolean                   (*request_selection_notification)  (GdkDisplay *display,
@@ -237,7 +236,6 @@ struct _GdkDisplayClass
                                                        const gchar    *text);

  /* Signals */
-  void                   (*opened)                     (GdkDisplay     *display);
  void (*closed) (GdkDisplay *display,
                  gboolean    is_error);
 };
@@ -346,6 +346,8 @@ void       _gdk_screen_close             (GdkScreen      *screen);
 void _gdk_cursor_destroy (GdkCursor *cursor);

 extern const GOptionEntry _gdk_windowing_args[];
+gchar *_gdk_windowing_substitute_screen_number (const gchar *display_name,
+                                                gint         screen_number);

 void _gdk_windowing_got_event                (GdkDisplay       *display,
                                              GList            *event_link,
@@ -90,10 +90,7 @@ _gdk_keyval_from_name (const gchar *keyval_name)
  gdk_key *found;

  g_return_val_if_fail (keyval_name != NULL, 0);
-
-  if (strncmp (keyval_name,"XF86", 4) == 0)
-    keyval_name += 4;
-
+  
  found = bsearch (keyval_name, gdk_keys_by_name,
 		   GDK_NUM_KEYS, sizeof (gdk_key),
 		   gdk_keys_name_compare);
@@ -189,6 +189,28 @@ gdk_keymap_init (GdkKeymap *keymap)
 /* Other key-handling stuff
 */

+/**
+ * gdk_keyval_convert_case:
+ * @symbol: a keyval
+ * @lower: (out): return location for lowercase version of @symbol
+ * @upper: (out): return location for uppercase version of @symbol
+ *
+ * Obtains the upper- and lower-case versions of the keyval @symbol.
+ * Examples of keyvals are #GDK_KEY_a, #GDK_KEY_Enter, #GDK_KEY_F1, etc.
+ */
+void
+gdk_keyval_convert_case (guint symbol,
+                         guint *lower,
+                         guint *upper)
+{
+  GdkDisplayManager *manager = _gdk_display_manager_get_nocreate ();
+
+  if (manager)
+    GDK_DISPLAY_MANAGER_GET_CLASS (manager)->keyval_convert_case (manager, symbol, lower, upper);
+  else
+    _gdk_display_manager_real_keyval_convert_case (NULL, symbol, lower, upper);
+}
+
 /**
 * gdk_keyval_to_upper:
 * @keyval: a key value.
@@ -674,7 +696,6 @@ gdk_keymap_get_modifier_mask (GdkKeymap         *keymap,
  return GDK_KEYMAP_GET_CLASS (keymap)->get_modifier_mask (keymap, intent);
 }

-#include "gdkkeynames.c"

 /**
 * gdk_keyval_name:
@@ -693,7 +714,10 @@ gdk_keymap_get_modifier_mask (GdkKeymap         *keymap,
 gchar *
 gdk_keyval_name (guint keyval)
 {
-  return _gdk_keyval_name (keyval);
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->get_keyval_name (manager,
+                                                                   keyval);
 }

 /**
@@ -712,27 +736,20 @@ gdk_keyval_name (guint keyval)
 guint
 gdk_keyval_from_name (const gchar *keyval_name)
 {
-  return _gdk_keyval_from_name (keyval_name);
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+
+  return GDK_DISPLAY_MANAGER_GET_CLASS (manager)->lookup_keyval (manager,
+                                                                 keyval_name);
 }

-/**
- * gdk_keyval_convert_case:
- * @symbol: a keyval
- * @lower: (out): return location for lowercase version of @symbol
- * @upper: (out): return location for uppercase version of @symbol
- *
- * Obtains the upper- and lower-case versions of the keyval @symbol.
- * Examples of keyvals are #GDK_KEY_a, #GDK_KEY_Enter, #GDK_KEY_F1, etc.
- */
 void
-gdk_keyval_convert_case (guint symbol,
-                         guint *lower,
-                         guint *upper)
+_gdk_display_manager_real_keyval_convert_case (GdkDisplayManager *manager,
+                                               guint              symbol,
+                                               guint             *lower,
+                                               guint             *upper)
 {
-  guint xlower, xupper;
-
-  xlower = symbol;
-  xupper = symbol;
+  guint xlower = symbol;
+  guint xupper = symbol;

  /* Check for directly encoded 24-bit UCS characters: */
  if ((symbol & 0xff000000) == 0x01000000)
@@ -76,6 +76,11 @@ struct _GdkKeymap
  GdkDisplay *display;
 };

+void _gdk_display_manager_real_keyval_convert_case (GdkDisplayManager *manager,
+                                                    guint              symbol,
+                                                    guint             *lower,
+                                                    guint             *upper);
+
 G_END_DECLS

 #endif
@@ -2278,7 +2278,6 @@
 #define GDK_TouchpadToggle 0x1008ffa9
 #define GDK_TouchpadOn 0x1008ffb0
 #define GDK_TouchpadOff 0x1008ffb1
-#define GDK_AudioMicMute 0x1008ffb2
 #define GDK_Switch_VT_1 0x1008fe01
 #define GDK_Switch_VT_2 0x1008fe02
 #define GDK_Switch_VT_3 0x1008fe03
@@ -2287,7 +2287,6 @@
 #define GDK_KEY_TouchpadToggle 0x1008ffa9
 #define GDK_KEY_TouchpadOn 0x1008ffb0
 #define GDK_KEY_TouchpadOff 0x1008ffb1
-#define GDK_KEY_AudioMicMute 0x1008ffb2
 #define GDK_KEY_Switch_VT_1 0x1008fe01
 #define GDK_KEY_Switch_VT_2 0x1008fe02
 #define GDK_KEY_Switch_VT_3 0x1008fe03
@@ -29,8 +29,6 @@

 G_BEGIN_DECLS

-const char * _gdk_atom_name_const (GdkAtom atom);
-
 void gdk_window_destroy_notify	     (GdkWindow *window);

 void gdk_synthesize_window_state (GdkWindow     *window,
@@ -1,254 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2000 Red Hat, Inc.
- *               2005 Imendio AB
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdkproperty.h"
-
-#include "gdkprivate.h"
-
-/**
- * SECTION:properties
- * @Short_description: Functions to manipulate properties on windows
- * @Title: Properties and Atoms
- *
- * Each window under X can have any number of associated
- * <firstterm>properties</firstterm> attached to it.
- * Properties are arbitrary chunks of data identified by
- * <firstterm>atom</firstterm>s. (An <firstterm>atom</firstterm>
- * is a numeric index into a string table on the X server. They are used
- * to transfer strings efficiently between clients without
- * having to transfer the entire string.) A property
- * has an associated type, which is also identified
- * using an atom.
- *
- * A property has an associated <firstterm>format</firstterm>,
- * an integer describing how many bits are in each unit
- * of data inside the property. It must be 8, 16, or 32.
- * When data is transferred between the server and client,
- * if they are of different endianesses it will be byteswapped
- * as necessary according to the format of the property.
- * Note that on the client side, properties of format 32
- * will be stored with one unit per <emphasis>long</emphasis>,
- * even if a long integer has more than 32 bits on the platform.
- * (This decision was apparently made for Xlib to maintain
- * compatibility with programs that assumed longs were 32
- * bits, at the expense of programs that knew better.)
- *
- * The functions in this section are used to add, remove
- * and change properties on windows, to convert atoms
- * to and from strings and to manipulate some types of
- * data commonly stored in X window properties.
- */
-
-static GHashTable *names_to_atoms;
-static GPtrArray *atoms_to_names;
-
-static const gchar xatoms_string[] = 
-  /* These are all the standard predefined X atoms */
-  "NONE\0"
-  "PRIMARY\0"
-  "SECONDARY\0"
-  "ARC\0"
-  "ATOM\0"
-  "BITMAP\0"
-  "CARDINAL\0"
-  "COLORMAP\0"
-  "CURSOR\0"
-  "CUT_BUFFER0\0"
-  "CUT_BUFFER1\0"
-  "CUT_BUFFER2\0"
-  "CUT_BUFFER3\0"
-  "CUT_BUFFER4\0"
-  "CUT_BUFFER5\0"
-  "CUT_BUFFER6\0"
-  "CUT_BUFFER7\0"
-  "DRAWABLE\0"
-  "FONT\0"
-  "INTEGER\0"
-  "PIXMAP\0"
-  "POINT\0"
-  "RECTANGLE\0"
-  "RESOURCE_MANAGER\0"
-  "RGB_COLOR_MAP\0"
-  "RGB_BEST_MAP\0"
-  "RGB_BLUE_MAP\0"
-  "RGB_DEFAULT_MAP\0"
-  "RGB_GRAY_MAP\0"
-  "RGB_GREEN_MAP\0"
-  "RGB_RED_MAP\0"
-  "STRING\0"
-  "VISUALID\0"
-  "WINDOW\0"
-  "WM_COMMAND\0"
-  "WM_HINTS\0"
-  "WM_CLIENT_MACHINE\0"
-  "WM_ICON_NAME\0"
-  "WM_ICON_SIZE\0"
-  "WM_NAME\0"
-  "WM_NORMAL_HINTS\0"
-  "WM_SIZE_HINTS\0"
-  "WM_ZOOM_HINTS\0"
-  "MIN_SPACE\0"
-  "NORM_SPACE\0"
-  "MAX_SPACE\0"
-  "END_SPACE\0"
-  "SUPERSCRIPT_X\0"
-  "SUPERSCRIPT_Y\0"
-  "SUBSCRIPT_X\0"
-  "SUBSCRIPT_Y\0"
-  "UNDERLINE_POSITION\0"
-  "UNDERLINE_THICKNESS\0"
-  "STRIKEOUT_ASCENT\0"
-  "STRIKEOUT_DESCENT\0"
-  "ITALIC_ANGLE\0"
-  "X_HEIGHT\0"
-  "QUAD_WIDTH\0"
-  "WEIGHT\0"
-  "POINT_SIZE\0"
-  "RESOLUTION\0"
-  "COPYRIGHT\0"
-  "NOTICE\0"
-  "FONT_NAME\0"
-  "FAMILY_NAME\0"
-  "FULL_NAME\0"
-  "CAP_HEIGHT\0"
-  "WM_CLASS\0"
-  "WM_TRANSIENT_FOR\0"
-  "CLIPBOARD\0"			/* = 69 */;
-
-static const gint xatoms_offset[] = {
-    0,   5,  13,  23,  27,  32,  39,  48,  57,  64,  76,  88, 
-  100, 112, 124, 136, 148, 160, 169, 174, 182, 189, 195, 205, 
-  222, 236, 249, 262, 278, 291, 305, 317, 324, 333, 340, 351, 
-  360, 378, 391, 404, 412, 428, 442, 456, 466, 477, 487, 497, 
-  511, 525, 537, 549, 568, 588, 605, 623, 636, 645, 656, 663, 
-  674, 685, 695, 702, 712, 724, 734, 745, 754, 771
-};
-
-static void
-ensure_atom_tables (void)
-{
-  int i;
-  
-  if (names_to_atoms)
-    return;
-
-  names_to_atoms = g_hash_table_new (g_str_hash, g_str_equal);
-  atoms_to_names = g_ptr_array_sized_new (G_N_ELEMENTS (xatoms_offset));
-
-  for (i = 0; i < G_N_ELEMENTS (xatoms_offset); i++)
-    {
-      g_hash_table_insert(names_to_atoms, (gchar *)xatoms_string + xatoms_offset[i], GINT_TO_POINTER (i));
-      g_ptr_array_add(atoms_to_names, (gchar *)xatoms_string + xatoms_offset[i]);
-    }
-}
-
-static GdkAtom
-intern_atom_internal (const gchar *atom_name, gboolean allocate)
-{
-  gpointer result;
-  gchar *name;
-
-  ensure_atom_tables ();
-  
-  if (g_hash_table_lookup_extended (names_to_atoms, atom_name, NULL, &result))
-    return result;
-  
-  result = GINT_TO_POINTER (atoms_to_names->len);
-  name = allocate ? g_strdup (atom_name) : (gchar *)atom_name;
-  g_hash_table_insert(names_to_atoms, name, result);
-  g_ptr_array_add(atoms_to_names, name);
-  
-  return result;  
-}
-
-/**
- * gdk_atom_intern:
- * @atom_name: a string.
- * @only_if_exists: if %TRUE, GDK is allowed to not create a new atom, but
- *   just return %GDK_NONE if the requested atom doesn't already
- *   exists. Currently, the flag is ignored, since checking the
- *   existance of an atom is as expensive as creating it.
- *
- * Finds or creates an atom corresponding to a given string.
- *
- * Returns: (transfer none): the atom corresponding to @atom_name.
- */
-GdkAtom
-gdk_atom_intern (const gchar *atom_name,
-                 gboolean     only_if_exists)
-{
-  g_return_val_if_fail (atom_name != NULL, GDK_NONE);
-
-  return intern_atom_internal (atom_name, TRUE);
-}
-
-/**
- * gdk_atom_intern_static_string:
- * @atom_name: a static string
- *
- * Finds or creates an atom corresponding to a given string.
- *
- * Note that this function is identical to gdk_atom_intern() except
- * that if a new #GdkAtom is created the string itself is used rather
- * than a copy. This saves memory, but can only be used if the string
- * will <emphasis>always</emphasis> exist. It can be used with statically
- * allocated strings in the main program, but not with statically
- * allocated memory in dynamically loaded modules, if you expect to
- * ever unload the module again (e.g. do not use this function in
- * GTK+ theme engines).
- *
- * Returns: (transfer none): the atom corresponding to @atom_name
- *
- * Since: 2.10
- */
-GdkAtom
-gdk_atom_intern_static_string (const gchar *atom_name)
-{
-  g_return_val_if_fail (atom_name != NULL, GDK_NONE);
-
-  return intern_atom_internal (atom_name, FALSE);
-}
-
-/**
- * gdk_atom_name:
- * @atom: a #GdkAtom.
- *
- * Determines the string corresponding to an atom.
- *
- * Returns: a newly-allocated string containing the string
- *   corresponding to @atom. When you are done with the
- *   return value, you should free it using g_free().
- */
-gchar *
-gdk_atom_name (GdkAtom atom)
-{
-  return g_strdup (_gdk_atom_name_const (atom));
-}
-
-const gchar *
-_gdk_atom_name_const (GdkAtom atom)
-{
-  ensure_atom_tables ();
-
-  if (GPOINTER_TO_INT (atom) >= atoms_to_names->len)
-    return NULL;
-
-  return g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom));
-}
@@ -1,65 +1,28 @@
-BackSpace
-Tab
-Return
-Pause
-Scroll_Lock
-Sys_Req
-Escape
-Multi_key
-Home
-Left
-Up
-Right
-Down
-Page_Up
-Page_Down
-End
-Begin
-Print
-Insert
-Num_Lock
-KP_Space
-KP_Tab
-KP_Enter
-KP_Home
-KP_Left
-KP_Up
-KP_Right
-KP_Down
-KP_Page_Up
-KP_Prior
-KP_Page_Down
-KP_Next
-KP_End
-KP_Begin
-KP_Insert
-KP_Delete
-Delete
-MonBrightnessUp
-MonBrightnessDown
-KbdBrightnessUp
-KbdBrightnessDown
-AudioMute
-AudioLowerVolume
-AudioRaiseVolume
-AudioPlay
-AudioStop
-AudioNext
-AudioPrev
-AudioRecord
-AudioPause
-AudioRewind
-AudioMedia
-ScreenSaver
-Battery
-Launch1
-Forward
-Back
-Sleep
-Hibernate
-WLAN
-WebCam
-Display
-TouchpadToggle
-WakeUp
-Suspend
+XF86MonBrightnessUp
+XF86MonBrightnessDown
+XF86KbdBrightnessUp
+XF86KbdBrightnessDown
+XF86AudioMute
+XF86AudioLowerVolume
+XF86AudioRaiseVolume
+XF86AudioPlay
+XF86AudioStop
+XF86AudioNext
+XF86AudioPrev
+XF86AudioRecord
+XF86AudioPause
+XF86AudioRewind
+XF86AudioMedia
+XF86ScreenSaver
+XF86Battery
+XF86Launch1
+XF86Forward
+XF86Back
+XF86Sleep
+XF86Hibernate
+XF86WLAN
+XF86WebCam
+XF86Display
+XF86TouchpadToggle
+XF86WakeUp
+XF86Suspend
@@ -134,7 +134,8 @@ _gdk_quartz_display_open (const gchar *display_name)
  _gdk_quartz_dnd_init ();
 #endif

-  g_signal_emit_by_name (_gdk_display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get (),
+			 "display_opened", _gdk_display);

  return _gdk_display;
 }
@@ -264,6 +265,8 @@ G_DEFINE_TYPE (GdkQuartzDisplay, gdk_quartz_display, GDK_TYPE_DISPLAY)
 static void
 gdk_quartz_display_init (GdkQuartzDisplay *display)
 {
+  _gdk_quartz_display_manager_add_display (gdk_display_manager_get (),
+                                           GDK_DISPLAY_OBJECT (display));
 }

 static void
@@ -271,6 +274,9 @@ gdk_quartz_display_dispose (GObject *object)
 {
  GdkQuartzDisplay *display_quartz = GDK_QUARTZ_DISPLAY (object);

+  _gdk_quartz_display_manager_remove_display (gdk_display_manager_get (),
+                                              GDK_DISPLAY_OBJECT (object));
+
  g_list_foreach (display_quartz->input_devices,
                  (GFunc) g_object_run_dispose, NULL);

@@ -35,11 +35,60 @@
 struct _GdkQuartzDisplayManager
 {
  GdkDisplayManager parent;
+
+  GdkDisplay *default_display;
+  GSList *displays;
 };


 G_DEFINE_TYPE (GdkQuartzDisplayManager, gdk_quartz_display_manager, GDK_TYPE_DISPLAY_MANAGER)

+static GdkDisplay *
+gdk_quartz_display_manager_open_display (GdkDisplayManager *manager,
+                                         const gchar       *name)
+{
+  return _gdk_quartz_display_open (name);
+}
+
+static GSList *
+gdk_quartz_display_manager_list_displays (GdkDisplayManager *manager)
+{
+  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
+
+  return g_slist_copy (manager_quartz->displays);
+}
+
+static GdkDisplay *
+gdk_quartz_display_manager_get_default_display (GdkDisplayManager *manager)
+{
+  return GDK_QUARTZ_DISPLAY_MANAGER (manager)->default_display;
+}
+
+static void
+gdk_quartz_display_manager_set_default_display (GdkDisplayManager *manager,
+                                                GdkDisplay        *display)
+{
+  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
+
+  manager_quartz->default_display = display;
+}
+
+#include "../gdkkeynames.c"
+
+static gchar *
+gdk_quartz_display_manager_get_keyval_name (GdkDisplayManager *manager,
+                                            guint              keyval)
+{
+  return _gdk_keyval_name (keyval);
+}
+
+static guint
+gdk_quartz_display_manager_lookup_keyval (GdkDisplayManager *manager,
+                                          const gchar       *name)
+{
+  return _gdk_keyval_from_name (name);
+}
+
 static void
 gdk_quartz_display_manager_init (GdkQuartzDisplayManager *manager)
 {
@@ -72,6 +121,41 @@ gdk_quartz_display_manager_class_init (GdkQuartzDisplayManagerClass *class)

  object_class->finalize = gdk_quartz_display_manager_finalize;

+  manager_class->open_display = gdk_quartz_display_manager_open_display;
+  manager_class->list_displays = gdk_quartz_display_manager_list_displays;
+  manager_class->set_default_display = gdk_quartz_display_manager_set_default_display;
+  manager_class->get_default_display = gdk_quartz_display_manager_get_default_display;
  manager_class->atom_intern = _gdk_quartz_display_manager_atom_intern;
  manager_class->get_atom_name = _gdk_quartz_display_manager_get_atom_name;
+  manager_class->lookup_keyval = gdk_quartz_display_manager_lookup_keyval;
+  manager_class->get_keyval_name = gdk_quartz_display_manager_get_keyval_name;
+}
+
+void
+_gdk_quartz_display_manager_add_display (GdkDisplayManager *manager,
+                                         GdkDisplay        *display)
+{
+  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
+
+  if (manager_quartz->displays == NULL)
+    gdk_display_manager_set_default_display (manager, display);
+
+  manager_quartz->displays = g_slist_prepend (manager_quartz->displays, display);
+}
+
+void
+_gdk_quartz_display_manager_remove_display (GdkDisplayManager *manager,
+                                            GdkDisplay        *display)
+{
+  GdkQuartzDisplayManager *manager_quartz = GDK_QUARTZ_DISPLAY_MANAGER (manager);
+
+  manager_quartz->displays = g_slist_remove (manager_quartz->displays, display);
+
+  if (manager_quartz->default_display == display)
+    {
+      if (manager_quartz->displays)
+        gdk_display_manager_set_default_display (manager, manager_quartz->displays->data);
+      else
+        gdk_display_manager_set_default_display (manager, NULL);
+    }
 }
@@ -155,6 +155,12 @@ gchar *     _gdk_quartz_display_utf8_to_string_target      (GdkDisplay     *disp
                                                            const gchar    *str);


+/* Display manager */
+void    _gdk_quartz_display_manager_add_display    (GdkDisplayManager *manager,
+                                                    GdkDisplay        *display);
+void    _gdk_quartz_display_manager_remove_display (GdkDisplayManager *manager,
+                                                    GdkDisplay        *display);
+
 /* Display manager methods - events */
 GdkAtom _gdk_quartz_display_manager_atom_intern   (GdkDisplayManager *manager,
                                                   const gchar       *atom_name,
@@ -301,6 +301,16 @@ gdk_quartz_screen_get_number (GdkScreen *screen)
  return 0;
 }

+gchar *
+_gdk_windowing_substitute_screen_number (const gchar *display_name,
+					 int          screen_number)
+{
+  if (screen_number != 0)
+    return NULL;
+
+  return g_strdup (display_name);
+}
+
 static gint
 gdk_quartz_screen_get_width (GdkScreen *screen)
 {
@@ -31,10 +31,6 @@ TEST_PROGS        += display
 display_SOURCES    = display.c
 display_LDADD      = $(progs_ldadd)

-TEST_PROGS        += keysyms
-keysyms_SOURCES    = keysyms.c
-keysyms_LDADD      = $(progs_ldadd)
-
 CLEANFILES = \
 	cairosurface.png	\
 	gdksurface.png
@@ -1,69 +0,0 @@
-#include <locale.h>
-#include <gdk/gdk.h>
-
-static void
-test_keysyms_basic (void)
-{
-  struct {
-    guint keyval;
-    const gchar *name;
-    const gchar *other_name;
-  } tests[] = {
-    { GDK_KEY_space, "space", NULL },
-    { GDK_KEY_a, "a", NULL },
-    { GDK_KEY_Thorn, "Thorn", "THORN" },
-    { GDK_KEY_Hangul_J_RieulTieut, "Hangul_J_RieulTieut", NULL },
-    { GDK_KEY_Page_Up, "Page_Up", NULL },
-    { GDK_KEY_KP_Multiply, "KP_Multiply", NULL },
-    { GDK_KEY_MonBrightnessUp, "MonBrightnessUp", NULL },
-    { 0, NULL }
-  };
-  gint i;
-
- for (i = 0; tests[i].keyval != 0; i++)
-   {
-     g_assert_cmpstr (gdk_keyval_name (tests[i].keyval), ==, tests[i].name);
-     g_assert_cmpuint (gdk_keyval_from_name (tests[i].name), ==, tests[i].keyval);
-     if (tests[i].other_name)
-       g_assert_cmpuint (gdk_keyval_from_name (tests[i].other_name), ==, tests[i].keyval);
-   }
-}
-
-static void
-test_keysyms_void (void)
-{
-  g_assert_cmpuint (gdk_keyval_from_name ("NoSuchKeysym"), ==, GDK_KEY_VoidSymbol);
-  g_assert_cmpstr (gdk_keyval_name (GDK_KEY_VoidSymbol), ==, "0xffffff");
-}
-
-static void
-test_keysyms_xf86 (void)
-{
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86MonBrightnessUp"), ==, GDK_KEY_MonBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86MonBrightnessDown"), ==, GDK_KEY_MonBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86KbdBrightnessUp"), ==, GDK_KEY_KbdBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86KbdBrightnessDown"), ==, GDK_KEY_KbdBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86Battery"), ==, GDK_KEY_Battery);
-  g_assert_cmpuint (gdk_keyval_from_name ("XF86Display"), ==, GDK_KEY_Display);
-
-  g_assert_cmpuint (gdk_keyval_from_name ("MonBrightnessUp"), ==, GDK_KEY_MonBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("MonBrightnessDown"), ==, GDK_KEY_MonBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("KbdBrightnessUp"), ==, GDK_KEY_KbdBrightnessUp);
-  g_assert_cmpuint (gdk_keyval_from_name ("KbdBrightnessDown"), ==, GDK_KEY_KbdBrightnessDown);
-  g_assert_cmpuint (gdk_keyval_from_name ("Battery"), ==, GDK_KEY_Battery);
-  g_assert_cmpuint (gdk_keyval_from_name ("Display"), ==, GDK_KEY_Display);
-}
-
-int main (int argc, char *argv[])
-{
-  setlocale (LC_ALL, "");
-
-  g_test_init (&argc, &argv, NULL);
-  gdk_init (&argc, &argv);
-
-  g_test_add_func ("/keysyms/basic", test_keysyms_basic);
-  g_test_add_func ("/keysyms/void", test_keysyms_void);
-  g_test_add_func ("/keysyms/xf86", test_keysyms_xf86);
-
-  return g_test_run ();
-}
@@ -251,6 +251,7 @@ _gdk_wayland_display_open (const gchar *display_name)
  gdk_input_init (display);

  g_signal_emit_by_name (display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get(), "display_opened", display);

  return display;
 }
@@ -423,6 +424,11 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
  return ++serial;
 }

+void
+_gdk_wayland_display_make_default (GdkDisplay *display)
+{
+}
+
 /**
 * gdk_wayland_display_broadcast_startup_message:
 * @display: a #GdkDisplay
@@ -27,12 +27,18 @@
 #include "gdkwayland.h"
 #include "gdkinternals.h"

+#include <xkbcommon/xkbcommon.h>
+
 struct _GdkWaylandDisplayManager
 {
  GdkDisplayManager parent;

+  GdkDisplay *default_display;
  GSList *displays;

+  GHashTable *name_to_atoms;
+  guint next_atom;
+
  gboolean init_failed;
 };

@@ -53,12 +59,6 @@ gdk_wayland_display_manager_initable_init (GInitable     *initable,
 {
  struct wl_display *wl_display;

-  /* Set by the compositor when launching a special client - and it gets reset
-   * by wl_display_connect so we must avoid calling it twice
-   */
-  if (g_getenv ("WAYLAND_SOCKET"))
-    return TRUE;
-
  /* check that a connection to the default display is possible */
  wl_display = wl_display_connect (gdk_get_display_arg_name ());

@@ -88,17 +88,172 @@ gdk_wayland_display_manager_finalize (GObject *object)
  G_OBJECT_CLASS (gdk_wayland_display_manager_parent_class)->finalize (object);
 }

+static GdkDisplay *
+gdk_wayland_display_manager_open_display (GdkDisplayManager *manager,
+					  const gchar       *name)
+{
+  return _gdk_wayland_display_open (name);
+}
+
+static GSList *
+gdk_wayland_display_manager_list_displays (GdkDisplayManager *manager)
+{
+  return g_slist_copy (GDK_WAYLAND_DISPLAY_MANAGER (manager)->displays);
+}
+
+static void
+gdk_wayland_display_manager_set_default_display (GdkDisplayManager *manager,
+						 GdkDisplay        *display)
+{
+  GDK_WAYLAND_DISPLAY_MANAGER (manager)->default_display = display;
+
+  _gdk_wayland_display_make_default (display);
+}
+
+static GdkDisplay *
+gdk_wayland_display_manager_get_default_display (GdkDisplayManager *manager)
+{
+  return GDK_WAYLAND_DISPLAY_MANAGER (manager)->default_display;
+}
+
+static GdkAtom
+gdk_wayland_display_manager_atom_intern (GdkDisplayManager *manager_in,
+					 const gchar       *atom_name,
+					 gboolean           dup)
+{
+  GdkWaylandDisplayManager *manager = GDK_WAYLAND_DISPLAY_MANAGER (manager_in);
+  GdkAtom atom;
+  gpointer data;
+  const gchar *atom_name_intern;
+
+  atom_name_intern = g_intern_string (atom_name);
+  data = g_hash_table_lookup (manager->name_to_atoms, atom_name_intern);
+
+  if (data)
+    {
+      atom = GDK_POINTER_TO_ATOM (data);
+      return atom;
+    }
+
+  atom = _GDK_MAKE_ATOM (manager->next_atom);
+
+  g_hash_table_insert (manager->name_to_atoms,
+                       (gchar *)atom_name_intern,
+                       GDK_ATOM_TO_POINTER (atom));
+  manager->next_atom++;
+
+  return atom;
+}
+
+static gchar *
+gdk_wayland_display_manager_get_atom_name (GdkDisplayManager *manager_in,
+					   GdkAtom            atom)
+{
+  GdkWaylandDisplayManager *manager = GDK_WAYLAND_DISPLAY_MANAGER (manager_in);
+  GHashTableIter iter;
+  gpointer key, value;
+
+  g_hash_table_iter_init (&iter, manager->name_to_atoms);
+
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      if (GDK_POINTER_TO_ATOM (value) == atom)
+        return g_strdup (key);
+    }
+
+  return NULL;
+}
+
+static guint
+gdk_wayland_display_manager_lookup_keyval (GdkDisplayManager *manager,
+					   const gchar       *keyval_name)
+{
+  g_return_val_if_fail (keyval_name != NULL, 0);
+
+  return xkb_keysym_from_name (keyval_name, 0);
+}
+
+static gchar *
+gdk_wayland_display_manager_get_keyval_name (GdkDisplayManager *manager,
+					     guint              keyval)
+{
+  static char buf[128];
+
+  switch (keyval)
+    {
+    case 0:
+      return NULL;
+    case GDK_KEY_Page_Up:
+      return "Page_Up";
+    case GDK_KEY_Page_Down:
+      return "Page_Down";
+    case GDK_KEY_KP_Page_Up:
+      return "KP_Page_Up";
+    case GDK_KEY_KP_Page_Down:
+      return "KP_Page_Down";
+    }
+
+  xkb_keysym_get_name(keyval, buf, sizeof (buf));
+
+  return buf;
+}
+
 static void
 gdk_wayland_display_manager_class_init (GdkWaylandDisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_wayland_display_manager_finalize;
+
+  manager_class->open_display = gdk_wayland_display_manager_open_display;
+  manager_class->list_displays = gdk_wayland_display_manager_list_displays;
+  manager_class->set_default_display = gdk_wayland_display_manager_set_default_display;
+  manager_class->get_default_display = gdk_wayland_display_manager_get_default_display;
+  manager_class->atom_intern = gdk_wayland_display_manager_atom_intern;
+  manager_class->get_atom_name = gdk_wayland_display_manager_get_atom_name;
+  manager_class->lookup_keyval = gdk_wayland_display_manager_lookup_keyval;
+  manager_class->get_keyval_name = gdk_wayland_display_manager_get_keyval_name;
 }

+static struct {
+  const gchar *name;
+  guint atom_id;
+} predefined_atoms[] = {
+      { "NONE", 0 },
+      { "PRIMARY", 1 },
+      { "SECONDARY", 2 },
+      { "ATOM", 4 },
+      { "BITMAP", 5 },
+      { "COLORMAP", 7 },
+      { "DRAWABLE", 17 },
+      { "INTEGER", 19 },
+      { "PIXMAP", 20 },
+      { "STRING", 31 },
+      { "WINDOW", 33 },
+      { "CLIPBOARD", 69 },
+};
+
 static void
 gdk_wayland_display_manager_init (GdkWaylandDisplayManager *manager)
 {
+  gint i;
+
+  manager->name_to_atoms = g_hash_table_new (NULL, NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (predefined_atoms); i++)
+    {
+      GdkAtom atom;
+      const gchar *atom_name = predefined_atoms[i].name;
+
+      atom = _GDK_MAKE_ATOM (predefined_atoms[i].atom_id);
+      g_hash_table_insert (manager->name_to_atoms,
+                           (gchar *)g_intern_static_string (atom_name),
+                           GDK_ATOM_TO_POINTER (atom));
+    }
+
+  manager->next_atom =
+    predefined_atoms[G_N_ELEMENTS (predefined_atoms) - 1].atom_id + 1;
 }

 void
@@ -121,7 +276,7 @@ _gdk_wayland_display_manager_remove_display (GdkDisplayManager *manager,

  manager_wayland->displays = g_slist_remove (manager_wayland->displays, display);

-  if (gdk_display_manager_get_default_display (manager) == display)
+  if (manager_wayland->default_display == display)
    {
      if (manager_wayland->displays)
        gdk_display_manager_set_default_display (manager, manager_wayland->displays->data);
@@ -40,6 +40,9 @@

 #include "config.h"

+#define GDK_SCREEN_DISPLAY(screen)    (GDK_SCREEN_WAYLAND (screen)->display)
+#define GDK_WINDOW_SCREEN(win)	      (gdk_window_get_screen (win))
+#define GDK_WINDOW_DISPLAY(win)       (GDK_SCREEN_WAYLAND (GDK_WINDOW_SCREEN (win))->display)
 #define GDK_WINDOW_IS_WAYLAND(win)    (GDK_IS_WINDOW_IMPL_WAYLAND (((GdkWindow *)win)->impl))

 void _gdk_wayland_window_add_focus    (GdkWindow *window);
@@ -153,6 +156,7 @@ void     _gdk_wayland_display_queue_events (GdkDisplay *display);
 GdkAppLaunchContext *_gdk_wayland_display_get_app_launch_context (GdkDisplay *display);

 GdkDisplay *_gdk_wayland_display_open (const gchar *display_name);
+void        _gdk_wayland_display_make_default (GdkDisplay *display);

 GdkWindow *_gdk_wayland_screen_create_root_window (GdkScreen *screen,
 						   int width,
@@ -714,9 +714,7 @@ gdk_wayland_window_show (GdkWindow *window, gboolean already_mapped)
      wl_surface_set_user_data(impl->surface, window);
    }

-  if (!impl->shell_surface &&
-      !impl->use_custom_surface &&
-      display_wayland->shell)
+  if (!impl->use_custom_surface && display_wayland->shell)
    {
      impl->shell_surface = wl_shell_get_shell_surface (display_wayland->shell,
                                                        impl->surface);
@@ -215,7 +215,8 @@ _gdk_win32_display_open (const gchar *display_name)
  /* Precalculate display name */
  (void) gdk_display_get_name (_gdk_display);

-  g_signal_emit_by_name (_gdk_display, "opened");
+  g_signal_emit_by_name (gdk_display_manager_get (),
+			 "display_opened", _gdk_display);

  GDK_NOTE (MISC, g_print ("... _gdk_display now set up\n"));

@@ -38,6 +38,48 @@ struct _GdkWin32DisplayManagerClass

 G_DEFINE_TYPE (GdkWin32DisplayManager, gdk_win32_display_manager, GDK_TYPE_DISPLAY_MANAGER)

+static GdkDisplay *
+gdk_win32_display_manager_open_display (GdkDisplayManager *manager,
+                                         const gchar       *name)
+{
+  return _gdk_win32_display_open (name);
+}
+
+static GSList *
+gdk_win32_display_manager_list_displays (GdkDisplayManager *manager)
+{
+  return g_slist_append (NULL, gdk_display_get_default ());
+}
+
+static GdkDisplay *
+gdk_win32_display_manager_get_default_display (GdkDisplayManager *manager)
+{
+  return _gdk_win32_display_open (NULL);
+}
+
+static void
+gdk_win32_display_manager_set_default_display (GdkDisplayManager *manager,
+                                               GdkDisplay        *display)
+{
+  g_assert (gdk_display_get_default () == display);
+}
+
+#include "../gdkkeynames.c"
+
+static gchar *
+gdk_win32_display_manager_get_keyval_name (GdkDisplayManager *manager,
+                                           guint              keyval)
+{
+  return _gdk_keyval_name (keyval);
+}
+
+static guint
+gdk_win32_display_manager_lookup_keyval (GdkDisplayManager *manager,
+                                         const gchar       *name)
+{
+  return _gdk_keyval_from_name (name);
+}
+
 static void
 gdk_win32_display_manager_init (GdkWin32DisplayManager *manager)
 {
@@ -62,11 +104,16 @@ static void
 gdk_win32_display_manager_class_init (GdkWin32DisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_win32_display_manager_finalize;

-#if 0
+  manager_class->open_display = gdk_win32_display_manager_open_display;
+  manager_class->list_displays = gdk_win32_display_manager_list_displays;
+  manager_class->set_default_display = gdk_win32_display_manager_set_default_display;
+  manager_class->get_default_display = gdk_win32_display_manager_get_default_display;
  manager_class->atom_intern = _gdk_win32_display_manager_atom_intern;
  manager_class->get_atom_name = _gdk_win32_display_manager_get_atom_name;
-#endif
+  manager_class->lookup_keyval = gdk_win32_display_manager_lookup_keyval;
+  manager_class->get_keyval_name = gdk_win32_display_manager_get_keyval_name;
 }
@@ -147,6 +147,16 @@ gdk_win32_screen_get_number (GdkScreen *screen)
  return 0;
 }

+gchar *
+_gdk_windowing_substitute_screen_number (const gchar *display_name,
+					 int          screen_number)
+{
+  if (screen_number != 0)
+    return NULL;
+
+  return g_strdup (display_name);
+}
+
 static gchar *
 gdk_win32_screen_make_display_name (GdkScreen *screen)
 {
@@ -140,7 +140,6 @@ static const char *const precache_atoms[] = {
  "_NET_WM_STATE_ABOVE",
  "_NET_WM_STATE_BELOW",
  "_NET_WM_STATE_FULLSCREEN",
-  "_NET_WM_STATE_HIDDEN",
  "_NET_WM_STATE_MODAL",
  "_NET_WM_STATE_MAXIMIZED_VERT",
  "_NET_WM_STATE_MAXIMIZED_HORZ",
@@ -150,17 +149,8 @@ static const char *const precache_atoms[] = {
  "_NET_WM_SYNC_REQUEST",
  "_NET_WM_SYNC_REQUEST_COUNTER",
  "_NET_WM_WINDOW_TYPE",
-  "_NET_WM_WINDOW_TYPE_COMBO",
-  "_NET_WM_WINDOW_TYPE_DIALOG",
-  "_NET_WM_WINDOW_TYPE_DND",
-  "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU",
-  "_NET_WM_WINDOW_TYPE_MENU",
  "_NET_WM_WINDOW_TYPE_NORMAL",
-  "_NET_WM_WINDOW_TYPE_POPUP_MENU",
-  "_NET_WM_WINDOW_TYPE_TOOLTIP",
-  "_NET_WM_WINDOW_TYPE_UTILITY",
  "_NET_WM_USER_TIME",
-  "_NET_WM_USER_TIME_WINDOW",
  "_NET_VIRTUAL_ROOTS",
  "GDK_SELECTION",
  "_NET_WM_STATE_FOCUSED"
@@ -176,6 +166,8 @@ G_DEFINE_TYPE_WITH_CODE (GdkX11Display, gdk_x11_display, GDK_TYPE_DISPLAY,
 static void
 gdk_x11_display_init (GdkX11Display *display)
 {
+  _gdk_x11_display_manager_add_display (gdk_display_manager_get (),
+                                        GDK_DISPLAY (display));
 }

 static void
@@ -1834,8 +1826,11 @@ gdk_x11_display_ungrab (GdkDisplay *display)
 static void
 gdk_x11_display_dispose (GObject *object)
 {
+  GdkDisplay *display = GDK_DISPLAY (object);
  GdkX11Display *display_x11 = GDK_X11_DISPLAY (object);

+  _gdk_x11_display_manager_remove_display (gdk_display_manager_get (), display);
+
  g_list_foreach (display_x11->input_devices, (GFunc) g_object_run_dispose, NULL);

  _gdk_screen_close (display_x11->screen);
@@ -1992,8 +1987,8 @@ gdk_x11_display_get_xdisplay (GdkDisplay *display)
  return GDK_X11_DISPLAY (display)->xdisplay;
 }

-static void
-gdk_x11_display_make_default (GdkDisplay *display)
+void
+_gdk_x11_display_make_default (GdkDisplay *display)
 {
  GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
  const gchar *startup_id;
@@ -2786,7 +2781,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
  display_class->beep = gdk_x11_display_beep;
  display_class->sync = gdk_x11_display_sync;
  display_class->flush = gdk_x11_display_flush;
-  display_class->make_default = gdk_x11_display_make_default;
  display_class->has_pending = gdk_x11_display_has_pending;
  display_class->queue_events = _gdk_x11_display_queue_events;
  display_class->get_default_group = gdk_x11_display_get_default_group;
@@ -32,6 +32,9 @@ struct _GdkX11DisplayManager
 {
  GdkDisplayManager parent;

+  GdkDisplay *default_display;
+  GSList *displays;
+
  gboolean init_failed;
 };

@@ -72,6 +75,47 @@ g_initable_iface_init (GInitableIface *iface)
 }


+static GdkDisplay *
+gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
+                                      const gchar       *name)
+{
+  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
+  GdkDisplay *display;
+
+  display = _gdk_x11_display_open (name);
+  if (display != NULL)
+    {
+      if (manager_x11->default_display == NULL)
+        gdk_display_manager_set_default_display (manager, display);
+
+      g_signal_emit_by_name (manager, "display-opened", display);
+    }
+
+  return display;
+}
+
+static GSList *
+gdk_x11_display_manager_list_displays (GdkDisplayManager *manager)
+{
+  return g_slist_copy (GDK_X11_DISPLAY_MANAGER (manager)->displays);
+}
+
+static GdkDisplay *
+gdk_x11_display_manager_get_default_display (GdkDisplayManager *manager)
+{
+  return GDK_X11_DISPLAY_MANAGER (manager)->default_display;
+}
+
+static void
+gdk_x11_display_manager_set_default_display (GdkDisplayManager *manager,
+                                             GdkDisplay        *display)
+{
+  GDK_X11_DISPLAY_MANAGER (manager)->default_display = display;
+
+  if (display)
+    _gdk_x11_display_make_default (display);
+}
+
 static void
 gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 {
@@ -90,6 +134,43 @@ static void
 gdk_x11_display_manager_class_init (GdkX11DisplayManagerClass *class)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GdkDisplayManagerClass *manager_class = GDK_DISPLAY_MANAGER_CLASS (class);

  object_class->finalize = gdk_x11_display_manager_finalize;
+
+  manager_class->open_display = gdk_x11_display_manager_open_display;
+  manager_class->list_displays = gdk_x11_display_manager_list_displays;
+  manager_class->set_default_display = gdk_x11_display_manager_set_default_display;
+  manager_class->get_default_display = gdk_x11_display_manager_get_default_display;
+  manager_class->atom_intern = _gdk_x11_display_manager_atom_intern;
+  manager_class->get_atom_name = _gdk_x11_display_manager_get_atom_name;
+  manager_class->lookup_keyval = _gdk_x11_display_manager_lookup_keyval;
+  manager_class->get_keyval_name = _gdk_x11_display_manager_get_keyval_name;
+  manager_class->keyval_convert_case = _gdk_x11_display_manager_keyval_convert_case;
+}
+
+void
+_gdk_x11_display_manager_add_display (GdkDisplayManager *manager,
+                                      GdkDisplay        *display)
+{
+  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
+
+  manager_x11->displays = g_slist_prepend (manager_x11->displays, display);
+}
+
+void
+_gdk_x11_display_manager_remove_display (GdkDisplayManager *manager,
+                                         GdkDisplay        *display)
+{
+  GdkX11DisplayManager *manager_x11 = GDK_X11_DISPLAY_MANAGER (manager);
+
+  manager_x11->displays = g_slist_remove (manager_x11->displays, display);
+
+  if (manager_x11->default_display == display)
+    {
+      if (manager_x11->displays)
+        gdk_display_manager_set_default_display (manager, manager_x11->displays->data);
+      else
+        gdk_display_manager_set_default_display (manager, NULL);
+    }
 }
@@ -1382,6 +1382,63 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  return tmp_keyval != NoSymbol;
 }

+/* Key handling not part of the keymap */
+gchar*
+_gdk_x11_display_manager_get_keyval_name (GdkDisplayManager *manager,
+                                          guint              keyval)
+{
+  switch (keyval)
+    {
+    case GDK_KEY_Page_Up:
+      return "Page_Up";
+    case GDK_KEY_Page_Down:
+      return "Page_Down";
+    case GDK_KEY_KP_Page_Up:
+      return "KP_Page_Up";
+    case GDK_KEY_KP_Page_Down:
+      return "KP_Page_Down";
+    }
+
+  return XKeysymToString (keyval);
+}
+
+guint
+_gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
+                                        const gchar       *keyval_name)
+{
+  g_return_val_if_fail (keyval_name != NULL, 0);
+
+  return XStringToKeysym (keyval_name);
+}
+
+void
+_gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
+                                              guint              symbol,
+                                              guint             *lower,
+                                              guint             *upper)
+{
+  KeySym xlower = 0;
+  KeySym xupper = 0;
+
+  /* Check for directly encoded 24-bit UCS characters: */
+  if ((symbol & 0xff000000) == 0x01000000)
+    {
+      if (lower)
+        *lower = gdk_unicode_to_keyval (g_unichar_tolower (symbol & 0x00ffffff));
+      if (upper)
+        *upper = gdk_unicode_to_keyval (g_unichar_toupper (symbol & 0x00ffffff));
+      return;
+    }
+
+  if (symbol)
+    XConvertCase (symbol, &xlower, &xupper);
+
+  if (lower)
+    *lower = xlower;
+  if (upper)
+    *upper = xupper;
+}
+
 /**
 * gdk_x11_keymap_get_group_for_state:
 * @keymap: a #GdkX11Keymap
@@ -168,6 +168,7 @@ gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
                                          Window      xroot_window);

 GdkDisplay * _gdk_x11_display_open            (const gchar *display_name);
+void _gdk_x11_display_make_default            (GdkDisplay *display);
 void _gdk_x11_display_update_grab_info        (GdkDisplay *display,
                                               GdkDevice  *device,
                                               gint        status);
@@ -247,11 +248,24 @@ void     _gdk_device_xi2_reset_scroll_valuators   (GdkX11DeviceXI2    *device);

 void     _gdk_x11_event_translate_keyboard_string (GdkEventKey *event);

+void _gdk_x11_display_manager_add_display      (GdkDisplayManager *manager,
+                                                GdkDisplay        *display);
+void _gdk_x11_display_manager_remove_display   (GdkDisplayManager *manager,
+                                                GdkDisplay        *display);
+
 GdkAtom _gdk_x11_display_manager_atom_intern   (GdkDisplayManager *manager,
                                                const gchar       *atom_name,
                                                gboolean           copy_name);
 gchar * _gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager,
                                                GdkAtom            atom);
+guint   _gdk_x11_display_manager_lookup_keyval (GdkDisplayManager *manager,
+                                                const gchar       *name);
+gchar * _gdk_x11_display_manager_get_keyval_name (GdkDisplayManager *manager,
+                                                  guint              keyval);
+void    _gdk_x11_display_manager_keyval_convert_case (GdkDisplayManager *manager,
+                                                      guint              symbol,
+                                                      guint             *lower,
+                                                      guint             *upper);

 GdkCursor *_gdk_x11_display_get_cursor_for_type     (GdkDisplay    *display,
                                                     GdkCursorType  type);
@@ -38,6 +38,44 @@
 #include <string.h>


+/**
+ * SECTION:properties
+ * @Short_description: Functions to manipulate properties on windows
+ * @Title: Properties and Atoms
+ *
+ * Each window under X can have any number of associated
+ * <firstterm>properties</firstterm> attached to it.
+ * Properties are arbitrary chunks of data identified by
+ * <firstterm>atom</firstterm>s. (An <firstterm>atom</firstterm>
+ * is a numeric index into a string table on the X server. They are used
+ * to transfer strings efficiently between clients without
+ * having to transfer the entire string.) A property
+ * has an associated type, which is also identified
+ * using an atom.
+ *
+ * A property has an associated <firstterm>format</firstterm>,
+ * an integer describing how many bits are in each unit
+ * of data inside the property. It must be 8, 16, or 32.
+ * When data is transferred between the server and client,
+ * if they are of different endianesses it will be byteswapped
+ * as necessary according to the format of the property.
+ * Note that on the client side, properties of format 32
+ * will be stored with one unit per <emphasis>long</emphasis>,
+ * even if a long integer has more than 32 bits on the platform.
+ * (This decision was apparently made for Xlib to maintain
+ * compatibility with programs that assumed longs were 32
+ * bits, at the expense of programs that knew better.)
+ *
+ * The functions in this section are used to add, remove
+ * and change properties on windows, to convert atoms
+ * to and from strings and to manipulate some types of
+ * data commonly stored in X window properties.
+ */
+
+
+static GPtrArray *virtual_atom_array;
+static GHashTable *virtual_atom_hash;
+
 static const gchar xatoms_string[] = 
  /* These are all the standard predefined X atoms */
  "\0"  /* leave a space for None, even though it is not a predefined atom */
@@ -197,12 +235,14 @@ gdk_x11_atom_to_xatom_for_display (GdkDisplay *display,

  if (!xatom)
    {
-      char *name = gdk_atom_name (atom);
+      char *name;
+
+      g_return_val_if_fail (ATOM_TO_INDEX (atom) < virtual_atom_array->len, None);
+
+      name = g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom));

      xatom = XInternAtom (GDK_DISPLAY_XDISPLAY (display), name, FALSE);
      insert_atom_pair (display, atom, xatom);
-
-      g_free (name);
    }

  return xatom;
@@ -337,6 +377,68 @@ gdk_x11_xatom_to_atom (Atom xatom)
  return gdk_x11_xatom_to_atom_for_display (gdk_display_get_default (), xatom);
 }

+static void
+virtual_atom_check_init (void)
+{
+  if (!virtual_atom_hash)
+    {
+      gint i;
+
+      virtual_atom_hash = g_hash_table_new (g_str_hash, g_str_equal);
+      virtual_atom_array = g_ptr_array_new ();
+
+      for (i = 0; i < G_N_ELEMENTS (xatoms_offset); i++)
+        {
+          g_ptr_array_add (virtual_atom_array, (gchar *)(xatoms_string + xatoms_offset[i]));
+          g_hash_table_insert (virtual_atom_hash, (gchar *)(xatoms_string + xatoms_offset[i]),
+                               GUINT_TO_POINTER (i));
+        }
+    }
+}
+
+GdkAtom
+_gdk_x11_display_manager_atom_intern (GdkDisplayManager *manager,
+                                      const gchar       *atom_name,
+                                      gboolean           dup)
+{
+  GdkAtom result;
+
+  virtual_atom_check_init ();
+
+  result = GDK_POINTER_TO_ATOM (g_hash_table_lookup (virtual_atom_hash, atom_name));
+  if (!result)
+    {
+      result = INDEX_TO_ATOM (virtual_atom_array->len);
+
+      g_ptr_array_add (virtual_atom_array, dup ? g_strdup (atom_name) : (gchar *)atom_name);
+      g_hash_table_insert (virtual_atom_hash,
+                           g_ptr_array_index (virtual_atom_array,
+                                              ATOM_TO_INDEX (result)),
+                                              GDK_ATOM_TO_POINTER (result));
+    }
+
+  return result;
+}
+
+static const gchar *
+get_atom_name (GdkAtom atom)
+{
+  virtual_atom_check_init ();
+
+  if (ATOM_TO_INDEX (atom) < virtual_atom_array->len)
+    return g_ptr_array_index (virtual_atom_array, ATOM_TO_INDEX (atom));
+  else
+    return NULL;
+}
+
+
+gchar *
+_gdk_x11_display_manager_get_atom_name (GdkDisplayManager *manager,
+                                        GdkAtom            atom)
+{
+  return g_strdup (get_atom_name (atom));
+}
+
 /**
 * gdk_x11_get_xatom_by_name_for_display:
 * @display: a #GdkDisplay
@@ -417,7 +519,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
 {
  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);

-  return _gdk_atom_name_const (gdk_x11_xatom_to_atom_for_display (display, xatom));
+  return get_atom_name (gdk_x11_xatom_to_atom_for_display (display, xatom));
 }

 /**
@@ -436,7 +538,7 @@ gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
 const gchar *
 gdk_x11_get_xatom_name (Atom xatom)
 {
-  return _gdk_atom_name_const (gdk_x11_xatom_to_atom (xatom));
+  return get_atom_name (gdk_x11_xatom_to_atom (xatom));
 }

 gboolean
@@ -331,8 +331,6 @@ gtk_public_h_sources = 		\
 	gtksocket.h		\
 	gtkspinbutton.h		\
 	gtkspinner.h		\
-	gtkstack.h		\
-	gtkstackswitcher.h	\
 	gtkstatusbar.h		\
 	gtkstatusicon.h		\
 	gtkstock.h		\
@@ -832,8 +830,6 @@ gtk_base_c_sources = 		\
 	gtkshow.c		\
 	gtkspinbutton.c		\
 	gtkspinner.c		\
-	gtkstack.c		\
-	gtkstackswitcher.c	\
 	gtkstatusbar.c		\
 	gtkstatusicon.c		\
 	gtkstock.c		\
@@ -68,34 +68,21 @@ end_element_handler (GMarkupParseContext  *context,
                     GError              **error)
 {
  ParserData *data = user_data;
-  gchar **lines;
-  gint i;

  if (!data->translatable)
    return;

-  lines = g_strsplit (data->text->str, "\n", -1);
-
  if (data->comments)
    g_string_append_printf (data->output, "\n/* %s */\n",
                            data->comments);

  if (data->context)
-    g_string_append_printf (data->output, "C_(\"%s\", ",
-                            data->context);
+    g_string_append_printf (data->output, "C_(\"%s\", \"%s\")\n",
+                            data->context,
+                            data->text->str);
  else
-    g_string_append (data->output, "N_(");
-
-  for (i = 0; lines[i]; i++)
-    g_string_append_printf (data->output, "%s\"%s%s\"%s",
-                            i > 0 ? "   " : "",
-                            lines[i],
-                            lines[i+1] ? "\\n" : "",
-                            lines[i+1] ? "\n" : "");
-
-  g_string_append (data->output, ");\n");
-
-  g_strfreev (lines);
+    g_string_append_printf (data->output, "N_(\"%s\")\n",
+                            data->text->str);

  g_free (data->comments);
  g_free (data->context);
@@ -179,8 +179,6 @@
 #include <gtk/gtksizerequest.h>
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtkspinner.h>
-#include <gtk/gtkstack.h>
-#include <gtk/gtkstackswitcher.h>
 #include <gtk/gtkstatusbar.h>
 #include <gtk/gtkstatusicon.h>
 #include <gtk/gtkstock.h>
@@ -2598,26 +2598,6 @@ gtk_spinner_new
 gtk_spinner_start
 gtk_spinner_stop
 gtk_spin_type_get_type
-gtk_stack_add_named
-gtk_stack_add_titled
-gtk_stack_get_homogeneous
-gtk_stack_get_transition_duration
-gtk_stack_get_transition_type
-gtk_stack_get_type
-gtk_stack_get_visible_child
-gtk_stack_get_visible_child_name
-gtk_stack_new
-gtk_stack_set_homogeneous
-gtk_stack_set_transition_duration
-gtk_stack_set_transition_type
-gtk_stack_set_visible_child
-gtk_stack_set_visible_child_full
-gtk_stack_set_visible_child_name
-gtk_stack_switcher_get_stack
-gtk_stack_switcher_get_type
-gtk_stack_switcher_new
-gtk_stack_switcher_set_stack
-gtk_stack_transition_type_get_type
 gtk_state_flags_get_type
 gtk_state_type_get_type
 gtk_statusbar_accessible_get_type
@@ -258,6 +258,9 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window)

      window->priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined));
      gtk_widget_set_parent (window->priv->menubar, GTK_WIDGET (window));
+      if (_gtk_window_get_content_window (GTK_WINDOW (window)) != NULL)
+        gtk_widget_set_parent_window (window->priv->menubar,
+                                      _gtk_window_get_content_window (GTK_WINDOW (window)));
      gtk_widget_show_all (window->priv->menubar);
      g_object_unref (combined);

@@ -760,6 +763,10 @@ gtk_application_window_real_realize (GtkWidget *widget)
  GTK_WIDGET_CLASS (gtk_application_window_parent_class)
    ->realize (widget);

+  if (window->priv->menubar != NULL)
+    gtk_widget_set_parent_window (window->priv->menubar,
+                                  _gtk_window_get_content_window (GTK_WINDOW (window)));
+
 #ifdef GDK_WINDOWING_X11
  {
    GdkWindow *gdkwindow;
@@ -1557,7 +1557,7 @@ gtk_bindings_activate_list (GObject  *object,
          handled = binding_activate (binding_set, entries,
                                      object, is_release,
                                      &unbound);
-          if (handled || unbound)
+          if (handled)
            break;
        }

@@ -1584,8 +1584,6 @@ gtk_bindings_activate_list (GObject  *object,
          handled = binding_activate (binding_set, entries,
                                      object, is_release,
                                      &unbound);
-          if (unbound)
-            break;
        }

      if (unbound)
@@ -3440,7 +3440,7 @@ gtk_cell_area_activate_cell (GtkCellArea          *area,
          /* If the signal was successfully handled start the editing */
          if (gtk_widget_get_parent (GTK_WIDGET (editable_widget)))
            {
-              gtk_cell_editable_start_editing (editable_widget, event);
+              gtk_cell_editable_start_editing (editable_widget, NULL);
              gtk_widget_grab_focus (GTK_WIDGET (editable_widget));
            }
          else
@@ -533,15 +533,11 @@
 * the GTK+ theming engine.
 * </para>
 * <para>
- * To set a shadow on an icon, use the icon-shadow property instead,
- * with the same syntax.
- * </para>
- * <para>
 * To set multiple shadows on an element, you can specify a comma-separated list
- * of shadow elements in the text-shadow or icon-shadow property. Shadows are
- * always rendered front-back, i.e. the first shadow specified is on top of the
- * others. Shadows can thus overlay each other, but they can never overlay the
- * text or icon itself, which is always rendered on top of the shadow layer.
+ * of shadow elements in the text-shadow property. Shadows are always rendered
+ * front-back, i.e. the first shadow specified is on top of the others. Shadows
+ * can thus overlay each other, but they can never overlay the text itself,
+ * which is always rendered on top of the shadow layer.
 * </para>
 * </refsect2>
 * <refsect2>
@@ -3439,7 +3439,6 @@ gtk_drag_set_icon_surface (GdkDragContext    *context,
    }

  gdk_window_set_background_pattern (gtk_widget_get_window (window), pattern);
-  cairo_pattern_destroy (pattern);

  gtk_drag_set_icon_window (context, window, extents.x, extents.y, TRUE);
 }
@@ -2100,16 +2100,6 @@ gtk_menu_shell_tracker_remove_func (gint     position,
 * mentioned and @action_namespace is "app" then the effective action
 * name is "app.quit".
 *
- * This function uses #GtkActionable to define the action name and
- * target values on the created menu items.  If you want to use an
- * action group other than "app" and "win", or if you want to use a
- * #GtkMenuShell outside of a #GtkApplicationWindow, then you will need
- * to attach your own action group to the widget hierarchy using
- * gtk_widget_insert_action_group().  As an example, if you created a
- * group with a "quit" action and inserted it with the name "mygroup"
- * then you would use the action name "mygroup.quit" in your
- * #GMenuModel.
- *
 * For most cases you are probably better off using
 * gtk_menu_new_from_model() or gtk_menu_bar_new_from_model() or just
 * directly passing the #GMenuModel to gtk_application_set_app_menu() or
@@ -108,26 +108,6 @@

 #define DO_NOT_COMPILE 0

-/* These are used when a destination-side DnD operation is taking place.
- * Normally, when a file is being hovered directly over a bookmark,
- * we'll be in DROP_STATE_NORMAL.
- *
- * But when a file is being hovered between bookmarks, this means the user
- * may want to create a new bookmark for that file between those bookmarks.
- * In that case, the drop state will be *not* DROP_STATE_NORMAL.
- *
- * When the drop state is FADING_OUT, it means that the user is hovering
- * directly over an existing bookmark and an immediate drop will cause the
- * file being dragged to be dropped on the bookmark, instead of causing
- * a new bookmark to be created.
- */
-typedef enum {
-	DROP_STATE_NORMAL,
-	DROP_STATE_NEW_BOOKMARK_FADING_IN,
-	DROP_STATE_NEW_BOOKMARK_ARMED,
-	DROP_STATE_NEW_BOOKMARK_FADING_OUT
-} DropState;
-
 struct _GtkPlacesSidebar {
 	GtkScrolledWindow parent;

@@ -163,12 +143,6 @@ struct _GtkPlacesSidebar {

 	GtkPlacesOpenFlags open_flags;

-	DropState drop_state;
-	int new_bookmark_index;
-	guint drag_leave_timeout_id;
-	guint switch_location_timer;
-	char *drop_target_uri;
-
 	guint show_desktop : 1;
 };

@@ -221,7 +195,6 @@ typedef enum {
 	PLACES_MOUNTED_VOLUME,
 	PLACES_BOOKMARK,
 	PLACES_HEADING,
-	PLACES_DROP_FEEDBACK
 } PlaceType;

 typedef enum {
@@ -767,8 +740,8 @@ update_places (GtkPlacesSidebar *sidebar)
 	icon = g_themed_icon_new (ICON_NAME_HOME);
 	add_place (sidebar, PLACES_BUILT_IN,
 		   SECTION_COMPUTER,
-		   _("Home"), icon, home_uri,
-		   NULL, NULL, NULL, 0,
+		   _("Home"), icon,
+		   home_uri, NULL, NULL, NULL, 0,
 		   _("Open your personal folder"));
 	g_object_unref (icon);
 	g_free (home_uri);
@@ -779,8 +752,8 @@ update_places (GtkPlacesSidebar *sidebar)
 		icon = g_themed_icon_new (ICON_NAME_DESKTOP);
 		add_place (sidebar, PLACES_BUILT_IN,
 			   SECTION_COMPUTER,
-			   _("Desktop"), icon, mount_uri,
-			   NULL, NULL, NULL, 0,
+			   _("Desktop"), icon,
+			   mount_uri, NULL, NULL, NULL, 0,
 			   _("Open the contents of your desktop in a folder"));
 		g_object_unref (icon);
 		g_free (mount_uri);
@@ -949,8 +922,8 @@ update_places (GtkPlacesSidebar *sidebar)
 	icon = g_themed_icon_new (ICON_NAME_FILESYSTEM);
 	add_place (sidebar, PLACES_BUILT_IN,
 		   SECTION_DEVICES,
-		   sidebar->hostname, icon, mount_uri,
-		   NULL, NULL, NULL, 0,
+		   sidebar->hostname, icon,
+		   mount_uri, NULL, NULL, NULL, 0,
 		   _("Open the contents of the File System"));
 	g_object_unref (icon);

@@ -1057,8 +1030,8 @@ update_places (GtkPlacesSidebar *sidebar)
 	icon = g_themed_icon_new (ICON_NAME_NETWORK);
 	add_place (sidebar, PLACES_BUILT_IN,
 		   SECTION_NETWORK,
-		   _("Browse Network"), icon, mount_uri,
-		   NULL, NULL, NULL, 0,
+		   _("Browse Network"), icon,
+		   mount_uri, NULL, NULL, NULL, 0,
 		   _("Browse the contents of the network"));
 	g_object_unref (icon);

@@ -1309,12 +1282,6 @@ compute_drop_position (GtkTreeView             *tree_view,

 	drop_possible = TRUE;

-	/* Normalize drops on the feedback row */
-	if (place_type == PLACES_DROP_FEEDBACK) {
-		*pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
-		goto out;
-	}
-
 	/* Never drop on headings, but special case the bookmarks heading,
 	 * so we can drop bookmarks in between it and the first bookmark.
 	 */
@@ -1376,8 +1343,6 @@ compute_drop_position (GtkTreeView             *tree_view,
 		g_free (uri);
 	}

-out:
-
 	if (!drop_possible) {
 		gtk_tree_path_free (*path);
 		*path = NULL;
@@ -1409,15 +1374,6 @@ get_drag_data (GtkTreeView *tree_view,
 	return TRUE;
 }

-static void
-remove_switch_location_timer (GtkPlacesSidebar *sidebar)
-{
-	if (sidebar->switch_location_timer != 0) {
-		g_source_remove (sidebar->switch_location_timer);
-		sidebar->switch_location_timer = 0;
-	}
-}
-
 static void
 free_drag_data (GtkPlacesSidebar *sidebar)
 {
@@ -1427,142 +1383,6 @@ free_drag_data (GtkPlacesSidebar *sidebar)
 		g_list_free_full (sidebar->drag_list, g_object_unref);
 		sidebar->drag_list = NULL;
 	}
-
-	remove_switch_location_timer (sidebar);
-
-	g_free (sidebar->drop_target_uri);
-	sidebar->drop_target_uri = NULL;
-}
-
-static gboolean
-switch_location_timer (gpointer user_data)
-{
-	GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (user_data);
-	GFile *location;
-
-	sidebar->switch_location_timer = 0;
-
-	location = g_file_new_for_uri (sidebar->drop_target_uri);
-	emit_open_location (sidebar, location, 0);
-	g_object_unref (location);
-
-	return FALSE;
-}
-
-static void
-check_switch_location_timer (GtkPlacesSidebar *sidebar, const char *uri)
-{
-	GtkSettings *settings;
-	guint timeout;
-
-	if (g_strcmp0 (uri, sidebar->drop_target_uri) == 0) {
-		return;
-	}
-	remove_switch_location_timer (sidebar);
-
-	settings = gtk_widget_get_settings (GTK_WIDGET (sidebar));
-	g_object_get (settings, "gtk-timeout-expand", &timeout, NULL);
-
-	g_free (sidebar->drop_target_uri);
-	sidebar->drop_target_uri = NULL;
-
-	if (uri != NULL) {
-		sidebar->drop_target_uri = g_strdup (uri);
-		sidebar->switch_location_timer = gdk_threads_add_timeout (timeout, switch_location_timer, sidebar);
-	}
-}
-
-static void
-remove_drop_bookmark_feedback_row (GtkPlacesSidebar *sidebar)
-{
-	if (sidebar->drop_state != DROP_STATE_NORMAL) {
-		gboolean success;
-		GtkTreeIter iter;
-
-		success = gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (sidebar->store), &iter, NULL, sidebar->new_bookmark_index);
-		g_assert (success);
-		gtk_list_store_remove (sidebar->store, &iter);
-
-		sidebar->drop_state = DROP_STATE_NORMAL;
-	}
-}
-
-#if 0
-static const char *
-pos_to_string (GtkTreeViewDropPosition pos)
-{
-	switch (pos) {
-	case GTK_TREE_VIEW_DROP_BEFORE:
-		return "before";
-		
-	case GTK_TREE_VIEW_DROP_AFTER:
-		return "after";
-		
-	case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
-		return "into_or_before";
-		
-	case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
-		return "into_or_after";
-
-	default:
-		return "w00t";
-	}
-}
-#endif
-
-static void
-start_drop_feedback (GtkPlacesSidebar *sidebar, GtkTreePath *path, GtkTreeViewDropPosition pos, gboolean drop_as_bookmarks)
-{
-	if (drop_as_bookmarks) {
-		int new_bookmark_index;
-		GtkTreePath *new_path;
-		gboolean need_feedback_row;
-
-		new_bookmark_index = gtk_tree_path_get_indices (path)[0];
-		if (pos == GTK_TREE_VIEW_DROP_AFTER)
-			new_bookmark_index++;
-
-		if (sidebar->drop_state == DROP_STATE_NORMAL)
-			need_feedback_row = TRUE;
-		else {
-			/* Feedback row already exists; remove it if its position needs to change */
-
-			if (sidebar->new_bookmark_index == new_bookmark_index)
-				need_feedback_row = FALSE;
-			else {
-				if (sidebar->new_bookmark_index < new_bookmark_index)
-					new_bookmark_index--; /* since the removal of the old feedback row pushed items one position up */
-
-				remove_drop_bookmark_feedback_row (sidebar);
-				need_feedback_row = TRUE;
-			}
-		}
-
-		if (need_feedback_row) {
-			GtkTreeIter iter;
-
-			sidebar->new_bookmark_index = new_bookmark_index;
-			gtk_list_store_insert_with_values (sidebar->store, &iter, sidebar->new_bookmark_index,
-							   PLACES_SIDEBAR_COLUMN_ROW_TYPE, PLACES_DROP_FEEDBACK,
-							   PLACES_SIDEBAR_COLUMN_SECTION_TYPE, SECTION_BOOKMARKS,
-							   PLACES_SIDEBAR_COLUMN_NAME, _("New bookmark"),
-							   PLACES_SIDEBAR_COLUMN_NO_EJECT, TRUE,
-							   -1);
-		}
-
-		new_path = gtk_tree_path_new_from_indices (sidebar->new_bookmark_index, -1);
-		gtk_tree_view_set_drag_dest_row (sidebar->tree_view, new_path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-		gtk_tree_path_free (new_path);
-
-		sidebar->drop_state = DROP_STATE_NEW_BOOKMARK_ARMED;
-	} else
-		gtk_tree_view_set_drag_dest_row (sidebar->tree_view, path, pos);
-}
-
-static void
-stop_drop_feedback (GtkPlacesSidebar *sidebar)
-{
-	gtk_tree_view_set_drag_dest_row (sidebar->tree_view, NULL, 0);
 }

 static gboolean
@@ -1578,11 +1398,8 @@ drag_motion_callback (GtkTreeView *tree_view,
 	int action;
 	GtkTreeIter iter;
 	gboolean res;
-	gboolean drop_as_bookmarks;
-	char *drop_target_uri = NULL;

 	action = 0;
-	drop_as_bookmarks = FALSE;

 	if (!sidebar->drag_data_received) {
 		if (!get_drag_data (tree_view, context, time)) {
@@ -1609,6 +1426,7 @@ drag_motion_callback (GtkTreeView *tree_view,
 		if (sidebar->drag_list != NULL) {
 			SectionType section_type;
 			PlaceType place_type;
+			gboolean drop_as_bookmarks;

 			gtk_tree_model_get_iter (GTK_TREE_MODEL (sidebar->store),
 						 &iter, path);
@@ -1618,40 +1436,40 @@ drag_motion_callback (GtkTreeView *tree_view,
 					    PLACES_SIDEBAR_COLUMN_ROW_TYPE, &place_type,
 					    -1);

-			if (place_type == PLACES_DROP_FEEDBACK
-			    || (section_type == SECTION_BOOKMARKS
-				&& (pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER))) {
-				action = GDK_ACTION_COPY;
-				drop_as_bookmarks = TRUE;
+			drop_as_bookmarks = FALSE;
+
+			if (section_type == SECTION_BOOKMARKS) {
+				if (pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER) {
+					action = GDK_ACTION_COPY;
+					drop_as_bookmarks = TRUE;
+				}
 			}

 			if (!drop_as_bookmarks) {
+				char *uri;
+
 				gtk_tree_model_get (GTK_TREE_MODEL (sidebar->store),
 						    &iter,
-						    PLACES_SIDEBAR_COLUMN_URI, &drop_target_uri,
+						    PLACES_SIDEBAR_COLUMN_URI, &uri,
 						    -1);

-				if (drop_target_uri != NULL) {
-					GFile *dest_file = g_file_new_for_uri (drop_target_uri);
+				if (uri != NULL) {
+					GFile *dest_file = g_file_new_for_uri (uri);

 					action = emit_drag_action_requested (sidebar, context, dest_file, sidebar->drag_list);

 					g_object_unref (dest_file);
+					g_free (uri);
 				} /* uri may be NULL for unmounted volumes, for example, so we don't allow drops there */
 			}
 		}
 	}

 out:
-	if (action != 0) {
-		check_switch_location_timer (sidebar, drop_target_uri);
-		start_drop_feedback (sidebar, path, pos, drop_as_bookmarks);
-	} else {
-		remove_switch_location_timer (sidebar);
-		stop_drop_feedback (sidebar);
-	}
-
-	g_free (drop_target_uri);
+	if (action != 0)
+		gtk_tree_view_set_drag_dest_row (tree_view, path, pos);
+	else
+		gtk_tree_view_set_drag_dest_row (tree_view, NULL, pos);

 	if (path != NULL) {
 		gtk_tree_path_free (path);
@@ -1664,32 +1482,14 @@ drag_motion_callback (GtkTreeView *tree_view,
 	return TRUE;
 }

-static gboolean
-drag_leave_timeout_cb (gpointer data)
-{
-	GtkPlacesSidebar *sidebar = GTK_PLACES_SIDEBAR (data);
-
-	free_drag_data (sidebar);
-	stop_drop_feedback (sidebar);
-	remove_drop_bookmark_feedback_row (sidebar);
-
-	sidebar->drag_leave_timeout_id = 0;
-	return FALSE;
-}
-
 static void
 drag_leave_callback (GtkTreeView *tree_view,
 		     GdkDragContext *context,
 		     unsigned int time,
 		     GtkPlacesSidebar *sidebar)
 {
-	if (sidebar->drag_leave_timeout_id)
-		g_source_remove (sidebar->drag_leave_timeout_id);
-
-	sidebar->drag_leave_timeout_id = gdk_threads_add_timeout (500, drag_leave_timeout_cb, sidebar);
-
-	remove_switch_location_timer (sidebar);
-
+	free_drag_data (sidebar);
+	gtk_tree_view_set_drag_dest_row (tree_view, NULL, 0);
 	g_signal_stop_emission_by_name (tree_view, "drag-leave");
 }

@@ -1870,9 +1670,7 @@ drag_data_received_callback (GtkWidget *widget,
 					position++;

 				if (tree_pos == GTK_TREE_VIEW_DROP_BEFORE
-				    || tree_pos == GTK_TREE_VIEW_DROP_AFTER
-				    || place_type == PLACES_DROP_FEEDBACK) {
-					remove_drop_bookmark_feedback_row (sidebar);
+				    || tree_pos == GTK_TREE_VIEW_DROP_AFTER) {
 					drop_files_as_bookmarks (sidebar, source_file_list, position);
 					success = TRUE;
 					drop_as_bookmarks = TRUE;
@@ -1902,7 +1700,6 @@ drag_data_received_callback (GtkWidget *widget,
 out:
 	sidebar->drop_occured = FALSE;
 	free_drag_data (sidebar);
-	remove_drop_bookmark_feedback_row (sidebar);
 	gtk_drag_finish (context, success, FALSE, time);

 	gtk_tree_path_free (tree_path);
@@ -1917,7 +1714,6 @@ drag_drop_callback (GtkTreeView *tree_view,
 		    GtkPlacesSidebar *sidebar)
 {
 	gboolean retval = FALSE;
-
 	sidebar->drop_occured = TRUE;
 	retval = get_drag_data (tree_view, context, time);
 	g_signal_stop_emission_by_name (tree_view, "drag-drop");
@@ -3211,22 +3007,6 @@ bookmarks_popup_menu_cb (GtkWidget *widget,
 	return TRUE;
 }

-static void
-bookmarks_row_activated_cb (GtkWidget *widget,
-			    GtkTreePath *path,
-			    GtkTreeViewColumn *column,
-			    GtkPlacesSidebar *sidebar)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
-	if (!gtk_tree_model_get_iter (model, &iter, path)) {
-		return;
-	}
-
-	open_selected_bookmark (sidebar, model, &iter, 0);
-}
-
 static gboolean
 bookmarks_button_release_event_cb (GtkWidget *widget,
 				   GdkEventButton *event,
@@ -3252,10 +3032,6 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
 		return FALSE;
 	}

-	if (event->button == 1) {
-		return FALSE;
-	}
-
 	tree_view = GTK_TREE_VIEW (widget);
 	model = gtk_tree_view_get_model (tree_view);

@@ -3276,7 +3052,9 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
 		return FALSE;
 	}

-	if (event->button == 2) {
+	if (event->button == 1) {
+		open_selected_bookmark (sidebar, model, &iter, 0);
+	} else if (event->button == 2) {
 		GtkPlacesOpenFlags open_flags = GTK_PLACES_OPEN_NORMAL;

 		open_flags = ((event->state & GDK_CONTROL_MASK) ?
@@ -3570,6 +3348,36 @@ bookmarks_changed_cb (gpointer data)
 	update_places (sidebar);
 }

+static gboolean
+tree_view_button_press_callback (GtkWidget *tree_view,
+				 GdkEventButton *event,
+				 gpointer data)
+{
+	GtkTreePath *path;
+	GtkTreeViewColumn *column;
+
+	if (event->button == 1 && event->type == GDK_BUTTON_PRESS) {
+		if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (tree_view),
+						   event->x, event->y,
+						   &path,
+						   &column,
+						   NULL,
+						   NULL)) {
+			gtk_tree_view_row_activated (GTK_TREE_VIEW (tree_view), path, column);
+		}
+	}
+
+	return FALSE;
+}
+
+static void
+tree_view_set_activate_on_single_click (GtkTreeView *tree_view)
+{
+	g_signal_connect (tree_view, "button_press_event",
+			  G_CALLBACK (tree_view_button_press_callback),
+			  NULL);
+}
+
 static void
 trash_monitor_trash_state_changed_cb (GtkTrashMonitor *monitor,
 				      GtkPlacesSidebar *sidebar)
@@ -3766,10 +3574,8 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
 			  G_CALLBACK (bookmarks_popup_menu_cb), sidebar);
 	g_signal_connect (tree_view, "button-release-event",
 			  G_CALLBACK (bookmarks_button_release_event_cb), sidebar);
-	g_signal_connect (tree_view, "row-activated",
-			  G_CALLBACK (bookmarks_row_activated_cb), sidebar);

-	gtk_tree_view_set_activate_on_single_click (sidebar->tree_view, TRUE);
+	tree_view_set_activate_on_single_click (sidebar->tree_view);

 	sidebar->hostname = g_strdup (_("Computer"));
 	sidebar->hostnamed_cancellable = g_cancellable_new ();
@@ -3782,9 +3588,6 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
 				  sidebar->hostnamed_cancellable,
 				  hostname_proxy_new_cb,
 				  g_object_ref (sidebar));
-
-	sidebar->drop_state = DROP_STATE_NORMAL;
-	sidebar->new_bookmark_index = -1;
 }

 static void
@@ -3844,11 +3647,6 @@ gtk_places_sidebar_dispose (GObject *object)

 	sidebar->tree_view = NULL;

-	if (sidebar->drag_leave_timeout_id) {
-		g_source_remove (sidebar->drag_leave_timeout_id);
-		sidebar->drag_leave_timeout_id = 0;
-	}
-
 	free_drag_data (sidebar);

 	if (sidebar->bookmarks_manager != NULL) {
@@ -152,8 +152,6 @@ gtk_printer_option_widget_finalize (GObject *object)
  
  if (priv->source)
    {
-      g_signal_handler_disconnect (priv->source,
-				   priv->source_changed_handler);
      g_object_unref (priv->source);
      priv->source = NULL;
    }
@@ -269,21 +269,21 @@ gtk_print_job_finalize (GObject *object)
  GtkPrintJob *job = GTK_PRINT_JOB (object);
  GtkPrintJobPrivate *priv = job->priv;

-  if (priv->surface)
-    cairo_surface_destroy (priv->surface);
-
-  if (priv->backend)
-    g_object_unref (priv->backend);
-
  if (priv->spool_io != NULL)
    {
      g_io_channel_unref (priv->spool_io);
      priv->spool_io = NULL;
    }

+  if (priv->backend)
+    g_object_unref (priv->backend);
+
  if (priv->printer)
    g_object_unref (priv->printer);

+  if (priv->surface)
+    cairo_surface_destroy (priv->surface);
+
  if (priv->settings)
    g_object_unref (priv->settings);

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Author: Alexander Larsson <alexl@redhat.com>
- *
- */
-
-#ifndef __GTK_STACK_H__
-#define __GTK_STACK_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_STACK (gtk_stack_get_type ())
-#define GTK_STACK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK, GtkStack))
-#define GTK_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK, GtkStackClass))
-#define GTK_IS_STACK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK))
-#define GTK_IS_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK))
-#define GTK_STACK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK, GtkStackClass))
-
-typedef struct _GtkStack GtkStack;
-typedef struct _GtkStackClass GtkStackClass;
-typedef struct _GtkStackPrivate GtkStackPrivate;
-
-typedef enum {
-  GTK_STACK_TRANSITION_TYPE_NONE,
-  GTK_STACK_TRANSITION_TYPE_CROSSFADE,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_UP,
-  GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN
-} GtkStackTransitionType;
-
-struct _GtkStack {
-  GtkContainer parent_instance;
-  GtkStackPrivate *priv;
-};
-
-struct _GtkStackClass {
-  GtkContainerClass parent_class;
-};
-
-GType                  gtk_stack_get_type                (void) G_GNUC_CONST;
-
-GtkWidget *            gtk_stack_new                     (void);
-void                   gtk_stack_add_named               (GtkStack               *stack,
-                                                          GtkWidget              *child,
-                                                          const gchar            *name);
-void                   gtk_stack_add_titled              (GtkStack               *stack,
-                                                          GtkWidget              *child,
-                                                          const gchar            *name,
-                                                          const gchar            *title);
-void                   gtk_stack_set_visible_child       (GtkStack               *stack,
-                                                          GtkWidget              *child);
-GtkWidget *            gtk_stack_get_visible_child       (GtkStack               *stack);
-void                   gtk_stack_set_visible_child_name  (GtkStack               *stack,
-                                                          const gchar            *name);
-const gchar *          gtk_stack_get_visible_child_name  (GtkStack               *stack);
-void                   gtk_stack_set_visible_child_full  (GtkStack               *stack,
-                                                          const gchar            *name,
-                                                          GtkStackTransitionType  transition_type);
-void                   gtk_stack_set_homogeneous         (GtkStack               *stack,
-                                                          gboolean                homogeneous);
-gboolean               gtk_stack_get_homogeneous         (GtkStack               *stack);
-void                   gtk_stack_set_transition_duration (GtkStack               *stack,
-                                                          guint                   transition_duration);
-guint                  gtk_stack_get_transition_duration (GtkStack               *stack);
-void                   gtk_stack_set_transition_type     (GtkStack               *stack,
-                                                          GtkStackTransitionType  transition_type);
-GtkStackTransitionType gtk_stack_get_transition_type     (GtkStack               *stack);
-
-G_END_DECLS
-
-#endif
@@ -1,445 +0,0 @@
-/*
- * Copyright (c) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include "config.h"
-#include "gtkstackswitcher.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-
-/**
- * SECTION:gtkstackswitcher
- * @Short_decription: A controller for GtkStack
- * @Title: GtkStackSwitcher
- * @See_also: #GtkStack
- *
- * The GtkStackSwitcher widget acts as a controller for a
- * #GtkStack; it shows a row of buttons to switch between
- * the various pages of the associated stack widget.
- *
- * All the content for the buttons comes from the child properties
- * of the #GtkStack.
- *
- * It is possible to associate multiple #GtkStackSwitcher widgets
- * with the same stack widget.
- *
- * The GtkStackSwitcher widget was added in 3.10.
- */
-
-struct _GtkStackSwitcherPrivate
-{
-  GtkStack *stack;
-  GHashTable *buttons;
-  gboolean in_child_changed;
-};
-
-enum {
-  PROP_0,
-  PROP_STACK
-};
-
-G_DEFINE_TYPE (GtkStackSwitcher, gtk_stack_switcher, GTK_TYPE_BOX);
-
-static void
-gtk_stack_switcher_init (GtkStackSwitcher *switcher)
-{
-  GtkStyleContext *context;
-  GtkStackSwitcherPrivate *priv;
-
-  priv = G_TYPE_INSTANCE_GET_PRIVATE (switcher, GTK_TYPE_STACK_SWITCHER, GtkStackSwitcherPrivate);
-  switcher->priv = priv;
-
-  priv->stack = NULL;
-  priv->buttons = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (switcher));
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
-
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (switcher), GTK_ORIENTATION_HORIZONTAL);
-}
-
-static void
-clear_switcher (GtkStackSwitcher *self)
-{
-  gtk_container_foreach (GTK_CONTAINER (self), (GtkCallback) gtk_widget_destroy, self);
-}
-
-static void
-on_button_clicked (GtkWidget        *widget,
-                   GtkStackSwitcher *self)
-{
-  GtkWidget *child;
-
-  if (!self->priv->in_child_changed)
-    {
-      child = g_object_get_data (G_OBJECT (widget), "stack-child");
-      gtk_stack_set_visible_child (self->priv->stack, child);
-    }
-}
-
-static void
-rebuild_child (GtkWidget   *self,
-               const gchar *icon_name,
-               const gchar *title)
-{
-  GtkStyleContext *context;
-  GtkWidget *button_child;
-
-  gtk_widget_set_valign (GTK_WIDGET (self), GTK_ALIGN_CENTER);
-
-  button_child = gtk_bin_get_child (GTK_BIN (self));
-  if (button_child != NULL)
-    gtk_widget_destroy (button_child);
-
-  button_child = NULL;
-  context = gtk_widget_get_style_context (GTK_WIDGET (self));
-
-  if (icon_name != NULL)
-    {
-      button_child = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-      if (title != NULL)
-        gtk_widget_set_tooltip_text (GTK_WIDGET (self), title);
-
-      gtk_style_context_remove_class (context, "text-button");
-      gtk_style_context_add_class (context, "image-button");
-    }
-  else if (title != NULL)
-    {
-      button_child = gtk_label_new (title);
-
-      gtk_style_context_remove_class (context, "image-button");
-      gtk_style_context_add_class (context, "text-button");
-    }
-
-  if (button_child)
-    {
-      gtk_widget_show_all (button_child);
-      gtk_container_add (GTK_CONTAINER (self), button_child);
-    }
-}
-
-static void
-update_button (GtkStackSwitcher *self,
-               GtkWidget        *widget,
-               GtkWidget        *button)
-{
-  gchar *title;
-  gchar *icon_name;
-
-  gtk_container_child_get (GTK_CONTAINER (self->priv->stack), widget,
-                           "title", &title,
-                           "icon-name", &icon_name,
-                           NULL);
-
-  rebuild_child (button, icon_name, title);
-
-  gtk_widget_set_visible (button, title != NULL || icon_name != NULL);
-
-  if (icon_name != NULL)
-    gtk_widget_set_size_request (button, -1, -1);
-  else
-    gtk_widget_set_size_request (button, 100, -1);
-
-  g_free (title);
-  g_free (icon_name);
-}
-
-static void
-on_title_icon_updated (GtkWidget        *widget,
-                       GParamSpec       *pspec,
-                       GtkStackSwitcher *self)
-{
-  GtkWidget *button;
-
-  button = g_hash_table_lookup (self->priv->buttons, widget);
-  update_button (self, widget, button);
-}
-
-static void
-on_position_updated (GtkWidget        *widget,
-                     GParamSpec       *pspec,
-                     GtkStackSwitcher *self)
-{
-  GtkWidget *button;
-  gint position;
-
-  button = g_hash_table_lookup (self->priv->buttons, widget);
-
-  gtk_container_child_get (GTK_CONTAINER (self->priv->stack), widget,
-                           "position", &position,
-                           NULL);
-
-  gtk_box_reorder_child (GTK_BOX (self), button, position);
-}
-
-static void
-add_child (GtkStackSwitcher *self,
-           GtkWidget        *widget)
-{
-  GtkWidget *button;
-  GList *group;
-
-  button = gtk_radio_button_new (NULL);
-  gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
-
-  update_button (self, widget, button);
-
-  group = gtk_container_get_children (GTK_CONTAINER (self));
-  if (group != NULL)
-    {
-      gtk_radio_button_join_group (GTK_RADIO_BUTTON (button), GTK_RADIO_BUTTON (group->data));
-      g_list_free (group);
-    }
-
-  gtk_container_add (GTK_CONTAINER (self), button);
-
-  g_object_set_data (G_OBJECT (button), "stack-child", widget);
-  g_signal_connect (button, "clicked", G_CALLBACK (on_button_clicked), self);
-  g_signal_connect (widget, "child-notify::title", G_CALLBACK (on_title_icon_updated), self);
-  g_signal_connect (widget, "child-notify::icon-name", G_CALLBACK (on_title_icon_updated), self);
-  g_signal_connect (widget, "child-notify::position", G_CALLBACK (on_position_updated), self);
-
-  g_hash_table_insert (self->priv->buttons, widget, button);
-}
-
-static void
-foreach_stack (GtkWidget        *widget,
-               GtkStackSwitcher *self)
-{
-  add_child (self, widget);
-}
-
-static void
-populate_switcher (GtkStackSwitcher *self)
-{
-  gtk_container_foreach (GTK_CONTAINER (self->priv->stack), (GtkCallback)foreach_stack, self);
-}
-
-static void
-on_child_changed (GtkWidget        *widget,
-                  GParamSpec       *pspec,
-                  GtkStackSwitcher *self)
-{
-  GtkWidget *child;
-  GtkWidget *button;
-
-  child = gtk_stack_get_visible_child (GTK_STACK (widget));
-  button = g_hash_table_lookup (self->priv->buttons, child);
-  if (button != NULL)
-    {
-      self->priv->in_child_changed = TRUE;
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-      self->priv->in_child_changed = FALSE;
-    }
-}
-
-static void
-on_stack_child_added (GtkContainer     *container,
-                      GtkWidget        *widget,
-                      GtkStackSwitcher *self)
-{
-  add_child (self, widget);
-}
-
-static void
-on_stack_child_removed (GtkContainer     *container,
-                        GtkWidget        *widget,
-                        GtkStackSwitcher *self)
-{
-  GtkWidget *button;
-
-  button = g_hash_table_lookup (self->priv->buttons, widget);
-  gtk_container_remove (GTK_CONTAINER (self), button);
-  g_hash_table_remove (self->priv->buttons, widget);
-}
-
-static void
-disconnect_stack_signals (GtkStackSwitcher *switcher)
-{
-  GtkStackSwitcherPrivate *priv = switcher->priv;
-
-  g_signal_handlers_disconnect_by_func (priv->stack, on_stack_child_added, switcher);
-  g_signal_handlers_disconnect_by_func (priv->stack, on_stack_child_removed, switcher);
-  g_signal_handlers_disconnect_by_func (priv->stack, on_child_changed, switcher);
-  g_signal_handlers_disconnect_by_func (priv->stack, disconnect_stack_signals, switcher);
-}
-
-static void
-connect_stack_signals (GtkStackSwitcher *switcher)
-{
-  GtkStackSwitcherPrivate *priv = switcher->priv;
-
-  g_signal_connect_after (priv->stack, "add",
-                          G_CALLBACK (on_stack_child_added), switcher);
-  g_signal_connect_after (priv->stack, "remove",
-                          G_CALLBACK (on_stack_child_removed), switcher);
-  g_signal_connect (priv->stack, "notify::visible-child",
-                    G_CALLBACK (on_child_changed), switcher);
-  g_signal_connect_swapped (priv->stack, "destroy",
-                            G_CALLBACK (disconnect_stack_signals), switcher);
-}
-
-/**
- * gtk_stack_switcher_set_stack:
- * @switcher: a #GtkStackSwitcher
- * @stack: (allow-none): a #GtkStack
- *
- * Sets the stack to control.
- *
- * Since: 3.10
- */
-void
-gtk_stack_switcher_set_stack (GtkStackSwitcher *switcher,
-                              GtkStack         *stack)
-{
-  GtkStackSwitcherPrivate *priv;
-
-  g_return_if_fail (GTK_IS_STACK_SWITCHER (switcher));
-  if (stack)
-    g_return_if_fail (GTK_IS_STACK (stack));
-
-  priv = switcher->priv;
-
-  if (priv->stack == stack)
-    return;
-
-  if (priv->stack)
-    {
-      disconnect_stack_signals (switcher);
-      clear_switcher (switcher);
-      g_clear_object (&priv->stack);
-    }
-
-  if (stack)
-    {
-      priv->stack = g_object_ref (stack);
-      populate_switcher (switcher);
-      connect_stack_signals (switcher);
-    }
-
-  gtk_widget_queue_resize (GTK_WIDGET (switcher));
-
-  g_object_notify (G_OBJECT (switcher), "stack");
-}
-
-/**
- * gtk_stack_switcher_get_stack:
- * @switcher: a #GtkStackSwitcher
- *
- * Retrieves the stack.
- * See gtk_stack_switcher_set_stack().
- *
- * Return value: (transfer none): the stack, or %NULL if
- *    none has been set explicitly.
- *
- * Since: 3.10
- */
-GtkStack *
-gtk_stack_switcher_get_stack (GtkStackSwitcher *switcher)
-{
-  g_return_val_if_fail (GTK_IS_STACK_SWITCHER (switcher), NULL);
-
-  return switcher->priv->stack;
-}
-
-static void
-gtk_stack_switcher_get_property (GObject      *object,
-                                 guint         prop_id,
-                                 GValue       *value,
-                                 GParamSpec   *pspec)
-{
-  GtkStackSwitcher *switcher = GTK_STACK_SWITCHER (object);
-  GtkStackSwitcherPrivate *priv = switcher->priv;
-
-  switch (prop_id)
-    {
-    case PROP_STACK:
-      g_value_set_object (value, priv->stack);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_stack_switcher_set_property (GObject      *object,
-                                 guint         prop_id,
-                                 const GValue *value,
-                                 GParamSpec   *pspec)
-{
-  GtkStackSwitcher *switcher = GTK_STACK_SWITCHER (object);
-
-  switch (prop_id)
-    {
-    case PROP_STACK:
-      gtk_stack_switcher_set_stack (switcher, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_stack_switcher_dispose (GObject *object)
-{
-  GtkStackSwitcher *switcher = GTK_STACK_SWITCHER (object);
-
-  gtk_stack_switcher_set_stack (switcher, NULL);
-
-  G_OBJECT_CLASS (gtk_stack_switcher_parent_class)->dispose (object);
-}
-
-static void
-gtk_stack_switcher_class_init (GtkStackSwitcherClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->get_property = gtk_stack_switcher_get_property;
-  object_class->set_property = gtk_stack_switcher_set_property;
-  object_class->dispose = gtk_stack_switcher_dispose;
-
-  g_object_class_install_property (object_class,
-                                   PROP_STACK,
-                                   g_param_spec_object ("stack",
-                                                        P_("Stack"),
-                                                        P_("Stack"),
-                                                        GTK_TYPE_STACK,
-                                                        GTK_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
-
-  g_type_class_add_private (object_class, sizeof (GtkStackSwitcherPrivate));
-}
-
-/**
- * gtk_stack_switcher_new:
- *
- * Create a new #GtkStackSwitcher.
- *
- * Return value: a new #GtkStackSwitcher.
- *
- * Since: 3.10
- */
-GtkWidget *
-gtk_stack_switcher_new (void)
-{
-  return GTK_WIDGET (g_object_new (GTK_TYPE_STACK_SWITCHER, NULL));
-}
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __GTK_STACK_SWITCHER_H__
-#define __GTK_STACK_SWITCHER_H__
-
-#include "gtkstack.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_STACK_SWITCHER            (gtk_stack_switcher_get_type ())
-#define GTK_STACK_SWITCHER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK_SWITCHER, GtkStackSwitcher))
-#define GTK_STACK_SWITCHER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK_SWITCHER, GtkStackSwitcherClass))
-#define GTK_IS_STACK_SWITCHER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK_SWITCHER))
-#define GTK_IS_STACK_SWITCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK_SWITCHER))
-#define GTK_STACK_SWITCHER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK_SWITCHER, GtkStackSwitcherClass))
-
-typedef struct _GtkStackSwitcher              GtkStackSwitcher;
-typedef struct _GtkStackSwitcherPrivate       GtkStackSwitcherPrivate;
-typedef struct _GtkStackSwitcherClass         GtkStackSwitcherClass;
-
-struct _GtkStackSwitcher
-{
-  GtkBox widget;
-
-  /*< private >*/
-  GtkStackSwitcherPrivate *priv;
-};
-
-struct _GtkStackSwitcherClass
-{
-  GtkBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType        gtk_stack_switcher_get_type          (void) G_GNUC_CONST;
-GtkWidget *  gtk_stack_switcher_new               (void);
-void         gtk_stack_switcher_set_stack         (GtkStackSwitcher *switcher,
-                                                   GtkStack         *stack);
-GtkStack *   gtk_stack_switcher_get_stack         (GtkStackSwitcher *switcher);
-
-G_END_DECLS
-
-#endif /* __GTK_STACK_SWITCHER_H__ */
@@ -52,6 +52,7 @@
 #include <math.h>

 #define DEFAULT_SLIDER_WIDTH    (36)
+#define DEFAULT_SLIDER_HEIGHT   (22)

 struct _GtkSwitchPrivate
 {
@@ -327,7 +328,7 @@ gtk_switch_get_preferred_width (GtkWidget *widget,
                        "focus-padding", &focus_pad,
                        NULL);

-  slider_width = MAX (slider_width, 3 * (focus_width + focus_pad));
+  width += 2 * (focus_width + focus_pad);

  /* Translators: if the "on" state label requires more than three
   * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
@@ -363,7 +364,7 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
  GtkStyleContext *context;
  GtkStateFlags state;
  GtkBorder padding;
-  gint height, focus_width, focus_pad, slider_width, min_height;
+  gint height, focus_width, focus_pad;
  PangoLayout *layout;
  PangoRectangle logical_rect;
  gchar *str;
@@ -381,12 +382,11 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
  gtk_style_context_restore (context);

  gtk_widget_style_get (widget,
-                        "slider-width", &slider_width,
                        "focus-line-width", &focus_width,
                        "focus-padding", &focus_pad,
                        NULL);

-  min_height = MAX (slider_width * 0.6, 3 * (focus_width + focus_pad));
+  height += 2 * (focus_width + focus_pad);

  str = g_strdup_printf ("%s%s",
                         C_("switch", "ON"),
@@ -395,7 +395,7 @@ gtk_switch_get_preferred_height (GtkWidget *widget,
  layout = gtk_widget_create_pango_layout (widget, str);
  pango_layout_get_extents (layout, NULL, &logical_rect);
  pango_extents_to_pixels (&logical_rect, NULL);
-  height += MAX (min_height, logical_rect.height);
+  height += MAX (DEFAULT_SLIDER_HEIGHT, logical_rect.height);

  g_object_unref (layout);
  g_free (str);
@@ -528,8 +528,14 @@ gtk_switch_draw (GtkWidget *widget,
  gint label_x, label_y;
  GtkBorder padding;
  GtkStateFlags state;
+  gint focus_width, focus_pad;
  gint x, y, width, height;

+  gtk_widget_style_get (widget,
+                        "focus-line-width", &focus_width,
+                        "focus-padding", &focus_pad,
+                        NULL);
+
  context = gtk_widget_get_style_context (widget);
  state = gtk_widget_get_state_flags (widget);

@@ -546,6 +552,14 @@ gtk_switch_draw (GtkWidget *widget,
  width = gtk_widget_get_allocated_width (widget);
  height = gtk_widget_get_allocated_height (widget);

+  if (gtk_widget_has_visible_focus (widget))
+    gtk_render_focus (context, cr, x, y, width, height);
+
+  x += focus_width + focus_pad;
+  y += focus_width + focus_pad;
+  width -= 2 * (focus_width + focus_pad);
+  height -= 2 * (focus_width + focus_pad);
+
  gtk_style_context_save (context);
  gtk_style_context_add_class (context, GTK_STYLE_CLASS_TROUGH);

@@ -604,22 +618,6 @@ gtk_switch_draw (GtkWidget *widget,

  gtk_switch_paint_handle (widget, cr, &handle);

-  if (gtk_widget_has_visible_focus (widget))
-    {
-      gint focus_width, focus_pad, pad;
-
-      gtk_widget_style_get (widget,
-                            "focus-line-width", &focus_width,
-                            "focus-padding", &focus_pad,
-                            NULL);
-
-      pad = focus_pad + focus_width;
-
-      gtk_render_focus (context, cr,
-                        handle.x + pad, handle.y + pad,
-                        handle.width - pad*2, handle.height - pad*2);
-    }
-
  return FALSE;
 }

@@ -2405,7 +2405,7 @@ gtk_tree_view_update_height (GtkTreeView *tree_view)
      if (button == NULL)
        continue;

-      gtk_widget_get_preferred_size (button, &requisition, NULL);
+      gtk_widget_get_preferred_size (button, NULL, &requisition);
      tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
    }

@@ -2595,7 +2595,7 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
  natural_width = tree_view->priv->natural_width;
  n_expand_columns = tree_view->priv->n_expand_columns;

-  width = MAX (widget_allocation.width, minimum_width);
+  width = MAX (widget_allocation.width, natural_width);

  /* We change the width here.  The user might have been resizing columns,
   * which changes the total width of the tree view.  This is of
@@ -6490,7 +6490,7 @@ validate_visible_area (GtkTreeView *tree_view)
       * in an inconsistent state if we call top_row_to_dy. */

      gtk_widget_get_preferred_size (GTK_WIDGET (tree_view),
-                                     &requisition, NULL);
+                                     NULL, &requisition);
      gtk_adjustment_set_upper (tree_view->priv->hadjustment,
                                MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
      gtk_adjustment_set_upper (tree_view->priv->vadjustment,
@@ -6707,8 +6707,8 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
       * untill we've recieved an allocation (never update scroll adjustments from size-requests).
       */
      prevent_recursion_hack = TRUE;
-      gtk_tree_view_get_preferred_width (GTK_WIDGET (tree_view), &requisition.width, NULL);
-      gtk_tree_view_get_preferred_height (GTK_WIDGET (tree_view), &requisition.height, NULL);
+      gtk_tree_view_get_preferred_width (GTK_WIDGET (tree_view), NULL, &requisition.width);
+      gtk_tree_view_get_preferred_height (GTK_WIDGET (tree_view), NULL, &requisition.height);
      prevent_recursion_hack = FALSE;

      /* If rows above the current position have changed height, this has
@@ -6780,7 +6780,7 @@ do_presize_handler (GtkTreeView *tree_view)
      GtkRequisition requisition;

      gtk_widget_get_preferred_size (GTK_WIDGET (tree_view),
-                                     &requisition, NULL);
+                                     NULL, &requisition);

      gtk_adjustment_set_upper (tree_view->priv->hadjustment,
                                MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
@@ -14420,7 +14420,7 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
  gint cell_y;
  gint bin_x, bin_y;
  gdouble offset_into_row;
-  gdouble fourth;
+  gdouble third;
  GdkRectangle cell;
  GtkTreeViewColumn *column = NULL;
  GtkTreePath *tmp_path = NULL;
@@ -14442,8 +14442,8 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
  if (tree_view->priv->tree == NULL)
    return FALSE;

-  /* If in the top fourth of a row, we drop before that row; if
-   * in the bottom fourth, drop after that row; if in the middle,
+  /* If in the top third of a row, we drop before that row; if
+   * in the bottom third, drop after that row; if in the middle,
   * and the row has children, drop into the row.
   */
  gtk_tree_view_convert_widget_to_bin_window_coords (tree_view, drag_x, drag_y,
@@ -14470,11 +14470,11 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,

  tmp_path = NULL;

-  fourth = cell.height / 4.0;
+  third = cell.height / 3.0;

  if (pos)
    {
-      if (offset_into_row < fourth)
+      if (offset_into_row < third)
        {
          *pos = GTK_TREE_VIEW_DROP_BEFORE;
        }
@@ -14482,7 +14482,7 @@ gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
        {
          *pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE;
        }
-      else if (offset_into_row < cell.height - fourth)
+      else if (offset_into_row < third * 2.0)
        {
          *pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
        }
@@ -15043,7 +15043,7 @@ gtk_tree_view_search_position_func (GtkTreeView *tree_view,
  gdk_window_get_origin (tree_window, &tree_x, &tree_y);
  tree_width = gdk_window_get_width (tree_window);
  tree_height = gdk_window_get_height (tree_window);
-  gtk_widget_get_preferred_size (search_dialog, &requisition, NULL);
+  gtk_widget_get_preferred_size (search_dialog, NULL, &requisition);

  if (tree_x + tree_width > gdk_screen_get_width (screen))
    x = gdk_screen_get_width (screen) - requisition.width;
@@ -15622,7 +15622,7 @@ _gtk_tree_view_add_editable (GtkTreeView       *tree_view,
  cell_area->y += pre_val - (int)gtk_adjustment_get_value (tree_view->priv->vadjustment);

  gtk_widget_get_preferred_size (GTK_WIDGET (cell_editable),
-                                 &requisition, NULL);
+                                 NULL, &requisition);

  tree_view->priv->draw_keyfocus = TRUE;

@@ -5009,12 +5009,12 @@ gtk_widget_unrealize (GtkWidget *widget)
 * @widget: a #GtkWidget
 * @region: region to draw
 *
- * Invalidates the area of @widget defined by @region by calling
- * gdk_window_invalidate_region() on the widget's window and all its
- * child windows. Once the main loop becomes idle (after the current
- * batch of events has been processed, roughly), the window will
- * receive expose events for the union of all regions that have been
- * invalidated.
+ * Invalidates the rectangular area of @widget defined by @region by
+ * calling gdk_window_invalidate_region() on the widget's window and
+ * all its child windows. Once the main loop becomes idle (after the
+ * current batch of events has been processed, roughly), the window
+ * will receive expose events for the union of all regions that have
+ * been invalidated.
 *
 * Normally you would only use this function in widget
 * implementations. You might also use it to schedule a redraw of a
@@ -148,7 +148,9 @@ struct _GtkWindowPrivate
  GtkWidget *title_close_button;
  GtkWidget *popup_menu;

-  GdkWindow *border_window[8];
+  GdkCursor *default_cursor;
+
+  GdkWindow *content_window;

  /* The following flags are initially TRUE (before a window is mapped).
   * They cause us to compute a configure request that involves
@@ -370,6 +372,12 @@ static gint gtk_window_key_release_event  (GtkWidget         *widget,
 					   GdkEventKey       *event);
 static gint gtk_window_button_press_event (GtkWidget         *widget,
                                           GdkEventButton    *event);
+static gint gtk_window_enter_notify_event (GtkWidget         *widget,
+					   GdkEventCrossing  *event);
+static gint gtk_window_leave_notify_event (GtkWidget         *widget,
+					   GdkEventCrossing  *event);
+static gint gtk_window_motion_notify_event (GtkWidget        *widget,
+					    GdkEventMotion   *event);
 static gint gtk_window_focus_in_event     (GtkWidget         *widget,
 					   GdkEventFocus     *event);
 static gint gtk_window_focus_out_event    (GtkWidget         *widget,
@@ -382,6 +390,8 @@ static void gtk_window_forall             (GtkContainer   *container,
 					   gboolean	include_internals,
 					   GtkCallback     callback,
 					   gpointer        callback_data);
+static void gtk_window_add                (GtkContainer     *container,
+                                           GtkWidget        *child);
 static gint gtk_window_focus              (GtkWidget        *widget,
 				           GtkDirectionType  direction);
 static void gtk_window_move_focus         (GtkWidget         *widget,
@@ -451,6 +461,7 @@ static void     resize_grip_create_window             (GtkWindow    *window);
 static void     resize_grip_destroy_window            (GtkWindow    *window);
 static void     update_grip_visibility                (GtkWindow    *window);
 static void     update_window_buttons                 (GtkWindow    *window);
+static void     update_cursor_at_position             (GtkWidget *widget, gint x, gint y);

 static void        gtk_window_notify_keys_changed (GtkWindow   *window);
 static GtkKeyHash *gtk_window_get_key_hash        (GtkWindow   *window);
@@ -464,6 +475,9 @@ static void        gtk_window_on_theme_variant_changed (GtkSettings *settings,
 #endif
 static void        gtk_window_set_theme_variant         (GtkWindow  *window);

+static void        window_cursor_changed       (GdkWindow  *window,
+                                                GParamSpec *pspec,
+                                                GtkWidget  *widget);
 static gboolean    gtk_window_popup_menu       (GtkWidget      *widget);
 static void        gtk_window_do_popup         (GtkWindow      *window,
                                                GdkEventButton *event);
@@ -632,6 +646,9 @@ gtk_window_class_init (GtkWindowClass *klass)
  widget_class->configure_event = gtk_window_configure_event;
  widget_class->key_press_event = gtk_window_key_press_event;
  widget_class->key_release_event = gtk_window_key_release_event;
+  widget_class->enter_notify_event = gtk_window_enter_notify_event;
+  widget_class->leave_notify_event = gtk_window_leave_notify_event;
+  widget_class->motion_notify_event = gtk_window_motion_notify_event;
  widget_class->focus_in_event = gtk_window_focus_in_event;
  widget_class->button_press_event = gtk_window_button_press_event;
  widget_class->focus_out_event = gtk_window_focus_out_event;
@@ -648,6 +665,7 @@ gtk_window_class_init (GtkWindowClass *klass)
  widget_class->get_preferred_height = gtk_window_get_preferred_height;
  widget_class->get_preferred_height_for_width = gtk_window_get_preferred_height_for_width;

+  container_class->add = gtk_window_add;
  container_class->check_resize = gtk_window_check_resize;
  container_class->forall = gtk_window_forall;

@@ -5623,7 +5641,7 @@ gtk_window_realize (GtkWidget *widget)
  GdkWindowAttr attributes;
  gint attributes_mask;
  GtkWindowPrivate *priv;
-  gint i;
+  GtkStyleContext *context;

  window = GTK_WINDOW (widget);
  priv = window->priv;
@@ -5656,6 +5674,17 @@ gtk_window_realize (GtkWidget *widget)
      gtk_widget_set_window (widget, gdk_window);
      gtk_widget_register_window (widget, gdk_window);

+      priv->content_window = gdk_window_new (gdk_window,
+                                             &attributes, attributes_mask);
+      gdk_window_show (priv->content_window);
+      gtk_widget_register_window (widget, priv->content_window);
+
+      gtk_style_context_set_background (gtk_widget_get_style_context (widget), priv->content_window);
+
+      if (gtk_bin_get_child (GTK_BIN (window)))
+        gtk_widget_set_parent_window (gtk_bin_get_child (GTK_BIN (window)),
+                                      priv->content_window);
+
      return;
    }

@@ -5738,13 +5767,8 @@ gtk_window_realize (GtkWidget *widget)

  gdk_window = gdk_window_new (parent_window, &attributes, attributes_mask);
  gtk_widget_set_window (widget, gdk_window);
-  gtk_widget_register_window (widget, gdk_window);

-  /* We don't need to set a background on the GdkWindow; with decorations
-   * we draw the background ourself
-   */
-  if (!priv->client_decorated)
-    gtk_style_context_set_background (gtk_widget_get_style_context (widget), gdk_window);
+  gtk_widget_register_window (widget, gdk_window);

  attributes.x = allocation.x;
  attributes.y = allocation.y;
@@ -5759,35 +5783,17 @@ gtk_window_realize (GtkWidget *widget)

  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;

-  if (priv->client_decorated)
-    {
-      GdkCursorType cursor_type[8] = {
-        GDK_TOP_LEFT_CORNER,
-        GDK_TOP_SIDE,
-        GDK_TOP_RIGHT_CORNER,
-        GDK_LEFT_SIDE,
-        GDK_RIGHT_SIDE,
-        GDK_BOTTOM_LEFT_CORNER,
-        GDK_BOTTOM_SIDE,
-        GDK_BOTTOM_RIGHT_CORNER
-      };
+  priv->content_window = gdk_window_new (gdk_window,
+                                         &attributes, attributes_mask);
+  gdk_window_show (priv->content_window);
+  gtk_widget_register_window (widget, priv->content_window);

-      attributes.wclass = GDK_INPUT_ONLY;
-      attributes.width = 1;
-      attributes.height = 1;
-      attributes.event_mask = GDK_BUTTON_PRESS_MASK;
-      attributes_mask = GDK_WA_CURSOR;
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_set_background (context, priv->content_window);

-      for (i = 0; i < 8; i++)
-        {
-          attributes.cursor = gdk_cursor_new (cursor_type[i]);
-          priv->border_window[i] = gdk_window_new (gdk_window, &attributes, attributes_mask);
-          g_object_unref (attributes.cursor);
-
-          gdk_window_show (priv->border_window[i]);
-          gtk_widget_register_window (widget, priv->border_window[i]);
-        }
-    }
+  if (gtk_bin_get_child (GTK_BIN (window)))
+    gtk_widget_set_parent_window (gtk_bin_get_child (GTK_BIN (window)),
+                                  priv->content_window);

  if (priv->transient_parent &&
      gtk_widget_get_realized (GTK_WIDGET (priv->transient_parent)))
@@ -5848,6 +5854,11 @@ gtk_window_realize (GtkWidget *widget)
    }
 #endif

+  /* get the default cursor */
+  g_signal_connect (G_OBJECT (gdk_window), "notify::cursor",
+                    G_CALLBACK (window_cursor_changed), widget);
+  window_cursor_changed (gdk_window, NULL, widget);
+
  /* Icons */
  gtk_window_realize_icon (window);

@@ -5861,7 +5872,6 @@ gtk_window_unrealize (GtkWidget *widget)
  GtkWindow *window = GTK_WINDOW (widget);
  GtkWindowPrivate *priv = window->priv;
  GtkWindowGeometryInfo *info;
-  gint i;

  /* On unrealize, we reset the size of the window such
   * that we will re-apply the default sizing stuff
@@ -5894,15 +5904,9 @@ gtk_window_unrealize (GtkWidget *widget)
  if (priv->grip_window != NULL)
    resize_grip_destroy_window (window);

-  if (priv->border_window[0] != NULL)
-    {
-      for (i = 0; i < 8; i++)
-        {
-          gtk_widget_unregister_window (widget, priv->border_window[i]);
-          gdk_window_destroy (priv->border_window[i]);
-          priv->border_window[i] = NULL;
-        }
-    }
+  gtk_widget_unregister_window (widget, priv->content_window);
+  gdk_window_destroy (priv->content_window);
+  priv->content_window = NULL;

  GTK_WIDGET_CLASS (gtk_window_parent_class)->unrealize (widget);
 }
@@ -6134,197 +6138,6 @@ get_decoration_borders (GtkWidget *widget,
    }
 }

-static void
-update_border_windows (GtkWindow *window, GtkBorder *border)
-{
-  GtkWidget *widget = (GtkWidget *)window;
-  GtkWindowPrivate *priv = window->priv;
-  GdkWindowState state;
-  gboolean resize_h, resize_v;
-  gint handle;
-  cairo_region_t *region;
-  cairo_rectangle_int_t rect;
-  gint width, height;
-
-  if (priv->border_window[0] == NULL)
-    return;
-
-  state = gdk_window_get_state (gtk_widget_get_window (widget));
-  if (!priv->resizable || (state & GDK_WINDOW_STATE_MAXIMIZED))
-    {
-      resize_h = resize_v = FALSE;
-    }
-  else
-    {
-      resize_h = resize_v = TRUE;
-      if (priv->geometry_info)
-        {
-          GdkGeometry *geometry = &priv->geometry_info->geometry;
-          GdkWindowHints flags = priv->geometry_info->mask;
-
-          if ((flags & GDK_HINT_MIN_SIZE) && (flags & GDK_HINT_MAX_SIZE))
-            {
-              resize_h = geometry->min_width != geometry->max_width;
-              resize_v = geometry->min_height != geometry->max_height;
-            }
-        }
-    }
-
-  gtk_widget_style_get (widget,
-                        "decoration-resize-handle", &handle,
-                        NULL);
-
-  width = gtk_widget_get_allocated_width (widget) - (border->left + border->right);
-  height = gtk_widget_get_allocated_height (widget) - (border->top + border->bottom);
-
-  if (resize_h && resize_v)
-    {
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST],
-                              0, 0,
-                              border->left + handle, border->top + handle);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST],
-                              border->left + width - handle, 0,
-                              border->right + handle, border->top + handle);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST],
-                              0, border->top + height - handle,
-                              border->left + handle, border->bottom + handle);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST],
-                              border->left + width - handle, border->top + height - handle,
-                              border->right + handle, border->bottom + handle);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->left + handle;
-      rect.height = border->top + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = border->left;
-      rect.y = border->top;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->right + handle;
-      rect.height = border->top + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = 0;
-      rect.y = border->top;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->left + handle;
-      rect.height = border->bottom + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = border->left;
-      rect.y = 0;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = border->right + handle;
-      rect.height = border->bottom + handle;
-      region = cairo_region_create_rectangle (&rect);
-      rect.x = 0;
-      rect.y = 0;
-      rect.width = handle;
-      rect.height = handle;
-      cairo_region_subtract_rectangle (region, &rect);
-      gdk_window_shape_combine_region (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST],
-                                       region, 0, 0);
-      cairo_region_destroy (region);
-
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST]);
-    }
-  else
-    {
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH_WEST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH_WEST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH_EAST]);
-    }
-
-  if (resize_v)
-    {
-      gint x, w;
-
-      if (resize_h)
-        {
-          x = border->left + handle;
-          w = width - 2 * handle;
-        }
-      else
-        {
-          x = 0;
-          w = width + border->left + border->right;
-        }
-
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH],
-                              x, 0,
-                              w, border->top);
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH],
-                              x, border->top + height,
-                              w, border->bottom);
-
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
-    }
-  else
-    {
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
-    }
-
-  if (resize_h)
-    {
-      gint y, h;
-
-      if (resize_v)
-        {
-          y = border->top + handle;
-          h = height - 2 * handle;
-        }
-      else
-        {
-          y = 0;
-          h = height + border->top + border->bottom;
-        }
-
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_WEST],
-                              0, y,
-                              border->left, h);
-
-      gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_EAST],
-                              border->left + width, y,
-                              border->right, h);
-
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_WEST]);
-      gdk_window_show (priv->border_window[GDK_WINDOW_EDGE_EAST]);
-    }
-  else
-    {
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_WEST]);
-      gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_EAST]);
-    }
-}
-
 /* _gtk_window_set_allocation:
 * @window: a #GtkWindow
 * @allocation: the original allocation for the window
@@ -6428,12 +6241,19 @@ _gtk_window_set_allocation (GtkWindow           *window,
        {
          update_grip_visibility (window);
          set_grip_position (window);
-          update_border_windows (window, &window_border);
        }
+
+      gdk_window_move_resize (priv->content_window,
+                              child_allocation.x,
+                              child_allocation.y,
+                              child_allocation.width,
+                              child_allocation.height);
+
    }

-  child_allocation.x += border_width;
-  child_allocation.y += border_width;
+  /* Apply border width */
+  child_allocation.x = border_width;
+  child_allocation.y = border_width;
  child_allocation.width = MAX (1, child_allocation.width - border_width * 2);
  child_allocation.height = MAX (1, child_allocation.height - border_width * 2);

@@ -6450,7 +6270,7 @@ gtk_window_size_allocate (GtkWidget     *widget,

  _gtk_window_set_allocation (window, allocation, &child_allocation);

-  child = gtk_bin_get_child (GTK_BIN (window));
+  child = gtk_bin_get_child (&(window->bin));
  if (child && gtk_widget_get_visible (child))
    gtk_widget_size_allocate (child, &child_allocation);
 }
@@ -6975,27 +6795,170 @@ gtk_window_key_release_event (GtkWidget   *widget,
 }

 static GtkWindowRegion
-get_active_region_type (GtkWindow *window, GdkEventAny *event, gint x, gint y)
+get_region_type (GtkWindow *window, gint x, gint y)
 {
  GtkWindowPrivate *priv = window->priv;
-  GtkAllocation allocation;
-  gint i;
+  GtkWidget *widget = GTK_WIDGET (window);
+  gint title_height = 0;
+  gint resize_handle = 0;
+  GtkBorder window_border = { 0 };

-  for (i = 0; i < 8; i++)
+  if (priv->title_box)
+    title_height = gtk_widget_get_allocated_height (priv->title_box);
+
+  if (priv->client_decorated)
    {
-      if (event->window == priv->border_window[i])
-        return i;
+      get_decoration_borders (widget, NULL, &window_border, NULL);
+      gtk_widget_style_get (widget,
+                            "decoration-resize-handle", &resize_handle,
+                            NULL);
    }

-  if (priv->title_box != NULL)
+  if (x < window_border.left)
    {
-      gtk_widget_get_allocation (priv->title_box, &allocation);
-      if (allocation.x <= x && allocation.x + allocation.width > x &&
-          allocation.y <= y && allocation.y + allocation.height > y)
+      if (y < window_border.top + MAX (title_height, resize_handle))
+        return GTK_WINDOW_REGION_EDGE_NW;
+      else if (y > gtk_widget_get_allocated_height (widget) - window_border.bottom - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SW;
+      else
+        return GTK_WINDOW_REGION_EDGE_W;
+    }
+  else if (x > gtk_widget_get_allocated_width (widget) - window_border.right)
+    {
+      if (y < window_border.top + MAX (title_height, resize_handle))
+        return GTK_WINDOW_REGION_EDGE_NE;
+      else if (y > gtk_widget_get_allocated_height (widget) - window_border.bottom - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SE;
+      else
+        return GTK_WINDOW_REGION_EDGE_E;
+    }
+  else if (y < window_border.top)
+    {
+      if (x < window_border.left + resize_handle)
+        return GTK_WINDOW_REGION_EDGE_NW;
+      else if (x > gtk_widget_get_allocated_width (widget) - window_border.right - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_NE;
+      else
+        return GTK_WINDOW_REGION_EDGE_N;
+    }
+  else if (y > gtk_widget_get_allocated_height (widget) - window_border.bottom)
+    {
+      if (x < window_border.left + resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SW;
+      else if (x > gtk_widget_get_allocated_width (widget) - window_border.right - resize_handle)
+        return GTK_WINDOW_REGION_EDGE_SE;
+      else
+        return GTK_WINDOW_REGION_EDGE_S;
+    }
+  else
+    {
+      if (y < window_border.top + title_height)
        return GTK_WINDOW_REGION_TITLE;
+      else
+        return GTK_WINDOW_REGION_CONTENT;
+    }
+}
+
+static GtkWindowRegion
+get_active_region_type (GtkWindow *window, gint x, gint y)
+{
+  GtkWindowPrivate *priv = window->priv;
+  GtkWidget *widget = GTK_WIDGET (window);
+  GtkWindowRegion region;
+  gboolean resize_h, resize_v;
+  gint state;
+  GtkBorder window_border = { 0 };
+
+  region = get_region_type (window, x, y);
+  if (priv->client_decorated)
+    get_decoration_borders (widget, NULL, &window_border, NULL);
+
+  state = gdk_window_get_state (gtk_widget_get_window (widget));
+  if (!priv->resizable || (state & GDK_WINDOW_STATE_MAXIMIZED))
+    {
+      resize_h = resize_v = FALSE;
+    }
+  else
+    {
+      resize_h = resize_v = TRUE;
+      if (priv->geometry_info)
+        {
+          GdkGeometry *geometry = &priv->geometry_info->geometry;
+          GdkWindowHints flags = priv->geometry_info->mask;
+
+          if ((flags & GDK_HINT_MIN_SIZE) && (flags & GDK_HINT_MAX_SIZE))
+            {
+              resize_h = geometry->min_width != geometry->max_width;
+              resize_v = geometry->min_height != geometry->max_height;
+            }
+        }
    }

-  return GTK_WINDOW_REGION_CONTENT;
+  switch (region)
+    {
+    case GTK_WINDOW_REGION_EDGE_N:
+    case GTK_WINDOW_REGION_EDGE_S:
+      if (resize_v)
+        return region;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_W:
+    case GTK_WINDOW_REGION_EDGE_E:
+      if (resize_h)
+        return region;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_NW:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x < window_border.left)
+        return GTK_WINDOW_REGION_EDGE_W;
+      else if (resize_v && y < window_border.top)
+        return GTK_WINDOW_REGION_EDGE_N;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_NE:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x > gtk_widget_get_allocated_width (widget) - window_border.right)
+        return GTK_WINDOW_REGION_EDGE_E;
+      else if (resize_v && y < window_border.top)
+        return GTK_WINDOW_REGION_EDGE_N;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_SW:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x < window_border.left)
+        return GTK_WINDOW_REGION_EDGE_W;
+      else if (resize_v && y > gtk_widget_get_allocated_height (widget) - window_border.bottom)
+        return GTK_WINDOW_REGION_EDGE_N;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    case GTK_WINDOW_REGION_EDGE_SE:
+      if (resize_h && resize_v)
+        return region;
+      else if (resize_h && x > gtk_widget_get_allocated_width (widget) - window_border.right)
+        return GTK_WINDOW_REGION_EDGE_E;
+      else if (resize_v && y > gtk_widget_get_allocated_height (widget) - window_border.bottom)
+        return GTK_WINDOW_REGION_EDGE_S;
+      else
+        return GTK_WINDOW_REGION_EDGE;
+      break;
+
+    default:
+      return region;
+    }
 }

 static gint
@@ -7041,7 +7004,7 @@ gtk_window_button_press_event (GtkWidget      *widget,
          x = event->x;
          y = event->y;
        }
-      region = get_active_region_type (window, (GdkEventAny*)event, x, y);
+      region = get_active_region_type (window, x, y);

      if (event->type == GDK_BUTTON_PRESS)
        {
@@ -7111,6 +7074,55 @@ gtk_window_real_activate_focus (GtkWindow *window)
  gtk_window_activate_focus (window);
 }

+static gint
+gtk_window_enter_notify_event (GtkWidget        *widget,
+			       GdkEventCrossing *event)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (widget)->priv;
+
+  if (priv->client_decorated)
+    {
+      gint x, y;
+      GdkWindow *gdk_window;
+
+      gdk_window = gtk_widget_get_window (widget);
+      gdk_window_get_device_position (gdk_window,
+                                      gdk_event_get_device ((GdkEvent*)event),
+                                      &x, &y, NULL);
+      update_cursor_at_position (widget, x, y);
+    }
+
+  return FALSE;
+}
+
+static gint
+gtk_window_leave_notify_event (GtkWidget        *widget,
+			       GdkEventCrossing *event)
+{
+  return FALSE;
+}
+
+static gboolean
+gtk_window_motion_notify_event (GtkWidget       *widget,
+                                GdkEventMotion  *event)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (widget)->priv;
+
+  if (priv->client_decorated)
+    {
+      gint x, y;
+      GdkWindow *gdk_window;
+
+      gdk_window = gtk_widget_get_window (widget);
+      gdk_window_get_device_position (gdk_window,
+                                      gdk_event_get_device ((GdkEvent*)event),
+                                      &x, &y, NULL);
+      update_cursor_at_position (widget, x, y);
+    }
+
+  return FALSE;
+}
+
 static void
 do_focus_change (GtkWidget *widget,
 		 gboolean   in)
@@ -7271,6 +7283,17 @@ gtk_window_forall (GtkContainer *container,
    (* callback) (priv->title_box, callback_data);
 }

+static void
+gtk_window_add (GtkContainer *container,
+                GtkWidget    *child)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (container)->priv;
+
+  gtk_widget_set_parent_window (child, priv->content_window);
+
+  GTK_CONTAINER_CLASS (gtk_window_parent_class)->add (container, child);
+}
+
 static gboolean
 gtk_window_focus (GtkWidget        *widget,
 		  GtkDirectionType  direction)
@@ -7448,6 +7471,103 @@ gtk_window_real_set_focus (GtkWindow *window,
    }
 }

+static void
+window_cursor_changed (GdkWindow  *window,
+                       GParamSpec *pspec,
+                       GtkWidget  *widget)
+{
+  GtkWindowPrivate *priv = GTK_WINDOW (widget)->priv;
+
+  priv->default_cursor = gdk_window_get_cursor (window);
+  if (priv->default_cursor == NULL)
+    priv->default_cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_LEFT_PTR);
+  gdk_window_set_cursor (priv->content_window, priv->default_cursor);
+}
+
+static void
+update_cursor_at_position (GtkWidget *widget, gint x, gint y)
+{
+  GtkWindow *window = GTK_WINDOW (widget);
+  GtkWindowPrivate *priv = window->priv;
+  GtkWindowRegion region;
+  GdkCursorType cursor_type;
+  GdkCursor *cursor;
+  GdkWindowState state;
+  gboolean use_default = FALSE;
+  GdkWindow *gdk_window;
+
+  region = get_active_region_type (window, x, y);
+
+  state = gdk_window_get_state (gtk_widget_get_window (widget));
+
+  if ((state & GDK_WINDOW_STATE_MAXIMIZED) || !priv->resizable || !priv->decorated)
+    {
+      use_default = TRUE;
+    }
+  else
+    {
+      switch (region)
+        {
+        case GTK_WINDOW_REGION_EDGE_NW:
+          cursor_type = GDK_TOP_LEFT_CORNER;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_N:
+          cursor_type = GDK_TOP_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_NE:
+          cursor_type = GDK_TOP_RIGHT_CORNER;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_W:
+          cursor_type = GDK_LEFT_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_E:
+          cursor_type = GDK_RIGHT_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_SW:
+          cursor_type = GDK_BOTTOM_LEFT_CORNER;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_S:
+          cursor_type = GDK_BOTTOM_SIDE;
+          break;
+
+        case GTK_WINDOW_REGION_EDGE_SE:
+          cursor_type = GDK_BOTTOM_RIGHT_CORNER;
+          break;
+
+        default:
+          use_default = TRUE;
+          break;
+        }
+    }
+
+  gdk_window = gtk_widget_get_window (widget);
+  g_signal_handlers_disconnect_by_func (G_OBJECT (gdk_window),
+                                        G_CALLBACK (window_cursor_changed),
+                                        widget);
+
+  if (use_default)
+    {
+      gdk_window_set_cursor (gdk_window, priv->default_cursor);
+    }
+  else
+    {
+      cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), cursor_type);
+      gdk_window_set_cursor (gdk_window, cursor);
+      g_object_unref (cursor);
+    }
+
+  g_signal_connect (G_OBJECT (gdk_window), "notify::cursor",
+                    G_CALLBACK (window_cursor_changed), widget);
+}
+
+
+
 static void
 gtk_window_get_preferred_width (GtkWidget *widget,
                                gint      *minimum_size,
@@ -8884,24 +9004,26 @@ gtk_window_draw (GtkWidget *widget,
  GtkBorder title_border = { 0 };
  GtkBorder inner_border = { 0 };
  GtkBorder outer_border = { 0 };
-  gint title_height;

  context = gtk_widget_get_style_context (widget);

  gtk_widget_get_allocation (widget, &allocation);

-  get_decoration_borders (widget, &title_border, &inner_border, &outer_border);
+  if (priv->title_box != NULL)
+    get_decoration_borders (widget, &title_border, &inner_border, &outer_border);
+  else
+    get_decoration_borders (widget, NULL, &inner_border, &outer_border);

  if (!gtk_widget_get_app_paintable (widget) &&
      gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
    {
+      gtk_style_context_save (context);
+
      if (priv->client_decorated &&
          priv->decorated &&
          !priv->fullscreen &&
          !(gdk_window_get_state (gtk_widget_get_window (widget)) & GDK_WINDOW_STATE_MAXIMIZED))
        {
-          gtk_style_context_save (context);
-
          gtk_style_context_add_class (context, "window-border");
          gtk_render_background (context, cr,
                                 inner_border.left + outer_border.left,
@@ -8921,31 +9043,22 @@ gtk_window_draw (GtkWidget *widget,
          gtk_style_context_add_class (context, "window-outer-border");
          gtk_render_frame (context, cr,
                            0, 0, allocation.width, allocation.height);
-          gtk_style_context_restore (context);
+          gtk_style_context_remove_class (context, "window-outer-border");
        }

-      if (priv->title_box)
-        title_height = gtk_widget_get_allocated_height (priv->title_box);
-      else
-        title_height = 0;
-      gtk_style_context_save (context);
-      gtk_style_context_add_class (context, "window-content");
-      gtk_render_background (context, cr,
-                             inner_border.left + outer_border.left,
-                             inner_border.top + outer_border.top +
-                             title_border.top + title_border.bottom +
-                             title_height,
-                             allocation.width -
-                             (inner_border.left + inner_border.right +
-                              outer_border.left + outer_border.right),
-                             allocation.height -
-                             (inner_border.top + inner_border.bottom +
-                              outer_border.top + outer_border.bottom +
-                              title_border.top + title_border.bottom +
-                              title_height));
      gtk_style_context_restore (context);
    }

+  if (!gtk_widget_get_app_paintable (widget) &&
+      gtk_cairo_should_draw_window (cr, priv->content_window))
+    {
+      gint x, y;
+      gdk_window_get_position (priv->content_window, &x, &y);
+      gtk_render_background (context, cr, x, y,
+                             gdk_window_get_width (priv->content_window),
+                             gdk_window_get_height (priv->content_window));
+    }
+
  if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw)
    ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr);

@@ -11164,3 +11277,9 @@ ensure_state_flag_backdrop (GtkWidget *widget)

  gtk_widget_queue_draw (widget);
 }
+
+GdkWindow *
+_gtk_window_get_content_window (GtkWindow *window)
+{
+  return window->priv->content_window;
+}
@@ -64,6 +64,7 @@ void            _gtk_window_get_wmclass            (GtkWindow  *window,
 void            _gtk_window_set_allocation         (GtkWindow           *window,
                                                    const GtkAllocation *allocation,
                                                    GtkAllocation       *allocation_out);
+GdkWindow *     _gtk_window_get_content_window     (GtkWindow           *window);

 typedef void (*GtkWindowKeysForeachFunc) (GtkWindow      *window,
                                          guint           keyval,
@@ -291,7 +291,7 @@ _cairo_write (void                *closure,
              unsigned int         length)
 {
  GIOChannel *io = (GIOChannel *)closure;
-  gsize written = 0;
+  gsize written;
  GError *error;

  error = NULL;
@@ -301,20 +301,14 @@ _cairo_write (void                *closure,

  while (length > 0) 
    {
-      GIOStatus status;
+      g_io_channel_write_chars (io, (const gchar *) data, length, &written, &error);

-      status = g_io_channel_write_chars (io, (const gchar *) data, length, &written, &error);
-
-      if (status == G_IO_STATUS_ERROR)
-        {
-          if (error != NULL)
-            {
-              GTK_NOTE (PRINTING,
-                        g_print ("FILE Backend: Error writting to temp file, %s\n", error->message));
-
-              g_error_free (error);
-            }
+      if (error != NULL)
+	{
+	  GTK_NOTE (PRINTING,
+                     g_print ("FILE Backend: Error writting to temp file, %s\n", error->message));

+          g_error_free (error);
 	  return CAIRO_STATUS_WRITE_ERROR;
 	}    

@@ -169,7 +169,6 @@ gtk/gtkpagesetupunixdialog.c
 gtk/gtkpaned.c
 gtk/gtkpapersize.c
 gtk/gtkpathbar.c
-gtk/gtkplacessidebar.c
 gtk/gtkplug.c
 gtk/gtkpressandhold.c
 gtk/gtkprintbackend.c
@@ -237,7 +236,6 @@ gtk/gtktoolitem.c
 gtk/gtktoolitemgroup.c
 gtk/gtktoolpalette.c
 gtk/gtktoolshell.c
-gtk/gtktrashmonitor.c
 gtk/gtktrayicon-x11.c
 gtk/gtktreednd.c
 gtk/gtktreemenu.c
@@ -101,7 +101,6 @@ sr@latin
 sv
 ta
 te
-tg
 th
 tk
 tr
@@ -68,9 +68,6 @@ INSTOBJEXT = @INSTOBJEXT@
 .SUFFIXES:
 .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat

-$(filter %.ui.h, $(POTFILES)):
-	$(MAKE) -C ../gtk gtkresources.c
-
 .c.o:
 	$(COMPILE) $<

@@ -171,7 +171,6 @@ gtk/gtkpagesetupunixdialog.c
 gtk/gtkpaned.c
 gtk/gtkpapersize.c
 gtk/gtkpathbar.c
-gtk/gtkplacessidebar.c
 gtk/gtkplug.c
 gtk/gtkpressandhold.c
 gtk/gtkprintbackend.c
@@ -240,7 +239,6 @@ gtk/gtktoolitem.c
 gtk/gtktoolitemgroup.c
 gtk/gtktoolpalette.c
 gtk/gtktoolshell.c
-gtk/gtktrashmonitor.c
 gtk/gtktrayicon-x11.c
 gtk/gtktreednd.c
 gtk/gtktreemenu.c
@@ -300,4 +298,3 @@ gtk/gtkrecentchooserdefault.ui.h
 gtk/gtkscalebutton.ui.h
 gtk/gtkstatusbar.ui.h
 gtk/gtkvolumebutton.ui.h
-
@@ -285,82 +285,82 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr ""

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr ""

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr ""

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr ""

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr ""

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr ""

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr ""

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr ""

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr ""

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr ""

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr ""

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr ""

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr ""

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr ""

 #: ../gdk/keyname-table.h:4006
@@ -368,7 +368,7 @@ msgstr ""
 #| msgctxt "Stock label, navigation"
 #| msgid "_Forward"
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "_Vorentoe"

 #: ../gdk/keyname-table.h:4007
@@ -376,47 +376,47 @@ msgstr "_Vorentoe"
 #| msgctxt "Stock label, navigation"
 #| msgid "_Back"
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "_Terug"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr ""

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr ""

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr ""

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr ""

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr ""

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr ""

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr ""

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr ""

 #. Description of --sync in --help output
@@ -278,132 +278,132 @@ msgstr "Suprimir"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor: puyar o brilo"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor: baixar o brilo"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Son: Silenciar"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Son: baixar o volumen"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Son: puyar o volumen"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Son: reproducir"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Son: aturar"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Son: siguient"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Son: anterior"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Son: gravar"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Son: pausar"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Son: rebobinar"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Son: meyo"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Salvapantallas"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batería"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Executar 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Abance"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Dezaga"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Adormir"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernar"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Camara web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Enchegar/desenchegar o touchpad"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Dispertar"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspender"

 #. Description of --sync in --help output
@@ -284,132 +284,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "رفع سطوع الشاشة"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "خفض سطوع الشاشة"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "غلق الصوت"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "خفض الصوت"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "رفع الصوت"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "تشغيل الصوتيات"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "إيقاف الصوتيات"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "الصوتي التالي"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "الصوتي السابق"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "تسجيل الصوت"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "إلباث الصوت"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "تدوير الصوت"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "وسائط الصوت"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "حافظة الشاشة"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "البطارية"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "مشغّل 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "أمام"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "خلف"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "نوم"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "إسبات"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "الشبكة المحلية"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "كمرة الوب"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "الشاشة"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "تشغيل لوحة اللمس"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "إيقاظ"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "تعليق"

 #. Description of --sync in --help output
@@ -281,132 +281,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -277,132 +277,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -288,132 +288,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Увеличаване на яркостта"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Намаляване на яркостта"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Заглушаване"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Намаляване на звука"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Увеличаване на звука"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Изпълнение на медия"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Спиране на изпълнение"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Следваща песен"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Предишна песен"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Запис на аудио"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Пауза на аудио"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Отначало на песента"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Аудио медия"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Предпазител на екрана"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Батерия"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Стартиране 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Напред"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Назад"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Приспиване"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Дълбоко приспиване"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Безжична мрежа"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Уеб камера"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Дисплей"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Сензорен панел"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Събуждане"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Изключване"

 #. Description of --sync in --help output
@@ -283,137 +283,137 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4006
 #| msgctxt "Stock label, navigation"
 #| msgid "_Forward"
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4007
 #| msgctxt "Stock label, navigation"
 #| msgid "_Back"
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:55
@@ -283,133 +283,133 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
@@ -282,134 +282,134 @@ msgstr "Dilemel"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr ""

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr ""

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr ""

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr ""

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr ""

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr ""

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr ""

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr ""

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr ""

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr ""

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr ""

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr ""

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr ""

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr ""

 #: ../gdk/keyname-table.h:4006
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "_War-lerc'h"

 #: ../gdk/keyname-table.h:4007
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "_Distro"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr ""

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr ""

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr ""

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr ""

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr ""

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr ""

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr ""

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr ""

 #. Description of --sync in --help output
@@ -305,132 +305,132 @@ msgstr "Supr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Augmenta la brillantor"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Redueix la brillantor"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silencia"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Apuja el volum"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Abaixa el volum"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Reprodueix"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Atura"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Següent"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Previ"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Enregistra"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Fes una pausa"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Rebobina"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Mèdia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Estalvi de pantalla"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Bateria"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Executa"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Endavant"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Enrere"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Atura temporalment"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hiberna"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Wi-Fi"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Càmera web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Commuta el ratolí tàctil"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Desperta"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Atura temporalment"

 #. Description of --sync in --help output
@@ -304,132 +304,132 @@ msgstr "Supr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Augmenta la brillantor"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Redueix la brillantor"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silencia"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Apuja el volum"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Abaixa el volum"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Reprodueix"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Para"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Següent"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Previ"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Enregistra"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Fes una pausa"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Rebobina"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Mèdia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Estalvi de pantalla"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Bateria"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Executa"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Avant"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Arrere"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Para temporalment"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hiberna"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Wi-Fi"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Càmera web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Commuta el ratolí tàctil"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Desperta"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Para temporalment"

 #. Description of --sync in --help output
@@ -291,134 +291,134 @@ msgstr "Sil"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr ""

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr ""

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr ""

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr ""

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr ""

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr ""

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr ""

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr ""

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr ""

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr ""

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr ""

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr ""

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr ""

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr ""

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr ""

 #: ../gdk/keyname-table.h:4007
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "İ_leri"

 #: ../gdk/keyname-table.h:4008
 #, fuzzy
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "_Keri"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr ""

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr ""

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr ""

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr ""

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr ""

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr ""

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr ""

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr ""

 #. Description of --sync in --help output
@@ -288,133 +288,133 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
-msgstr "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
-msgstr "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
-msgstr "AudioMute"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
-msgstr "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
-msgstr "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
-msgstr "AudioPlay"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
-msgstr "AudioStop"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
-msgstr "AudioNext"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
-msgstr "AudioPrev"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
-msgstr "AudioRecord"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
-msgstr "AudioPause"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
-msgstr "AudioRewind"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
-msgstr "ScreenSaver"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
-msgstr "Battery"
+msgid "XF86Battery"
+msgstr "XF86Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
-msgstr "Launch1"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
-msgstr "Forward"
+msgid "XF86Forward"
+msgstr "XF86Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
-msgstr "Back"
+msgid "XF86Back"
+msgstr "XF86Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
-msgstr "Sleep"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
-msgstr "Hibernate"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
-msgstr "WLAN"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
-msgstr "WebCam"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
-msgstr "Display"
+msgid "XF86Display"
+msgstr "XF86Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
-msgstr "WakeUp"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
-msgstr "Suspend"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"

 #. Description of --sync in --help output
 #: ../gdk/win32/gdkmain-win32.c:53
@@ -306,133 +306,133 @@ msgstr "Del"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "SkærmLysstyrkeOp"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "SkærmLysstyrkeNed"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "LydFra"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "LydstyrkeNed"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "LydstyrkeOp"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "LydAfspil"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "LydStop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "LydNæste"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "LydForrige"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "LydOptag"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "LydPause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "LydSpolTilbage"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "LydMedie"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Pauseskærm"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batteri"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Kør1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Næste"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Forrige"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sove"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Dvale"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Trådløs"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Webkamera"

 # Tasten på visse bærbare computeres tastaturer, som aktiverer noget projektoragtigt eller på anden vis piller ved skærmindstillingerne
 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Skærm"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "PegepladeTilFra"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "VågnOp"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Hvile"

 #. Description of --sync in --help output
@@ -304,132 +304,132 @@ msgstr "Entf"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitorhelligkeit erhöhen"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitorhelligkeit senken"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Stumm schalten"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Lautstärke senken"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Lautstärke erhöhen"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Wiedergabe starten"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Wiedergabe stoppen"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Nächster Titel"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Vorheriger Titel"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Aufnahme starten"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Aufnahme pausieren"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Zurückspulen"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
-msgstr "AudioMedia"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Bildschirmschoner"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batterie"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Starten1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Vorwärts"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Rückwärts"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Bereitschaft"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Ruhezustand"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "WebCam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Anzeige"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
-msgstr "TouchpadToggle"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Aufwecken"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "In Bereitschaft versetzen"

 #. Description of --sync in --help output
@@ -273,132 +273,132 @@ msgstr ""

 #: gdk/keyname-table.h:3988
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor brightness up"

 #: gdk/keyname-table.h:3989
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor brightness down"

 #: gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Audio mute"

 #: gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Audio lower volume"

 #: gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Audio raise volume"

 #: gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Audio play"

 #: gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Audio stop"

 #: gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Audio next"

 #: gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Audio previous"

 #: gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Audio record"

 #: gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Audio pause"

 #: gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Audio rewind"

 #: gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Audio media"

 #: gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Screensaver"

 #: gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Web Cam"

 #: gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Touchpad toggle"

 #: gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Wake up"

 #: gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -279,132 +279,132 @@ msgstr "Delete"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor brightness up"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor brightness down"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Audio mute"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Audio lower volume"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Audio raise volume"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Audio play"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Audio stop"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Audio next"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Audio previous"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Audio record"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Audio pause"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Audio rewind"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Audio media"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Screensaver"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Battery"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Launch1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Forward"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Back"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Sleep"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernate"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Webcam"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Display"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Touchpad toggle"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Wake up"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspend"

 #. Description of --sync in --help output
@@ -280,132 +280,132 @@ msgstr "Forigi"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3990
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Plialtigi ekran-helecon"

 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Malplialtigi ekran-helecon"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silentigi sonon"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Malplialtigi sonforton"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Plialtigi sonforton"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Ludi sonon"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Haltigi sonludon"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Sekva sono"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Antaŭa sono"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Registri sonon"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Paŭzigi sonon"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Revolvi sonon"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Aŭdvidea sono"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Ekrankurteno"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Akumulatoro"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Lanĉi1"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Antaŭen"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Malantaŭen"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Dormeti"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Pasivumigi"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Retkamerao"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Ekrano"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Tuŝplata baskulo"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Veki"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Prokrasti"

 #. Description of --sync in --help output
@@ -286,132 +286,132 @@ msgstr "Supr"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitor: subir brillo"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitor: bajar brillo"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Silenciar"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Sonido: bajar volumen"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Sonido: subir volumen"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Sonido: reproducir"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Sonido: parar"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Sonido: siguiente"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Sonido: anterior"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Sonido: grabar"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Sonido: pausar"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Sonido: rebobinar"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Sonido: medio"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Salvapantallas"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Batería"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Ejecutar1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Adelante"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Atrás"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Dormir"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernar"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Cámara web"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantalla"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Activar/desactivar touchpad"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Despertar"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Suspender"

 #. Description of --sync in --help output
@@ -236,107 +236,107 @@ msgstr "Delete"

 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Kuvari heledust vähemaks"

 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Kuvari heledust juurde"

 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Heli tummaks"

 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Heli vaiksemaks"

 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Heli valjemaks"

 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Heli - esitamine"

 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Heli - stopp"

 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Heli - järgmine"

 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Heli - eelmine"

 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Heli - lindistamine"

 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Heli - paus"

 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Heli - tagasi kerimine"

 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Heli - meedianupp"

 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Ekraanisäästja"

 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Aku"

 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Käivitaja 1"

 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Edasi"

 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Tagasi"

 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Uinak"

 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Talveuni"

 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "Juhtmeta võrk"

 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Veebikaamera"

 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Kuva"

 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Puuteplaadi lüliti"

 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Üles äratamine"

 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Arvuti peatamine"

 #. Description of --sync in --help output
@@ -278,132 +278,132 @@ msgstr "Ezabatu"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "Monitorea: igo distira"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "Monitorea: jaitsi distira"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "Audioa: mututu"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "Audioa: jaitsi bolumena"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "Audioa: igo bolumena"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "Audioa: erreproduzitu"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "Audioa: gelditu"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "Audioa: hurrengoa"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "Audioa: aurrekoa"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "Audioa: grabatu"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "Audioa: pausatu"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "Audioa: birbobinatu"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "Audioa: euskarria"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "Pantaila-babeslea"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "Bateria"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "Abiarazi 1"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "Aurrera"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "Atzera"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "Lo egin"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "Hibernatu"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "WLAN"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "Web kamera"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "Pantaila"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "Touchpad: aktibatu/desaktibatu"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "Esnatu"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "Eseki"

 #. Description of --sync in --help output
@@ -284,132 +284,132 @@ msgstr "حذف"
 #. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
 #: ../gdk/keyname-table.h:3991
 msgctxt "keyboard label"
-msgid "MonBrightnessUp"
+msgid "XF86MonBrightnessUp"
 msgstr "افزایش درخشندگی صفحه‌نمایش"

 #: ../gdk/keyname-table.h:3992
 msgctxt "keyboard label"
-msgid "MonBrightnessDown"
+msgid "XF86MonBrightnessDown"
 msgstr "کاهش درخشندگی صفحه‌نمایش"

 #: ../gdk/keyname-table.h:3993
 msgctxt "keyboard label"
-msgid "AudioMute"
+msgid "XF86AudioMute"
 msgstr "بی‌صدا"

 #: ../gdk/keyname-table.h:3994
 msgctxt "keyboard label"
-msgid "AudioLowerVolume"
+msgid "XF86AudioLowerVolume"
 msgstr "کاهش بلندی صدا"

 #: ../gdk/keyname-table.h:3995
 msgctxt "keyboard label"
-msgid "AudioRaiseVolume"
+msgid "XF86AudioRaiseVolume"
 msgstr "افزایش بلندی صدا"

 #: ../gdk/keyname-table.h:3996
 msgctxt "keyboard label"
-msgid "AudioPlay"
+msgid "XF86AudioPlay"
 msgstr "پخش صوت"

 #: ../gdk/keyname-table.h:3997
 msgctxt "keyboard label"
-msgid "AudioStop"
+msgid "XF86AudioStop"
 msgstr "توقف صوت"

 #: ../gdk/keyname-table.h:3998
 msgctxt "keyboard label"
-msgid "AudioNext"
+msgid "XF86AudioNext"
 msgstr "صوت بعدی"

 #: ../gdk/keyname-table.h:3999
 msgctxt "keyboard label"
-msgid "AudioPrev"
+msgid "XF86AudioPrev"
 msgstr "صوت قبلی"

 #: ../gdk/keyname-table.h:4000
 msgctxt "keyboard label"
-msgid "AudioRecord"
+msgid "XF86AudioRecord"
 msgstr "ضبط صوت"

 #: ../gdk/keyname-table.h:4001
 msgctxt "keyboard label"
-msgid "AudioPause"
+msgid "XF86AudioPause"
 msgstr "مکث صوت"

 #: ../gdk/keyname-table.h:4002
 msgctxt "keyboard label"
-msgid "AudioRewind"
+msgid "XF86AudioRewind"
 msgstr "عقب‌بردن صوت"

 #: ../gdk/keyname-table.h:4003
 msgctxt "keyboard label"
-msgid "AudioMedia"
+msgid "XF86AudioMedia"
 msgstr "رسانه صوتی"

 #: ../gdk/keyname-table.h:4004
 msgctxt "keyboard label"
-msgid "ScreenSaver"
+msgid "XF86ScreenSaver"
 msgstr "محافظ صفحه‌نمایش"

 #: ../gdk/keyname-table.h:4005
 msgctxt "keyboard label"
-msgid "Battery"
+msgid "XF86Battery"
 msgstr "باتری"

 #: ../gdk/keyname-table.h:4006
 msgctxt "keyboard label"
-msgid "Launch1"
+msgid "XF86Launch1"
 msgstr "اجرا ۱"

 #: ../gdk/keyname-table.h:4007
 msgctxt "keyboard label"
-msgid "Forward"
+msgid "XF86Forward"
 msgstr "جلو"

 #: ../gdk/keyname-table.h:4008
 msgctxt "keyboard label"
-msgid "Back"
+msgid "XF86Back"
 msgstr "عقب"

 #: ../gdk/keyname-table.h:4009
 msgctxt "keyboard label"
-msgid "Sleep"
+msgid "XF86Sleep"
 msgstr "بخواب بردن"

 #: ../gdk/keyname-table.h:4010
 msgctxt "keyboard label"
-msgid "Hibernate"
+msgid "XF86Hibernate"
 msgstr "خواب زمستانی"

 #: ../gdk/keyname-table.h:4011
 msgctxt "keyboard label"
-msgid "WLAN"
+msgid "XF86WLAN"
 msgstr "لن"

 #: ../gdk/keyname-table.h:4012
 msgctxt "keyboard label"
-msgid "WebCam"
+msgid "XF86WebCam"
 msgstr "دوربین وب"

 #: ../gdk/keyname-table.h:4013
 msgctxt "keyboard label"
-msgid "Display"
+msgid "XF86Display"
 msgstr "نمایشگر"

 #: ../gdk/keyname-table.h:4014
 msgctxt "keyboard label"
-msgid "TouchpadToggle"
+msgid "XF86TouchpadToggle"
 msgstr "تغییرحالت صفحه‌لمسی"

 #: ../gdk/keyname-table.h:4015
 msgctxt "keyboard label"
-msgid "WakeUp"
+msgid "XF86WakeUp"
 msgstr "بیدار کردن"

 #: ../gdk/keyname-table.h:4016
 msgctxt "keyboard label"
-msgid "Suspend"
+msgid "XF86Suspend"
 msgstr "تعلیق کردن"

 #. Description of --sync in --help output
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Federico Mena Quintero	0ba4952eb1	Fix compilation Signed-off-by: Federico Mena Quintero <federico@gnome.org>	2013-04-15 18:30:10 -05:00
Tristan Van Berkom	74f5c44efc	Load the file chooser's widgets from the .ui file This is Tristan's excellent work, minus the old code for the shortcuts bar - that is all done in GtkPlacesSidebar now. The UI gets loaded from a Glade resource; most of the old code to create the UI by hand is gone. There is still code for save_widgets_create(); this needs to be moved into the UI file, but it is not a big deal. gtk_file_chooser_default_init() calls a new post_process_ui() that takes care of all the things that cannot be done directly in Glade.	2013-04-12 20:42:24 -05:00
Federico Mena Quintero	6fc6e9d8f7	Add .ui file for GtkFileChooserDefault	2013-04-12 19:58:16 -05:00
Federico Mena Quintero	7f1ef86476	For now, add GtkPlacesSidebar to the Glade catalog for private widgets Although GtkPlacesSidebar is a public widget, we can't have that in Glade's general catalog as this branch is not merged into GTK+ proper yet. We'll move the widget to Glade's catalog when this is done.	2013-04-12 19:57:35 -05:00
Federico Mena Quintero	b7fbed8bc0	INCOMPLETE COMMIT: re-instate Tristan's patch to gtkfilechooserdefault	2013-04-12 12:29:40 -05:00