image: Fix loading of pixdata GResources

Pixdata is deprecated but some software already use GtkImage widgets
with image data loaded from GResource-backed pixdata. As the
security-problem ridden pixdata loader was removed, we need to manually
check whether the GResource data is pixdata, and load it manually.

https://bugzilla.gnome.org/show_bug.cgi?id=781583

NEWS

@@ -1,292 +1,174 @@
-Overview of Changes in GTK+ 3.19.5
+Overview of Changes in GTK+ 3.18.9
 ==================================
 
-* GtkShortcutsWindow:
- - GtkShortcutsGesture has been removed, since GtkShortcutsShortcut
-   can now document gestures
-
-* GtkFileChooser:
- - The places view now shows the available space when that information
-   is available
- - Problems with remembering the dialog size have been fixed
-
-* CSS changes:
- - CSS margins, border and padding are more consistently supported
- - Many widgets now support min-width and min-height
- - Many style properties have been superseded by CSS properties
-
-* Adwaita:
- - Some visual updates and fixes
-
-* Wayland:
- - DND with icon widgets is working properly
-
-* GDK:
- - More of the DND implementation is now handled in GDK: creating the
-   drag window, moving the window along with the cursor, the drag
-   cancel animation.
- - GdkSeat is a new API that supersedes grabs on individual devices and
-   is a better fit for backends like Wayland or Mir
-
 * Bugs fixed:
- 758929 GtkEntryCompletion should allow for changing the popdown delay
- 759079 GtkComboBox triggers segmentation fault in update_menu_sensitivity...
- 759081 Add 'nullable' to return type of gtk_cell_layout_get_area.
- 759091 notebook tab stays hovered if mouse leaves slowly
- 759092 GtkTextIter: add starts_tag() and deprecate begins_tag(), for cons...
- 759168 wayland: Implement DND icon hotspot API
- 759225 placesview: implement available space
- 759260 [Adwaita:dark] menus on GtkTreeView barely visible because menu sh...
- 759309 Add GdkSeat
- 759323 gdk_display_get_pointer(): segfault if application client (core) p...
- 729593 Add margin style property to GtkSwitch slider
- 756191 GtkModelButton css padding not working
- 708394 CSS - support min-width
- 755947 wayland: gnome-terminal does not fill entire area when tiled
+ 677329 Missing focus-in events
+ 761474 x11: Scaling factor is applied twice on screen work area
+ 762468 wayland: Switching between fullscreen and unfullscreen too fast...
+ 762907 gnome-shell crashes after undocking
+ 763017 tooltip text is not shown
 
 * Translation updates:
- Arabic
- German
- Polish
- Portuguese
- Slovak
- Spanish
+ Scottish Gaelic
+ Slovenian
 
 
-Overview of Changes in GTK+ 3.19.4
+Overview of Changes in GTK+ 3.18.8
 ==================================
 
-* GtkPopover can now be instructed to stay within the toplevel window
-  on platforms that don't already enforce this (such as Wayland)
- 
-* Wayland:
- - Memory leak fixes
- - Window positioning and sizing fixes
- - Clipboard and DND fixes
- - New build dependency: wayland-protocols
+* Bugs fixed:
+ 756751 Keypad decimal point patch prevents entry of comma in german key...
+ 761026 Pressing ESC in a file chooser dialog doesn't dismiss it
+ 761552 Warnings in filechooser when typing-to-search in Recent
+ 761757 Crash in GtkFileChooserWidget
+ 761838 Editing widgets may be drawn off the visible area if the column ...
+ 762315 Assistant pages have no padding which looks weird
+ 762319 issues with randr 1.5
+        Fix Quartz clipboard image retrieval
+        Fix Quartz Full Screen Crash
+        box: Fix rtl allocation with center widget
 
-* CSS changes:
- - The -gtk-image-effect property was renamed to -gtk-icon-effect
- - Active spinners are now :checked, not :active
- - A -gtk-icontheme property has been added
- - A -gtk-icon-palette has been added to allow recoloring symbolic icons
- - Drag highlighting uses the new :dnd pseudoclass
+* Translation updates:
+ French
+ Scottish Gaelic
 
-* DND:
- - Make drag highlighting themable
- - Stop using RGBA cursors for drag icons (this only ever worked on X11)
- - Change the handling of drag windows to work on Wayland. The drag window
-   implementation has been moved to GDK, with the new function
-   gdk_drag_context_get_drag_window
- - Non-toplevel widgets can be used as drag widgets
+
+Overview of Changes in GTK+ 3.18.7
+==================================
+
+* Bugs fixed:
+ 688524 Expose gtk-primary-button-warps-slider as an X setting
+ 722937 problem rendering asymmetric borders with dotted style
+ 728344 Collate setting in Print Dialog does not override PPD setting for...
+ 754868 visual anomaly in gtk path bar
+ 757147 gdk_pixbuf_get_from_window() doesn't honor device scale
+ 758908 The app chooser dialog uses a non standard icon and doesn't wrap ...
+ 758929 GtkEntryCompletion should allow for changing the popdown delay
+ 759079 GtkComboBox triggers segmentation fault in update_menu_sensitivit...
+ 759081 Add 'nullable' to return type of gtk_cell_layout_get_area.
+ 759091 notebook tab stays hovered if mouse leaves slowly
+ 759260 [Adwaita:dark] menus on GtkTreeView barely visible because menu s...
+ 759757 Flow box redraws all children on hover
+ 760141  New gdk_cursor_new_from_name() fallback breaks behavior expected...
+ 760169 GtkColorButton sensitive and insensitive appearances are barely d...
+ 760416 broadwayd --help shows translated characters as question marks on...
+ 760445 regression: openQA no longer able to press ctrl-alt-del to get to...
+ 760615 GTK FTBFS with MinGW-w64
+ 760680 Emitting "shutdown" signal twice leads to a crash
+ 760891 GtkTreeView Cannot expand/collapse rows by mouse
+ 760897 A few clean ups to the shm handling code
+ 760964 hardcodes temp dir to /tmp
+ 761005 GtkColorChooser: make set_rgba work in editor mode
+ 761095 wayland: use shm_open instead of open in tmpdir
+
+* Translation updates
+ Arabic
+ Brazilian Portuguese
+ Czech
+ German
+ Hungarian
+ Indonesian
+ Lithuanian
+ Polish
+ Portuguese
+ Swedish
+
+
+Overview of Changes in GTK+ 3.18.6
+==================================
 
 * Bugs fixed:
  539944 Add GtkScaleButton API so struct fields can be marked as private
  732742 Infinite recursion on GdkDevice disposal
  735847 move animatable cursors' current frame info into GdkCursor
+ 746745 Window suddenly always on top
  747295 shared memory leak when creating/destroying widgets
- 756618 GtkWindow CSD: gtk_window_resize() also includes client side deco...
- 757147 gdk_pixbuf_get_from_window() doesn't honor device scale
- 757282 "window: Ignore geometry widget" commit breaks gnome-terminal win...
- 757474 Add option for automatic GtkPopover placement
- 758483 GDK W32: Incorrectly uses SetWindowLong() to set/unset WS_EX_TOPM...
+ 748904 wayland: map real modifiers to virtual modifiers
+ 757358 single touch devices are not detected as touch devices
+ 758025 cursor flickering
+ 758072 [Wayland] additional mouse buttons don't work
+ 758175 Fix character entity
+ 758327 gnome-disks segfault in gdkwayland get_popup_parent - dereference...
+ 758367 GTK+ 3 does not respect bold in org.gnome.desktop.interface font-name
+ 758407 Could not send the search request \ GDBus.Error:org.freedesktop...
+ 758483 GDK W32: Incorrectly uses SetWindowLong() to set/unset WS_EX_TOPMOST
  758484 GDK W32: Some calls to W32 routines are rather unclear
- 758563 play bar gets weird position in fullscreen under Wayland
- 758609 Regression with firefox dropdown menu position
- 758634 wayland: Use wayland-protocols for shared protocols
  758660 Copy and paste doesn't work in wayland session
  758661 every second right-click to window header is ignored (CSD-related?)
- 758698 Bug backward search + case insensitive + preceding multi-byte cha...
- 758713 Evolution cannot start on wayland if the clipboard contains data ...
- 758790 A few stylistic icon-browser patches
- 758901 wayland: old window size applied sometimes
- 758908 The app chooser dialog uses a non standard icon and doesn't wrap ...
- 758930 GTK+ spamming system logs with "doesn't match state" warnings
- 758936 Widgets within an offscreen windows are blurry on wayland with hidpi
- 759018 wayland: tests/testtooltips custom tooltip misplaced at (0,0) on ... 
+ 758698 Bug backward search + case insensitive + preceding multi-byte character
+ 758790 A few stylistic icon-browser patches 
 
 * Translation updates:
  Polish
- Portuguese
- Spanish
 
- 
-Overview of Changes in GTK+ 3.19.3
+Overview of Changes in GTK+ 3.18.5
 ==================================
 
-* Theming changes
- - Non-standard CSS properties have been renamed to have a -gtk-
-   prefix (the old names still work, with a warning):
-     gtk-key-bindings is now -gtk-key-bindings
-     icon-shadow is now -gtk-icon-shadow
- - CSS parsing errors and warnings are shown in the inspector
+* GtkFileChooser:
+ - Make sure external drives show up either in the sidebar or the places view
+ - Ignore double-click events
 
-* GtkShortcutsWindow:
- - Widgets are more complete, to allow supporting them in glade
- - GtkShortcutsShortcut can now show gestures as well, GtkShortcutsGesture
-   is no longer needed and will be removed soon
- - GtkShortcutsShortcut supports standard gestures, with predefined
-   icons and subtitles
+* Avoid some crashes in CSS parsing error handling
 
-* Bugs fixed:
- 746745 Window suddenly always on top
- 758025 cursor flickering
- 758094 GtkSpinButton missing redraw
- 758187 Stock images for gestures
- 758367 GTK+ 3 does not respect bold in org.gnome.desktop.interface font-name
- 758407 Could not send the search request \ GDBus.Error:org.freedesktop.Tr...
- 758442 gtk_style_context_save() destroys style information
-
-* Translation updates:
+Overview of Changes in GTK+ 3.18.4
 ==================================
 
-* Most widgets have been ported to CSS nodes. The element names and
-  the tree relationships are documented now. The Adwaita and HighContrast
-  themes have been mostly kept up-to-date with these changes. Third-party
-  themes and custom CSS will need adjustments.
+* Revert a GtkTextBuffer change that broke binding API
 
-* The inspector now shows CSS nodes and allows to manipulate them.
+* Properly refresh styles when widget names change
 
-* Size allocation has been simplified to avoid excessive resizes of
-  the entire window.
+Overview of Changes in GTK+ 3.18.3
+==================================
 
-* GtkShortcutsWindow can now display direction-dependent shortcuts
-  and sequences of keys.
-
-* Support for native file chooser on Win32 when using the new
-  GtkFileChooserNative API, and when using GtkFileChooserButton.
-
-* The GtkFileChooser interface prerequisite was changed from GtkWidget
-  to GObject to allow non-widget filechooser implementations.
-
-* :focus-on-click has been moved from various subclasses to GtkWidget,
-  so it is now available for every widget, in particular GtkListBoxRow.
-
-* Bugs fixed:
+* Bug fixes:
  735341 Fix/improve gtk_text_buffer_get_iter_at_*() functions
- 748904 wayland: map real modifiers to virtual modifiers
- 756618 GtkWindow CSD: gtk_window_resize() also includes client side decorations...
- 756625 segfault in captured_event_cb
- 756670 Popover is shown below clutter widget after tab switch from Gtk.Notebook
- 756978 Deadlock in the places widget
- 757221 Memory leak in gtk-3.0.m4
- 757269 Allow to make ListBoxRows not grab focus when activated
- 757324 win32: handle WM_DISPLAYCHANGE globally
- 757358 single touch devices are not detected as touch devices
- 757377 settings.ini is only loaded from first XDG_CONFIG_DIRS entry
- 757397 gtk_widget_set_name() doesn't properly refresh the style
- 757805 gtkwindow: CSD windows not resizable in metacity
- 757888 ShortcutsWindow: Support different keyboard shortcuts for LTR vs RTL loc...
- 757950 Hanle double click better in the new file chooser
- 757968 Typo in GtkCheckMenuItem
- 757984 gtkimcontextsimple.c: Fix build on Windows
- 758072 [Wayland] additional mouse buttons don't work
- 758087 gtkcontainer: clarify requirements for implementations
- 758208 GtkStackSwitcher should allow changing the icon size
- 758327 gnome-disks segfault in gdkwayland get_popup_parent...
- 758086 gtkstack: allow subclasses overriding properties on init
- 758175 Fix character entity
-
-* Translation updates:
- Hebrew
- Hungarian
- Norwegian bokmål
- Portuguese
- Scottish Gaelic
- Spanish
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.19.1
-==================================
-
-* Support for help overlays to document keyboard shortcuts and gestures
-  has been added
-
-* GdkAppLaunchContext is now setting the DISPLAY environment variable
-  for X11
-
-* Support for GL legacy profiles has been added back
-
-* GTK+ now loads compose tables in the format used by XLib from
-  ~/.config/gtk-3.0/Compose, ~/.XCompose and the X11 locale information
-
-* GtkBuilder can now create GFile objects, for use in e.g. GFileIcons.
-
-* New APIs:
- - GtkShortcutsWindow
- - gtk_text_tag_changed
- - gtk_settings_reset_property
- - gdk_rectangle_equal
- - gdk_gl_context_is_legacy
-
-* A new commandline utility, gtk-query-settings, to query GTK+ settings,
-  has been added
-
-* Theming: Element names are now supported.
-  A number of widgets have already been changed to use element names for
-  the widget itself and its various subelements. This effort will continue
-  in next development releases.
-  This change will require adjustments in themes and custom css - as part of
-  this transition, the element names and style classes in use are documented
-  and will be stable going forward.
-
-* Debugging: GtkInspector can now edit string-array-valued properties
-
-* Wayland:
- - Fix transparent terminals
- - Fix treeview search popups
-* Debugging: GtkInspector can now edit string-array-valued properties
-
-* Wayland:
- - Fix transparent terminals
- - Fix treeview search popups
- - Fix CSD window resizing / moving
-
-* Bugs fixed:
- 721120 GtkIMContextSimple needs locale compose tables similar with X11.
- 735341 Fix/improve gtk_text_buffer_get_iter_at_*() functions
- 753371 Bad focus order in GtkFlowBox
  753992 im-quartz discard_preedit segmentation fault
- 754983 Wayland: g_desktop_app_info_launch_uris_with_spawn() forces DISPLAY...
- 755008 API to reset a gtksettings property
- 755413 Bug in _gtk_text_btree_get_iter_at_last_toggle()
- 755416 Be able to subclass GtkTextTag cleanly
  755654 mmc/sd drive does not appear in Nautilus
- 755791 GtkSwitch: unclip css box-shadow on the slider
- 755927 Occasional "stuck key" after closing window using keyboard shortcut...
- 755988 gtk printer dialog won't print jobs with names exceeding 255 charac...
- 756042 GtkAssistant: Segfault after g_object_run_dispose(page)
- 756142 Bring back support for legacy OpenGL contexts
  756160 Crash/segfault when dragging tabs (after 2nd/3rd/4th+ drag)
- 756174 Add a tool to inspect all xsettings from the command line
- 756195 GtkColorChooser: Plus/checkmark icons are blurry in hidpi
- 756338 applications segfaults on 3.18.1 when using external themes
- 756428 Add a help overlay widget
- 756439 Regression: Critical warning "g_app_launch_context_get_display: ass...
+ 756385 No more content in Anjuta project wizard
  756449 GtkTextHandle artifacts under Wayland
- 756496 wayland: Make it possible to use a window type hint to map as a sub...
+ 756496 wayland: Make it possible to use a window type hint to map as a subsurface
  756505 Entering a dot removes all other characters from input
  756568 Some improvements to gtkplacesview
  756589 Improve the heuristics for external drives
- 756618 GtkWindow CSD: gtk_window_resize() also includes client side decora...
  756625 segfault in captured_event_cb
- 756751 Keypad decimal point patch prevents entry of comma in german keypad...
- 756770 GTK+ 3.18.2 doesn't compile on OS X 10.6 (but so close!)
- 756852 GtkInspector segfaults when you respond to a GtkFileChooserDialog
- 756881 Guard against selection requestor disappearing
- 756886 The GtkWindow patch here is necessary to make transparent terminals...
+ 756751 Keypad decimal point patch prevents entry of comma in german keypad layout
  756780 wayland: Fix GtkTreeView's search window
- 757147 gdk_pixbuf_get_from_window: honor device scale
+ 756886 The GtkWindow patch here is necessary to make transparent terminals work...
+ 757147 gdk_pixbuf_get_from_window() doesn't honor device scale
+ 757221 Memory leak in gtk-3.0.m4
+ 757298 nautilus crashes on drag'n'drop over 'side bar'
+ 757303 Vertically align path labels in Other Locations view
+ 757324 win32: handle WM_DISPLAYCHANGE globally
+ 757358 single touch devices are not detected as touch devices
+ 757377 settings.ini is only loaded from first XDG_CONFIG_DIRS entry
+ 757544 GtkHeaderBar subclass template and <child type="title"> does not work
 
 * Translation updates:
  Basque
  Czech
- German
+ Icelandic
  Norwegian bokmål
  Slovak
 
 
+Overview of Changes in GTK+ 3.18.2
+==================================
+
+* Bug fixes:
+ 753371 Bad focus order in GtkFlowBox
+ 755413 Bug in _gtk_text_btree_get_iter_at_last_toggle()
+ 755791 GtkSwitch: unclip css box-shadow on the slider
+ 755927 Occasional "stuck key" after closing window using keyboard shortcut...
+ 755988 gtk printer dialog won't print jobs with names exceeding 255 charac...
+ 756042 GtkAssistant: Segfault after g_object_run_dispose(page)
+ 756195 GtkColorChooser: Plus/checkmark icons are blurry in hidpi
+ 756338 applications segfaults on 3.18.1 when using external themes
+
+* Translation updates:
+ Finnish
+ German
+
 Overview of Changes in GTK+ 3.18.1
 ==================================
 

README.in

@@ -72,15 +72,6 @@ and attach the patch to that bug report.
 Patches should be in unified diff form. (The -up option to GNU diff)
 Even better are git-formatted patches. (Use git format-patch)
 
-Release notes for 3.20
-======================
-
-* The GtkFileChooser interface pre-requisite changed from GtkWidget
-  to GObject, allowing non-widget implementations of this interface.
-  This is a minor change in ABI, as apps are no longer guaranteed
-  that a GtkFileChooser interface also supports all GtkWidget methods.
-  However, all previously existing objects still derive from GtkWidget,
-  so no existing code should break.
 
 Release notes for 3.18
 ======================

build/win32/vs10/Makefile.am

@@ -47,8 +47,6 @@ EXTRA_DIST += \
 	gtk-builder-tool.vcxproj.filters	\
 	gtk-encode-symbolic-svg.vcxproj		\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
 	gtk-update-icon-cache.vcxproj		\
 	gtk-update-icon-cache.vcxproj.filters	\
 	gtk3-demo.vcxprojin			\

build/win32/vs10/gailutil-3.vcxprojin

@@ -88,37 +88,11 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -139,13 +113,39 @@
       <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -160,12 +160,12 @@
       <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gdk-3.vcxprojin

@@ -169,10 +169,10 @@
     <Link>
       <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -189,12 +189,12 @@
     <Link>
       <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -211,12 +211,12 @@
     <Link>
       <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -236,10 +236,10 @@
     <Link>
       <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -259,10 +259,10 @@
     <Link>
       <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -279,12 +279,12 @@
     <Link>
       <AdditionalDependencies>imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -301,12 +301,12 @@
     <Link>
       <AdditionalDependencies>imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk+.sln

@@ -26,8 +26,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gt
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcxproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcxproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 EndProject
 Global
@@ -258,22 +256,6 @@ Global
 		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs10/gtk-3.vcxprojin

@@ -88,10 +88,10 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -108,12 +108,12 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -133,10 +133,10 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -153,12 +153,12 @@
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).0.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk-query-settings.vcxproj

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9F22107A-3EF7-4B52-B269-747B65307F36}</ProjectGuid>
-    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\gtk-query-settings.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-3.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-3.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/win32/vs10/gtk-query-settings.vcxproj.filters

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\gtk\gtk-query-settings.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>

build/win32/vs10/gtk3-demo-application.vcxprojin

@@ -105,8 +105,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -149,8 +150,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk3-demo.vcxprojin

@@ -112,11 +112,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <FunctionLevelLinking>false</FunctionLevelLinking>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -160,11 +161,12 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <FunctionLevelLinking>false</FunctionLevelLinking>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk3-icon-browser.vcxprojin

@@ -107,8 +107,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -153,8 +154,9 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs11/Makefile.am

@@ -16,8 +16,6 @@ EXTRA_DIST +=	\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
 	gtk-update-icon-cache.vcxproj		\
 	gtk-update-icon-cache.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
 	gtk3-demo.vcxproj	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\

build/win32/vs12/Makefile.am

@@ -14,8 +14,6 @@ EXTRA_DIST +=	\
 	gtk-builder-tool.vcxproj.filters	\
 	gtk-encode-symbolic-svg.vcxproj	\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
 	gtk-update-icon-cache.vcxproj		\
 	gtk-update-icon-cache.vcxproj.filters	\
 	gtk3-demo.vcxproj	\

build/win32/vs14/Makefile.am

@@ -14,8 +14,6 @@ EXTRA_DIST +=	\
 	gtk-builder-tool.vcxproj.filters	\
 	gtk-encode-symbolic-svg.vcxproj	\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
 	gtk-update-icon-cache.vcxproj		\
 	gtk-update-icon-cache.vcxproj.filters	\
 	gtk3-demo.vcxproj	\

build/win32/vs9/Makefile.am

@@ -29,7 +29,6 @@ EXTRA_DIST += \
 	gtk-3.vcprojin			\
 	gtk-builder-tool.vcproj	\
 	gtk-encode-symbolic-svg.vcproj	\
-	gtk-query-settings.vcproj	\
 	gtk-update-icon-cache.vcproj	\
 	gtk3-demo.vcprojin		\
 	gtk3-demo-application.vcprojin	\

build/win32/vs9/gtk+.sln

@@ -68,12 +68,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-bui
 		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
@@ -86,7 +80,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal
 		{F280BF1A-777A-4FB5-8005-DFBE04621EDB} = {F280BF1A-777A-4FB5-8005-DFBE04621EDB}
 		{FC98AF16-4C68-42DF-906B-93A6804C198A} = {FC98AF16-4C68-42DF-906B-93A6804C198A}
 		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} = {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}
-		{9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36}
 	EndProjectSection
 EndProject
 Global
@@ -309,22 +302,6 @@ Global
 		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk-query-settings.vcproj

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-query-settings"
-	ProjectGUID="{9F22107A-3EF7-4B52-B269-747B65307F36}"
-	RootNamespace="gtkquerysettings"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=""
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gtk\gtk-query-settings.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/win32/vs9/gtk3-demo-application.vcprojin

@@ -73,7 +73,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
 			/>
@@ -134,7 +134,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="17"
 			/>

build/win32/vs9/gtk3-demo.vcprojin

@@ -111,7 +111,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -144,7 +144,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"

build/win32/vs9/gtk3-icon-browser.vcprojin

@@ -77,7 +77,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
 			/>
@@ -142,7 +142,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="1"
 				EnableCOMDATFolding="2"
 				TargetMachine="17"
 			/>

configure.ac

@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [19])
-m4_define([gtk_micro_version], [5])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_minor_version], [18])
+m4_define([gtk_micro_version], [9])
+m4_define([gtk_interface_age], [9])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -60,9 +60,7 @@ m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
 m4_define([wayland_required_version], [1.5.91])
-m4_define([wayland_protocols_required_version], [1.0])
 m4_define([mirclient_required_version], [0.11.0])
-m4_define([mircookie_required_version], [0.17.0])
 m4_define([epoxy_required_version], [1.0])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -429,7 +427,7 @@ fi
 
 PKG_PROG_PKG_CONFIG
 
-WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version wayland-protocols >= wayland_protocols_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version wayland-egl"
+WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version wayland-egl"
 if test "$enable_wayland_backend" = "maybe" ; then
   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
   PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
@@ -445,7 +443,6 @@ fi
 if test "$enable_wayland_backend" = "yes"; then
   # For the cairo image backend
   cairo_backends="$cairo_backends cairo"
-  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
   GDK_BACKENDS="$GDK_BACKENDS wayland"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
@@ -460,7 +457,7 @@ else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
 
-MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version"
+MIR_DEPENDENCIES="mirclient >= mirclient_required_version"
 if test "$enable_mir_backend" = "maybe" ; then
   PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
   AC_MSG_CHECKING([for MIR_DEPENDENCIES])
@@ -1378,14 +1375,6 @@ if test x"$os_win32" = xyes; then
   GTK_EXTRA_CFLAGS="$msnative_struct"
 fi
 
-if $PKG_CONFIG --exists x11; then
-  X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
-elif test x"$prefix" != xNONE; then
-  X11_PREFIX="$prefix"
-else
-  X11_PREFIX="$ac_default_prefix"
-fi
-
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
 PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
@@ -1398,7 +1387,6 @@ AC_SUBST(GTK_EXTRA_CFLAGS)
 AC_SUBST(GTK_DEP_LIBS)
 AC_SUBST(GTK_DEP_CFLAGS)
 
-AC_SUBST(X11_PREFIX)
 AC_SUBST(GLIB_PREFIX)
 AC_SUBST(ATK_PREFIX)
 AC_SUBST(PANGO_PREFIX)
@@ -1894,8 +1882,6 @@ testsuite/a11y/Makefile
 testsuite/a11y/state/Makefile
 testsuite/css/Makefile
 testsuite/css/parser/Makefile
-testsuite/css/nodes/Makefile
-testsuite/css/style/Makefile
 testsuite/gdk/Makefile
 testsuite/gtk/Makefile
 testsuite/reftests/Makefile

demos/gtk-demo/Makefile.am

@@ -56,7 +56,6 @@ demos_base =					\
 	scale.c					\
 	search_entry.c				\
 	search_entry2.c				\
-	shortcuts.c				\
 	sidebar.c				\
 	sizegroup.c				\
 	spinbutton.c				\

demos/gtk-demo/application.c

@@ -13,8 +13,6 @@
 
 #ifdef STANDALONE
 
-static void create_window (GApplication *app, const char *contents);
-
 static void
 show_action_dialog (GSimpleAction *action)
 {
@@ -67,80 +65,6 @@ activate_action (GSimpleAction  *action,
   show_action_dialog (action);
 }
 
-static void
-activate_new (GSimpleAction  *action,
-              GVariant       *parameter,
-              gpointer        user_data)
-{
-  GApplication *app = user_data;
-
-  create_window (app, NULL);
-}
-
-static void
-open_response_cb (GtkNativeDialog *dialog,
-                  gint response_id,
-                  gpointer user_data)
-{
-  GtkFileChooserNative *native = user_data;
-  GApplication *app = g_object_get_data (G_OBJECT (native), "app");
-  GtkWidget *message_dialog;
-  GFile *file;
-  char *contents;
-  GError *error = NULL;
-
-  if (response_id == GTK_RESPONSE_ACCEPT)
-    {
-      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (native));
-
-      if (g_file_load_contents (file, NULL, &contents, NULL, NULL, &error))
-        {
-          create_window (app, contents);
-          g_free (contents);
-        }
-      else
-        {
-          message_dialog = gtk_message_dialog_new (NULL,
-                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                   GTK_MESSAGE_ERROR,
-                                                   GTK_BUTTONS_CLOSE,
-                                                   "Error loading file: \"%s\"",
-                                                   error->message);
-          g_signal_connect (message_dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
-          gtk_widget_show (message_dialog);
-          g_error_free (error);
-        }
-    }
-
-  gtk_native_dialog_destroy (GTK_NATIVE_DIALOG (native));
-  g_object_unref (native);
-}
-
-
-static void
-activate_open (GSimpleAction  *action,
-               GVariant       *parameter,
-               gpointer        user_data)
-{
-  GApplication *app = user_data;
-  GtkFileChooserNative *native;
-
-  native = gtk_file_chooser_native_new ("Open File",
-                                        NULL,
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Open",
-                                        "_Cancel");
-
-  g_object_set_data_full (G_OBJECT (native), "app", g_object_ref (app), g_object_unref);
-  g_signal_connect (native,
-                    "response",
-                    G_CALLBACK (open_response_cb),
-                    native);
-
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (native));
-}
-
 static void
 activate_toggle (GSimpleAction *action,
                  GVariant      *parameter,
@@ -302,8 +226,8 @@ change_radio_state (GSimpleAction *action,
 }
 
 static GActionEntry app_entries[] = {
-  { "new", activate_new, NULL, NULL, NULL },
-  { "open", activate_open, NULL, NULL, NULL },
+  { "new", activate_action, NULL, NULL, NULL },
+  { "open", activate_action, NULL, NULL, NULL },
   { "save", activate_action, NULL, NULL, NULL },
   { "save-as", activate_action, NULL, NULL, NULL },
   { "quit", activate_quit, NULL, NULL, NULL },
@@ -345,8 +269,7 @@ startup (GApplication *app)
 }
 
 static void
-create_window (GApplication *app,
-               const char *content_text)
+activate (GApplication *app)
 {
   GtkBuilder *builder;
   GtkWidget *window;
@@ -394,8 +317,6 @@ create_window (GApplication *app,
 
   /* Show text widget info in the statusbar */
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
-  if (content_text)
-    gtk_text_buffer_set_text (buffer, content_text, -1);
   g_signal_connect_object (buffer, "changed",
                            G_CALLBACK (update_statusbar), status, 0);
   g_signal_connect_object (buffer, "mark-set",
@@ -408,12 +329,6 @@ create_window (GApplication *app,
   g_object_unref (builder);
 }
 
-static void
-activate (GApplication *app)
-{
-  create_window (app, NULL);
-}
-
 int
 main (int argc, char *argv[])
 {

demos/gtk-demo/assistant.c

@@ -101,7 +101,6 @@ create_page1 (GtkWidget *assistant)
 
   entry = gtk_entry_new ();
   gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
   gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
   g_signal_connect (G_OBJECT (entry), "changed",
                     G_CALLBACK (on_entry_changed), assistant);

demos/gtk-demo/changedisplay.c

@@ -171,7 +171,7 @@ query_change_display (ChangeDisplayInfo *info)
                                  "to move to the new screen");
 
   if (toplevel)
-    gtk_window_set_screen (GTK_WINDOW (toplevel), gdk_display_get_default_screen (info->current_display));
+    gtk_window_set_screen (GTK_WINDOW (toplevel), gdk_display_get_screen (info->current_display, 0));
   else
     gdk_display_beep (gdk_screen_get_display (screen));
 }

demos/gtk-demo/css_accordion.css

@@ -7,7 +7,7 @@
     font: Cantarell 20px;
 }
 
-window {
+GtkWindow {
     background: linear-gradient(153deg, #151515, #151515 5px, transparent 5px) 0 0,
                 linear-gradient(333deg, #151515, #151515 5px, transparent 5px) 10px 5px,
                 linear-gradient(153deg, #222, #222 5px, transparent 5px) 0 5px,
@@ -18,7 +18,7 @@ window {
     background-size: 20px 20px;
 }
 
-button {
+.button {
     color: black;
     background-color: #bbb;
     border-style: solid;
@@ -28,25 +28,25 @@ button {
     padding: 12px 4px;
 }
 
-button:first-child {
+.button:first-child {
     border-radius: 5px 0 0 5px;
 }
 
-button:last-child {
+.button:last-child {
     border-radius: 0 5px 5px 0;
     border-width: 2px;
 }
 
-button:hover {
+.button:hover {
     padding: 12px 48px;
     background-color: #4870bc;
 }
 
-button *:hover {
+.button *:hover {
     color: white;
 }
 
-button:hover:active,
-button:active {
+.button:hover:active,
+.button:active {
     background-color: #993401;
 }

demos/gtk-demo/css_basics.css

@@ -16,7 +16,7 @@
 }
 
 /* Make sure selections are visible */
-selection {
+:selected {
   background-color: darkGreen;
   color: black;
 }

demos/gtk-demo/css_pixbufs.css

@@ -50,7 +50,7 @@
     100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto }
 }
 
-window {
+GtkWindow {
     background-image: url("resource://css_pixbufs/apple-red.png"),
                       url("resource://css_pixbufs/gnome-applets.png"),
                       url("resource://css_pixbufs/gnome-calendar.png"),
@@ -66,7 +66,7 @@ window {
 }
 
 /* Make the text editor has a nice style */
-.view, scrollbar, separator {
+.view, .scrollbar, .pane-separator {
   color: black;
   background-color: rgba(255,255,255,0.5);
 }

demos/gtk-demo/css_shadows.css

@@ -19,7 +19,7 @@
   background-size: 29px, 59px, 73px, 109px;
 }
 
-button {
+.button {
   color: black;
   padding: 10px;
   border-radius: 5px;
@@ -27,14 +27,14 @@ button {
   border: 1px transparent solid;
 }
 
-button:hover {
+.button:hover {
   text-shadow: 3px 3px 5px alpha(black, 0.75);
   icon-shadow: 3px 3px 5px alpha(black, 0.75);
   box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
   border: solid 1px alpha(black, 0.75);
 }
 
-button:active {
+.button:active {
   padding: 11px 9px 9px 11px;
   text-shadow: 1px 1px 2.5px alpha(black, 0.6);
   icon-shadow: 1px 1px 2.5px alpha(black, 0.6);

demos/gtk-demo/demo.gresource.xml

@@ -91,13 +91,6 @@
   <gresource prefix="/stack">
     <file>stack.ui</file>
   </gresource>
-  <gresource prefix="/shortcuts">
-    <file>shortcuts.ui</file>
-    <file>shortcuts-builder.ui</file>
-    <file>shortcuts-gedit.ui</file>
-    <file>shortcuts-clocks.ui</file>
-    <file>shortcuts-boxes.ui</file>
-  </gresource>
   <gresource prefix="/revealer">
     <file>revealer.ui</file>
   </gresource>
@@ -170,7 +163,6 @@
     <file>scale.c</file>
     <file>search_entry.c</file>
     <file>search_entry2.c</file>
-    <file>shortcuts.c</file>
     <file>sizegroup.c</file>
     <file>sidebar.c</file>
     <file>stack.c</file>

demos/gtk-demo/main.ui

@@ -72,6 +72,9 @@
                 <property name="can_focus">1</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="min_content_width">150</property>
+                <style>
+                  <class name="sidebar"/>
+                </style>
                 <child>
                   <object class="GtkTreeView" id="treeview">
                     <property name="visible">1</property>

demos/gtk-demo/reset.css

@@ -62,5 +62,7 @@
   engine: initial;
   gtk-key-bindings: initial;
 
+  -GtkWidget-focus-line-width: 0;
+  -GtkWidget-focus-padding: 0;
   -GtkNotebook-initial-gap: 0;
 }

demos/gtk-demo/shortcuts-boxes.ui

@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.17 -->
-
-  <object class="GtkShortcutsWindow" id="shortcuts-boxes">
-    <property name="modal">1</property>
-    
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
-        <property name="section-name">shortcuts</property>
-        <property name="max-height">12</property>
-
-        <!-- Overview shortcuts -->
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Overview</property>
-            <property name="view">overview</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">F1</property>
-                <property name="title" translatable="yes">Help</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;n</property>
-                <property name="title" translatable="yes">Create a new box</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;f</property>
-                <property name="title" translatable="yes">Search</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;k</property>
-                <property name="title" translatable="yes">Keyboard shortcuts</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;q</property>
-                <property name="title" translatable="yes">Close Window/Quit Boxes</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-        <!-- Wizard and Properties shortcuts -->
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Box Creation and Properties</property>
-            <property name="view">wizard</property>
-
-            <!-- LTR -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">ltr</property>
-                <property name="accelerator">&lt;Alt&gt;Right</property>
-                <property name="title" translatable="yes">Switch to the next page</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">ltr</property>
-                <property name="accelerator">&lt;Alt&gt;Left</property>
-                <property name="title" translatable="yes">Switch to the previous page</property>
-              </object>
-            </child>
-
-            <!-- RTL -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">rtl</property>
-                <property name="accelerator">&lt;Alt&gt;Left</property>
-                <property name="title" translatable="yes">Switch to the next page</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">rtl</property>
-                <property name="accelerator">&lt;Alt&gt;Right</property>
-                <property name="title" translatable="yes">Switch to the previous page</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-        <!-- Display shortcuts -->
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Box Display</property>
-            <property name="view">display</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Control_L+Alt_L</property>
-                <property name="title" translatable="yes">Grab/Ungrab keyboard</property>
-              </object>
-            </child>
-
-            <!-- LTR -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">ltr</property>
-                <property name="accelerator">&lt;Alt&gt;Left</property>
-                <property name="title" translatable="yes">Back to overview</property>
-              </object>
-            </child>
-
-            <!-- RTL -->
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="direction">rtl</property>
-                <property name="accelerator">&lt;Alt&gt;Right</property>
-                <property name="title" translatable="yes">Back to overview</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Ctrl&gt;q</property>
-                <property name="title" translatable="yes">Close window/Quit Boxes</property>
-              </object>
-            </child>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">F11</property>
-                <property name="title" translatable="yes">Fullscreen/Restore from fullscreen</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-      </object>
-    </child>
-  </object>
-
-</interface>

demos/gtk-demo/shortcuts-builder.ui

@@ -1,547 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.17 -->
-
-  <object class="GtkShortcutsWindow" id="shortcuts-builder">
-    <property name="modal">1</property>
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
-        <property name="section-name">editor</property>
-        <property name="title" translatable="yes">Editor Shortcuts</property>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">General</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Global Search</property>
-                <property name="accelerator">&lt;ctrl&gt;period</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Preferences</property>
-                <property name="accelerator">&lt;ctrl&gt;comma</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Command Bar</property>
-                <property name="accelerator">&lt;ctrl&gt;Return</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Terminal</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;t</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Keyboard Shortcuts</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;question</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Panels</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Toggle left panel</property>
-                <property name="accelerator">F9</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Toggle right panel</property>
-                <property name="accelerator">&lt;shift&gt;F9</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Toggle bottom panel</property>
-                <property name="accelerator">&lt;ctrl&gt;F9</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Touchpad gestures</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
-                <property name="title" translatable="yes">Switch to the next document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
-                <property name="title" translatable="yes">Switch to the previous document</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Files</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;n</property>
-                <property name="title" translatable="yes">Create new document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;o</property>
-                <property name="title" translatable="yes">Open a document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;s</property>
-                <property name="title" translatable="yes">Save the document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;w</property>
-                <property name="title" translatable="yes">Close the document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;Page_Down</property>
-                <property name="title" translatable="yes">Switch to the next document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;Page_Up</property>
-                <property name="title" translatable="yes">Switch to the previous document</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Find and replace</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;f</property>
-                <property name="title" translatable="yes">Find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;g</property>
-                <property name="title" translatable="yes">Find the next match</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;g</property>
-                <property name="title" translatable="yes">Find the previous match</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;k</property>
-                <property name="title" translatable="yes">Clear highlight</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Copy and Paste</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;c</property>
-                <property name="title" translatable="yes">Copy selected text to clipboard</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;x</property>
-                <property name="title" translatable="yes">Cut selected text to clipboard</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;v</property>
-                <property name="title" translatable="yes">Paste text from clipboard</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Undo and Redo</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;z</property>
-                <property name="title" translatable="yes">Undo previous command</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;z</property>
-                <property name="title" translatable="yes">Redo previous command</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Editing</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;a</property>
-                <property name="title" translatable="yes">Increment number at cursor</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;x</property>
-                <property name="title" translatable="yes">Decrement number at cursor</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;j</property>
-                <property name="title" translatable="yes">Join selected lines</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;space</property>
-                <property name="title" translatable="yes">Show completion window</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Insert</property>
-                <property name="title" translatable="yes">Toggle overwrite</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;i</property>
-                <property name="title" translatable="yes">Reindent line</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Navigation</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;n</property>
-                <property name="title" translatable="yes">Move to next error in file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;p</property>
-                <property name="title" translatable="yes">Move to previous error in file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;alt&gt;Left</property>
-                <property name="title" translatable="yes">Move to previous edit location</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;alt&gt;Right</property>
-                <property name="title" translatable="yes">Move to next edit location</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;period</property>
-                <property name="title" translatable="yes">Jump to definition of symbol</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Up</property>
-                <property name="title" translatable="yes">Move sectionport up within the file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Down</property>
-                <property name="title" translatable="yes">Move sectionport down within the file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;End</property>
-                <property name="title" translatable="yes">Move sectionport to end of file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Home</property>
-                <property name="title" translatable="yes">Move sectionport to beginning of file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;percent</property>
-                <property name="title" translatable="yes">Move to matching bracket</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Selections</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;a</property>
-                <property name="title" translatable="yes">Select all</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;backslash</property>
-                <property name="title" translatable="yes">Unselect all</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
-        <property name="section-name">terminal</property>
-        <property name="title" translatable="yes">Terminal Shortcuts</property>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">General</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Global Search</property>
-                <property name="accelerator">&lt;ctrl&gt;period</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Preferences</property>
-                <property name="accelerator">&lt;ctrl&gt;comma</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Command Bar</property>
-                <property name="accelerator">&lt;ctrl&gt;Return</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Terminal</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;t</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="title" translatable="yes">Keyboard Shortcuts</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;question</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Copy and Paste</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;c</property>
-                <property name="title" translatable="yes">Copy selected text to clipboard</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;v</property>
-                <property name="title" translatable="yes">Paste text from clipboard</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Switching</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;1...9</property>
-                <property name="title" translatable="yes">Switch to n-th tab</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">All gestures</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-pinch</property>
-                <property name="title" translatable="yes">A stock pinch gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-stretch</property>
-                <property name="title" translatable="yes">A stock stretch gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-rotate-clockwise</property>
-                <property name="title" translatable="yes">A stock rotation gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-rotate-counterclockwise</property>
-                <property name="title" translatable="yes">A stock rotation gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
-                <property name="title" translatable="yes">A stock swipe gesture</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
-                <property name="title" translatable="yes">A stock swipe gesture</property>
-              </object>
-            </child>
-
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">'Special' combinations</property>
-
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">t+t</property>
-                <property name="title" translatable="yes">You want tea ?</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;</property>
-                <property name="title" translatable="yes">Shift Control</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&amp;&lt;ctrl&gt;</property>
-                <property name="title" translatable="yes">Control Control</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Control_L&amp;Control_R</property>
-                <property name="title" translatable="yes">Left and right control</property>
-              </object>
-            </child>
-
-          </object>
-        </child>
-
-      </object>
-    </child>
-  </object>
-
-</interface>

demos/gtk-demo/shortcuts-clocks.ui

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.17 -->
-
-  <object class="GtkShortcutsWindow" id="shortcuts-clocks">
-    <property name="modal">1</property>
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
-        <property name="section-name">shortcuts</property>
-        <property name="max-height">10</property>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">General</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;Page_Down</property>
-                <property name="title" translatable="yes">Go to the next section</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;Page_Up</property>
-                <property name="title" translatable="yes">Go to the previous section</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;Q</property>
-                <property name="title" translatable="yes">Quit</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;Right</property>
-                <property name="direction">ltr</property>
-                <property name="title" translatable="yes">Forward</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;Left</property>
-                <property name="direction">ltr</property>
-                <property name="title" translatable="yes">Back</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;alt&gt;Left</property>
-                <property name="direction">rtl</property>
-                <property name="title" translatable="yes">Forward</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;Right</property>
-                <property name="direction">rtl</property>
-                <property name="title" translatable="yes">Back</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="view">world</property>
-            <property name="title" translatable="yes">World Clocks</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;N</property>
-                <property name="title" translatable="yes">Add a world clock</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;S</property>
-                <property name="title" translatable="yes">Select world clocks</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="view">alarm</property>
-            <property name="title" translatable="yes">Alarm</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;N</property>
-                <property name="title" translatable="yes">Add an alarm</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;S</property>
-                <property name="title" translatable="yes">Select alarms</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="view">stopwatch</property>
-            <property name="title" translatable="yes">Stopwatch</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Return space</property>
-                <property name="title" translatable="yes">Start / Stop / Continue</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">L</property>
-                <property name="title" translatable="yes">Lap</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Delete</property>
-                <property name="title" translatable="yes">Reset</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="view">timer</property>
-            <property name="title" translatable="yes">Timer</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Return space</property>
-                <property name="title" translatable="yes">Start / Stop / Pause</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Delete</property>
-                <property name="title" translatable="yes">Reset</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-
-</interface>

demos/gtk-demo/shortcuts-gedit.ui

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.17 -->
-
-  <object class="GtkShortcutsWindow" id="shortcuts-gedit">
-    <property name="modal">1</property>
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
-        <property name="section-name">shortcuts</property>
-        <property name="max-height">12</property>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Touchpad gestures</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
-                <property name="title" translatable="yes">Switch to the next document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
-                <property name="title" translatable="yes">Switch to the previous document</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Documents</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;N</property>
-                <property name="title" translatable="yes">Create new document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;O</property>
-                <property name="title" translatable="yes">Open a document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;S</property>
-                <property name="title" translatable="yes">Save the document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;W</property>
-                <property name="title" translatable="yes">Close the document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;Alt&gt;Page_Down</property>
-                <property name="title" translatable="yes">Switch to the next document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;Alt&gt;Page_Up</property>
-                <property name="title" translatable="yes">Switch to the previous document</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Find and Replace</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;F</property>
-                <property name="title" translatable="yes">Find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;G</property>
-                <property name="title" translatable="yes">Find the next match</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;G</property>
-                <property name="title" translatable="yes">Find the previous match</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;H</property>
-                <property name="title" translatable="yes">Find and Replace</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;K</property>
-                <property name="title" translatable="yes">Clear highlight</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;I</property>
-                <property name="title" translatable="yes">Go to line</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Tools</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;shift&gt;F7</property>
-                <property name="title" translatable="yes">Check spelling</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title" translatable="yes">Miscellaneous</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">F11</property>
-                <property name="title" translatable="yes">Fullscreen on / off</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;ctrl&gt;P</property>
-                <property name="title" translatable="yes">Print the document</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Insert</property>
-                <property name="title" translatable="yes">Toggle insert / overwrite</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-
-</interface>

demos/gtk-demo/shortcuts.c

@@ -1,114 +0,0 @@
-/* Shortcuts Window
- *
- * GtkShortcutsWindow is a window that provides a help overlay
- * for shortcuts and gestures in an application.
- */
-
-#include <gtk/gtk.h>
-
-static void
-show_shortcuts (GtkWidget   *window,
-                const gchar *id,
-                const gchar *view)
-{
-  GtkBuilder *builder;
-  GtkWidget *overlay;
-  gchar *path;
-
-  path = g_strdup_printf ("/shortcuts/%s.ui", id);
-  builder = gtk_builder_new_from_resource (path);
-  g_free (path);
-  overlay = GTK_WIDGET (gtk_builder_get_object (builder, id));
-  gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
-  g_object_set (overlay, "view-name", view, NULL);
-  gtk_widget_show (overlay);
-  g_object_unref (builder);
-}
-
-static void
-builder_shortcuts (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-builder", NULL);
-}
-
-static void
-gedit_shortcuts (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-gedit", NULL);
-}
-
-static void
-clocks_shortcuts (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-clocks", NULL);
-}
-
-static void
-clocks_shortcuts_stopwatch (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-clocks", "stopwatch");
-}
-
-static void
-boxes_shortcuts (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-boxes", NULL);
-}
-
-static void
-boxes_shortcuts_wizard (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-boxes", "wizard");
-}
-
-static void
-boxes_shortcuts_display (GtkWidget *window)
-{
-  show_shortcuts (window, "shortcuts-boxes", "display");
-}
-
-GtkWidget *
-do_shortcuts (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  static gboolean icons_added = FALSE;
-
-  if (!icons_added)
-    {
-      icons_added = TRUE;
-      gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (), "/icons");
-    }
-
-  g_type_ensure (G_TYPE_FILE_ICON);
-
-  if (!window)
-    {
-      GtkBuilder *builder;
-
-      builder = gtk_builder_new_from_resource ("/shortcuts/shortcuts.ui");
-      gtk_builder_add_callback_symbols (builder,
-                                        "builder_shortcuts", G_CALLBACK (builder_shortcuts),
-                                        "gedit_shortcuts", G_CALLBACK (gedit_shortcuts),
-                                        "clocks_shortcuts", G_CALLBACK (clocks_shortcuts),
-                                        "clocks_shortcuts_stopwatch", G_CALLBACK (clocks_shortcuts_stopwatch),
-                                        "boxes_shortcuts", G_CALLBACK (boxes_shortcuts),
-                                        "boxes_shortcuts_wizard", G_CALLBACK (boxes_shortcuts_wizard),
-                                        "boxes_shortcuts_display", G_CALLBACK (boxes_shortcuts_display),
-                                        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);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/shortcuts.ui

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.17 -->
-
-  <object class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">Shortcuts</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">1</property>
-        <property name="orientation">vertical</property>
-        <property name="margin">50</property>
-        <property name="spacing">10</property>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Builder</property>
-            <signal name="clicked" handler="builder_shortcuts" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">GEdit</property>
-            <signal name="clicked" handler="gedit_shortcuts" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Clocks - All</property>
-            <signal name="clicked" handler="clocks_shortcuts" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Clocks - Stopwatch</property>
-            <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Boxes</property>
-            <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Boxes - Wizard</property>
-            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">1</property>
-            <property name="label">Boxes - Display</property>
-            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/toolpalette.c

@@ -645,7 +645,7 @@ load_icon_items (GtkToolPalette *palette)
   icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (palette)));
 
   contexts = gtk_icon_theme_list_contexts (icon_theme);
-  for (l = contexts; l; l = l->next)
+  for (l = contexts; l; l = g_list_next (l))
     {
       gchar *context = l->data;
       GList *icon_names;
@@ -663,7 +663,7 @@ load_icon_items (GtkToolPalette *palette)
       icon_names = gtk_icon_theme_list_icons (icon_theme, context);
       icon_names = g_list_sort (icon_names, (GCompareFunc) strcmp);
 
-      for (ll = icon_names; ll; ll = ll->next)
+      for (ll = icon_names; ll; ll = g_list_next (ll))
         {
           GtkToolItem *item;
           gchar *id = ll->data;

demos/widget-factory/Makefile.am

@@ -64,7 +64,6 @@ EXTRA_DIST += 				\
 	widget-factory.ui 		\
 	widget-factory.css		\
 	menus.ui 			\
-	help-overlay.ui			\
 	widget-factory.gresource.xml	\
 	data/source.svg			\
 	data/symbolic-source.svg

demos/widget-factory/help-overlay.ui

@@ -1,92 +0,0 @@
-<interface>
-  <object class="GtkShortcutsWindow" id="help_overlay">
-    <child>
-      <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title">General</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">F1</property>
-                <property name="title">Show About Dialog</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;q</property>
-                <property name="title">Quit</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;d</property>
-                <property name="title">Switch to dark theme</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title">Traditional</property>
-            <property name="view">page2</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;s</property>
-                <property name="title">Search</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">Delete</property>
-                <property name="title">Delete</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;b</property>
-                <property name="title">Set background</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
-            <property name="title">Modern</property>
-            <property name="view">page3</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;o</property>
-                <property name="title">Open a file</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;r</property>
-                <property name="title">Start recording</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
-                <property name="accelerator">&lt;Primary&gt;l</property>
-                <property name="title">Lock or unlock</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/widget-factory/widget-factory.c

@@ -69,13 +69,6 @@ get_busy (GSimpleAction *action,
   gtk_widget_set_sensitive (window, FALSE);
 }
 
-static gint current_page = 0;
-static gboolean
-on_page (gint i)
-{
-  return current_page == i;
-}
-
 static void
 activate_search (GSimpleAction *action,
                  GVariant      *parameter,
@@ -84,9 +77,6 @@ activate_search (GSimpleAction *action,
   GtkWidget *window = user_data;
   GtkWidget *searchbar;
 
-  if (!on_page (2))
-    return;
-
   searchbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "searchbar"));
   gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (searchbar), TRUE);
 }
@@ -99,79 +89,10 @@ activate_delete (GSimpleAction *action,
   GtkWidget *window = user_data;
   GtkWidget *infobar;
 
-  if (!on_page (2))
-    return;
-
   infobar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "infobar"));
   gtk_widget_show (infobar);
 }
 
-static void populate_flowbox (GtkWidget *flowbox);
-
-static void
-activate_background (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkWidget *dialog;
-  GtkWidget *flowbox;
-
-  if (!on_page (2))
-    return;
-
-  dialog = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "selection_dialog"));
-  flowbox = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "selection_flowbox"));
-
-  gtk_widget_show (dialog);
-  populate_flowbox (flowbox);
-}
-
-static void
-activate_open (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkWidget *button;
-
-  if (!on_page (3))
-    return;
-
-  button = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "open_menubutton"));
-  gtk_button_clicked (GTK_BUTTON (button));
-}
-
-static void
-activate_record (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkWidget *button;
-
-  if (!on_page (3))
-    return;
-
-  button = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "record_button"));
-  gtk_button_clicked (GTK_BUTTON (button));
-}
-
-static void
-activate_lock (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkWidget *button;
-
-  if (!on_page (3))
-    return;
-
-  button = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "lockbutton"));
-  gtk_button_clicked (GTK_BUTTON (button));
-}
-
 static void
 activate_about (GSimpleAction *action,
                 GVariant      *parameter,
@@ -548,26 +469,14 @@ static void
 page_changed_cb (GtkWidget *stack, GParamSpec *pspec, gpointer data)
 {
   const gchar *name;
-  GtkWidget *window;
   GtkWidget *page;
 
   if (gtk_widget_in_destruction (stack))
     return;
 
   name = gtk_stack_get_visible_child_name (GTK_STACK (stack));
-
-  window = gtk_widget_get_ancestor (stack, GTK_TYPE_APPLICATION_WINDOW);
-  g_object_set (gtk_application_window_get_help_overlay (GTK_APPLICATION_WINDOW (window)),
-                "view-name", name,
-                NULL);
-
-  if (g_str_equal (name, "page1"))
-    current_page = 1;
-  else if (g_str_equal (name, "page2"))
-    current_page = 2;
   if (g_str_equal (name, "page3"))
     {
-      current_page = 3;
       page = gtk_stack_get_visible_child (GTK_STACK (stack));
       set_needs_attention (GTK_WIDGET (page), FALSE);
     }
@@ -909,7 +818,7 @@ background_loaded_cb (GObject      *source,
 }
 
 static void
-populate_flowbox (GtkWidget *flowbox)
+populate_flowbox (GtkWidget *button, GtkWidget *flowbox)
 {
   const gchar *location;
   GDir *dir;
@@ -922,10 +831,7 @@ populate_flowbox (GtkWidget *flowbox)
   GdkPixbuf *pixbuf;
   GtkWidget *child;
 
-  if (GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (flowbox), "populated")))
-    return;
-
-  g_object_set_data (G_OBJECT (flowbox), "populated", GUINT_TO_POINTER (1));
+  g_signal_handlers_disconnect_by_func (button, populate_flowbox, flowbox);
 
   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 110, 70);
   gdk_pixbuf_fill (pixbuf, 0xffffffff);
@@ -1034,7 +940,7 @@ my_tv_draw_layer (GtkTextView      *widget,
 {
   MyTextView *tv = (MyTextView *)widget;
 
-  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->surface)
+  if (layer == GTK_TEXT_VIEW_LAYER_BELOW && tv->surface)
     {
       cairo_save (cr);
       cairo_set_source_surface (cr, tv->surface, 0.0, 0.0);
@@ -1273,7 +1179,7 @@ add_item (GtkTextView *tv,
     {
       item = gtk_check_button_new ();
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item), set);
-      gtk_widget_set_focus_on_click (item, FALSE);
+      gtk_button_set_focus_on_click (GTK_BUTTON (item), FALSE);
       g_signal_connect (item, "clicked", G_CALLBACK (activate_item), tv);
     }
 
@@ -1473,11 +1379,7 @@ activate (GApplication *app)
     { "dark", NULL, NULL, "false", change_theme_state },
     { "search", activate_search, NULL, NULL, NULL },
     { "delete", activate_delete, NULL, NULL, NULL },
-    { "busy", get_busy, NULL, NULL, NULL },
-    { "background", activate_background, NULL, NULL, NULL },
-    { "open", activate_open, NULL, NULL, NULL },
-    { "record", activate_record, NULL, NULL, NULL },
-    { "lock", activate_lock, NULL, NULL, NULL },
+    { "busy", get_busy, NULL, NULL, NULL }
   };
   struct {
     const gchar *action_and_target;
@@ -1487,15 +1389,10 @@ activate (GApplication *app)
     { "app.quit", { "<Primary>q", NULL } },
     { "win.dark", { "<Primary>d", NULL } },
     { "win.search", { "<Primary>s", NULL } },
-    { "win.delete", { "Delete", NULL } },
-    { "win.background", { "<Primary>b", NULL } },
-    { "win.open", { "<Primary>o", NULL } },
-    { "win.record", { "<Primary>r", NULL } },
-    { "win.lock", { "<Primary>l", NULL } },
+    { "win.delete", { "Delete", NULL } }
   };
   gint i;
   GPermission *permission;
-  GAction *action;
 
   g_type_ensure (my_text_view_get_type ());
 
@@ -1601,7 +1498,6 @@ activate (GApplication *app)
   stack = (GtkWidget *)gtk_builder_get_object (builder, "toplevel_stack");
   g_signal_connect (widget, "clicked", G_CALLBACK (action_dialog_button_clicked), stack);
   g_signal_connect (stack, "notify::visible-child-name", G_CALLBACK (page_changed_cb), NULL);
-  page_changed_cb (stack, NULL, NULL);
 
   dialog = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog");
   g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
@@ -1611,15 +1507,13 @@ activate (GApplication *app)
   g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
 
   dialog = (GtkWidget *)gtk_builder_get_object (builder, "selection_dialog");
-  g_object_set_data (G_OBJECT (window), "selection_dialog", dialog);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "text3");
   g_signal_connect (dialog, "response", G_CALLBACK (close_selection_dialog), widget);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "selection_dialog_button");
   g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
 
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "selection_flowbox");
-  g_object_set_data (G_OBJECT (window), "selection_flowbox", widget2);
-  g_signal_connect_swapped (widget, "clicked", G_CALLBACK (populate_flowbox), widget2);
+  g_signal_connect (widget, "clicked", G_CALLBACK (populate_flowbox), widget2);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "charletree");
   populate_model ((GtkTreeStore *)gtk_tree_view_get_model (GTK_TREE_VIEW (widget)));
@@ -1644,7 +1538,6 @@ activate (GApplication *app)
   set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "searchmenuitem")));
   set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "darkmenuitem")));
   set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "aboutmenuitem")));
-  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "bgmenuitem")));
 
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "tooltextview");
 
@@ -1670,8 +1563,8 @@ activate (GApplication *app)
                     G_CALLBACK (textbuffer_notify_selection), widget);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "pastebutton");
   g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect_object (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
-                           G_CALLBACK (clipboard_owner_change), widget, 0);
+  g_signal_connect (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
+                    G_CALLBACK (clipboard_owner_change), widget);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "totem_like_osd");
@@ -1687,26 +1580,13 @@ activate (GApplication *app)
   gtk_popover_set_default_widget (GTK_POPOVER (widget), widget3);
   g_signal_connect (widget2, "notify::text", G_CALLBACK (open_popover_text_changed), widget3);
   g_signal_connect_swapped (widget3, "clicked", G_CALLBACK (gtk_widget_hide), widget);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "open_menubutton");
-  g_object_set_data (G_OBJECT (window), "open_menubutton", widget);
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "record_button");
-  g_object_set_data (G_OBJECT (window), "record_button", widget);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "lockbox");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "lockbutton");
-  g_object_set_data (G_OBJECT (window), "lockbutton", widget2);
   permission = g_object_new (g_test_permission_get_type (), NULL);
   g_object_bind_property (permission, "allowed",
                           widget, "sensitive",
                           G_BINDING_SYNC_CREATE);
-  action = g_action_map_lookup_action (G_ACTION_MAP (window), "open");
-  g_object_bind_property (permission, "allowed",
-                          action, "enabled",
-                          G_BINDING_SYNC_CREATE);
-  action = g_action_map_lookup_action (G_ACTION_MAP (window), "record");
-  g_object_bind_property (permission, "allowed",
-                          action, "enabled",
-                          G_BINDING_SYNC_CREATE);
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission);
   g_object_unref (permission);
 

demos/widget-factory/widget-factory.css

@@ -1,6 +1,6 @@
 .circular-button {
   border-radius: 20px;
-  -gtk-outline-radius: 20px;
+  outline-radius: 20px;
 }
 
 .small-button {

demos/widget-factory/widget-factory.gresource.xml

@@ -9,7 +9,4 @@
   <gresource prefix="/org/gtk/WidgetFactory/gtk">
     <file preprocess="xml-stripblanks">menus.ui</file>
   </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory/gtk">
-    <file preprocess="xml-stripblanks">help-overlay.ui</file>
-  </gresource>
 </gresources>

demos/widget-factory/widget-factory.ui

@@ -150,19 +150,6 @@
       </row>
     </data>
   </object>
-  <object class="GtkEntryCompletion" id="name_completion">
-    <property name="model">liststore1</property>
-    <property name="text-column">2</property>
-    <property name="inline-completion">1</property>
-    <property name="popup-single-match">0</property>
-    <property name="inline-selection">1</property>
-    <child>
-      <object class="GtkCellRendererText"/>
-      <attributes>
-        <attribute name="text">2</attribute>
-      </attributes>
-    </child>
-  </object>
   <object class="GtkListStore" id="lrmodel">
     <columns>
       <column type="gchararray"/>
@@ -2498,15 +2485,6 @@ microphone-sensitivity-medium-symbolic</property>
                                                 <property name="action_name">win.statusbar</property>
                                               </object>
                                             </child>
-                                            <child>
-                                              <object class="GtkMenuItem" id="bgmenuitem">
-                                                <property name="label">_Select Background</property>
-                                                <property name="visible">1</property>
-                                                <property name="use_action_appearance">0</property>
-                                                <property name="use_underline">1</property>
-                                                <property name="action_name">win.background</property>
-                                              </object>
-                                            </child>
                                           </object>
                                         </child>
                                       </object>
@@ -2924,7 +2902,7 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="halign">start</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkMenuButton" id="open_menubutton">
+                              <object class="GtkMenuButton">
                                 <property name="visible">1</property>
                                 <property name="halign">center</property>
                                 <property name="popover">open_popover</property>
@@ -3633,7 +3611,6 @@ microphone-sensitivity-medium-symbolic</property>
                   <object class="GtkBox">
                     <property name="visible">1</property>
                     <property name="orientation">vertical</property>
-                    <property name="spacing">10</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">1</property>
@@ -3643,7 +3620,6 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="visible">1</property>
                             <property name="can_focus">1</property>
                             <property name="placeholder_text" translatable="yes">Name…</property>
-                            <property name="completion">name_completion</property>
                           </object>
                         </child>
                         <child>
@@ -3661,108 +3637,6 @@ microphone-sensitivity-medium-symbolic</property>
                         </style>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="visible">1</property>
-                        <property name="orientation">horizontal</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkNotebook">
-                        <property name="visible">1</property>
-                        <property name="scrollable">1</property>
-                        <child type="action-end">
-                          <object class="GtkMenuButton">
-                            <property name="visible">1</property>
-                            <property name="valign">center</property>
-                            <property name="popover">notebook_info_popover</property>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="visible">1</property>
-                                <property name="icon-name">emblem-important-symbolic</property>
-                                <property name="icon-size">1</property>
-                              </object>
-                            </child>
-                            <style>
-                              <class name="image-button"/>
-                              <class name="sidebar-button"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="height-request">120</property>
-                          </object>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Page 1</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">1</property>
-                            <property name="height-request">40</property>
-                          </object>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Page 2</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">1</property>
-                          </object>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Page 3</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">1</property>
-                          </object>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Page 4</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">1</property>
-                          </object>
-                          <packing>
-                            <property name="tab-expand">1</property>
-                          </packing>
-                        </child>
-                        <child type="tab">
-                          <object class="GtkLabel">
-                            <property name="visible">1</property>
-                            <property name="label" translatable="yes">Page 5</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkSpinner">
                         <property name="visible">1</property>
@@ -4118,13 +3992,4 @@ bad things might happen.</property>
       <widget name="panedframe2"/>
     </widgets>
   </object>
-  <object class="GtkPopover" id="notebook_info_popover">
-    <child>
-      <object class="GtkLabel" id="notebook_info_label">
-        <property name="visible">1</property>
-        <property name="margin">10</property>
-        <property name="label">No updates at this time</property>
-      </object>
-    </child>
-  </object>
 </interface>

docs/reference/gdk/gdk-docs.sgml

@@ -22,7 +22,6 @@
     <xi:include href="xml/gdkdisplaymanager.xml" />
     <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkscreen.xml" />
-    <xi:include href="xml/gdkseat.xml" />
     <xi:include href="xml/gdkdevicemanager.xml" />
     <xi:include href="xml/gdkdevice.xml" />
     <xi:include href="xml/regions.xml" />
@@ -102,10 +101,6 @@
     <title>Index of new symbols in 3.18</title>
     <xi:include href="xml/api-index-3.18.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-20" role="3.20">
-    <title>Index of new symbols in 3.20</title>
-    <xi:include href="xml/api-index-3.20.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -156,8 +156,6 @@ gdk_display_supports_input_shapes
 gdk_display_supports_composite
 gdk_display_get_app_launch_context
 gdk_display_notify_startup_complete
-gdk_display_get_default_seat
-gdk_display_list_seats
 
 <SUBSECTION Standard>
 GDK_DISPLAY
@@ -364,7 +362,6 @@ gdk_window_unstick
 gdk_window_maximize
 gdk_window_unmaximize
 gdk_window_fullscreen
-gdk_window_fullscreen_on_monitor
 gdk_window_unfullscreen
 GdkFullscreenMode
 gdk_window_get_fullscreen_mode
@@ -374,8 +371,6 @@ gdk_window_set_keep_below
 gdk_window_set_opacity
 gdk_window_set_composited
 gdk_window_get_composited
-gdk_window_set_pass_through
-gdk_window_get_pass_through
 gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
@@ -636,10 +631,6 @@ GdkPoint
 GdkRectangle
 gdk_rectangle_intersect
 gdk_rectangle_union
-gdk_rectangle_equal
-
-<SUBSECTION>
-GdkBorder
 
 <SUBSECTION Private>
 gdk_rectangle_get_type
@@ -740,7 +731,6 @@ gdk_device_get_has_cursor
 gdk_device_get_n_axes
 gdk_device_get_n_keys
 gdk_device_warp
-gdk_device_get_seat
 
 <SUBSECTION>
 gdk_device_grab
@@ -781,31 +771,6 @@ gdk_device_type_get_type
 GDK_MAX_TIMECOORD_AXES
 </SECTION>
 
-<SECTION>
-<TITLE>GdkSeat</TITLE>
-<FILE>gdkseat</FILE>
-GdkSeat
-GdkSeatCapabilities
-GdkSeatGrabPrepareFunc
-gdk_seat_get_display
-gdk_seat_grab
-gdk_seat_ungrab
-gdk_seat_get_capabilities
-gdk_seat_get_pointer
-gdk_seat_get_keyboard
-gdk_seat_get_slaves
-
-<SUBSECTION Standard>
-GDK_SEAT
-GDK_IS_SEAT
-GDK_TYPE_SEAT
-GDK_TYPE_SEAT_CAPABILITIES
-
-<SUBSECTION Private>
-gdk_seat_get_type
-gdk_seat_capabilities_get_type
-</SECTION>
-
 <SECTION>
 <TITLE>GdkDeviceManager</TITLE>
 <FILE>gdkdevicemanager</FILE>
@@ -870,7 +835,6 @@ gdk_events_get_angle
 gdk_events_get_center
 gdk_events_get_distance
 gdk_event_triggers_context_menu
-gdk_event_get_seat
 
 <SUBSECTION>
 gdk_event_handler_set
@@ -982,11 +946,9 @@ gdk_drag_get_selection
 gdk_drag_abort
 gdk_drop_reply
 gdk_drag_drop
-gdk_drag_drop_done
 gdk_drag_find_window_for_screen
 gdk_drag_begin
 gdk_drag_begin_for_device
-gdk_drag_begin_from_point
 gdk_drag_motion
 gdk_drop_finish
 GdkDragProtocol
@@ -1004,8 +966,6 @@ gdk_drag_context_set_device
 gdk_drag_context_get_source_window
 gdk_drag_context_get_dest_window
 gdk_drag_context_get_protocol
-gdk_drag_context_get_drag_window
-gdk_drag_context_set_hotspot
 
 <SUBSECTION Standard>
 GDK_DRAG_CONTEXT
@@ -1219,7 +1179,6 @@ gdk_window_impl_x11_get_type
 <INCLUDE>gdk/gdkwayland.h</INCLUDE>
 <TITLE>Wayland Interaction</TITLE>
 <FILE>wayland_interaction</FILE>
-gdk_wayland_seat_get_wl_seat
 gdk_wayland_device_get_wl_keyboard
 gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_seat

docs/reference/gdk/gdk3.types

@@ -11,6 +11,5 @@ gdk_frame_clock_get_type
 gdk_gl_context_get_type
 gdk_keymap_get_type
 gdk_screen_get_type
-gdk_seat_get_type
 gdk_visual_get_type
 gdk_window_get_type

docs/reference/gtk/Makefile.am

@@ -172,7 +172,6 @@ IGNORE_HFILES = \
 	gtktoolbarprivate.h		\
 	gtktoolpaletteprivate.h		\
 	gtktooltipprivate.h		\
-	gtktooltipwindowprivate.h	\
 	gtktreeprivate.h		\
 	gtkwidgetprivate.h		\
 	gtkwin32themeprivate.h		\
@@ -316,8 +315,7 @@ content_files =					\
 	input-handling.xml			\
 	visual_index.xml			\
 	getting_started.xml			\
-	overview.xml 				\
-	gtk-query-settings.xml
+	overview.xml
 
 expand_content_files = 				\
 	compiling.sgml				\
@@ -471,10 +469,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/getting-started-app10.png			\
 	$(srcdir)/images/exampleapp.png					\
 	$(srcdir)/images/flow-box.png					\
-	$(srcdir)/images/inspector.png					\
-	$(srcdir)/images/gedit-shortcuts.png				\
-	$(srcdir)/images/clocks-shortcuts.png				\
-	$(srcdir)/images/builder-shortcuts.png
+	$(srcdir)/images/inspector.png
 
 if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
@@ -504,8 +499,7 @@ man_MANS = 				\
 	gtk3-widget-factory.1		\
 	gtk3-icon-browser.1		\
 	broadwayd.1			\
-	gtk-builder-tool.1 		\
-	gtk-query-settings.1
+	gtk-builder-tool.1
 
 if ENABLE_MAN
 

docs/reference/gtk/gtk-docs.sgml

@@ -28,6 +28,7 @@
     <xi:include href="xml/input-handling.xml" />
   </part>
 
+
   <part id="gtkobjects">
     <title>GTK+ Widgets and Objects</title>
 
@@ -202,7 +203,6 @@
       <xi:include href="xml/gtkcolorchooserdialog.xml" />
       <xi:include href="xml/gtkfilechooser.xml" />
       <xi:include href="xml/gtkfilechooserbutton.xml" />
-      <xi:include href="xml/gtkfilechoosernative.xml" />
       <xi:include href="xml/gtkfilechooserdialog.xml" />
       <xi:include href="xml/gtkfilechooserwidget.xml" />
       <xi:include href="xml/gtkfilefilter.xml" />
@@ -239,14 +239,6 @@
       <xi:include href="xml/gtkpagesetupunixdialog.xml" />
     </chapter>
 
-    <chapter id="ShortcutsOverview">
-      <title>Shortcuts Overview</title>
-      <xi:include href="xml/gtkshortcutswindow.xml" />
-      <xi:include href="xml/gtkshortcutssection.xml" />
-      <xi:include href="xml/gtkshortcutsgroup.xml" />
-      <xi:include href="xml/gtkshortcutsshortcut.xml" />
-    </chapter>
-
     <chapter id="MiscObjects">
       <title>Miscellaneous</title>
       <xi:include href="xml/gtkadjustment.xml" />
@@ -271,7 +263,6 @@
       <xi:include href="xml/gtkmenushell.xml" />
       <xi:include href="xml/gtkrange.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
-      <xi:include href="xml/gtknativedialog.xml" />
     </chapter>
 
     <chapter id="PlugSocket">
@@ -375,7 +366,6 @@
 
   <part id="theming">
     <title>Theming in GTK+</title>
-    <xi:include href="css.xml" />
     <xi:include href="xml/gtkstylecontext.xml" />
     <xi:include href="xml/gtkcssprovider.xml" />
     <xi:include href="xml/gtkstyleprovider.xml" />
@@ -416,7 +406,6 @@
     <xi:include href="gtk-encode-symbolic-svg.xml" />
     <xi:include href="gtk-builder-tool.xml" />
     <xi:include href="gtk-launch.xml" />
-    <xi:include href="gtk-query-settings.xml" />
     <xi:include href="broadwayd.xml" />
   </part>
 
@@ -483,10 +472,6 @@
     <title>Index of new symbols in 3.18</title>
     <xi:include href="xml/api-index-3.18.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-20" role="3.20">
-    <title>Index of new symbols in 3.20</title>
-    <xi:include href="xml/api-index-3.20.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk-query-settings.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="gtk-query-settings">
-
-<refentryinfo>
-  <title>gtk-query-settings</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Timm</firstname>
-      <surname>Bäder</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk-query-settings</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk-query-settings</refname>
-  <refpurpose>Utility to print name and value of all GtkSettings properties</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-query-settings</command>
-<arg choice="opt"><replaceable>PATTERN</replaceable></arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-  <command>gtk-query-settings</command> prints both name and value of all properties
-  available in the GtkSettings class. Optionally, you can filter which properties
-  to list by specifying a PATTERN.
-</para>
-</refsect1>
-
-</refentry>

docs/reference/gtk/gtk3-sections.txt

@@ -628,7 +628,6 @@ gtk_builder_add_from_string
 gtk_builder_add_objects_from_file
 gtk_builder_add_objects_from_string
 gtk_builder_add_objects_from_resource
-gtk_builder_extend_with_template
 gtk_builder_get_object
 gtk_builder_get_objects
 gtk_builder_expose_object
@@ -1433,25 +1432,6 @@ gtk_file_chooser_error_quark
 gtk_file_chooser_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkfilechoosernative</FILE>
-<TITLE>GtkFileChooserNative</TITLE>
-gtk_file_chooser_native_new
-gtk_file_chooser_native_get_accept_label
-gtk_file_chooser_native_set_accept_label
-gtk_file_chooser_native_get_cancel_label
-gtk_file_chooser_native_set_cancel_label
-<SUBSECTION Standard>
-GTK_FILE_CHOOSER_NATIVE
-GTK_IS_FILE_CHOOSER_NATIVE
-GTK_TYPE_FILE_CHOOSER_NATIVE
-GTK_FILE_CHOOSER_NATIVE_CLASS
-GTK_IS_FILE_CHOOSER_NATIVE_CLASS
-GTK_FILE_CHOOSER_NATIVE_GET_CLASS
-<SUBSECTION Private>
-gtk_file_chooser_native_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkfilechooserdialog</FILE>
 <TITLE>GtkFileChooserDialog</TITLE>
@@ -2513,28 +2493,6 @@ GtkMiscPrivate
 gtk_misc_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtknativedialog</FILE>
-<TITLE>GtkNativeDialog</TITLE>
-GTK_TYPE_NATIVE_DIALOG
-GtkNativeDialogClass
-gtk_native_dialog_show
-gtk_native_dialog_hide
-gtk_native_dialog_destroy
-gtk_native_dialog_get_visible
-gtk_native_dialog_set_modal
-gtk_native_dialog_get_modal
-gtk_native_dialog_set_title
-gtk_native_dialog_get_title
-gtk_native_dialog_set_transient_for
-gtk_native_dialog_get_transient_for
-gtk_native_dialog_run
-<SUBSECTION Standard>
-GtkNativeDialog
-<SUBSECTION Private>
-gtk_native_dialog_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtknotebook</FILE>
 <TITLE>GtkNotebook</TITLE>
@@ -3336,7 +3294,6 @@ gtk_settings_set_property_value
 gtk_settings_set_string_property
 gtk_settings_set_long_property
 gtk_settings_set_double_property
-gtk_settings_reset_property
 GtkIMPreeditStyle
 GtkIMStatusStyle
 <SUBSECTION Standard>
@@ -3742,7 +3699,6 @@ gtk_text_iter_get_pixbuf
 gtk_text_iter_get_marks
 gtk_text_iter_get_toggled_tags
 gtk_text_iter_get_child_anchor
-gtk_text_iter_starts_tag
 gtk_text_iter_begins_tag
 gtk_text_iter_ends_tag
 gtk_text_iter_toggles_tag
@@ -3853,7 +3809,6 @@ gtk_text_tag_new
 gtk_text_tag_get_priority
 gtk_text_tag_set_priority
 gtk_text_tag_event
-gtk_text_tag_changed
 GtkTextAttributes
 GtkTextAppearance
 gtk_text_attributes_new
@@ -5450,7 +5405,6 @@ gtk_widget_draw
 gtk_widget_queue_draw
 gtk_widget_queue_resize
 gtk_widget_queue_resize_no_redraw
-gtk_widget_queue_allocate
 gtk_widget_get_frame_clock
 gtk_widget_get_scale_factor
 GtkTickCallback
@@ -5597,7 +5551,6 @@ gtk_widget_get_allocated_height
 gtk_widget_get_allocation
 gtk_widget_set_allocation
 gtk_widget_get_allocated_baseline
-gtk_widget_get_allocated_size
 gtk_widget_get_clip
 gtk_widget_set_clip
 gtk_widget_get_app_paintable
@@ -5605,8 +5558,6 @@ gtk_widget_get_can_default
 gtk_widget_set_can_default
 gtk_widget_get_can_focus
 gtk_widget_set_can_focus
-gtk_widget_get_focus_on_click
-gtk_widget_set_focus_on_click
 gtk_widget_get_double_buffered
 gtk_widget_get_has_window
 gtk_widget_set_has_window
@@ -5649,8 +5600,6 @@ gtk_widget_get_action_group
 gtk_widget_get_path
 gtk_widget_get_style_context
 gtk_widget_reset_style
-gtk_widget_class_get_css_name
-gtk_widget_class_set_css_name
 
 <SUBSECTION>
 gtk_requisition_new
@@ -5996,7 +5945,6 @@ gtk_widget_path_iter_add_region
 gtk_widget_path_iter_clear_classes
 gtk_widget_path_iter_clear_regions
 gtk_widget_path_iter_get_name
-gtk_widget_path_iter_get_object_name
 gtk_widget_path_iter_get_object_type
 gtk_widget_path_iter_get_siblings
 gtk_widget_path_iter_get_sibling_index
@@ -6012,7 +5960,6 @@ gtk_widget_path_iter_list_regions
 gtk_widget_path_iter_remove_class
 gtk_widget_path_iter_remove_region
 gtk_widget_path_iter_set_name
-gtk_widget_path_iter_set_object_name
 gtk_widget_path_iter_set_object_type
 gtk_widget_path_iter_set_state
 gtk_widget_path_length
@@ -6244,8 +6191,6 @@ gtk_style_context_set_frame_clock
 gtk_style_context_set_state
 gtk_style_context_set_scale
 gtk_style_context_get_scale
-GtkStyleContextPrintFlags
-gtk_style_context_to_string
 
 <SUBSECTION>
 GtkBorder
@@ -7598,8 +7543,6 @@ gtk_application_window_new
 gtk_application_window_set_show_menubar
 gtk_application_window_get_show_menubar
 gtk_application_window_get_id
-gtk_application_window_set_help_overlay
-gtk_application_window_get_help_overlay
 
 <SUBSECTION Standard>
 GTK_TYPE_APPLICATION_WINDOW
@@ -8144,9 +8087,6 @@ gtk_popover_set_pointing_to
 gtk_popover_get_pointing_to
 gtk_popover_set_position
 gtk_popover_get_position
-GtkPopoverConstraint
-gtk_popover_set_constrain_to
-gtk_popover_get_constrain_to
 gtk_popover_set_modal
 gtk_popover_get_modal
 gtk_popover_set_transitions_enabled
@@ -8480,64 +8420,3 @@ GTK_IS_GL_AREA_CLASS
 <SUBSECTION Private>
 gtk_gl_area_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkshortcutswindow</FILE>
-GtkShortcutsWindow
-<SUBSECTION Standard>
-GTK_TYPE_SHORTCUTS_WINDOW
-GTK_SHORTCUTS_WINDOW
-GTK_IS_SHORTCUTS_WINDOW
-GTK_SHORTCUTS_WINDOW_CLASS
-GTK_IS_SHORTCUTS_WINDOW_CLASS
-GTK_GET_SHORTCUTS_WINDOW_CLASS
-<SUBSECTION Private>
-GtkShortcutsWindowClass
-gtk_shortcuts_window_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkshortcutssection</FILE>
-GtkShortcutsSection
-<SUBSECTION Standard>
-GTK_TYPE_SHORTCUTS_SECTION
-GTK_SHORTCUTS_SECTION
-GTK_IS_SHORTCUTS_SECTION
-GTK_SHORTCUTS_SECTION_CLASS
-GTK_IS_SHORTCUTS_SECTION_CLASS
-GTK_GET_SHORTCUTS_SECTION_CLASS
-<SUBSECTION Private>
-GtkShortcutsSectionClass
-gtk_shortcuts_section_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkshortcutsgroup</FILE>
-GtkShortcutsGroup
-<SUBSECTION Standard>
-GTK_TYPE_SHORTCUTS_GROUP
-GTK_SHORTCUTS_GROUP
-GTK_IS_SHORTCUTS_GROUP
-GTK_SHORTCUTS_GROUP_CLASS
-GTK_IS_SHORTCUTS_GROUP_CLASS
-GTK_GET_SHORTCUTS_GROUP_CLASS
-<SUBSECTION Private>
-GtkShortcutsGroupClass
-gtk_shortcuts_group_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkshortcutsshortcut</FILE>
-GtkShortcutsShortcut
-GtkShortcutType
-<SUBSECTION Standard>
-GTK_TYPE_SHORTCUTS_SHORTCUT
-GTK_SHORTCUTS_SHORTCUT
-GTK_IS_SHORTCUTS_SHORTCUT
-GTK_SHORTCUTS_SHORTCUT_CLASS
-GTK_IS_SHORTCUTS_SHORTCUT_CLASS
-GTK_GET_SHORTCUTS_SHORTCUT_CLASS
-<SUBSECTION Private>
-GtkShortcutsShortcutClass
-gtk_shortcuts_shortcut_get_type
-</SECTION>

docs/reference/gtk/gtk3.types.in

@@ -173,16 +173,12 @@ gtk_separator_get_type
 gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
-gtk_shortcuts_window_get_type
-gtk_shortcuts_section_get_type
-gtk_shortcuts_group_get_type
-gtk_shortcuts_shortcut_get_type
+gtk_stack_sidebar_get_type
 gtk_size_group_get_type
 @ENABLE_ON_X11@gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_stack_get_type
-gtk_stack_sidebar_get_type
 gtk_stack_switcher_get_type
 gtk_statusbar_get_type
 gtk_status_icon_get_type

docs/reference/gtk/running.sgml

@@ -214,10 +214,6 @@ additional environment variables.
       <term>updates</term>
       <listitem><para>Visual feedback about window updates</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>resize</term>
-      <listitem><para>Highlight resizing widgets</para></listitem>
-    </varlistentry>
 
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all

gdk/Makefile.am

@@ -85,7 +85,6 @@ gdk_public_h_sources = 				\
 	gdkrectangle.h				\
 	gdkrgba.h				\
 	gdkscreen.h				\
-	gdkseat.h				\
 	gdkselection.h				\
 	gdktestutils.h				\
 	gdkthreads.h				\
@@ -113,8 +112,6 @@ gdk_private_headers = 				\
 	gdkframeclockprivate.h			\
 	gdkglcontextprivate.h			\
 	gdkscreenprivate.h			\
-	gdkseatprivate.h			\
-	gdkseatdefaultprivate.h			\
 	gdkinternals.h				\
 	gdkintl.h				\
 	gdkkeysprivate.h			\
@@ -153,8 +150,6 @@ gdk_c_sources = 				\
 	gdkrectangle.c				\
 	gdkrgba.c				\
 	gdkscreen.c				\
-	gdkseat.c				\
-	gdkseatdefault.c			\
 	gdkselection.c				\
 	gdkvisual.c				\
 	gdkwindow.c				\

gdk/broadway/broadwayd.c

@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <locale.h>
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -434,6 +435,8 @@ main (int argc, char *argv[])
     { NULL }
   };
 
+  setlocale (LC_ALL, "");
+
   context = g_option_context_new ("[:DISPLAY] - broadway display daemon");
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
   if (!g_option_context_parse (context, &argc, &argv, &error))

gdk/broadway/gdkdevice-broadway.c

@@ -219,14 +219,12 @@ _gdk_broadway_window_grab_check_unmap (GdkWindow *window,
   GdkDeviceManager *device_manager;
   GList *devices, *d;
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (display);
 
   /* Get all devices */
   devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
   devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
   devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
-  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   /* End all grabs on the newly hidden window */
   for (d = devices; d; d = d->next)
@@ -244,12 +242,10 @@ _gdk_broadway_window_grab_check_destroy (GdkWindow *window)
   GdkDeviceGrabInfo *grab;
   GList *devices, *d;
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (display);
 
   /* Get all devices */
   devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   for (d = devices; d; d = d->next)
     {

gdk/broadway/gdkdevicemanager-broadway.c

@@ -24,7 +24,6 @@
 #include "gdkdevice-broadway.h"
 #include "gdkkeysyms.h"
 #include "gdkprivate-broadway.h"
-#include "gdkseatdefaultprivate.h"
 
 #define HAS_FOCUS(toplevel)                           \
   ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
@@ -119,7 +118,6 @@ gdk_broadway_device_manager_constructed (GObject *object)
 {
   GdkBroadwayDeviceManager *device_manager;
   GdkDisplay *display;
-  GdkSeat *seat;
 
   device_manager = GDK_BROADWAY_DEVICE_MANAGER (object);
   display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (object));
@@ -131,12 +129,6 @@ gdk_broadway_device_manager_constructed (GObject *object)
   _gdk_device_set_associated_device (device_manager->core_keyboard, device_manager->core_pointer);
   _gdk_device_set_associated_device (device_manager->touchscreen, device_manager->core_pointer);
   _gdk_device_add_slave (device_manager->core_pointer, device_manager->touchscreen);
-
-  seat = gdk_seat_default_new_for_master_pair (device_manager->core_pointer,
-                                               device_manager->core_keyboard);
-  gdk_display_add_seat (display, seat);
-  gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), device_manager->touchscreen);
-  g_object_unref (seat);
 }
 
 

gdk/broadway/gdkdisplay-broadway.c

@@ -75,7 +75,6 @@ gdk_broadway_display_init_input (GdkDisplay *display)
   GList *list, *l;
 
   broadway_display = GDK_BROADWAY_DISPLAY (display);
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (display);
 
   /* For backwards compatibility, just add
@@ -111,7 +110,6 @@ gdk_broadway_display_init_input (GdkDisplay *display)
       display->core_pointer = device;
       break;
     }
-  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   /* Add the core pointer to the devices list */
   broadway_display->input_devices = g_list_prepend (broadway_display->input_devices,

gdk/broadway/gdkdnd-broadway.c

@@ -87,9 +87,7 @@ gdk_broadway_drag_context_finalize (GObject *object)
 GdkDragContext *
 _gdk_broadway_window_drag_begin (GdkWindow *window,
 				 GdkDevice *device,
-				 GList     *targets,
-                                 gint       x_root,
-                                 gint       y_root)
+				 GList     *targets)
 {
   GdkDragContext *new_context;
 

gdk/broadway/gdkeventsource.c

@@ -117,9 +117,7 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
   g_assert (display != NULL);
 
   display_broadway = GDK_BROADWAY_DISPLAY (display);
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = GDK_BROADWAY_DEVICE_MANAGER (gdk_display_get_device_manager (display));
-  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   switch (message->base.type) {
   case BROADWAY_EVENT_ENTER:
@@ -137,7 +135,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->crossing.mode = message->crossing.mode;
 	event->crossing.detail = GDK_NOTIFY_ANCESTOR;
 	gdk_event_set_device (event, display->core_pointer);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
@@ -158,7 +155,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->crossing.mode = message->crossing.mode;
 	event->crossing.detail = GDK_NOTIFY_ANCESTOR;
 	gdk_event_set_device (event, display->core_pointer);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
@@ -180,7 +176,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->motion.y_root = message->pointer.root_y;
 	event->motion.state = message->pointer.state;
 	gdk_event_set_device (event, display->core_pointer);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
@@ -206,7 +201,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->button.button = message->button.button;
 	event->button.state = message->pointer.state;
 	gdk_event_set_device (event, display->core_pointer);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
@@ -226,7 +220,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->scroll.y_root = message->pointer.root_y;
 	event->scroll.direction = message->scroll.dir == 0 ? GDK_SCROLL_UP : GDK_SCROLL_DOWN;
 	gdk_event_set_device (event, display->core_pointer);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
@@ -270,7 +263,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 
 	gdk_event_set_device (event, device_manager->core_pointer);
 	gdk_event_set_source_device (event, device_manager->touchscreen);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 
         if (message->touch.is_emulated)
           _gdk_event_set_pointer_emulated (event, TRUE);
@@ -297,7 +289,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->key.hardware_keycode = message->key.key;
 	event->key.length = 0;
 	gdk_event_set_device (event, device_manager->core_keyboard);
-	gdk_event_set_seat (event, gdk_device_get_seat (device_manager->core_keyboard));
 
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
@@ -366,7 +357,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->focus_change.window = g_object_ref (window);
 	event->focus_change.in = FALSE;
 	gdk_event_set_device (event, display->core_pointer);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
       }
@@ -377,7 +367,6 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
 	event->focus_change.window = g_object_ref (window);
 	event->focus_change.in = TRUE;
 	gdk_event_set_device (event, display->core_pointer);
-	gdk_event_set_seat (event, gdk_device_get_seat (display->core_pointer));
 	node = _gdk_event_queue_append (display, event);
 	_gdk_windowing_got_event (display, node, event, message->base.serial);
       }

gdk/broadway/gdkprivate-broadway.h

@@ -44,9 +44,7 @@ void _gdk_broadway_resync_windows (void);
 void     _gdk_broadway_window_register_dnd (GdkWindow      *window);
 GdkDragContext * _gdk_broadway_window_drag_begin (GdkWindow *window,
 						  GdkDevice *device,
-						  GList     *targets,
-                                                  gint       x_root,
-                                                  gint       y_root);
+						  GList     *targets);
 void     _gdk_broadway_window_translate         (GdkWindow *window,
 						 cairo_region_t *area,
 						 gint       dx,

gdk/gdk.c

@@ -144,7 +144,6 @@ static const GDebugKey gdk_gl_keys[] = {
   {"software-draw-gl",      GDK_GL_SOFTWARE_DRAW_GL},
   {"software-draw-surface", GDK_GL_SOFTWARE_DRAW_SURFACE},
   {"texture-rectangle",     GDK_GL_TEXTURE_RECTANGLE},
-  {"legacy",                GDK_GL_LEGACY},
 };
 
 #ifdef G_ENABLE_DEBUG

gdk/gdk.h

@@ -51,7 +51,6 @@
 #include <gdk/gdkrectangle.h>
 #include <gdk/gdkrgba.h>
 #include <gdk/gdkscreen.h>
-#include <gdk/gdkseat.h>
 #include <gdk/gdkselection.h>
 #include <gdk/gdktestutils.h>
 #include <gdk/gdkthreads.h>

gdk/gdkcursor.c

@@ -253,6 +253,7 @@ gdk_cursor_new_for_display (GdkDisplay    *display,
  * - ![](default_cursor.png) "default"
  * - ![](help_cursor.png) "help"
  * - ![](pointer_cursor.png) "pointer"
+ * - ![](pointer_cursor.png) "context-menu"
  * - ![](progress_cursor.png) "progress"
  * - ![](wait_cursor.png) "wait"
  * - ![](cell_cursor.png) "cell"

gdk/gdkdevice.c

@@ -90,7 +90,6 @@ enum {
   PROP_N_AXES,
   PROP_VENDOR_ID,
   PROP_PRODUCT_ID,
-  PROP_SEAT,
   LAST_PROP
 };
 
@@ -272,21 +271,6 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
                            G_PARAM_STATIC_STRINGS);
 
-  /**
-   * GdkDevice:seat:
-   *
-   * #GdkSeat of this device.
-   *
-   * Since: 3.20
-   */
-  device_props[PROP_SEAT] =
-      g_param_spec_object ("seat",
-                           P_("Seat"),
-                           P_("Seat"),
-                           GDK_TYPE_SEAT,
-                           G_PARAM_READWRITE |
-                           G_PARAM_STATIC_STRINGS);
-
   g_object_class_install_properties (object_class, LAST_PROP, device_props);
 
   /**
@@ -397,9 +381,6 @@ gdk_device_set_property (GObject      *object,
     case PROP_PRODUCT_ID:
       device->product_id = g_value_dup_string (value);
       break;
-    case PROP_SEAT:
-      device->seat = g_value_get_object (value);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -449,9 +430,6 @@ gdk_device_get_property (GObject    *object,
     case PROP_PRODUCT_ID:
       g_value_set_string (value, device->product_id);
       break;
-    case PROP_SEAT:
-      g_value_set_object (value, device->seat);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1360,8 +1338,6 @@ get_native_grab_event_mask (GdkEventMask grab_mask)
  * Returns: %GDK_GRAB_SUCCESS if the grab was successful.
  *
  * Since: 3.0
- *
- * Deprecated: 3.20. Use gdk_seat_grab() instead.
  **/
 GdkGrabStatus
 gdk_device_grab (GdkDevice        *device,
@@ -1435,8 +1411,6 @@ gdk_device_grab (GdkDevice        *device,
  * Release any grab on @device.
  *
  * Since: 3.0
- *
- * Deprecated: 3.20. Use gdk_seat_ungrab() instead.
  */
 void
 gdk_device_ungrab (GdkDevice  *device,
@@ -1906,36 +1880,3 @@ gdk_device_get_product_id (GdkDevice *device)
 
   return device->product_id;
 }
-
-void
-gdk_device_set_seat (GdkDevice *device,
-                     GdkSeat   *seat)
-{
-  g_return_if_fail (GDK_IS_DEVICE (device));
-  g_return_if_fail (!seat || GDK_IS_SEAT (seat));
-
-  if (device->seat == seat)
-    return;
-
-  device->seat = seat;
-  g_object_notify (G_OBJECT (device), "seat");
-}
-
-/**
- * gdk_device_get_seat:
- * @device: A #GdkDevice
- *
- * Returns the #GdkSeat the device belongs to.
- *
- * Returns: (transfer none): A #GdkSeat. This memory is owned by GTK+ and
- *          must not be freed.
- *
- * Since: 3.20
- **/
-GdkSeat *
-gdk_device_get_seat (GdkDevice *device)
-{
-  g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
-
-  return device->seat;
-}

gdk/gdkdevice.h

@@ -246,7 +246,7 @@ GList *      gdk_device_list_slave_devices    (GdkDevice     *device);
 GDK_AVAILABLE_IN_ALL
 GdkDeviceType gdk_device_get_device_type (GdkDevice *device);
 
-GDK_DEPRECATED_IN_3_20_FOR(gdk_seat_grab)
+GDK_AVAILABLE_IN_ALL
 GdkGrabStatus gdk_device_grab        (GdkDevice        *device,
                                       GdkWindow        *window,
                                       GdkGrabOwnership  grab_ownership,
@@ -255,7 +255,7 @@ GdkGrabStatus gdk_device_grab        (GdkDevice        *device,
                                       GdkCursor        *cursor,
                                       guint32           time_);
 
-GDK_DEPRECATED_IN_3_20_FOR(gdk_seat_ungrab)
+GDK_AVAILABLE_IN_ALL
 void          gdk_device_ungrab      (GdkDevice        *device,
                                       guint32           time_);
 
@@ -279,9 +279,6 @@ const gchar *gdk_device_get_vendor_id       (GdkDevice *device);
 GDK_AVAILABLE_IN_3_16
 const gchar *gdk_device_get_product_id      (GdkDevice *device);
 
-GDK_AVAILABLE_IN_3_20
-GdkSeat     *gdk_device_get_seat            (GdkDevice *device);
-
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_H__ */

gdk/gdkdevicemanager.c

@@ -323,9 +323,6 @@ gdk_device_manager_get_display (GdkDeviceManager *device_manager)
  *          GTK+ and must not be freed or unreffed.
  *
  * Since: 3.0
- *
- * Deprecated: 3.20, use gdk_seat_get_pointer(), gdk_seat_get_keyboard()
- *             and gdk_seat_list_slaves() instead.
  **/
 GList *
 gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
@@ -351,8 +348,6 @@ gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
  *          owned by GDK and must not be freed or unreferenced.
  *
  * Since: 3.0
- *
- * Deprecated: 3.20.
  **/
 GdkDevice *
 gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager)

gdk/gdkdevicemanager.h

@@ -37,10 +37,10 @@ GType        gdk_device_manager_get_type           (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_device_manager_get_display        (GdkDeviceManager *device_manager);
-GDK_DEPRECATED_IN_3_20
+GDK_AVAILABLE_IN_ALL
 GList *      gdk_device_manager_list_devices       (GdkDeviceManager *device_manager,
                                                     GdkDeviceType     type);
-GDK_DEPRECATED_IN_3_20
+GDK_AVAILABLE_IN_ALL
 GdkDevice *  gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager);
 
 G_END_DECLS

gdk/gdkdeviceprivate.h

@@ -21,7 +21,6 @@
 #include "gdkdevice.h"
 #include "gdkdevicemanager.h"
 #include "gdkevents.h"
-#include "gdkseat.h"
 
 G_BEGIN_DECLS
 
@@ -60,8 +59,6 @@ struct _GdkDevice
 
   gchar *vendor_id;
   gchar *product_id;
-
-  GdkSeat *seat;
 };
 
 struct _GdkDeviceClass
@@ -179,9 +176,6 @@ GdkWindow * _gdk_device_window_at_position    (GdkDevice        *device,
                                                GdkModifierType  *mask,
                                                gboolean          get_toplevel);
 
-void  gdk_device_set_seat  (GdkDevice *device,
-                            GdkSeat   *seat);
-
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_PRIVATE_H__ */

gdk/gdkdisplay.c

@@ -69,8 +69,6 @@
 enum {
   OPENED,
   CLOSED,
-  SEAT_ADDED,
-  SEAT_REMOVED,
   LAST_SIGNAL
 };
 
@@ -106,9 +104,7 @@ gdk_display_real_opened (GdkDisplay *display)
 {
   GdkDeviceManager *device_manager;
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (display);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   g_signal_connect (device_manager, "device-removed",
                     G_CALLBACK (device_removed_cb), display);
@@ -129,15 +125,6 @@ gdk_display_real_event_data_free (GdkDisplay     *display,
 {
 }
 
-static GdkSeat *
-gdk_display_real_get_default_seat (GdkDisplay *display)
-{
-  if (!display->seats)
-    return NULL;
-
-  return display->seats->data;
-}
-
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
@@ -153,7 +140,6 @@ gdk_display_class_init (GdkDisplayClass *class)
   class->make_default = gdk_display_real_make_default;
   class->event_data_copy = gdk_display_real_event_data_copy;
   class->event_data_free = gdk_display_real_event_data_free;
-  class->get_default_seat = gdk_display_real_get_default_seat;
 
   /**
    * GdkDisplay::opened:
@@ -191,42 +177,6 @@ gdk_display_class_init (GdkDisplayClass *class)
 		  G_TYPE_NONE,
 		  1,
 		  G_TYPE_BOOLEAN);
-
-  /**
-   * GdkDisplay::seat-added:
-   * @display: the object on which the signal is emitted
-   * @seat: the seat that was just added
-   *
-   * The ::seat-added signal is emitted whenever a new seat is made
-   * known to the windowing system.
-   *
-   * Since: 3.20
-   */
-  signals[SEAT_ADDED] =
-    g_signal_new (g_intern_static_string ("seat-added"),
-		  G_OBJECT_CLASS_TYPE (object_class),
-		  G_SIGNAL_RUN_LAST,
-		  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
-		  G_TYPE_NONE, 1, GDK_TYPE_SEAT);
-
-  /**
-   * GdkDisplay::seat-removed:
-   * @display: the object on which the signal is emitted
-   * @seat: the seat that was just added
-   *
-   * The ::seat-removed signal is emitted whenever a seat is removed
-   * by the windowing system.
-   *
-   * Since: 3.20
-   */
-  signals[SEAT_REMOVED] =
-    g_signal_new (g_intern_static_string ("seat-removed"),
-		  G_OBJECT_CLASS_TYPE (object_class),
-		  G_SIGNAL_RUN_LAST,
-		  0, NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
-		  G_TYPE_NONE, 1, GDK_TYPE_SEAT);
 }
 
 static void
@@ -283,9 +233,7 @@ gdk_display_dispose (GObject *object)
   GdkDisplay *display = GDK_DISPLAY (object);
   GdkDeviceManager *device_manager;
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (GDK_DISPLAY (object));
-  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   _gdk_display_manager_remove_display (gdk_display_manager_get (), display);
 
@@ -462,22 +410,28 @@ void
 gdk_display_pointer_ungrab (GdkDisplay *display,
 			    guint32     time_)
 {
-  GList *seats, *s;
+  GdkDeviceManager *device_manager;
+  GList *devices, *dev;
   GdkDevice *device;
 
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
-  seats = gdk_display_list_seats (display);
+  device_manager = gdk_display_get_device_manager (display);
+  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
 
-  for (s = seats; s; s = s->next)
+  /* FIXME: Should this be generic to all backends? */
+  /* FIXME: What happens with extended devices? */
+  for (dev = devices; dev; dev = dev->next)
     {
-      device = gdk_seat_get_pointer (s->data);
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+      device = dev->data;
+
+      if (gdk_device_get_source (device) != GDK_SOURCE_MOUSE)
+        continue;
+
       gdk_device_ungrab (device, time_);
-      G_GNUC_END_IGNORE_DEPRECATIONS;
     }
 
-  g_list_free (seats);
+  g_list_free (devices);
 }
 
 /**
@@ -496,22 +450,28 @@ void
 gdk_display_keyboard_ungrab (GdkDisplay *display,
 			     guint32     time)
 {
-  GList *seats, *s;
+  GdkDeviceManager *device_manager;
+  GList *devices, *dev;
   GdkDevice *device;
 
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
-  seats = gdk_display_list_seats (display);
+  device_manager = gdk_display_get_device_manager (display);
+  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
 
-  for (s = seats; s; s = s->next)
+  /* FIXME: Should this be generic to all backends? */
+  /* FIXME: What happens with extended devices? */
+  for (dev = devices; dev; dev = dev->next)
     {
-      device = gdk_seat_get_keyboard (s->data);
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+      device = dev->data;
+
+      if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
+        continue;
+
       gdk_device_ungrab (device, time);
-      G_GNUC_END_IGNORE_DEPRECATIONS;
     }
 
-  g_list_free (seats);
+  g_list_free (devices);
 }
 
 /**
@@ -1420,25 +1380,28 @@ gdk_device_grab_info_libgtk_only (GdkDisplay  *display,
 gboolean
 gdk_display_pointer_is_grabbed (GdkDisplay *display)
 {
-  GList *seats, *s;
+  GdkDeviceManager *device_manager;
+  GList *devices, *dev;
   GdkDevice *device;
 
   g_return_val_if_fail (GDK_IS_DISPLAY (display), TRUE);
 
-  seats = gdk_display_list_seats (display);
+  device_manager = gdk_display_get_device_manager (display);
+  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
 
-  for (s = seats; s; s = s->next)
+  for (dev = devices; dev; dev = dev->next)
     {
-      device = gdk_seat_get_pointer (s->data);
+      device = dev->data;
 
-      if (gdk_display_device_is_grabbed (display, device))
+      if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE &&
+          gdk_display_device_is_grabbed (display, device))
         {
-          g_list_free (seats);
+          g_list_free (devices);
           return TRUE;
         }
     }
 
-  g_list_free (seats);
+  g_list_free (devices);
 
   return FALSE;
 }
@@ -1480,8 +1443,6 @@ gdk_display_device_is_grabbed (GdkDisplay *display,
  *          or unreferenced.
  *
  * Since: 3.0
- *
- * Deprecated: 3.20. Use gdk_display_get_default_seat() and #GdkSeat operations.
  **/
 GdkDeviceManager *
 gdk_display_get_device_manager (GdkDisplay *display)
@@ -1540,7 +1501,6 @@ gdk_display_get_n_screens (GdkDisplay *display)
  * Returns: (transfer none): the #GdkScreen object
  *
  * Since: 2.2
- * Deprecated: 3.20: There is only one screen; use gdk_display_get_default_screen() to get it.
  */
 GdkScreen *
 gdk_display_get_screen (GdkDisplay *display,
@@ -2357,75 +2317,3 @@ gdk_display_get_debug_updates (GdkDisplay *display)
   else
     return _gdk_debug_updates;
 }
-
-void
-gdk_display_add_seat (GdkDisplay *display,
-                      GdkSeat    *seat)
-{
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-  g_return_if_fail (GDK_IS_SEAT (seat));
-
-  display->seats = g_list_prepend (display->seats, g_object_ref (seat));
-  g_signal_emit (display, signals[SEAT_ADDED], 0, seat);
-}
-
-void
-gdk_display_remove_seat (GdkDisplay *display,
-                         GdkSeat    *seat)
-{
-  GList *link;
-
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-  g_return_if_fail (GDK_IS_SEAT (seat));
-
-  link = g_list_find (display->seats, seat);
-
-  if (link)
-    {
-      display->seats = g_list_remove_link (display->seats, link);
-      g_signal_emit (display, signals[SEAT_REMOVED], 0, seat);
-      g_object_unref (link->data);
-      g_list_free (link);
-    }
-}
-
-/**
- * gdk_display_get_default_seat:
- * @display: a #GdkDisplay
- *
- * Returns the default #GdkSeat for this display.
- *
- * Returns: (transfer none): the default seat.
- *
- * Since: 3.20
- **/
-GdkSeat *
-gdk_display_get_default_seat (GdkDisplay *display)
-{
-  GdkDisplayClass *display_class;
-
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
-  display_class = GDK_DISPLAY_GET_CLASS (display);
-
-  return display_class->get_default_seat (display);
-}
-
-/**
- * gdk_display_list_seats:
- * @display: a #GdkDisplay
- *
- * Returns the list of seats known to @display.
- *
- * Returns: (transfer container) (element-type GdkSeat): the
- *          list of seats known to the #GdkDisplay
- *
- * Since: 3.20
- **/
-GList *
-gdk_display_list_seats (GdkDisplay *display)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
-  return g_list_copy (display->seats);
-}

gdk/gdkdisplay.h

@@ -30,7 +30,6 @@
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkdevicemanager.h>
-#include <gdk/gdkseat.h>
 
 G_BEGIN_DECLS
 
@@ -166,18 +165,12 @@ GDK_AVAILABLE_IN_ALL
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const gchar   *startup_id);
 
-GDK_DEPRECATED_IN_3_20_FOR(gdk_display_get_default_seat)
+GDK_AVAILABLE_IN_ALL
 GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
 GdkAppLaunchContext *gdk_display_get_app_launch_context (GdkDisplay *display);
 
-GDK_AVAILABLE_IN_3_20
-GdkSeat * gdk_display_get_default_seat (GdkDisplay *display);
-
-GDK_AVAILABLE_IN_3_20
-GList   * gdk_display_list_seats       (GdkDisplay *display);
-
 G_END_DECLS
 
 #endif  /* __GDK_DISPLAY_H__ */

gdk/gdkdisplayprivate.h

@@ -125,8 +125,6 @@ struct _GdkDisplay
   guint debug_updates_set : 1;
 
   GdkRenderingMode rendering_mode;
-
-  GList *seats;
 };
 
 struct _GdkDisplayClass
@@ -239,8 +237,6 @@ struct _GdkDisplayClass
   gboolean               (*make_gl_context_current)    (GdkDisplay        *display,
                                                         GdkGLContext      *context);
 
-  GdkSeat *              (*get_default_seat)           (GdkDisplay     *display);
-
   /* Signals */
   void                   (*opened)                     (GdkDisplay     *display);
   void (*closed) (GdkDisplay *display,
@@ -322,11 +318,6 @@ GdkWindow *         _gdk_display_create_window        (GdkDisplay       *display
 gboolean            gdk_display_make_gl_context_current  (GdkDisplay        *display,
                                                           GdkGLContext      *context);
 
-void                gdk_display_add_seat              (GdkDisplay       *display,
-                                                       GdkSeat          *seat);
-void                gdk_display_remove_seat           (GdkDisplay       *display,
-                                                       GdkSeat          *seat);
-
 G_END_DECLS
 
 #endif  /* __GDK_DISPLAY_PRIVATE_H__ */

gdk/gdkdnd.c

@@ -454,76 +454,3 @@ gdk_drag_get_selection (GdkDragContext *context)
 
   return GDK_DRAG_CONTEXT_GET_CLASS (context)->get_selection (context);
 }
-
-/**
- * gdk_drag_context_get_drag_window:
- * @context: a #GdkDragContext
- *
- * Returns the window on which the drag icon should be rendered
- * during the drag operation. Note that the window may not be
- * available until the drag operation has begun. GDK will move
- * the window in accordance with the ongoing drag operation.
- * The window is owned by @context and will be destroyed when
- * the drag operation is over.
- *
- * Returns: (transfer none): the drag window, or %NULL
- *
- * Since: 3.20
- */
-GdkWindow *
-gdk_drag_context_get_drag_window (GdkDragContext *context)
-{
-  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
-
-  if (GDK_DRAG_CONTEXT_GET_CLASS (context)->get_drag_window)
-    return GDK_DRAG_CONTEXT_GET_CLASS (context)->get_drag_window (context);
-
-  return NULL;
-}
-
-/**
- * gdk_drag_context_set_hotspot:
- * @context: a #GdkDragContext
- * @hot_x: x coordinate of the drag window hotspot
- * @hot_y: y coordinate of the drag window hotspot
- *
- * Sets the position of the drag window that will be kept
- * under the cursor hotspot. Initially, the hotspot is at the
- * top left corner of the drag window.
- *
- * Since: 3.20
- */
-void
-gdk_drag_context_set_hotspot (GdkDragContext *context,
-                              gint            hot_x,
-                              gint            hot_y)
-{
-  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-
-  if (GDK_DRAG_CONTEXT_GET_CLASS (context)->set_hotspot)
-    GDK_DRAG_CONTEXT_GET_CLASS (context)->set_hotspot (context, hot_x, hot_y);
-}
-
-/**
- * gdk_drag_drop_done:
- * @context: a #GdkDragContext
- * @success: whether the drag was ultimatively successful
- *
- * Inform GDK if the drop ended successfully. Passing %FALSE
- * for @success may trigger a drag cancellation animation.
- *
- * This function is called by the drag source, and should
- * be the last call before dropping the reference to the
- * @context.
- *
- * Since: 3.20
- */
-void
-gdk_drag_drop_done (GdkDragContext *context,
-                    gboolean        success)
-{
-  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-
-  if (GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_done)
-    GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_done (context, success);
-}

gdk/gdkdnd.h

@@ -31,7 +31,6 @@
 
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdevice.h>
-#include <gdk/gdkevents.h>
 
 G_BEGIN_DECLS
 
@@ -144,12 +143,6 @@ GDK_AVAILABLE_IN_ALL
 GdkDragContext * gdk_drag_begin_for_device (GdkWindow      *window,
                                             GdkDevice      *device,
                                             GList          *targets);
-GDK_AVAILABLE_IN_3_20
-GdkDragContext * gdk_drag_begin_from_point  (GdkWindow      *window,
-                                             GdkDevice      *device,
-                                             GList          *targets,
-                                             gint            x_root,
-                                             gint            y_root);
 
 GDK_AVAILABLE_IN_ALL
 void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
@@ -178,18 +171,6 @@ void            gdk_drag_abort       (GdkDragContext *context,
 GDK_AVAILABLE_IN_ALL
 gboolean        gdk_drag_drop_succeeded (GdkDragContext *context);
 
-GDK_AVAILABLE_IN_3_20
-void            gdk_drag_drop_done   (GdkDragContext *context,
-                                      gboolean        success);
-
-GDK_AVAILABLE_IN_3_20
-GdkWindow      *gdk_drag_context_get_drag_window (GdkDragContext *context);
-
-GDK_AVAILABLE_IN_3_20
-void            gdk_drag_context_set_hotspot (GdkDragContext *context,
-                                              gint            hot_x,
-                                              gint            hot_y);
-
 G_END_DECLS
 
 #endif /* __GDK_DND_H__ */

gdk/gdkdndprivate.h

@@ -62,12 +62,6 @@ struct _GdkDragContextClass {
                                 gboolean         success,
                                 guint32          time_);
   gboolean    (*drop_status)   (GdkDragContext  *context);
-  GdkWindow*  (*get_drag_window) (GdkDragContext *context);
-  void        (*set_hotspot)   (GdkDragContext  *context,
-                                gint             hot_x,
-                                gint             hot_y);
-  void        (*drop_done)     (GdkDragContext   *context,
-                                gboolean          success);
 };
 
 struct _GdkDragContext {
@@ -79,7 +73,6 @@ struct _GdkDragContext {
   gboolean is_source;
   GdkWindow *source_window;
   GdkWindow *dest_window;
-  GdkWindow *drag_window;
 
   GList *targets;
   GdkDragAction actions;

gdk/gdkevents.c

@@ -108,7 +108,7 @@ _gdk_event_queue_find_first (GdkDisplay *display)
             return tmp_list;
         }
 
-      tmp_list = tmp_list->next;
+      tmp_list = g_list_next (tmp_list);
     }
 
   return NULL;
@@ -660,7 +660,6 @@ gdk_event_copy (const GdkEvent *event)
       new_private->screen = private->screen;
       new_private->device = private->device ? g_object_ref (private->device) : NULL;
       new_private->source_device = private->source_device ? g_object_ref (private->source_device) : NULL;
-      new_private->seat = private->seat;
     }
 
   switch (event->any.type)
@@ -1635,20 +1634,22 @@ gdk_event_get_device (const GdkEvent *event)
     case GDK_KEY_RELEASE:
       {
         GdkDisplay *display;
-        GdkSeat *seat;
+        GdkDeviceManager *device_manager;
+        GdkDevice *client_pointer;
 
         g_warning ("Event with type %d not holding a GdkDevice. "
                    "It is most likely synthesized outside Gdk/GTK+\n",
                    event->type);
 
         display = gdk_window_get_display (event->any.window);
-        seat = gdk_display_get_default_seat (display);
+        device_manager = gdk_display_get_device_manager (display);
+        client_pointer = gdk_device_manager_get_client_pointer (device_manager);
 
         if (event->type == GDK_KEY_PRESS ||
             event->type == GDK_KEY_RELEASE)
-          return gdk_seat_get_keyboard (seat);
+          return gdk_device_get_associated_device (client_pointer);
         else
-          return gdk_seat_get_pointer (seat);
+          return client_pointer;
       }
       break;
     default:
@@ -2144,12 +2145,32 @@ _gdk_event_button_generate (GdkDisplay *display,
     }
 }
 
+static GList *
+gdk_get_pending_window_state_event_link (GdkWindow *window)
+{
+  GdkDisplay *display = gdk_window_get_display (window);
+  GList *tmp_list;
+
+  for (tmp_list = display->queued_events; tmp_list; tmp_list = tmp_list->next)
+    {
+      GdkEventPrivate *event = tmp_list->data;
+
+      if (event->event.type == GDK_WINDOW_STATE &&
+          event->event.window_state.window == window)
+        return tmp_list;
+    }
+
+  return NULL;
+}
+
 void
 _gdk_set_window_state (GdkWindow      *window,
                        GdkWindowState  new_state)
 {
+  GdkDisplay *display = gdk_window_get_display (window);
   GdkEvent temp_event;
   GdkWindowState old;
+  GList *pending_event_link;
 
   g_return_if_fail (window != NULL);
 
@@ -2158,11 +2179,22 @@ _gdk_set_window_state (GdkWindow      *window,
   temp_event.window_state.send_event = FALSE;
   temp_event.window_state.new_window_state = new_state;
 
-  old = window->state;
-
-  if (temp_event.window_state.new_window_state == old)
+  if (temp_event.window_state.new_window_state == window->state)
     return; /* No actual work to do, nothing changed. */
 
+  pending_event_link = gdk_get_pending_window_state_event_link (window);
+  if (pending_event_link)
+    {
+      old = window->old_state;
+      _gdk_event_queue_remove_link (display, pending_event_link);
+      g_list_free_1 (pending_event_link);
+    }
+  else
+    {
+      old = window->state;
+      window->old_state = old;
+    }
+
   temp_event.window_state.changed_mask = new_state ^ old;
 
   /* Actually update the field in GdkWindow, this is sort of an odd
@@ -2184,7 +2216,7 @@ _gdk_set_window_state (GdkWindow      *window,
     {
     case GDK_WINDOW_TOPLEVEL:
     case GDK_WINDOW_TEMP: /* ? */
-      gdk_display_put_event (gdk_window_get_display (window), &temp_event);
+      gdk_display_put_event (display, &temp_event);
       break;
     case GDK_WINDOW_FOREIGN:
     case GDK_WINDOW_ROOT:
@@ -2313,52 +2345,3 @@ gdk_event_get_event_type (const GdkEvent *event)
 
   return event->type;
 }
-
-/**
- * gdk_event_get_seat:
- * @event: a #GdkEvent
- *
- * Returns the #GdkSeat this event was generated for.
- *
- * Returns: (transfer none): The #GdkSeat of this event
- *
- * Since: 3.20
- **/
-GdkSeat *
-gdk_event_get_seat (const GdkEvent *event)
-{
-  const GdkEventPrivate *priv;
-
-  if (!gdk_event_is_allocated (event))
-    return NULL;
-
-  priv = (const GdkEventPrivate *) event;
-
-  if (!priv->seat)
-    {
-      GdkDevice *device;
-
-      g_warning ("Event with type %d not holding a GdkSeat. "
-                 "It is most likely synthesized outside Gdk/GTK+\n",
-                 event->type);
-
-      device = gdk_event_get_device (event);
-
-      return device ? gdk_device_get_seat (device) : NULL;
-    }
-
-  return priv->seat;
-}
-
-void
-gdk_event_set_seat (GdkEvent *event,
-                    GdkSeat  *seat)
-{
-  GdkEventPrivate *priv;
-
-  if (gdk_event_is_allocated (event))
-    {
-      priv = (GdkEventPrivate *) event;
-      priv->seat = seat;
-    }
-}

gdk/gdkevents.h

@@ -1427,9 +1427,6 @@ GdkEventSequence *gdk_event_get_event_sequence (const GdkEvent *event);
 GDK_AVAILABLE_IN_3_10
 GdkEventType gdk_event_get_event_type   (const GdkEvent *event);
 
-GDK_AVAILABLE_IN_3_20
-GdkSeat  *gdk_event_get_seat            (const GdkEvent *event);
-
 GDK_AVAILABLE_IN_ALL
 void	  gdk_set_show_events		(gboolean	 show_events);
 GDK_AVAILABLE_IN_ALL

gdk/gdkgl.c

@@ -147,27 +147,9 @@ bind_vao (GdkGLContextPaintData *paint_data)
 static void
 use_texture_2d_program (GdkGLContextPaintData *paint_data)
 {
-  static const char *vertex_shader_code_150 =
+  static const char *vertex_shader_code =
     "#version 150\n"
     "uniform sampler2D map;"
-    "in vec2 position;\n"
-    "in vec2 uv;\n"
-    "out vec2 vUv;\n"
-    "void main() {\n"
-    "  gl_Position = vec4(position, 0, 1);\n"
-    "  vUv = uv;\n"
-    "}\n";
-  static const char *fragment_shader_code_150 =
-    "#version 150\n"
-    "in vec2 vUv;\n"
-    "out vec4 vertexColor;\n"
-    "uniform sampler2D map;\n"
-    "void main() {\n"
-    "  vertexColor = texture2D (map, vUv);\n"
-    "}\n";
-  static const char *vertex_shader_code_130 =
-    "#version 130\n"
-    "uniform sampler2D map;"
     "attribute vec2 position;\n"
     "attribute vec2 uv;\n"
     "varying vec2 vUv;\n"
@@ -175,21 +157,14 @@ use_texture_2d_program (GdkGLContextPaintData *paint_data)
     "  gl_Position = vec4(position, 0, 1);\n"
     "  vUv = uv;\n"
     "}\n";
-  static const char *fragment_shader_code_130 =
-    "#version 130\n"
+  static const char *fragment_shader_code =
+    "#version 150\n"
     "varying vec2 vUv;\n"
     "uniform sampler2D map;\n"
     "void main() {\n"
     "  gl_FragColor = texture2D (map, vUv);\n"
     "}\n";
 
-  const char *vertex_shader_code = paint_data->is_legacy
-                                 ? vertex_shader_code_130
-                                 : vertex_shader_code_150;
-  const char *fragment_shader_code = paint_data->is_legacy
-                                   ? fragment_shader_code_130
-                                   : fragment_shader_code_150;
-
   if (paint_data->texture_2d_quad_program.program == 0)
     make_program (&paint_data->texture_2d_quad_program, vertex_shader_code, fragment_shader_code);
 
@@ -203,9 +178,9 @@ use_texture_2d_program (GdkGLContextPaintData *paint_data)
 static void
 use_texture_rect_program (GdkGLContextPaintData *paint_data)
 {
-  static const char *vertex_shader_code_150 =
+  static const char *vertex_shader_code =
     "#version 150\n"
-    "uniform sampler2DRect map;\n"
+    "uniform sampler2DRect map;"
     "attribute vec2 position;\n"
     "attribute vec2 uv;\n"
     "varying vec2 vUv;\n"
@@ -213,37 +188,13 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
     "  gl_Position = vec4(position, 0, 1);\n"
     "  vUv = uv;\n"
     "}\n";
-  static const char *fragment_shader_code_150 =
+  static const char *fragment_shader_code =
     "#version 150\n"
     "varying vec2 vUv;\n"
     "uniform sampler2DRect map;\n"
     "void main() {\n"
     "  gl_FragColor = texture2DRect (map, vUv);\n"
     "}\n";
-  static const char *vertex_shader_code_130 =
-    "#version 130\n"
-    "uniform sampler2DRect map;\n"
-    "attribute vec2 position;\n"
-    "attribute vec2 uv;\n"
-    "varying vec2 vUv;\n"
-    "void main() {\n"
-    "  gl_Position = vec4(position, 0, 1);\n"
-    "  vUv = uv;\n"
-    "}\n";
-  static const char *fragment_shader_code_130 =
-    "#version 130\n"
-    "varying vec2 vUv;\n"
-    "uniform sampler2DRect map;\n"
-    "void main() {\n"
-    "  gl_FragColor = texture2DRect (map, vUv);\n"
-    "}\n";
-
-  const char *vertex_shader_code = paint_data->is_legacy
-                                 ? vertex_shader_code_130
-                                 : vertex_shader_code_150;
-  const char *fragment_shader_code = paint_data->is_legacy
-                                   ? fragment_shader_code_130
-                                   : fragment_shader_code_150;
 
   if (paint_data->texture_rect_quad_program.program == 0)
     make_program (&paint_data->texture_rect_quad_program, vertex_shader_code, fragment_shader_code);

gdk/gdkglcontext.c

@@ -103,7 +103,6 @@ typedef struct {
   guint extensions_checked : 1;
   guint debug_enabled : 1;
   guint forward_compatible : 1;
-  guint is_legacy : 1;
 
   GdkGLContextPaintData *paint_data;
 } GdkGLContextPrivate;
@@ -345,10 +344,7 @@ gdk_gl_context_get_paint_data (GdkGLContext *context)
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
 
   if (priv->paint_data == NULL)
-    {
-      priv->paint_data = g_new0 (GdkGLContextPaintData, 1);
-      priv->paint_data->is_legacy = priv->is_legacy;
-    }
+    priv->paint_data = g_new0 (GdkGLContextPaintData, 1);
 
   return priv->paint_data;
 }
@@ -558,51 +554,6 @@ gdk_gl_context_get_required_version (GdkGLContext *context,
     *minor = min;
 }
 
-/**
- * gdk_gl_context_is_legacy:
- * @context: a #GdkGLContext
- *
- * Whether the #GdkGLContext is in legacy mode or not.
- *
- * The #GdkGLContext must be realized before calling this function.
- *
- * When realizing a GL context, GDK will try to use the OpenGL 3.2 core
- * profile; this profile removes all the OpenGL API that was deprecated
- * prior to the 3.2 version of the specification. If the realization is
- * successful, this function will return %FALSE.
- *
- * If the underlying OpenGL implementation does not support core profiles,
- * GDK will fall back to a pre-3.2 compatibility profile, and this function
- * will return %TRUE.
- *
- * You can use the value returned by this function to decide which kind
- * of OpenGL API to use, or whether to do extension discovery, or what
- * kind of shader programs to load.
- *
- * Returns: %TRUE if the GL context is in legacy mode
- *
- * Since: 3.20
- */
-gboolean
-gdk_gl_context_is_legacy (GdkGLContext *context)
-{
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-
-  g_return_val_if_fail (GDK_IS_GL_CONTEXT (context), FALSE);
-  g_return_val_if_fail (priv->realized, FALSE);
-
-  return priv->is_legacy;
-}
-
-void
-gdk_gl_context_set_is_legacy (GdkGLContext *context,
-                              gboolean      is_legacy)
-{
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-
-  priv->is_legacy = !!is_legacy;
-}
-
 /**
  * gdk_gl_context_realize:
  * @context: a #GdkGLContext

gdk/gdkglcontext.h

@@ -52,8 +52,6 @@ GDK_AVAILABLE_IN_3_16
 void                    gdk_gl_context_get_version              (GdkGLContext  *context,
                                                                  int           *major,
                                                                  int           *minor);
-GDK_AVAILABLE_IN_3_20
-gboolean                gdk_gl_context_is_legacy                (GdkGLContext  *context);
 
 GDK_AVAILABLE_IN_3_16
 void                    gdk_gl_context_set_required_version     (GdkGLContext  *context,

gdk/gdkglcontextprivate.h

@@ -67,13 +67,8 @@ typedef struct {
   GdkGLContextProgram texture_rect_quad_program;
 
   GdkGLContextProgram *current_program;
-
-  guint is_legacy : 1;
 } GdkGLContextPaintData;
 
-void                    gdk_gl_context_set_is_legacy            (GdkGLContext    *context,
-                                                                 gboolean         is_legacy);
-
 void                    gdk_gl_context_upload_texture           (GdkGLContext    *context,
                                                                  cairo_surface_t *image_surface,
                                                                  int              width,

gdk/gdkinternals.h

@@ -99,8 +99,7 @@ typedef enum {
   GDK_GL_ALWAYS                 = 1 << 1,
   GDK_GL_SOFTWARE_DRAW_GL       = 1 << 2,
   GDK_GL_SOFTWARE_DRAW_SURFACE  = 1 << 3,
-  GDK_GL_TEXTURE_RECTANGLE      = 1 << 4,
-  GDK_GL_LEGACY                 = 1 << 5
+  GDK_GL_TEXTURE_RECTANGLE      = 1 << 4
 } GdkGLFlags;
 
 extern GList            *_gdk_default_filters;
@@ -185,7 +184,6 @@ struct _GdkEventPrivate
   gpointer   windowing_data;
   GdkDevice *device;
   GdkDevice *source_device;
-  GdkSeat   *seat;
 };
 
 typedef struct _GdkWindowPaint GdkWindowPaint;
@@ -312,6 +310,7 @@ struct _GdkWindow
   /* We store the old expose areas to support buffer-age optimizations */
   cairo_region_t *old_updated_area[2];
 
+  GdkWindowState old_state;
   GdkWindowState state;
 
   guint8 alpha;
@@ -391,9 +390,6 @@ void     _gdk_event_set_pointer_emulated (GdkEvent *event,
                                           gboolean  emulated);
 gboolean _gdk_event_get_pointer_emulated (GdkEvent *event);
 
-void     gdk_event_set_seat              (GdkEvent *event,
-                                          GdkSeat  *seat);
-
 void   _gdk_event_emit               (GdkEvent   *event);
 GList* _gdk_event_queue_find_first   (GdkDisplay *display);
 void   _gdk_event_queue_remove_link  (GdkDisplay *display,

gdk/gdkkeyuni.c

@@ -27,7 +27,6 @@
 #include "gdkkeys.h"
 #include "gdktypes.h"
 
-#include <locale.h>
 
 /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
  * mapping functions, from the xterm sources.
@@ -873,23 +872,6 @@ static const struct {
 #endif
 };
 
-static gunichar
-get_decimal_point (void)
-{
-  struct lconv *locale_data;
-  const gchar *decimal_point;
-  gunichar ret;
-
-  locale_data = localeconv ();
-  decimal_point = locale_data->decimal_point;
-
-  ret = g_utf8_get_char_validated (decimal_point, -1);
-  if (ret != (gunichar)-2 && ret != (gunichar)-1)
-    return ret;
-
-  return (gunichar) '.';
-}
-
 /**
  * gdk_keyval_to_unicode:
  * @keyval: a GDK key symbol 
@@ -917,9 +899,6 @@ gdk_keyval_to_unicode (guint keyval)
   if ((keyval & 0xff000000) == 0x01000000)
     return keyval & 0x00ffffff;
 
-  if (keyval == 0xffae)
-    return (guint32) get_decimal_point ();
-
   /* binary search in table */
   while (max >= min) {
     mid = (min + max) / 2;

gdk/gdkoffscreenwindow.c

@@ -143,16 +143,10 @@ _gdk_offscreen_window_create_surface (GdkWindow *offscreen,
                                       gint       width,
                                       gint       height)
 {
-  GdkOffscreenWindow *impl;
-  GdkWindow *derived;
-
   g_return_val_if_fail (GDK_IS_OFFSCREEN_WINDOW (offscreen->impl), NULL);
 
-  impl = GDK_OFFSCREEN_WINDOW (offscreen->impl);
-  derived = impl->embedder ? impl->embedder : offscreen->parent;
-
-  return gdk_window_create_similar_surface (derived,
-					    CAIRO_CONTENT_COLOR_ALPHA,
+  return gdk_window_create_similar_surface (offscreen->parent,
+					    CAIRO_CONTENT_COLOR_ALPHA, 
 					    width, height);
 }
 
@@ -663,15 +657,10 @@ gdk_offscreen_window_get_frame_extents (GdkWindow    *window,
 static gint
 gdk_offscreen_window_get_scale_factor (GdkWindow *window)
 {
-  GdkOffscreenWindow *offscreen;
 
   if (GDK_WINDOW_DESTROYED (window))
     return 1;
 
-  offscreen = GDK_OFFSCREEN_WINDOW (window->impl);
-  if (offscreen->embedder)
-    return gdk_window_get_scale_factor (offscreen->embedder);
-
   return gdk_window_get_scale_factor (window->parent);
 }
 

gdk/gdkpixbuf-drawable.c

@@ -47,8 +47,8 @@
  * @window: Source window
  * @src_x: Source X coordinate within @window
  * @src_y: Source Y coordinate within @window
- * @width: Width in pixels of region to get
- * @height: Height in pixels of region to get
+ * @width: Width in logical pixels of region to get
+ * @height: Height in logical pixels of region to get
  *
  * Transfers image data from a #GdkWindow and converts it to an RGB(A)
  * representation inside a #GdkPixbuf. In other words, copies
@@ -91,14 +91,15 @@ gdk_pixbuf_get_from_window (GdkWindow *src,
   cairo_surface_t *copy;
   cairo_t *cr;
   GdkPixbuf *dest;
-  int scale;
+  gint scale;
 
   g_return_val_if_fail (GDK_IS_WINDOW (src), NULL);
   g_return_val_if_fail (gdk_window_is_viewable (src), NULL);
 
-  surface = _gdk_window_ref_cairo_surface (src);
   scale = gdk_window_get_scale_factor (src);
 
+  surface = _gdk_window_ref_cairo_surface (src);
+
   /* We do not know what happened to this surface outside of GDK.
    * Especially for foreign windows, they will have been modified
    * by external applications.

gdk/gdkrectangle.c

@@ -133,27 +133,6 @@ gdk_rectangle_intersect (const GdkRectangle *src1,
   return return_val;
 }
 
-/**
- * gdk_rectangle_equal:
- * @rect1: a #GdkRectangle
- * @rect2: a #GdkRectangle
- *
- * Checks if the two given rectangles are equal.
- *
- * Returns: %TRUE if the rectangles are equal.
- *
- * Since: 3.20
- */
-gboolean
-gdk_rectangle_equal (const GdkRectangle *rect1,
-                     const GdkRectangle *rect2)
-{
-  return rect1->x == rect2->x
-      && rect1->y == rect2->y
-      && rect1->width == rect2->width
-      && rect1->height == rect2->height;
-}
-
 static GdkRectangle *
 gdk_rectangle_copy (const GdkRectangle *rectangle)
 {

gdk/gdkrectangle.h

@@ -45,10 +45,6 @@ void     gdk_rectangle_union     (const GdkRectangle *src1,
                                   const GdkRectangle *src2,
                                   GdkRectangle       *dest);
 
-GDK_AVAILABLE_IN_3_20
-gboolean gdk_rectangle_equal     (const GdkRectangle *rect1,
-                                  const GdkRectangle *rect2);
-
 GDK_AVAILABLE_IN_ALL
 GType gdk_rectangle_get_type (void) G_GNUC_CONST;
 

gdk/gdkseat.c

@@ -1,391 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2015 Red Hat
- *
- * 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/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#include "config.h"
-
-#include <glib-object.h>
-#include "gdkdisplay.h"
-#include "gdkdevice.h"
-#include "gdkseatprivate.h"
-#include "gdkdeviceprivate.h"
-#include "gdkintl.h"
-
-/**
- * SECTION:gdkseat
- * @Short_description: Object representing an user seat
- * @Title: GdkSeat
- * @See_also: #GdkDisplay, #GdkDevice
- *
- * The #GdkSeat object represents a collection of input devices
- * that belong to an user.
- */
-
-typedef struct _GdkSeatPrivate GdkSeatPrivate;
-
-struct _GdkSeatPrivate
-{
-  GdkDisplay *display;
-};
-
-enum {
-  DEVICE_ADDED,
-  DEVICE_REMOVED,
-  N_SIGNALS
-};
-
-enum {
-  PROP_0,
-  PROP_DISPLAY,
-  N_PROPS
-};
-
-static guint signals[N_SIGNALS] = { 0 };
-static GParamSpec *props[N_PROPS] = { NULL };
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkSeat, gdk_seat, G_TYPE_OBJECT)
-
-static void
-gdk_seat_set_property (GObject      *object,
-                       guint         prop_id,
-                       const GValue *value,
-                       GParamSpec   *pspec)
-{
-  GdkSeatPrivate *priv = gdk_seat_get_instance_private (GDK_SEAT (object));
-
-  switch (prop_id)
-    {
-    case PROP_DISPLAY:
-      priv->display = g_value_get_object (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gdk_seat_get_property (GObject    *object,
-                       guint       prop_id,
-                       GValue     *value,
-                       GParamSpec *pspec)
-{
-  GdkSeatPrivate *priv = gdk_seat_get_instance_private (GDK_SEAT (object));
-
-  switch (prop_id)
-    {
-    case PROP_DISPLAY:
-      g_value_set_object (value, priv->display);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gdk_seat_class_init (GdkSeatClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->set_property = gdk_seat_set_property;
-  object_class->get_property = gdk_seat_get_property;
-
-  /**
-   * GdkSeat::device-added:
-   * @seat: the object on which the signal is emitted
-   * @device: the newly added #GdkDevice.
-   *
-   * The ::device-added signal is emitted either when a new input
-   * device is related to this seat.
-   *
-   * Since: 3.20
-   */
-  signals [DEVICE_ADDED] =
-    g_signal_new (g_intern_static_string ("device-added"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GdkSeatClass, device_added),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
-                  G_TYPE_NONE, 1,
-                  GDK_TYPE_DEVICE);
-
-  /**
-   * GdkSeat::device-removed:
-   * @seat: the object on which the signal is emitted
-   * @device: the just removed #GdkDevice.
-   *
-   * The ::device-removed signal is emitted either when an
-   * input device is removed (e.g. unplugged).
-   *
-   * Since: 3.20
-   */
-  signals [DEVICE_REMOVED] =
-    g_signal_new (g_intern_static_string ("device-removed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GdkSeatClass, device_removed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
-                  G_TYPE_NONE, 1,
-                  GDK_TYPE_DEVICE);
-
-  /**
-   * GdkSeat:display:
-   *
-   * #GdkDisplay of this seat.
-   *
-   * Since: 3.20
-   */
-  props[PROP_DISPLAY] =
-    g_param_spec_object ("display",
-                         P_("Display"),
-                         P_("Display"),
-                         GDK_TYPE_DISPLAY,
-                         G_PARAM_READWRITE |
-                         G_PARAM_CONSTRUCT_ONLY |
-                         G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, N_PROPS, props);
-}
-
-static void
-gdk_seat_init (GdkSeat *seat)
-{
-}
-
-/**
- * gdk_seat_get_capabilities:
- * @seat: a #GdkSeat
- *
- * Returns the capabilities this #GdkSeat currently has.
- *
- * Returns: the seat capabilities
- *
- * Since: 3.20
- **/
-GdkSeatCapabilities
-gdk_seat_get_capabilities (GdkSeat *seat)
-{
-  GdkSeatClass *seat_class;
-
-  g_return_val_if_fail (GDK_IS_SEAT (seat), GDK_SEAT_CAPABILITY_NONE);
-
-  seat_class = GDK_SEAT_GET_CLASS (seat);
-  return seat_class->get_capabilities (seat);
-}
-
-/**
- * gdk_seat_grab:
- * @seat: a #GdkSeat
- * @window: the #GdkWindow which will own the grab
- * @capabilities: capabilities that will be grabbed
- * @owner_events: if %FALSE then all device events are reported with respect to
- *                @window and are only reported if selected by @event_mask. If
- *                %TRUE then pointer events for this application are reported
- *                as normal, but pointer events outside this application are
- *                reported with respect to @window and only if selected by
- *                @event_mask. In either mode, unreported events are discarded.
- * @cursor: (nullable): the cursor to display while the grab is active. If
- *          this is %NULL then the normal cursors are used for
- *          @window and its descendants, and the cursor for @window is used
- *          elsewhere.
- * @event: (nullable): the event that is triggering the grab, or %NULL if none
- *         is available.
- * @prepare_func: (nullable) (scope call): function to prepare the window to be
- *                grabbed, it can be %NULL if @window is visible before this call.
- * @prepare_func_data: (closure prepare_func): user data to pass to @prepare_func
- *
- * Grabs the seat so that all events corresponding to the given @capabilities
- * are passed to this application until the seat is ungrabbed with gdk_seat_ungrab(),
- * or the window becomes hidden. This overrides any previous grab on the
- * seat by this client.
- *
- * As a rule of thumb, if a grab is desired over %GDK_SEAT_CAPABILITY_POINTER,
- * all other "pointing" capabilities (eg. %GDK_SEAT_CAPABILITY_TOUCH) should
- * be grabbed too, so the user is able to interact with all of those while
- * the grab holds, you should thus use %GDK_SEAT_CAPABILITY_ALL_POINTING most
- * commonly.
- *
- * Grabs are used for operations which need complete control over the
- * events corresponding to the given capabilities. For example in GTK+ this
- * is used for Drag and Drop operations, popup menus and such.
- *
- * Note that if the event mask of a #GdkWindow has selected both button press
- * and button release events, or touch begin and touch end, then a press event
- * will cause an automatic grab until the button is released, equivalent to a
- * grab on the window with @owner_events set to %TRUE. This performed as most
- * applications expect to receive presses and releases in pairs.
- *
- * If you set up anything at the time you take the grab that needs to be
- * cleaned up when the grab ends, you should handle the #GdkEventGrabBroken
- * events that are emitted when the grab ends unvoluntarily.
- *
- * Returns: %GDK_GRAB_SUCCESS if the grab was successful.
- *
- * Since: 3.20
- **/
-GdkGrabStatus
-gdk_seat_grab (GdkSeat                *seat,
-               GdkWindow              *window,
-               GdkSeatCapabilities     capabilities,
-               gboolean                owner_events,
-               GdkCursor              *cursor,
-               const GdkEvent         *event,
-               GdkSeatGrabPrepareFunc  prepare_func,
-               gpointer                prepare_func_data)
-{
-  GdkSeatClass *seat_class;
-
-  g_return_val_if_fail (GDK_IS_SEAT (seat), GDK_GRAB_FAILED);
-  g_return_val_if_fail (GDK_IS_WINDOW (window), GDK_GRAB_FAILED);
-
-  capabilities &= GDK_SEAT_CAPABILITY_ALL;
-  g_return_val_if_fail (capabilities != GDK_SEAT_CAPABILITY_NONE, GDK_GRAB_FAILED);
-
-  seat_class = GDK_SEAT_GET_CLASS (seat);
-
-  return seat_class->grab (seat, window, capabilities, owner_events, cursor,
-                           event, prepare_func, prepare_func_data);
-}
-
-/**
- * gdk_seat_ungrab:
- * @seat: a #GdkSeat
- *
- * Releases a grab added through gdk_seat_grab().
- *
- * Since: 3.20
- **/
-void
-gdk_seat_ungrab (GdkSeat *seat)
-{
-  GdkSeatClass *seat_class;
-
-  g_return_if_fail (GDK_IS_SEAT (seat));
-
-  seat_class = GDK_SEAT_GET_CLASS (seat);
-  return seat_class->ungrab (seat);
-}
-
-/**
- * gdk_seat_get_slaves:
- * @seat: a #GdkSeat
- * @capabilities: capabilities to get devices for
- *
- * Returns the slave devices that match the given capabilities.
- *
- * Returns: (transfer container) (element-type GdkSeat): A list of #GdkDevices. The list
- *          must be freed with g_list_free(), the elements are owned
- *          by GDK and must not be freed.
- *
- * Since: 3.20
- **/
-GList *
-gdk_seat_get_slaves (GdkSeat             *seat,
-                     GdkSeatCapabilities  capabilities)
-{
-  GdkSeatClass *seat_class;
-
-  g_return_val_if_fail (GDK_IS_SEAT (seat), NULL);
-
-  seat_class = GDK_SEAT_GET_CLASS (seat);
-  return seat_class->get_slaves (seat, capabilities);
-}
-
-/**
- * gdk_seat_get_pointer:
- * @seat: a #GdkSeat
- *
- * Returns the master device that routes pointer events.
- *
- * Returns: (transfer none) (nullable): a master #GdkDevice with pointer
- *          capabilities. This object is owned by GTK+ and must not be
- *          freed.
- *
- * Since: 3.20
- **/
-GdkDevice *
-gdk_seat_get_pointer (GdkSeat *seat)
-{
-  GdkSeatClass *seat_class;
-
-  g_return_val_if_fail (GDK_IS_SEAT (seat), NULL);
-
-  seat_class = GDK_SEAT_GET_CLASS (seat);
-  return seat_class->get_master (seat, GDK_SEAT_CAPABILITY_POINTER);
-}
-
-/**
- * gdk_seat_get_keyboard:
- * @seat: a #GdkSeat
- *
- * Returns the master device that routes keyboard events.
- *
- * Returns: (transfer none) (nullable): a master #GdkDevice with keyboard
- *          capabilities. This object is owned by GTK+ and must not be
- *          freed.
- *
- * Since: 3.20
- **/
-GdkDevice *
-gdk_seat_get_keyboard (GdkSeat *seat)
-{
-  GdkSeatClass *seat_class;
-
-  g_return_val_if_fail (GDK_IS_SEAT (seat), NULL);
-
-  seat_class = GDK_SEAT_GET_CLASS (seat);
-  return seat_class->get_master (seat, GDK_SEAT_CAPABILITY_KEYBOARD);
-}
-
-void
-gdk_seat_device_added (GdkSeat   *seat,
-                       GdkDevice *device)
-{
-  gdk_device_set_seat (device, seat);
-  g_signal_emit (seat, signals[DEVICE_ADDED], 0, device);
-}
-
-void
-gdk_seat_device_removed (GdkSeat   *seat,
-                         GdkDevice *device)
-{
-  gdk_device_set_seat (device, NULL);
-  g_signal_emit (seat, signals[DEVICE_REMOVED], 0, device);
-}
-
-/**
- * gdk_seat_get_display:
- * @seat: a #GdkSeat
- *
- * Returns the #GdkDisplay this seat belongs to.
- *
- * Returns: (transfer none): a #GdkDisplay. This memory is owned by GTK+ and
- *          must not be freed.
- **/
-GdkDisplay *
-gdk_seat_get_display (GdkSeat *seat)
-{
-  GdkSeatPrivate *priv = gdk_seat_get_instance_private (seat);
-
-  g_return_val_if_fail (GDK_IS_SEAT (seat), NULL);
-
-  return priv->display;
-}

gdk/gdkseat.h

@@ -1,117 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2015 Red Hat
- *
- * 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/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __GDK_SEAT_H__
-#define __GDK_SEAT_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <glib-object.h>
-#include <gdk/gdkwindow.h>
-#include <gdk/gdkevents.h>
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_SEAT  (gdk_seat_get_type ())
-#define GDK_SEAT(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_SEAT, GdkSeat))
-#define GDK_IS_SEAT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_SEAT))
-
-/**
- * GdkSeatCapabilities:
- * @GDK_SEAT_CAPABILITY_NONE: No input capabilities
- * @GDK_SEAT_CAPABILITY_POINTER: The seat has a pointer (e.g. mouse)
- * @GDK_SEAT_CAPABILITY_TOUCH: The seat has touchscreen(s) attached
- * @GDK_SEAT_CAPABILITY_TABLET_STYLUS: The seat has drawing tablet(s) attached
- * @GDK_SEAT_CAPABILITY_KEYBOARD: The seat has keyboard(s) attached
- * @GDK_SEAT_CAPABILITY_ALL_POINTING: The union of all pointing capabilities
- * @GDK_SEAT_CAPABILITY_ALL: The union of all capabilities
- *
- * Flags describing the seat capabilities.
- *
- * Since: 3.20
- */
-typedef enum {
-  GDK_SEAT_CAPABILITY_NONE          = 0,
-  GDK_SEAT_CAPABILITY_POINTER       = 1 << 0,
-  GDK_SEAT_CAPABILITY_TOUCH         = 1 << 1,
-  GDK_SEAT_CAPABILITY_TABLET_STYLUS = 1 << 2,
-  GDK_SEAT_CAPABILITY_KEYBOARD      = 1 << 3,
-  GDK_SEAT_CAPABILITY_ALL_POINTING  = (GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_TOUCH | GDK_SEAT_CAPABILITY_TABLET_STYLUS),
-  GDK_SEAT_CAPABILITY_ALL           = (GDK_SEAT_CAPABILITY_ALL_POINTING | GDK_SEAT_CAPABILITY_KEYBOARD)
-} GdkSeatCapabilities;
-
-/**
- * GdkSeatGrabPrepareFunc:
- * @seat: the #GdkSeat being grabbed
- * @window: the #GdkWindow being grabbed
- * @user_data: user data passed in gdk_seat_grab()
- *
- * Type of the callback used to set up @window so it can be
- * grabbed. A typical action would be ensuring the window is
- * visible, although there's room for other initialization
- * actions.
- *
- * Since: 3.20
- */
-typedef void (* GdkSeatGrabPrepareFunc) (GdkSeat   *seat,
-                                         GdkWindow *window,
-                                         gpointer   user_data);
-
-struct _GdkSeat
-{
-  GObject parent_instance;
-};
-
-GDK_AVAILABLE_IN_3_20
-GType          gdk_seat_get_type         (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_3_20
-GdkGrabStatus  gdk_seat_grab             (GdkSeat                *seat,
-                                          GdkWindow              *window,
-                                          GdkSeatCapabilities     capabilities,
-                                          gboolean                owner_events,
-                                          GdkCursor              *cursor,
-                                          const GdkEvent         *event,
-                                          GdkSeatGrabPrepareFunc  prepare_func,
-                                          gpointer                prepare_func_data);
-GDK_AVAILABLE_IN_3_20
-void           gdk_seat_ungrab           (GdkSeat                *seat);
-
-GDK_AVAILABLE_IN_3_20
-GdkDisplay *   gdk_seat_get_display      (GdkSeat             *seat);
-
-GDK_AVAILABLE_IN_3_20
-GdkSeatCapabilities
-               gdk_seat_get_capabilities (GdkSeat             *seat);
-
-GDK_AVAILABLE_IN_3_20
-GList *        gdk_seat_get_slaves       (GdkSeat             *seat,
-                                          GdkSeatCapabilities  capabilities);
-
-GDK_AVAILABLE_IN_3_20
-GdkDevice *    gdk_seat_get_pointer      (GdkSeat             *seat);
-GDK_AVAILABLE_IN_3_20
-GdkDevice *    gdk_seat_get_keyboard     (GdkSeat             *seat);
-
-G_END_DECLS
-
-#endif /* __GDK_SEAT_H__ */

gdk/gdkseatdefault.c

@@ -1,341 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2015 Red Hat
- *
- * 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/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#include "gdkseatdefaultprivate.h"
-#include "gdkdeviceprivate.h"
-
-typedef struct _GdkSeatDefaultPrivate GdkSeatDefaultPrivate;
-
-struct _GdkSeatDefaultPrivate
-{
-  GdkDevice *master_pointer;
-  GdkDevice *master_keyboard;
-  GList *slave_pointers;
-  GList *slave_keyboards;
-};
-
-#define KEYBOARD_EVENTS (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |    \
-                         GDK_FOCUS_CHANGE_MASK)
-#define TOUCH_EVENTS    (GDK_TOUCH_MASK)
-#define POINTER_EVENTS  (GDK_POINTER_MOTION_MASK |                      \
-                         GDK_BUTTON_PRESS_MASK |                        \
-                         GDK_BUTTON_RELEASE_MASK |                      \
-                         GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK |     \
-                         GDK_ENTER_NOTIFY_MASK |                        \
-                         GDK_LEAVE_NOTIFY_MASK |                        \
-                         GDK_PROXIMITY_IN_MASK |                        \
-                         GDK_PROXIMITY_OUT_MASK)
-
-G_DEFINE_TYPE_WITH_PRIVATE (GdkSeatDefault, gdk_seat_default, GDK_TYPE_SEAT)
-
-static void
-gdk_seat_dispose (GObject *object)
-{
-  GdkSeatDefault *seat = GDK_SEAT_DEFAULT (object);
-  GdkSeatDefaultPrivate *priv = gdk_seat_default_get_instance_private (seat);
-  GList *l;
-
-  if (priv->master_pointer)
-    {
-      gdk_seat_device_removed (GDK_SEAT (seat), priv->master_pointer);
-      g_clear_object (&priv->master_pointer);
-    }
-
-  if (priv->master_keyboard)
-    {
-      gdk_seat_device_removed (GDK_SEAT (seat), priv->master_keyboard);
-      g_clear_object (&priv->master_pointer);
-    }
-
-  for (l = priv->slave_pointers; l; l = l->next)
-    {
-      gdk_seat_device_removed (GDK_SEAT (seat), l->data);
-      g_object_unref (l->data);
-    }
-
-  for (l = priv->slave_keyboards; l; l = l->next)
-    {
-      gdk_seat_device_removed (GDK_SEAT (seat), l->data);
-      g_object_unref (l->data);
-    }
-
-  g_list_free (priv->slave_pointers);
-  g_list_free (priv->slave_keyboards);
-  priv->slave_pointers = NULL;
-  priv->slave_keyboards = NULL;
-
-  G_OBJECT_CLASS (gdk_seat_default_parent_class)->dispose (object);
-}
-
-static GdkSeatCapabilities
-gdk_seat_default_get_capabilities (GdkSeat *seat)
-{
-  /* FIXME */
-  return GDK_SEAT_CAPABILITY_NONE;
-}
-
-static GdkGrabStatus
-gdk_seat_default_grab (GdkSeat                *seat,
-                       GdkWindow              *window,
-                       GdkSeatCapabilities     capabilities,
-                       gboolean                owner_events,
-                       GdkCursor              *cursor,
-                       const GdkEvent         *event,
-                       GdkSeatGrabPrepareFunc  prepare_func,
-                       gpointer                prepare_func_data)
-{
-  GdkSeatDefaultPrivate *priv;
-  guint32 evtime = event ? gdk_event_get_time (event) : GDK_CURRENT_TIME;
-  GdkGrabStatus status = GDK_GRAB_SUCCESS;
-
-  priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat));
-
-  if (prepare_func)
-    (prepare_func) (seat, window, prepare_func_data);
-
-  if (!gdk_window_is_visible (window))
-    {
-      g_critical ("Window %p has not been made visible in GdkSeatGrabPrepareFunc",
-                  window);
-      return GDK_GRAB_NOT_VIEWABLE;
-    }
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  if (capabilities & GDK_SEAT_CAPABILITY_ALL_POINTING)
-    {
-      status = gdk_device_grab (priv->master_pointer, window,
-                                GDK_OWNERSHIP_NONE, owner_events,
-                                POINTER_EVENTS, cursor,
-                                evtime);
-    }
-
-  if (status == GDK_GRAB_SUCCESS &&
-      capabilities & GDK_SEAT_CAPABILITY_KEYBOARD)
-    {
-      status = gdk_device_grab (priv->master_keyboard, window,
-                                GDK_OWNERSHIP_NONE, owner_events,
-                                KEYBOARD_EVENTS, cursor,
-                                evtime);
-
-      if (status != GDK_GRAB_SUCCESS)
-        {
-          if (capabilities & ~GDK_SEAT_CAPABILITY_KEYBOARD)
-            gdk_device_ungrab (priv->master_pointer, evtime);
-          gdk_window_hide (window);
-        }
-    }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return status;
-}
-
-static void
-gdk_seat_default_ungrab (GdkSeat *seat)
-{
-  GdkSeatDefaultPrivate *priv;
-
-  priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat));
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  gdk_device_ungrab (priv->master_pointer, GDK_CURRENT_TIME);
-  gdk_device_ungrab (priv->master_keyboard, GDK_CURRENT_TIME);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-}
-
-static GdkDevice *
-gdk_seat_default_get_master (GdkSeat             *seat,
-                             GdkSeatCapabilities  capability)
-{
-  GdkSeatDefaultPrivate *priv;
-
-  priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat));
-
-  /* There must be only one flag set */
-  switch (capability)
-    {
-    case GDK_SEAT_CAPABILITY_POINTER:
-    case GDK_SEAT_CAPABILITY_TOUCH:
-      return priv->master_pointer;
-    case GDK_SEAT_CAPABILITY_KEYBOARD:
-      return priv->master_keyboard;
-    default:
-      g_warning ("Unhandled capability %x\n", capability);
-      break;
-    }
-
-  return NULL;
-}
-
-static GdkSeatCapabilities
-device_get_capability (GdkDevice *device)
-{
-  GdkInputSource source;
-
-  source = gdk_device_get_source (device);
-
-  switch (source)
-    {
-    case GDK_SOURCE_KEYBOARD:
-      return GDK_SEAT_CAPABILITY_KEYBOARD;
-    case GDK_SOURCE_TOUCHSCREEN:
-      return GDK_SEAT_CAPABILITY_TOUCH;
-    case GDK_SOURCE_MOUSE:
-    case GDK_SOURCE_TOUCHPAD:
-    default:
-      return GDK_SEAT_CAPABILITY_POINTER;
-    }
-
-  return GDK_SEAT_CAPABILITY_NONE;
-}
-
-static GList *
-append_filtered (GList               *list,
-                 GList               *devices,
-                 GdkSeatCapabilities  capabilities)
-{
-  GList *l;
-
-  for (l = devices; l; l = l->next)
-    {
-      GdkSeatCapabilities device_cap;
-
-      device_cap = device_get_capability (l->data);
-
-      if ((device_cap & capabilities) != 0)
-        list = g_list_prepend (list, l->data);
-    }
-
-  return list;
-}
-
-static GList *
-gdk_seat_default_get_slaves (GdkSeat             *seat,
-                             GdkSeatCapabilities  capabilities)
-{
-  GdkSeatDefaultPrivate *priv;
-  GList *devices = NULL;
-
-  priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat));
-
-  if (capabilities & (GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_TOUCH))
-    devices = append_filtered (devices, priv->slave_pointers, capabilities);
-
-  if (capabilities & GDK_SEAT_CAPABILITY_KEYBOARD)
-    devices = append_filtered (devices, priv->slave_keyboards, capabilities);
-
-  return devices;
-}
-
-static void
-gdk_seat_default_class_init (GdkSeatDefaultClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkSeatClass *seat_class = GDK_SEAT_CLASS (klass);
-
-  object_class->dispose = gdk_seat_dispose;
-
-  seat_class->get_capabilities = gdk_seat_default_get_capabilities;
-
-  seat_class->grab = gdk_seat_default_grab;
-  seat_class->ungrab = gdk_seat_default_ungrab;
-
-  seat_class->get_master = gdk_seat_default_get_master;
-  seat_class->get_slaves = gdk_seat_default_get_slaves;
-}
-
-static void
-gdk_seat_default_init (GdkSeatDefault *seat)
-{
-}
-
-GdkSeat *
-gdk_seat_default_new_for_master_pair (GdkDevice *pointer,
-                                      GdkDevice *keyboard)
-{
-  GdkSeatDefaultPrivate *priv;
-  GdkDisplay *display;
-  GdkSeat *seat;
-
-  display = gdk_device_get_display (pointer);
-
-  seat = g_object_new (GDK_TYPE_SEAT_DEFAULT,
-                       "display", display,
-                       NULL);
-
-  priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat));
-  priv->master_pointer = g_object_ref (pointer);
-  priv->master_keyboard = g_object_ref (keyboard);
-
-  gdk_seat_device_added (seat, priv->master_pointer);
-  gdk_seat_device_added (seat, priv->master_keyboard);
-
-  return seat;
-}
-
-void
-gdk_seat_default_add_slave (GdkSeatDefault *seat,
-                            GdkDevice      *device)
-{
-  GdkSeatDefaultPrivate *priv;
-  GdkSeatCapabilities capability;
-
-  g_return_if_fail (GDK_IS_SEAT_DEFAULT (seat));
-  g_return_if_fail (GDK_IS_DEVICE (device));
-
-  priv = gdk_seat_default_get_instance_private (seat);
-  capability = device_get_capability (device);
-
-  if (capability & (GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_TOUCH))
-    priv->slave_pointers = g_list_prepend (priv->slave_pointers, g_object_ref (device));
-  else if (capability & GDK_SEAT_CAPABILITY_KEYBOARD)
-    priv->slave_keyboards = g_list_prepend (priv->slave_keyboards, g_object_ref (device));
-  else
-    {
-      g_critical ("Unhandled capability %x for device '%s'",
-                  capability, gdk_device_get_name (device));
-      return;
-    }
-
-  gdk_seat_device_added (GDK_SEAT (seat), device);
-}
-
-void
-gdk_seat_default_remove_slave (GdkSeatDefault *seat,
-                               GdkDevice      *device)
-{
-  GdkSeatDefaultPrivate *priv;
-
-  g_return_if_fail (GDK_IS_SEAT_DEFAULT (seat));
-  g_return_if_fail (GDK_IS_DEVICE (device));
-
-  priv = gdk_seat_default_get_instance_private (seat);
-
-  if (g_list_find (priv->slave_pointers, device))
-    {
-      priv->slave_pointers = g_list_remove (priv->slave_pointers, device);
-      gdk_seat_device_removed (GDK_SEAT (seat), device);
-    }
-  else if (g_list_find (priv->slave_keyboards, device))
-    {
-      priv->slave_keyboards = g_list_remove (priv->slave_keyboards, device);
-      gdk_seat_device_removed (GDK_SEAT (seat), device);
-    }
-}

gdk/gdkseatdefaultprivate.h

@@ -1,56 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2015 Red Hat
- *
- * 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/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __GDK_SEAT_DEFAULT_PRIVATE_H__
-#define __GDK_SEAT_DEFAULT_PRIVATE_H__
-
-#include "gdkseat.h"
-#include "gdkseatprivate.h"
-
-#define GDK_TYPE_SEAT_DEFAULT         (gdk_seat_default_get_type ())
-#define GDK_SEAT_DEFAULT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_SEAT_DEFAULT, GdkSeatDefault))
-#define GDK_IS_SEAT_DEFAULT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_SEAT_DEFAULT))
-#define GDK_SEAT_DEFAULT_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_SEAT_DEFAULT, GdkSeatDefaultClass))
-#define GDK_IS_SEAT_DEFAULT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_SEAT_DEFAULT))
-#define GDK_SEAT_DEFAULT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_SEAT_DEFAULT, GdkSeatDefaultClass))
-
-typedef struct _GdkSeatDefault GdkSeatDefault;
-typedef struct _GdkSeatDefaultClass GdkSeatDefaultClass;
-
-struct _GdkSeatDefault
-{
-  GdkSeat parent_instance;
-};
-
-struct _GdkSeatDefaultClass
-{
-  GdkSeatClass parent_class;
-};
-
-GType     gdk_seat_default_get_type     (void) G_GNUC_CONST;
-
-GdkSeat * gdk_seat_default_new_for_master_pair (GdkDevice *pointer,
-                                                GdkDevice *keyboard);
-
-void      gdk_seat_default_add_slave    (GdkSeatDefault *seat,
-                                         GdkDevice      *device);
-void      gdk_seat_default_remove_slave (GdkSeatDefault *seat,
-                                         GdkDevice      *device);
-
-#endif /* __GDK_SEAT_DEFAULT_PRIVATE_H__ */

gdk/gdkseatprivate.h

@@ -1,65 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2015 Red Hat
- *
- * 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/>.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __GDK_SEAT_PRIVATE_H__
-#define __GDK_SEAT_PRIVATE_H__
-
-typedef struct _GdkSeatClass GdkSeatClass;
-
-#include "gdkseat.h"
-
-#define GDK_SEAT_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_SEAT, GdkSeatClass))
-#define GDK_IS_SEAT_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_SEAT))
-#define GDK_SEAT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_SEAT, GdkSeatClass))
-
-struct _GdkSeatClass
-{
-  GObjectClass parent_class;
-
-  void (* device_added)   (GdkSeat   *seat,
-                           GdkDevice *device);
-  void (* device_removed) (GdkSeat   *seat,
-                           GdkDevice *device);
-  void (* device_changed) (GdkSeat   *seat,
-                           GdkDevice *device);
-
-  GdkSeatCapabilities (*get_capabilities) (GdkSeat *seat);
-
-  GdkGrabStatus (* grab)   (GdkSeat                *seat,
-                            GdkWindow              *window,
-                            GdkSeatCapabilities     capabilities,
-                            gboolean                owner_events,
-                            GdkCursor              *cursor,
-                            const GdkEvent         *event,
-                            GdkSeatGrabPrepareFunc  prepare_func,
-                            gpointer                prepare_func_data);
-  void          (* ungrab) (GdkSeat                *seat);
-
-  GdkDevice * (* get_master) (GdkSeat             *seat,
-                              GdkSeatCapabilities  capability);
-  GList *     (* get_slaves) (GdkSeat             *seat,
-                              GdkSeatCapabilities  capabilities);
-};
-
-void gdk_seat_device_added   (GdkSeat   *seat,
-                              GdkDevice *device);
-void gdk_seat_device_removed (GdkSeat   *seat,
-                              GdkDevice *device);
-
-#endif /* __GDK_SEAT_PRIVATE_H__ */

gdk/gdktypes.h

@@ -93,26 +93,6 @@ typedef struct _GdkRectangle          GdkRectangle;
 typedef cairo_rectangle_int_t         GdkRectangle;
 #endif
 
-typedef struct _GdkBorder GdkBorder;
-
-/**
- * GdkBorder:
- * @left: The width of the left border
- * @right: The width of the right border
- * @top: The width of the top border
- * @bottom: The width of the bottom border
- *
- * A struct that specifies a border around a rectangular area
- * that can be of different width on each side.
- */
-struct _GdkBorder
-{
-  gint left;
-  gint right;
-  gint top;
-  gint bottom;
-};
-
 /**
  * GdkAtom:
  *
@@ -163,7 +143,6 @@ typedef struct _GdkScreen             GdkScreen;
 typedef struct _GdkWindow             GdkWindow;
 typedef struct _GdkKeymap             GdkKeymap;
 typedef struct _GdkAppLaunchContext   GdkAppLaunchContext;
-typedef struct _GdkSeat               GdkSeat;
 
 typedef struct _GdkGLContext          GdkGLContext;
 
@@ -501,54 +480,6 @@ typedef enum {
   GDK_GL_ERROR_UNSUPPORTED_PROFILE
 } GdkGLError;
 
-/**
- * GdkWindowTypeHint:
- * @GDK_WINDOW_TYPE_HINT_NORMAL: Normal toplevel window.
- * @GDK_WINDOW_TYPE_HINT_DIALOG: Dialog window.
- * @GDK_WINDOW_TYPE_HINT_MENU: Window used to implement a menu; GTK+ uses
- *  this hint only for torn-off menus, see #GtkTearoffMenuItem.
- * @GDK_WINDOW_TYPE_HINT_TOOLBAR: Window used to implement toolbars.
- * @GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: Window used to display a splash
- *  screen during application startup.
- * @GDK_WINDOW_TYPE_HINT_UTILITY: Utility windows which are not detached
- *  toolbars or dialogs.
- * @GDK_WINDOW_TYPE_HINT_DOCK: Used for creating dock or panel windows.
- * @GDK_WINDOW_TYPE_HINT_DESKTOP: Used for creating the desktop background
- *  window.
- * @GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU: A menu that belongs to a menubar.
- * @GDK_WINDOW_TYPE_HINT_POPUP_MENU: A menu that does not belong to a menubar,
- *  e.g. a context menu.
- * @GDK_WINDOW_TYPE_HINT_TOOLTIP: A tooltip.
- * @GDK_WINDOW_TYPE_HINT_NOTIFICATION: A notification - typically a “bubble”
- *  that belongs to a status icon.
- * @GDK_WINDOW_TYPE_HINT_COMBO: A popup from a combo box.
- * @GDK_WINDOW_TYPE_HINT_DND: A window that is used to implement a DND cursor.
- *
- * These are hints for the window manager that indicate what type of function
- * the window has. The window manager can use this when determining decoration
- * and behaviour of the window. The hint must be set before mapping the window.
- *
- * See the [Extended Window Manager Hints](http://www.freedesktop.org/Standards/wm-spec)
- * specification for more details about window types.
- */
-typedef enum
-{
-  GDK_WINDOW_TYPE_HINT_NORMAL,
-  GDK_WINDOW_TYPE_HINT_DIALOG,
-  GDK_WINDOW_TYPE_HINT_MENU,		/* Torn off menu */
-  GDK_WINDOW_TYPE_HINT_TOOLBAR,
-  GDK_WINDOW_TYPE_HINT_SPLASHSCREEN,
-  GDK_WINDOW_TYPE_HINT_UTILITY,
-  GDK_WINDOW_TYPE_HINT_DOCK,
-  GDK_WINDOW_TYPE_HINT_DESKTOP,
-  GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU,	/* A drop down menu (from a menubar) */
-  GDK_WINDOW_TYPE_HINT_POPUP_MENU,	/* A popup menu (from right-click) */
-  GDK_WINDOW_TYPE_HINT_TOOLTIP,
-  GDK_WINDOW_TYPE_HINT_NOTIFICATION,
-  GDK_WINDOW_TYPE_HINT_COMBO,
-  GDK_WINDOW_TYPE_HINT_DND
-} GdkWindowTypeHint;
-
 G_END_DECLS
 
 #endif /* __GDK_TYPES_H__ */

gdk/gdkversionmacros.h.in

@@ -152,16 +152,6 @@
  */
 #define GDK_VERSION_3_18        (G_ENCODE_VERSION (3, 18))
 
-/**
- * GDK_VERSION_3_20:
- *
- * A macro that evaluates to the 3.20 version of GDK, in a format
- * that can be used by the C pre-processor.
- *
- * Since: 3.18
- */
-#define GDK_VERSION_3_20        (G_ENCODE_VERSION (3, 20))
-
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -374,19 +364,5 @@
 # define GDK_AVAILABLE_IN_3_18                _GDK_EXTERN
 #endif
 
-#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_20
-# define GDK_DEPRECATED_IN_3_20               GDK_DEPRECATED
-# define GDK_DEPRECATED_IN_3_20_FOR(f)        GDK_DEPRECATED_FOR(f)
-#else
-# define GDK_DEPRECATED_IN_3_20               _GDK_EXTERN
-# define GDK_DEPRECATED_IN_3_20_FOR(f)        _GDK_EXTERN
-#endif
-
-#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_20
-# define GDK_AVAILABLE_IN_3_20                GDK_UNAVAILABLE(3, 20)
-#else
-# define GDK_AVAILABLE_IN_3_20                _GDK_EXTERN
-#endif
-
 #endif  /* __GDK_VERSION_MACROS_H__ */