inspector: Use some of the new GtkSearchEntry API

Avoid repetitive, manual event handling in various places in GtkInspector.
GtkSearchEntry: Add more API
2014-11-24 22:44:44 -05:00 · 2014-11-24 22:40:45 -05:00
689 changed files with 14627 additions and 21705 deletions
@@ -22,8 +22,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================

-  % tar xf gtk+-@GTK_VERSION@.tar.xz          # unpack the sources
-  % cd gtk+-@GTK_VERSION@                     # change to the toplevel directory
+  % tar xf gtk+-@GTK_VERSION@.tar.xz   # unpack the sources
+  % cd gtk+-@GTK_VERSION@              # change to the toplevel directory
  % ./configure                        # run the `configure' script
  % make                               # build GTK+
  [ Become root if necessary ]
@@ -9,15 +9,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 EXTRA_DIST +=			\
 	autogen.sh		\
 	HACKING			\
-	README			\
-	README.in		\
-	INSTALL			\
-	INSTALL.in		\
 	NEWS.pre-1-0		\
-	README.commits		\
+	README.commits	\
 	README.win32		\
 	config.h.win32		\
-	makefile.msc		\
+	makefile.msc	\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
@@ -30,6 +26,8 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/m4/gtk-doc.m4 \
 	$(srcdir)/INSTALL \
 	$(srcdir)/README \
+	$(srcdir)/omf.make \
+	$(srcdir)/xmldocs.make \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/ChangeLog

@@ -45,6 +43,7 @@ gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-waylan

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
+
 pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc}
 pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc}

@@ -78,7 +77,7 @@ distclean-local:

 ChangeLog:
 	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git $(top_builddir)/build-aux/missing git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
 	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
@@ -89,11 +88,19 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi

-.PHONY: ChangeLog
-
 uninstall-local:
 	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc

+dist-hook:
+	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
+	     CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
+	     CONFIG_HEADERS= \
+	     $(SHELL) config.status \
+	     && cp INSTALL README $(distdir) ; \
+	fi
+
+.PHONY: ChangeLog
+
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-gtk-doc 		\
 	--disable-doc-cross-references  \
@@ -1,100 +1,3 @@
-Overview of Changes in GTK+ 3.15.3
-==================================
-
-* GtkTextView:
- - Font fallback and letter spacing can be controlled with tags now
- - Pango markup can be inserted in text buffers
-
-* GtkEntry now has API to grab focus without selecting the contents
-
-* GtkWindow now starts from the focused widget when looking for
-  actions that are activated by accelerators
-
-* GtkScrolledWindow draws an indication where an edge if hiding
-  some content that can be scrolled in
-
-* GtkStack has gained GtkNotebook-like focus handling
-
-* Theming:
- - Support :not() in CSS
- - GtkRange now supports :hover for the whole widget
- - The HighContrast theme has caught up with some never GTK+ features
- - Avoid excessive shadow redraws
-
-* Build:
- - gtk3-update-icon-cache is no longer used at build time, and the
-   --enable-gtk2-dependency configure option has been removed
- - The examples that are used in the documentation can now be built
-   standalone
-
-* Inspector:
- - Allow extension with loadable modules, the first use for this
-   is gjs-inspector, which adds a JavaScript prompt
- - Allow testing cursor theme changes
-
-* Bugs fixed:
-  59390 load Pango Markup into GtkTextBuffer
- 364566 Text editing widgets should support keypad Insert/Delete...
- 461249 gtk_icon_theme_list_contexts() documentation: What is a ...
- 674537 GtkMenuPositionFunc: x and y should be "inout"
- 708857 Half-maximized CSD apps don't get a drop shadow drawn
- 710793 GtkDialog destroy event allocation size== 1, 1
- 721939 Editable cells demo: Add new row at cursor
- 722781 Foreach call on sort model fails with sort function
- 729927 impossible to create a directory if the contents of the ...
- 730232 print dialog clips off left page size label on A4 landsc...
- 730364 Add HTTPS or secure connection support with certificates...
- 735122 GtkApplication: fix global menubar on Mac OS
- 735838 Provide a way to focus an entry without selecting its co...
- 739453 Home and Desktop do not link to correct place in PlacesS...
- 739729 Bookmarks in sidebar sometimes randomly change their order
- 739977 Don't wait for ENTER to initiate search
- 740162 Problem linking gtk-query-immodules-3.0
- 740287 GtkWindow's hide-titlebar-when-maximized no longer does ...
- 740358 Postbuild checks complains about 64-bit portability
- 740374 Is enum GtkCssProviderError really deprecated?
- 740438 Stop emitting state-change signals for ATK_STATE_ARMED
- 740447 support symbolic Application icons for high contrast theme
- 740537 Cannot build example application
- 740605 Fix Build In gdkgl.c (Avoid GCCism In Pointer Arithmetic)
- 740612 Cups secret service auth_info lookup fails to read auth_...
- 740613 XConvertSelection crashes Gtk+ apps
- 740642 Fix different height for buttons with Hebrew character
- 740682 gtkapplication: Use actions from focused widget to activ...
- 740742 Don't scale before translation
- 740770 Missing style when the GtkCellRenderer:sensitive propert...
- 740812 Gtk-CRITICAL **: gtk_widget_is_ancestor: assertion 'GTK_...
- 740851 widget-factory: Add a row separator to the tree view
- 740857 HighContrast: in-app notifications lack padding
- 740860 HighContrast: vertical linking
- 740862 HighContrast: wide pane splitter
- 740863 HighContrast: separators
- 740876 HighContrast: scrolled window overshoot
- 740896 GtkPlacesSidebar: add support for unmount notifications
- 740904 Adwaita: tree lines are broken
- 740954 Please consider adding a font fallback property
- 740983 Allow plugins for Gtk Inspector
- 741027 Gtk Icon Browser | Add separator instead of shadow
- 741041 Add standalone Makefiles for the application examples
- 741117 Improve marks of GtkScale
- 741130 Entry completion with multiple cells can size wrong on f...
- 741185 GtkNotebook Raleigh theme doesn't highlight the active tab
- 741249 gtk_menu_tracker_section_find_model returns FALSE
- 741250 gtk_places_sidebar_list_shortcuts returns FALSE
- 741251 gtk_widget_get_frame_clock returns 0
- 741252 tests/variable.h header guard typo
- 741254 Improper headers guards
- 741314 No border / shadow underneath items dragged onto listvie...
- 741375 Windows: GTK+ programs stop running due to changes in CS...
- 741386 allow applications to retrieve GActionGroups available t...
-
-* Translation updates:
- Hebrew
- Swedish
- Turkish
- Vietnamese
-
-
 Overview of Changes in GTK+ 3.15.2
 ==================================

@@ -79,14 +79,6 @@ Release notes for 3.16
 * GTK+ now includes an OpenGL rendering widget. To support GL on various
  platforms, GTK+ uses libepoxy.

-* GTK+ no longer uses gtk-update-icon-cache during its build. The
-  --enable-gtk2-dependency configure option has been removed.
-
-* The introspection annotations for the x and y parameters of
-  GtkMenuPositionFunc have been corrected from 'out' to 'inout'.
-  If you are using such a function from language-bindings, this
-  may require adjustments.
-
 Release notes for 3.14
 ======================

@@ -22,6 +22,10 @@ EXTRA_DIST +=	\
 	gtk3-demo-application.vcxproj.filters	\
 	gtk3-icon-browser.vcxproj	\
 	gtk3-icon-browser.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxprojin	\
+	gtk-inspector.vcxproj.filters	\
+	gtk-inspector.vcxproj.filtersin	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
 	install.vcxproj	\
@@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
@@ -108,6 +110,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -9,7 +9,7 @@
    <GtkPrefixDefine>GTK_PREFIX=\"$(GtkDummyPrefix)\"</GtkPrefixDefine>
    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
-    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
  </PropertyGroup>
  <PropertyGroup>
    <_PropertySheetDisplayName>gtkbuilddefinesprops</_PropertySheetDisplayName>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <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</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+#include "libgtk-inspector.vs10.sourcefiles.filters"
+  </ItemGroup>
+</Project>
@@ -0,0 +1,131 @@
+<?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>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}</ProjectGuid>
+    <RootNamespace>gtkinspector</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</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="gtk-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="gtk-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="gtk-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="gtk-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+#include "libgtk-inspector.vs10.sourcefiles"
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gtk-prebuild.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -217,6 +217,10 @@
      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
+    <ProjectReference Include="gtk-inspector.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
@@ -18,6 +18,8 @@ EXTRA_DIST +=	\
 	gtk3-demo-application.vcxproj.filters	\
 	gtk3-icon-browser.vcxproj	\
 	gtk3-icon-browser.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxproj.filters	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
 	install.vcxproj	\
@@ -18,6 +18,8 @@ EXTRA_DIST +=	\
 	gtk3-demo-application.vcxproj.filters	\
 	gtk3-icon-browser.vcxproj	\
 	gtk3-icon-browser.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxproj.filters	\
 	gailutil.vcxproj	\
 	gailutil.vcxproj.filters	\
 	install.vcxproj	\
@@ -13,6 +13,8 @@ EXTRA_DIST +=	\
 	gtk3-demo.vcproj	\
 	gtk3-demo-application.vcproj	\
 	gtk3-icon-browser.vcproj	\
+	gtk-inspector.vcproj	\
+	gtk-inspector.vcprojin	\
 	gailutil.vcproj	\
 	install.vcproj	\
 	broadwayd.vcproj	\
@@ -23,9 +23,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AA
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
@@ -145,6 +151,22 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
@@ -40,6 +40,6 @@
 	/>
 	<UserMacro
 		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
 	/>
 </VisualStudioPropertySheet>
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk-inspector"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}"
+	RootNamespace="gtkinspector"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk-build-defines.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			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"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "libgtk-inspector.sourcefiles"
+		</Filter>
+	</Files>
+</VisualStudioProject>
@@ -10,7 +10,7 @@

 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [15])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_micro_version], [2])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -279,6 +279,13 @@ AC_ARG_ENABLE(installed_tests,
              [enable_installed_tests=no])
 AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)

+AC_ARG_ENABLE(gtk2-dependency,
+              [AS_HELP_STRING([--enable-gtk2-dependency],
+                              [Do not build gtk-update-icon-cache and other shared tools])],,
+              [enable_gtk2_dependency=no])
+
+AM_CONDITIONAL(BUILD_ICON_CACHE, [test "x$enable_gtk2_dependency" = xno])
+
 AC_ARG_ENABLE(xkb,
              [AS_HELP_STRING([--enable-xkb],
                              [support XKB extension [default=maybe]])],,
@@ -399,6 +406,7 @@ if test "x$enable_quartz_backend" = xyes; then
  # Pull in gio-unix for GDesktopAppInfo usage, see at least
  # gdkapplaunchcontext-x11.c
  have_gio_unix=yes
+
 else
  AM_CONDITIONAL(USE_QUARTZ, false)
 fi
@@ -957,6 +965,44 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling

 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)

+AS_IF([test "x$enable_gtk2_dependency" = xyes],
+      [AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+       if test x$GTK_UPDATE_ICON_CACHE = xno; then
+         AC_MSG_ERROR([
+*** --enable-gtk2-dependency has been set but no existing
+*** `gtk-update-icon-cache` has been found in the path.])
+       fi],
+
+      [test "x$cross_compiling" = xyes],
+      [# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf.
+       # pkg.m4 blocks all variable starting with PKG, so allow this one
+       m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
+
+       AS_IF([test x$PKG_CONFIG_FOR_BUILD = x],
+             [AC_MSG_ERROR([You must define PKG_CONFIG_FOR_BUILD when cross compiling])])
+
+       AC_MSG_CHECKING([for native gdk-pixbuf])
+       AS_IF([AC_RUN_LOG([$PKG_CONFIG_FOR_BUILD --exists --print-errors gdk-pixbuf-2.0])],
+             [AC_MSG_RESULT([yes])],
+             [AC_MSG_ERROR([native gdk-pixbuf not found])])
+
+       NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
+       NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
+       # This is the native gtk-update-icon-cache which will be used at
+       # build time, NOT the one installed on the target host.
+       GTK_UPDATE_ICON_CACHE="`cd $builddir && pwd`/gtk/native/native-update-icon-cache$BUILD_EXEEXT"
+       AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
+       AC_SUBST(NATIVE_GDKPIXBUF_LIBS)
+       AC_SUBST(GTK_UPDATE_ICON_CACHE)],
+
+      [# In native compiling case, the gtk-update-icon-cache installed
+       # is the same as the one used during build.
+       GTK_UPDATE_ICON_CACHE="\$(abs_top_builddir)/gtk/gtk-update-icon-cache$EXEEXT"
+       AC_SUBST(GTK_UPDATE_ICON_CACHE)]
+)
+
+AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
+
 ########################################
 # Windowing system checks
 ########################################
@@ -1338,7 +1384,7 @@ fi
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)

 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES"
 if test "x$enable_x11_backend" = xyes; then
  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1461,7 +1507,6 @@ else

    PRINT_BACKENDS="$PRINT_BACKENDS cups"
    AM_CONDITIONAL(HAVE_CUPS, true)
-    have_cups=yes

    gtk_save_cflags="$CFLAGS"
    CFLAGS="$CUPS_CFLAGS"
@@ -1521,9 +1566,8 @@ else
  PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0], have_json_glib=yes, have_json_glib=no)
  if test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes"; then
    PRINT_BACKENDS="$PRINT_BACKENDS cloudprint"
-    have_cloudprint=yes
  fi
-  AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_cloudprint" = "xyes")
+  AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes")
 fi

 if test "x$enable_cloudprint" = "xyes" -a "x$have_rest" = "xno"; then
@@ -1538,6 +1582,8 @@ if test "x$enable_cloudprint" = "xyes" -a "x$have_json_glib" = "xno"; then
 ])
 fi

+AM_CONDITIONAL(HAVE_PAPI_CUPS, test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno")
+
 gtk_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"

@@ -1557,6 +1603,7 @@ fi

 CPPFLAGS="$gtk_save_cppflags"

+
 AC_ARG_ENABLE(test-print-backend,
              [AS_HELP_STRING([--enable-test-print-backend],
                              [build test print backend])],,
@@ -1570,21 +1617,6 @@ if test "$os_win32" = "yes"; then
  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
 fi

-GTK_PRINT_BACKENDS="file"
-if test "$have_papi" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,papi"
-fi
-if test "$have_cups" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
-fi
-if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"
-fi
-if test "$have_cloudprint" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint"
-fi
-AC_SUBST(GTK_PRINT_BACKENDS)
-
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
 ################################################################
@@ -1837,8 +1869,6 @@ fi
 AC_SUBST(GTK_LINK_FLAGS)

 AC_CONFIG_FILES([
-README
-INSTALL
 config.h.win32
 gtk-zip.sh
 Makefile
@@ -1911,6 +1941,8 @@ gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/libgtk3.manifest
+gtk/inspector/Makefile
+gtk/native/Makefile
 util/Makefile
 libgail-util/Makefile
 modules/Makefile
@@ -72,10 +72,10 @@ DEPS = \
 	$(top_builddir)/gtk/libgtk-3.la

 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la		\
-	$(top_builddir)/gdk/libgdk-3.la		\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)				\
-	$(GDK_DEP_LIBS)				\
+	$(GDK_DEP_LIBS)			\
 	-lm

 bin_PROGRAMS = gtk3-demo gtk3-demo-application
@@ -86,8 +86,7 @@ dist_desktop_DATA = gtk3-demo.desktop
 BUILT_SOURCES = demos.h demo_resources.c

 EXTRA_DIST += 				\
-	data/source.svg			\
-	data/symbolic-source.svg	\
+	$(IMAGEFILES)			\
 	demo.gresource.xml		\
 	$(RESOURCES)			\
 	org.gtk.Demo.gschema.xml
@@ -119,40 +118,39 @@ gtk3_demo_application_LDADD = $(LDADDS)
 demo_resources.c: demo.gresource.xml $(RESOURCES)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml

-RESOURCES =				\
-	$(demos)			\
-	main.ui				\
-	application.ui			\
-	demo.ui				\
-	menus.ui			\
-	stack.ui			\
-	revealer.ui			\
-	theming.ui			\
-	listbox.ui			\
-	popover.ui			\
-	alphatest.png			\
-	apple-red.png			\
-	brick.png			\
-	brick2.png			\
-	background.jpg			\
-	floppybuddy.gif			\
-	gnome-applets.png		\
-	gnome-calendar.png		\
-	gnome-foot.png			\
-	gnome-fs-directory.png		\
-	gnome-fs-regular.png		\
-	gnome-gimp.png			\
-	gnome-gmush.png			\
-	gnome-gsame.png			\
-	gnu-keys.png			\
-	messages.txt			\
-	css_accordion.css		\
-	css_basics.css			\
-	css_multiplebgs.css		\
-	css_pixbufs.css			\
-	css_shadows.css			\
-	cssview.css			\
-	reset.css
+RESOURCES=	$(demos)			\
+		main.ui				\
+		application.ui			\
+		demo.ui				\
+		menus.ui			\
+		stack.ui			\
+		revealer.ui			\
+		theming.ui			\
+		listbox.ui			\
+		popover.ui			\
+		alphatest.png			\
+		apple-red.png			\
+		brick.png			\
+		brick2.png			\
+		background.jpg			\
+		floppybuddy.gif			\
+		gnome-applets.png		\
+		gnome-calendar.png		\
+		gnome-foot.png			\
+		gnome-fs-directory.png		\
+		gnome-fs-regular.png		\
+		gnome-gimp.png			\
+		gnome-gmush.png			\
+		gnome-gsame.png			\
+		gnu-keys.png			\
+		messages.txt			\
+		css_accordion.css		\
+		css_basics.css			\
+		css_multiplebgs.css		\
+		css_pixbufs.css			\
+		css_shadows.css			\
+		cssview.css			\
+		reset.css

 iconthemedir = $(datadir)/icons/hicolor

@@ -162,16 +160,15 @@ appsicon24dir = $(iconthemedir)/24x24/apps
 appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
-appsiconscalabledir = $(iconthemedir)/scalable/apps

-dist_appsicon16_DATA = data/16x16/gtk3-demo.png data/16x16/gtk3-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-demo.png data/22x22/gtk3-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-demo.png data/24x24/gtk3-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk3-demo.png
+dist_appsicon22_DATA = data/22x22/gtk3-demo.png
+dist_appsicon24_DATA = data/24x24/gtk3-demo.png
+dist_appsicon32_DATA = data/32x32/gtk3-demo.png
+dist_appsicon48_DATA = data/48x48/gtk3-demo.png
+dist_appsicon256_DATA = data/256x256/gtk3-demo.png

-update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force

 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gtk3-demo-symbolic.svg' height='16.000015' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.5 r10040' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-12.5126' inkscape:cy='-0.73412416' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='5.6568542'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-182.99998px' originy='-251.99998px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'>
-    <linearGradient id='linearGradient7212' osb:paint='solid'>
-      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
-    </linearGradient>
-  </defs>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-424.00018,35)'>
-    
-    <rect height='8.0000048' id='rect7866' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(0.83205029,0.5547002,0,1,0,0)' width='7.2111053' x='510.78668' y='-314.33347'/>
-    <rect height='8.0000086' id='rect7868' style='opacity:0.5;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(-0.86824295,0.49613928,0,1,0,0)' width='8.0622425' x='-505.61908' y='219.8575'/>
-    <path inkscape:connector-curvature='0' d='m 431.53145,-28 -5.875,-3.65625 6.8125,-3.34375 6.03125,3 z' id='path7870' sodipodi:nodetypes='ccccc' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
-  </g>
-</svg>
@@ -142,11 +142,8 @@ static void
 add_item (GtkWidget *button, gpointer data)
 {
  Item foo;
-  GtkTreeIter current, iter;
-  GtkTreePath *path;
-  GtkTreeModel *model;
-  GtkTreeViewColumn *column;
-  GtkTreeView *treeview = (GtkTreeView *)data;
+  GtkTreeIter iter;
+  GtkTreeModel *model = (GtkTreeModel *)data;

  g_return_if_fail (articles != NULL);

@@ -155,26 +152,12 @@ add_item (GtkWidget *button, gpointer data)
  foo.yummy = 50;
  g_array_append_vals (articles, &foo, 1);

-  /* Insert a new row below the current one */
-  gtk_tree_view_get_cursor (treeview, &path, NULL);
-  model = gtk_tree_view_get_model (treeview);
-  gtk_tree_model_get_iter (model, &current, path);
-  gtk_tree_path_free (path);
-
-  /* Set the data for the new row */
-  gtk_list_store_insert_after (GTK_LIST_STORE (model), &iter, &current);
+  gtk_list_store_append (GTK_LIST_STORE (model), &iter);
  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                      COLUMN_ITEM_NUMBER, foo.number,
                      COLUMN_ITEM_PRODUCT, foo.product,
                      COLUMN_ITEM_YUMMY, foo.yummy,
                      -1);
-
-  /* Move focus to the new row */
-  path = gtk_tree_model_get_path (model, &iter);
-  column = gtk_tree_view_get_column (treeview, 0);
-  gtk_tree_view_set_cursor (treeview, path, column, FALSE);
-
-  gtk_tree_path_free (path);
 }

 static void
@@ -385,7 +368,7 @@ do_editable_cells (GtkWidget *do_widget)

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
-                        G_CALLBACK (add_item), treeview);
+                        G_CALLBACK (add_item), items_model);
      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);

      button = gtk_button_new_with_label ("Remove item");
@@ -77,11 +77,6 @@
            <signal name="selected-rows-changed" handler="selected_context_changed"/>
          </object>
        </child>
-        <child>
-          <object class="GtkVSeparator">
-            <property name="visible">True</property>
-          </object>
-        </child>
        <child>
          <object class="GtkBox" id="content_box">
            <property name="visible">True</property>
@@ -104,6 +99,7 @@
                <property name="expand">True</property>
                <property name="hscrollbar-policy">never</property>
                <property name="vscrollbar-policy">automatic</property>
+                <property name="shadow-type">in</property>
                <child>
                  <object class="GtkIconView" id="list">
                    <property name="visible">True</property>
@@ -5,23 +5,23 @@ bin_PROGRAMS = gtk3-widget-factory
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = gtk3-widget-factory.desktop

-gtk3_widget_factory_SOURCES = 		\
-	widget-factory.c		\
+gtk3_widget_factory_SOURCES = \
+	widget-factory.c	\
 	widget_factory_resources.c

-BUILT_SOURCES = 			\
+BUILT_SOURCES = \
 	widget_factory_resources.c

-gtk3_widget_factory_DEPENDENCIES = 	\
+gtk3_widget_factory_DEPENDENCIES = \
 	$(top_builddir)/gtk/libgtk-3.la

-gtk3_widget_factory_CPPFLAGS = 		\
+gtk3_widget_factory_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)		\
 	$(LIBCANBERRA_CFLAGS)

-gtk3_widget_factory_LDADD = 		\
+gtk3_widget_factory_LDADD = \
 	$(top_builddir)/gdk/libgdk-3.la \
 	$(top_builddir)/gtk/libgtk-3.la \
 	$(GTK_DEP_LIBS)			\
@@ -40,14 +40,14 @@ appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps

-dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png data/16x16/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png data/22x22/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png data/24x24/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png
+dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png
+dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png
+dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png
+dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png
+dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png

-update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force

 install-data-hook: install-update-icon-cache
 uninstall-hook: uninstall-update-icon-cache
@@ -60,11 +60,9 @@ uninstall-update-icon-cache:
 	$(AM_V_at)$(POST_UNINSTALL)
 	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"

-EXTRA_DIST += 				\
-	widget-factory.ui 		\
-	menus.ui 			\
-	widget-factory.gresource.xml	\
-	data/source.svg			\
-	data/symbolic-source.svg
+EXTRA_DIST += \
+	widget-factory.ui \
+	menus.ui \
+	widget-factory.gresource.xml

 -include $(top_srcdir)/git.mk
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gtk3-widget-factory-symbolic.svg' height='16.03125' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.5 r10040' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='15.183262' inkscape:cy='0.30876' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='16'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-203px' originy='-251.96875px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'>
-    <linearGradient id='linearGradient7212' osb:paint='solid'>
-      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
-    </linearGradient>
-  </defs>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-444.0002,35)'>
-    
-    <path inkscape:connector-curvature='0' d='m 446.21875,-34 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7030' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <path inkscape:connector-curvature='0' d='m 454.0002,-32 0,1 0,0.0312 1.53125,1.375 1.46875,-1.4062 0,-1 -0.75781,0 -0.73828,0.74609 L 454.77754,-32 z' id='path7800' sodipodi:nodetypes='cccccccccc' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <path inkscape:connector-curvature='0' d='m 446.21875,-26 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.65625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.65625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.65625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.65625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7811' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <rect height='2' id='rect7813' rx='0' ry='0' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='8' x='448.00021' y='-24'/>
-    <rect height='1' id='rect7815' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53082' y='-29'/>
-    <rect height='1' id='rect7817' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53085' y='-20.96875'/>
-  </g>
-</svg>
@@ -547,24 +547,6 @@ populate_model (GtkTreeStore *store)
  gtk_tree_store_set (store, &iter,
                      0, "Gisele of Aquitaine",
                      -1);
-  gtk_tree_store_append (store, &iter, NULL);
-  gtk_tree_store_set (store, &iter, 3, TRUE, -1);
-  gtk_tree_store_append (store, &iter, NULL);
-  gtk_tree_store_set (store, &iter,
-                      0, "Attila the Hun",
-                      1, "ca. 390",
-                      2, "453",
-                      -1);
-}
-
-static gboolean
-row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
-{
-  gboolean is_sep;
-
-  gtk_tree_model_get (model, iter, 3, &is_sep, -1);
-
-  return is_sep;
 }

 static void
@@ -1253,7 +1235,6 @@ activate (GApplication *app)

  widget = (GtkWidget *)gtk_builder_get_object (builder, "charletree");
  populate_model ((GtkTreeStore *)gtk_tree_view_get_model (GTK_TREE_VIEW (widget)));
-  gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget), row_separator_func, NULL, NULL);
  gtk_tree_view_expand_all (GTK_TREE_VIEW (widget));

  populate_colors ((GtkWidget *)gtk_builder_get_object (builder, "munsell"));
@@ -94,13 +94,6 @@
    <property name="step_increment">1</property>
    <property name="page_increment">10</property>
  </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">4</property>
-    <property name="lower">0</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-  </object>
  <object class="GtkAdjustment" id="pg_adjustment">
    <property name="upper">99</property>
    <property name="lower">1</property>
@@ -339,7 +332,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
      <column type="gchararray"/>
      <column type="gchararray"/>
      <column type="gchararray"/>
-      <column type="gboolean"/>
    </columns>
  </object>
  <object class="GtkApplicationWindow" id="window">
@@ -1267,29 +1259,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="position">1</property>
                          </packing>
                        </child>
-                        <child>
-                          <object class="GtkScale" id="scale5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="draw_value">False</property>
-                            <property name="has_origin">False</property>
-                            <property name="round_digits">0</property>
-                            <property name="adjustment">adjustment3</property>
-                            <property name="restrict_to_fill_level">False</property>
-                            <marks>
-                              <mark value="0" position="bottom"/>
-                              <mark value="1" position="bottom"/>
-                              <mark value="2" position="bottom"/>
-                              <mark value="3" position="bottom"/>
-                              <mark value="4" position="bottom"/>
-                            </marks>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
                        <child>
                          <object class="GtkBox" id="box25">
                            <property name="visible">True</property>
@@ -1387,7 +1356,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                          <packing>
                            <property name="expand">True</property>
                            <property name="fill">True</property>
-                            <property name="position">3</property>
+                            <property name="position">2</property>
                          </packing>
                        </child>
                      </object>
@@ -1290,6 +1290,9 @@ gdk_gl_context_get_window
 gdk_gl_context_make_current
 gdk_gl_context_clear_current
 gdk_gl_context_get_current
+GDK_GL_ERROR
+GDK_TYPE_GL_ERROR
+GDK_TYPE_GL_PROFILE
 GdkGLProfile
 GdkGLError

@@ -1302,7 +1305,4 @@ GDK_GL_CONTEXT_GET_CLASS
 GDK_IS_GL_CONTEXT_CLASS
 gdk_gl_context_get_type
 gdk_gl_error_quark
-GDK_GL_ERROR
-GDK_TYPE_GL_ERROR
-GDK_TYPE_GL_PROFILE
 </SECTION>
@@ -416,6 +416,11 @@ How to compile GTK+ itself
            <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
          </group>
          <sbr/>
+          <group>
+            <arg choice="plain">--enable-gtk2-dependency</arg>
+            <arg choice="plain">--disable-gtk2-dependency</arg>
+          </group>
+          <sbr/>
          <group>
            <arg choice="plain">--enable-installed-tests</arg>
            <arg choice="plain">--disable-installed-tests</arg>
@@ -632,6 +637,19 @@ How to compile GTK+ itself
        </para>
      </formalpara>

+      <formalpara>
+        <title><systemitem>--enable-gtk2-dependency</systemitem> or
+           <systemitem>--disable-gtk2-dependency</systemitem></title>
+
+        <para>
+          Whether to rely on an exiting gtk-update-icon-cache utility
+          instead of building our own. Distributions which are shipping
+          both GTK+ 2.x and GTK+ 3 may want to use this option to
+          avoid file conflicts between these packages.
+          The default is to build gtk-update-icon-cache.
+        </para>
+      </formalpara>
+
      <formalpara>
        <title><systemitem>--enable-installed-tests</systemitem> or
           <systemitem>--disable-installed-tests</systemitem></title>
@@ -302,10 +302,7 @@

    <para>The full, buildable sources for these examples can be found
    in the examples/ directory of the GTK+ source distribution, or
-    <ulink url="https://git.gnome.org/browse/gtk+/tree/examples">online</ulink> in the GTK+ git repository.
-    You can build each example separately by using make with the <filename>Makefile.example</filename>
-    file. For more information, see the <filename>README</filename> included in the
-    examples directory.</para>
+    <ulink url="https://git.gnome.org/browse/gtk+/tree/examples">online</ulink> in the GTK+ git repository.</para>

    <section>
      <title>A trivial application</title>
@@ -1196,7 +1196,6 @@ gtk_entry_get_input_purpose
 GtkInputHints
 gtk_entry_set_input_hints
 gtk_entry_get_input_hints
-gtk_entry_grab_focus_without_selecting

 <SUBSECTION Standard>
 GTK_ENTRY
@@ -3096,7 +3095,7 @@ gtk_scrollable_get_hscroll_policy
 gtk_scrollable_set_hscroll_policy
 gtk_scrollable_get_vscroll_policy
 gtk_scrollable_set_vscroll_policy
-gtk_scrollable_get_border
+

 <SUBSECTION Standard>
 GtkScrollableInterface
@@ -3561,7 +3560,6 @@ gtk_text_buffer_insert_range
 gtk_text_buffer_insert_range_interactive
 gtk_text_buffer_insert_with_tags
 gtk_text_buffer_insert_with_tags_by_name
-gtk_text_buffer_insert_markup
 gtk_text_buffer_delete
 gtk_text_buffer_delete_interactive
 gtk_text_buffer_backspace
@@ -5543,8 +5541,6 @@ gtk_widget_get_modifier_mask
 gtk_widget_insert_action_group
 gtk_widget_get_opacity
 gtk_widget_set_opacity
-gtk_widget_list_action_prefixes
-gtk_widget_get_action_group

 <SUBSECTION>
 gtk_widget_get_path
@@ -6059,7 +6055,6 @@ GTK_STYLE_CLASS_TOOLBAR
 GTK_STYLE_CLASS_TOOLTIP
 GTK_STYLE_CLASS_TOP
 GTK_STYLE_CLASS_TROUGH
-GTK_STYLE_CLASS_UNDERSHOOT
 GTK_STYLE_CLASS_VERTICAL
 GTK_STYLE_CLASS_VIEW
 GTK_STYLE_CLASS_WARNING
@@ -7959,8 +7954,6 @@ gtk_popover_set_position
 gtk_popover_get_position
 gtk_popover_set_modal
 gtk_popover_get_modal
-<SUBSECTION Private>
-gtk_popover_get_type
 </SECTION>

 <SECTION>
@@ -7969,8 +7962,6 @@ gtk_popover_get_type
 GtkPopoverMenu
 gtk_popover_menu_new
 gtk_popover_menu_open_submenu
-<SUBSECTION Private>
-gtk_popover_menu_get_type
 </SECTION>

 <SECTION>
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 include $(top_srcdir)/Makefile.decl

 AM_CPPFLAGS = \
@@ -34,8 +32,8 @@ doc_shooter_SOURCES=	\
 	shooter.c	\
 	widgets.c	\
 	widgets.h	\
-	../../tests/gtkgears.c \
-	../../tests/gtkgears.h
+	$(top_srcdir)/tests/gtkgears.c \
+	$(top_srcdir)/tests/gtkgears.h

 clean-local:
 	for file in *.png; do \
@@ -1,12 +0,0 @@
-= Examples =
-
-== Building the examples ==
-
-The examples in this directory are built alongside the rest of GTK+.
-
-The examples under the `application[1-10]` directories are also included in
-the GTK+ API reference documentation, and can be built independently, using
-the system libraries, by doing:
-
-    $ cd application1
-    $ make -f Makefile.example
@@ -81,7 +81,6 @@ activate (GApplication *app,
    return;

  win = gtk_application_window_new (GTK_APPLICATION (app));
-  gtk_window_set_default_size (GTK_WINDOW (win), 200, 300);

  doc_actions = g_simple_action_group_new ();
  g_action_map_add_action_entries (G_ACTION_MAP (doc_actions), doc_entries, G_N_ELEMENTS (doc_entries), win);
@@ -111,8 +110,7 @@ activate (GApplication *app,
  gtk_button_set_label (GTK_BUTTON (button), "Menu");
  gtk_widget_insert_action_group (button, "doc", G_ACTION_GROUP (doc_actions));
  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (button), G_MENU_MODEL (button_menu));
-  gtk_widget_set_halign (GTK_WIDGET (button), GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_START);
+
  gtk_container_add (GTK_CONTAINER (win), button);
  gtk_container_set_border_width (GTK_CONTAINER (win), 12);
  gtk_widget_show_all (win);
@@ -1,20 +1,21 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
 	exampleappwin.c exampleappwin.h

 -include $(top_srcdir)/git.mk
@@ -1,20 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-
-SRC = main.c exampleapp.c exampleappwin.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS)
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,33 +1,34 @@
-GTK_CFLAGS =			 		\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
+	exampleappprefs.c exampleappprefs.h \
 	resources.c

-BUILT_SOURCES = 				\
-	resources.c 				\
+BUILT_SOURCES = \
+	resources.c \
 	gschemas.compiled

 resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-gsettings_SCHEMAS = 				\
+gsettings_SCHEMAS = \
 	org.gtk.exampleapp.gschema.xml

@GSETTINGS_RULES@
@@ -35,15 +36,15 @@ gsettings_SCHEMAS = 				\
 gschemas.compiled: org.gtk.exampleapp.gschema.xml
 	$(GLIB_COMPILE_SCHEMAS) .

-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	gears-menu.ui 				\
-	exampleapp.gresource.xml 		\
+EXTRA_DIST = \
+	window.ui \
+	app-menu.ui \
+	prefs.ui \
+	gears-menu.ui \
+	exampleapp.gresource.xml \
 	org.gtk.exampleapp.gschema.xml

-CLEANFILES = 					\
+CLEANFILES = \
 	gschemas.compiled

 -include $(top_srcdir)/git.mk
@@ -1,34 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-GLIB_COMPILE_SCHEMAS = `$(PKGCONFIG) --variable=glib_compile_schemas gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c exampleappprefs.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-org.gtk.exampleapp.gschema.valid: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) --strict --dry-run --schema-file=$< && mkdir -p $(@D) && touch $@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.valid
-	$(GLIB_COMPILE_SCHEMAS) .
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=. --generate-dependencies exampleapp.gresource.xml)
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS) gschemas.compiled
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f org.gtk.exampleapp.gschema.valid
-	rm -f gschemas.compiled
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,21 +1,22 @@
-GTK_CFLAGS =	 				\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
 	resources.c

 BUILT_SOURCES = resources.c
@@ -24,8 +25,8 @@ resources.c: exampleapp.gresource.xml window.ui
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-EXTRA_DIST = 					\
-	window.ui 				\
+EXTRA_DIST = \
+	window.ui \
 	exampleapp.gresource.xml

 -include $(top_srcdir)/git.mk
@@ -1,25 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-resources.c: exampleapp.gresource.xml window.ui
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS)
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,21 +1,22 @@
-GTK_CFLAGS =	 				\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
 	resources.c

 BUILT_SOURCES = resources.c
@@ -24,8 +25,8 @@ resources.c: exampleapp.gresource.xml window.ui
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-EXTRA_DIST = 					\
-	window.ui 				\
+EXTRA_DIST = \
+	window.ui \
 	exampleapp.gresource.xml

 -include $(top_srcdir)/git.mk
@@ -1,25 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-resources.c: exampleapp.gresource.xml window.ui
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS)
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,21 +1,22 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
 	resources.c

 BUILT_SOURCES = resources.c
@@ -24,9 +25,9 @@ resources.c: exampleapp.gresource.xml window.ui app-menu.ui
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
+EXTRA_DIST = \
+	window.ui \
+	app-menu.ui \
 	exampleapp.gresource.xml

 -include $(top_srcdir)/git.mk
@@ -1,25 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-resources.c: exampleapp.gresource.xml window.ui app-menu.ui
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS)
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,32 +1,33 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
 	resources.c

-BUILT_SOURCES = 				\
-	resources.c 				\
+BUILT_SOURCES = \
+	resources.c \
 	gschemas.compiled

 resources.c: exampleapp.gresource.xml window.ui app-menu.ui
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-gsettings_SCHEMAS = 				\
+gsettings_SCHEMAS = \
 	org.gtk.exampleapp.gschema.xml

@GSETTINGS_RULES@
@@ -34,13 +35,13 @@ gsettings_SCHEMAS = 				\
 gschemas.compiled: org.gtk.exampleapp.gschema.xml
 	$(GLIB_COMPILE_SCHEMAS) .

-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	exampleapp.gresource.xml 		\
+EXTRA_DIST = \
+	window.ui \
+	app-menu.ui \
+	exampleapp.gresource.xml \
 	org.gtk.exampleapp.gschema.xml

-CLEANFILES = 					\
+CLEANFILES = \
 	gschemas.compiled

 -include $(top_srcdir)/git.mk
@@ -1,34 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-GLIB_COMPILE_SCHEMAS = `$(PKGCONFIG) --variable=glib_compile_schemas gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-org.gtk.exampleapp.gschema.valid: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) --strict --dry-run --schema-file=$< && mkdir -p $(@D) && touch $@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.valid
-	$(GLIB_COMPILE_SCHEMAS) .
-
-resources.c: exampleapp.gresource.xml window.ui app-menu.ui
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS) gschemas.compiled
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f org.gtk.exampleapp.gschema.valid
-	rm -f gschemas.compiled
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,33 +1,34 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
+	exampleappprefs.c exampleappprefs.h \
 	resources.c

-BUILT_SOURCES = 				\
-	resources.c 				\
+BUILT_SOURCES = \
+	resources.c \
 	gschemas.compiled

 resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-gsettings_SCHEMAS = 				\
+gsettings_SCHEMAS = \
 	org.gtk.exampleapp.gschema.xml

@GSETTINGS_RULES@
@@ -35,14 +36,14 @@ gsettings_SCHEMAS = 				\
 gschemas.compiled: org.gtk.exampleapp.gschema.xml
 	$(GLIB_COMPILE_SCHEMAS) .

-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	exampleapp.gresource.xml 		\
+EXTRA_DIST = \
+	window.ui \
+	app-menu.ui \
+	prefs.ui \
+	exampleapp.gresource.xml \
 	org.gtk.exampleapp.gschema.xml

-CLEANFILES = 					\
+CLEANFILES = \
 	gschemas.compiled

 -include $(top_srcdir)/git.mk
@@ -1,34 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-GLIB_COMPILE_SCHEMAS = `$(PKGCONFIG) --variable=glib_compile_schemas gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c exampleappprefs.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-org.gtk.exampleapp.gschema.valid: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) --strict --dry-run --schema-file=$< && mkdir -p $(@D) && touch $@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.valid
-	$(GLIB_COMPILE_SCHEMAS) .
-
-resources.c: exampleapp.gresource.xml window.ui app-menu.ui
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS) gschemas.compiled
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f org.gtk.exampleapp.gschema.valid
-	rm -f gschemas.compiled
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,33 +1,34 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
+	exampleappprefs.c exampleappprefs.h \
 	resources.c

-BUILT_SOURCES = 				\
-	resources.c 				\
+BUILT_SOURCES = \
+	resources.c \
 	gschemas.compiled

 resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-gsettings_SCHEMAS = 				\
+gsettings_SCHEMAS = \
 	org.gtk.exampleapp.gschema.xml

@GSETTINGS_RULES@
@@ -35,14 +36,14 @@ gsettings_SCHEMAS = 				\
 gschemas.compiled: org.gtk.exampleapp.gschema.xml
 	$(GLIB_COMPILE_SCHEMAS) .

-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	exampleapp.gresource.xml 		\
+EXTRA_DIST = \
+	window.ui \
+	app-menu.ui \
+	prefs.ui \
+	exampleapp.gresource.xml \
 	org.gtk.exampleapp.gschema.xml

-CLEANFILES = 					\
+CLEANFILES = \
 	gschemas.compiled

 -include $(top_srcdir)/git.mk
@@ -1,34 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-GLIB_COMPILE_SCHEMAS = `$(PKGCONFIG) --variable=glib_compile_schemas gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c exampleappprefs.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-org.gtk.exampleapp.gschema.valid: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) --strict --dry-run --schema-file=$< && mkdir -p $(@D) && touch $@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.valid
-	$(GLIB_COMPILE_SCHEMAS) .
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=. --generate-dependencies exampleapp.gresource.xml)
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS) gschemas.compiled
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f org.gtk.exampleapp.gschema.valid
-	rm -f gschemas.compiled
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,33 +1,34 @@
-GTK_CFLAGS =			 		\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
+	exampleappprefs.c exampleappprefs.h \
 	resources.c

-BUILT_SOURCES = 				\
-	resources.c 				\
+BUILT_SOURCES = \
+	resources.c \
 	gschemas.compiled

 resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-gsettings_SCHEMAS = 				\
+gsettings_SCHEMAS = \
 	org.gtk.exampleapp.gschema.xml

@GSETTINGS_RULES@
@@ -35,15 +36,15 @@ gsettings_SCHEMAS = 				\
 gschemas.compiled: org.gtk.exampleapp.gschema.xml
 	$(GLIB_COMPILE_SCHEMAS) .

-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	gears-menu.ui 				\
-	exampleapp.gresource.xml 		\
+EXTRA_DIST = \
+	window.ui \
+	app-menu.ui \
+	prefs.ui \
+	gears-menu.ui \
+	exampleapp.gresource.xml \
 	org.gtk.exampleapp.gschema.xml

-CLEANFILES = 					\
+CLEANFILES = \
 	gschemas.compiled

 -include $(top_srcdir)/git.mk
@@ -1,34 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-GLIB_COMPILE_SCHEMAS = `$(PKGCONFIG) --variable=glib_compile_schemas gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c exampleappprefs.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-org.gtk.exampleapp.gschema.valid: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) --strict --dry-run --schema-file=$< && mkdir -p $(@D) && touch $@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.valid
-	$(GLIB_COMPILE_SCHEMAS) .
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=. --generate-dependencies exampleapp.gresource.xml)
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS) gschemas.compiled
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f org.gtk.exampleapp.gschema.valid
-	rm -f gschemas.compiled
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -1,33 +1,34 @@
-GTK_CFLAGS =			 		\
-	-I$(top_srcdir)				\
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)

-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
        $(GTK_DEP_LIBS)


 noinst_PROGRAMS = exampleapp

-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
+exampleapp_SOURCES = \
+	main.c \
+	exampleapp.c exampleapp.h \
+	exampleappwin.c exampleappwin.h \
+	exampleappprefs.c exampleappprefs.h \
 	resources.c

-BUILT_SOURCES = 				\
-	resources.c 				\
+BUILT_SOURCES = \
+	resources.c \
 	gschemas.compiled

 resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source

-gsettings_SCHEMAS = 				\
+gsettings_SCHEMAS = \
 	org.gtk.exampleapp.gschema.xml

@GSETTINGS_RULES@
@@ -35,15 +36,15 @@ gsettings_SCHEMAS = 				\
 gschemas.compiled: org.gtk.exampleapp.gschema.xml
 	$(GLIB_COMPILE_SCHEMAS) .

-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	gears-menu.ui 				\
-	exampleapp.gresource.xml 		\
+EXTRA_DIST = \
+	window.ui \
+	app-menu.ui \
+	prefs.ui \
+	gears-menu.ui \
+	exampleapp.gresource.xml \
 	org.gtk.exampleapp.gschema.xml

-CLEANFILES = 					\
+CLEANFILES = \
 	gschemas.compiled

 -include $(top_srcdir)/git.mk
@@ -1,34 +0,0 @@
-CC = gcc
-PKGCONFIG = $(shell which pkg-config)
-CFLAGS = `$(PKGCONFIG) --cflags gtk+-3.0`
-LIBS = `$(PKGCONFIG) --libs gtk+-3.0`
-GLIB_COMPILE_RESOURCES = `$(PKGCONFIG) --variable=glib_compile_resources gio-2.0`
-GLIB_COMPILE_SCHEMAS = `$(PKGCONFIG) --variable=glib_compile_schemas gio-2.0`
-
-SRC = resources.c exampleapp.c exampleappwin.c exampleappprefs.c main.c
-
-OBJS = $(SRC:.c=.o)
-
-all: exampleapp
-
-org.gtk.exampleapp.gschema.valid: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) --strict --dry-run --schema-file=$< && mkdir -p $(@D) && touch $@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.valid
-	$(GLIB_COMPILE_SCHEMAS) .
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=. --generate-dependencies exampleapp.gresource.xml)
-	$(GLIB_COMPILE_RESOURCES) exampleapp.gresource.xml --target=$@ --sourcedir=. --generate-source
-
-%.o: %.c
-	$(CC) -c -o $(@F) $(CFLAGS) $<
-
-exampleapp: $(OBJS) gschemas.compiled
-	$(CC) -o $(@F) $(LIBS) $(OBJS)
-
-clean:
-	rm -f org.gtk.exampleapp.gschema.valid
-	rm -f gschemas.compiled
-	rm -f resources.c
-	rm -f $(OBJS)
-	rm -f exampleapp
@@ -1,7 +1,6 @@
-#include <gtk/gtk.h>
-
 #include "exampleapp.h"
 #include "exampleappwin.h"
+#include <gtk/gtk.h>

 struct _ExampleAppWindow
 {
@@ -1,6 +1,5 @@
 #include <gtk/gtk.h>
-
-#include "exampleapp.h"
+#include <exampleapp.h>

 int
 main (int argc, char *argv[])
@@ -257,7 +257,6 @@ new_window (GApplication *app,
  label = gtk_label_new ("Fullscreen:");
  gtk_container_add (GTK_CONTAINER (box), label);
  sw = gtk_switch_new ();
-  gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
  gtk_actionable_set_action_name (GTK_ACTIONABLE (sw), "win.fullscreen");
  gtk_container_add (GTK_CONTAINER (box), sw);
  gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (button));
@@ -519,11 +518,12 @@ bloat_pad_startup (GApplication *application)
  GtkApplication *app = GTK_APPLICATION (application);
  GMenu *menu;
  GMenuItem *item;
-  GBytes *bytes;
  GIcon *icon;
  GIcon *icon2;
  GEmblem *emblem;
  GFile *file;
+  gchar *data;
+  gsize size;
  gint i;
  struct {
    const gchar *action_and_target;
@@ -548,7 +548,7 @@ bloat_pad_startup (GApplication *application)

  menu = gtk_application_get_menu_by_id (GTK_APPLICATION (application), "icon-menu");

-  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/gtk-select-color.png");
+  file = g_file_new_for_path (SRCDIR "/../../gtk/resources/icons/16x16/actions/gtk-select-color.png");
  icon = g_file_icon_new (file);
  item = g_menu_item_new ("File Icon", NULL);
  g_menu_item_set_icon (item, icon);
@@ -564,28 +564,31 @@ bloat_pad_startup (GApplication *application)
  g_object_unref (item);
  g_object_unref (icon);

-  bytes = g_resources_lookup_data ("/org/gtk/libgtk/icons/16x16/actions/gtk-select-font.png", 0, NULL);
-  icon = g_bytes_icon_new (bytes);
-  item = g_menu_item_new ("Bytes Icon", NULL);
-  g_menu_item_set_icon (item, icon);
-  g_menu_append_item (menu, item);
-  g_object_unref (item);
-  g_object_unref (icon);
-  g_bytes_unref (bytes);
+  if (g_file_get_contents (SRCDIR "/../../gtk/resources/icons/16x16/actions/gtk-select-font.png", &data, &size, NULL))
+    {
+      GBytes *bytes = g_bytes_new_take (data, size);
+      icon = g_bytes_icon_new (bytes);
+      item = g_menu_item_new ("Bytes Icon", NULL);
+      g_menu_item_set_icon (item, icon);
+      g_menu_append_item (menu, item);
+      g_object_unref (item);
+      g_object_unref (icon);
+      g_bytes_unref (bytes);
+    }

-  icon = G_ICON (gdk_pixbuf_new_from_resource ("/org/gtk/libgtk/icons/16x16/actions/gtk-preferences.png", NULL));
+  icon = G_ICON (gdk_pixbuf_new_from_file (SRCDIR "/../../gtk/resources/icons/16x16/actions/gtk-preferences.png", NULL));
  item = g_menu_item_new ("Pixbuf", NULL);
  g_menu_item_set_icon (item, icon);
  g_menu_append_item (menu, item);
  g_object_unref (item);
  g_object_unref (icon);

-  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/gtk-page-setup.png");
+  file = g_file_new_for_path (SRCDIR "/../../gtk/resources/icons/16x16/actions/gtk-page-setup.png");
  icon = g_file_icon_new (file);
  emblem = g_emblem_new (icon);
  g_object_unref (icon);
  g_object_unref (file);
-  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/gtk-orientation-reverse-portrait.png");
+  file = g_file_new_for_path (SRCDIR "/../../gtk/resources/icons/16x16/actions/gtk-orientation-reverse-portrait.png");
  icon2 = g_file_icon_new (file);
  icon = g_emblemed_icon_new (icon2, emblem);
  item = g_menu_item_new ("Emblemed Icon", NULL);
@@ -429,8 +429,8 @@ gdkconfig.h: stamp-gc-h
 	$(AM_V_GEN) if test -f gdkconfig.h; then :; \
 	else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 stamp-gc-h: $(top_builddir)/config.status
-	$(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h \
-	&& echo timestamp > gdk/$(@F)
+	$(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
+	echo timestamp > stamp-gc-h

 dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../build/win32/vs10/gdk.vcxproj.filters

@@ -31,12 +31,12 @@ libgdkbroadwayinclude_HEADERS = 	\
 	gdkbroadwayvisual.h

 clienthtml.h: client.html
-	$(AM_V_GEN) $(PERL) $(srcdir)/toarray.pl client_html $(srcdir)/client.html > $@
+	$(PERL) $(srcdir)/toarray.pl client_html $(srcdir)/client.html > $@

 EXTRA_DIST += client.html

 broadwayjs.h: broadway.js rawinflate.min.js
-	$(AM_V_GEN) $(PERL) $(srcdir)/toarray.pl broadway_js $(srcdir)/broadway.js $(srcdir)/rawinflate.min.js  > $@
+	$(PERL) $(srcdir)/toarray.pl broadway_js $(srcdir)/broadway.js $(srcdir)/rawinflate.min.js  > $@

 EXTRA_DIST += broadway.js rawinflate.min.js

@@ -42,8 +42,6 @@ struct _BroadwayServer {

  char *address;
  int port;
-  char *ssl_cert;
-  char *ssl_key;
  GSocketService *service;
  BroadwayOutput *output;
  guint32 id_counter;
@@ -87,8 +85,7 @@ struct _BroadwayServerClass

 typedef struct HttpRequest {
  BroadwayServer *server;
-  GSocketConnection *socket_connection;
-  GIOStream *connection;
+  GSocketConnection *connection;
  GDataInputStream *data;
  GString *request;
 }  HttpRequest;
@@ -96,7 +93,7 @@ typedef struct HttpRequest {
 struct BroadwayInput {
  BroadwayServer *server;
  BroadwayOutput *output;
-  GIOStream *connection;
+  GSocketConnection *connection;
  GByteArray *buffer;
  GSource *source;
  gboolean seen_time;
@@ -158,8 +155,6 @@ broadway_server_finalize (GObject *object)
  BroadwayServer *server = BROADWAY_SERVER (object);

  g_free (server->address);
-  g_free (server->ssl_cert);
-  g_free (server->ssl_key);

  G_OBJECT_CLASS (broadway_server_parent_class)->finalize (object);
 }
@@ -177,7 +172,6 @@ static void start (BroadwayInput *input);
 static void
 http_request_free (HttpRequest *request)
 {
-  g_object_unref (request->socket_connection);
  g_object_unref (request->connection);
  g_object_unref (request->data);
  g_string_free (request->request, TRUE);
@@ -667,13 +661,14 @@ broadway_server_read_all_input_nonblocking (BroadwayInput *input)
  GInputStream *in;
  gssize res;
  guint8 buffer[1024];
-  GError *error = NULL;
+  GError *error;

  if (input == NULL)
    return;

-  in = g_io_stream_get_input_stream (input->connection);
+  in = g_io_stream_get_input_stream (G_IO_STREAM (input->connection));

+  error = NULL;
  res = g_pollable_input_stream_read_nonblocking (G_POLLABLE_INPUT_STREAM (in),
 						  buffer, sizeof (buffer), NULL, &error);

@@ -801,8 +796,7 @@ broadway_server_block_for_input (BroadwayServer *server, char op,

    /* Not found, read more, blocking */

-    in = g_io_stream_get_input_stream (input->connection);
-
+    in = g_io_stream_get_input_stream (G_IO_STREAM (input->connection));
    res = g_input_stream_read (in, buffer, sizeof (buffer), NULL, NULL);
    if (res <= 0)
      return NULL;
@@ -915,11 +909,9 @@ send_error (HttpRequest *request,
 			 error_code, reason,
 			 error_code, reason,
 			 reason);
-
  /* TODO: This should really be async */
-  g_output_stream_write_all (g_io_stream_get_output_stream (request->connection),
-                             res, strlen (res), NULL, NULL, NULL);
-
+  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
+			     res, strlen (res), NULL, NULL, NULL);
  g_free (res);
  http_request_free (request);
 }
@@ -1012,8 +1004,8 @@ start_input (HttpRequest *request)
      g_print ("v7 proto response:\n%s", res);
 #endif

-      g_output_stream_write_all (g_io_stream_get_output_stream (request->connection),
-                                 res, strlen (res), NULL, NULL, NULL);
+      g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
+				 res, strlen (res), NULL, NULL, NULL);
      g_free (res);
    }
  else
@@ -1023,7 +1015,7 @@ start_input (HttpRequest *request)
      return;
    }

-  socket = g_socket_connection_get_socket (request->socket_connection);
+  socket = g_socket_connection_get_socket (request->connection);
  setsockopt (g_socket_get_fd (socket), IPPROTO_TCP,
 	      TCP_NODELAY, (char *) &flag, sizeof(int));

@@ -1036,13 +1028,12 @@ start_input (HttpRequest *request)
  g_byte_array_append (input->buffer, data_buffer, data_buffer_size);

  input->output =
-    broadway_output_new (g_io_stream_get_output_stream (request->connection), 0);
+    broadway_output_new (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)), 0);

  /* This will free and close the data input stream, but we got all the buffered content already */
  http_request_free (request);

-  in = g_io_stream_get_input_stream (input->connection);
-
+  in = g_io_stream_get_input_stream (G_IO_STREAM (input->connection));
  input->source = g_pollable_input_stream_create_source (G_POLLABLE_INPUT_STREAM (in), NULL);
  g_source_set_callback (input->source, (GSourceFunc)input_data_cb, input, NULL);
  g_source_attach (input->source, NULL);
@@ -1110,12 +1101,11 @@ send_data (HttpRequest *request,
 			 "Content-Length: %"G_GSIZE_FORMAT"\r\n"
 			 "\r\n",
 			 mimetype, len);
-
  /* TODO: This should really be async */
-  g_output_stream_write_all (g_io_stream_get_output_stream (request->connection),
+  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
 			     res, strlen (res), NULL, NULL, NULL);
  g_free (res);
-  g_output_stream_write_all (g_io_stream_get_output_stream (request->connection),
+  g_output_stream_write_all (g_io_stream_get_output_stream (G_IO_STREAM (request->connection)),
 			     data, len, NULL, NULL, NULL);
  http_request_free (request);
 }
@@ -1212,49 +1202,11 @@ handle_incoming_connection (GSocketService    *service,
  GInputStream *in;

  request = g_new0 (HttpRequest, 1);
-  request->socket_connection = g_object_ref (connection);
+  request->connection = g_object_ref (connection);
  request->server = BROADWAY_SERVER (source_object);
  request->request = g_string_new ("");

-  if (request->server->ssl_cert && request->server->ssl_key)
-    {
-      GError *error = NULL;
-      GTlsCertificate *certificate;
-
-      certificate = g_tls_certificate_new_from_files (request->server->ssl_cert,
-                                                      request->server->ssl_key,
-                                                      &error);
-      if (!certificate)
-        {
-          g_warning ("Cannot create TLS certificate: %s", error->message);
-          g_error_free (error);
-          return FALSE;
-        }
-
-      request->connection = g_tls_server_connection_new (G_IO_STREAM (connection),
-                                                         certificate,
-                                                         &error);
-      if (!request->connection)
-        {
-          g_warning ("Cannot create TLS connection: %s", error->message);
-          g_error_free (error);
-          return FALSE;
-        }
-
-      if (!g_tls_connection_handshake (G_TLS_CONNECTION (request->connection),
-                                       NULL, &error))
-        {
-          g_warning ("Cannot create TLS connection: %s", error->message);
-          g_error_free (error);
-          return FALSE;
-        }
-    }
-  else
-    {
-      request->connection = g_object_ref (connection);
-    }
-
-  in = g_io_stream_get_input_stream (request->connection);
+  in = g_io_stream_get_input_stream (G_IO_STREAM (connection));

  request->data = g_data_input_stream_new (in);
  g_filter_input_stream_set_close_base_stream (G_FILTER_INPUT_STREAM (request->data), FALSE);
@@ -1267,11 +1219,7 @@ handle_incoming_connection (GSocketService    *service,
 }

 BroadwayServer *
-broadway_server_new (char        *address,
-                     int          port,
-                     const char  *ssl_cert,
-                     const char  *ssl_key,
-                     GError     **error)
+broadway_server_new (char *address, int port, GError **error)
 {
  BroadwayServer *server;
  GInetAddress *inet_address;
@@ -1280,8 +1228,6 @@ broadway_server_new (char        *address,
  server = g_object_new (BROADWAY_TYPE_SERVER, NULL);
  server->port = port;
  server->address = g_strdup (address);
-  server->ssl_cert = g_strdup (ssl_cert);
-  server->ssl_key = g_strdup (ssl_key);

  if (address == NULL)
    {
@@ -21,8 +21,6 @@ typedef struct _BroadwayServerClass BroadwayServerClass;

 BroadwayServer     *broadway_server_new                      (char             *address,
 							      int               port,
-                                                              const char       *ssl_cert,
-                                                              const char       *ssl_key,
 							      GError          **error);
 BroadwayServer     *broadway_server_on_unix_socket_new       (char             *address,
 							      GError          **error);
@@ -419,8 +419,6 @@ main (int argc, char *argv[])
  char *http_address = NULL;
  char *unixsocket_address = NULL;
  int http_port = 0;
-  char *ssl_cert = NULL;
-  char *ssl_key = NULL;
  char *display;
  int port = 0;
  const GOptionEntry entries[] = {
@@ -429,8 +427,6 @@ main (int argc, char *argv[])
 #ifdef G_OS_UNIX
    { "unixsocket", 'u', 0, G_OPTION_ARG_STRING, &unixsocket_address, "Unix domain socket address", "ADDRESS" },
 #endif
-    { "cert", 'c', 0, G_OPTION_ARG_STRING, &ssl_cert, "SSL certificate path", "PATH" },
-    { "key", 'k', 0, G_OPTION_ARG_STRING, &ssl_key, "SSL key path", "PATH" },
    { NULL }
  };

@@ -497,11 +493,7 @@ main (int argc, char *argv[])
  if (unixsocket_address != NULL)
    server = broadway_server_on_unix_socket_new (unixsocket_address, &error);
  else
-    server = broadway_server_new (http_address,
-                                  http_port,
-                                  ssl_cert,
-                                  ssl_key,
-                                  &error);
+    server = broadway_server_new (http_address, http_port, &error);

  if (server == NULL)
    {
@@ -15,8 +15,8 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __GDK_BROADWAY_EVENT_SOURCE_H__
-#define __GDK_BROADWAY_EVENT_SOURCE_H__
+#ifndef __GDK_EVENT_SOURCE_H__
+#define __GDK_EVENT_SOURCE_H__

 #include "gdkprivate-broadway.h"

@@ -29,4 +29,4 @@ GSource * _gdk_broadway_event_source_new            (GdkDisplay *display);

 G_END_DECLS

-#endif /* __GDK_BROADWAY_EVENT_SOURCE_H__ */
+#endif /* __GDK_EVENT_SOURCE_H__ */
@@ -1733,7 +1733,7 @@ _gdk_device_window_at_position (GdkDevice        *device,
 * gdk_device_get_last_event_window:
 * @device: a #GdkDevice, with a source other than %GDK_SOURCE_KEYBOARD
 *
- * Gets information about which window the given pointer device is in, based on events
+ * Gets information about which window the given pointer device is in, based on
 * that have been received so far from the display server. If another application
 * has a pointer grab, or this application has a grab with owner_events = %FALSE,
 * %NULL may be returned even if the pointer is physically over one of this
@@ -1,11 +1,11 @@
 /*** BEGIN file-header ***/
-#ifndef __GDK_ENUM_TYPES_H__
-#define __GDK_ENUM_TYPES_H__
-
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#ifndef __GDK_ENUM_TYPES_H__
+#define __GDK_ENUM_TYPES_H__
+
 #include <glib-object.h>
 #include <gdk/gdkversionmacros.h>

@@ -22,13 +22,13 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#ifndef __GDK_FRAME_CLOCK_H__
-#define __GDK_FRAME_CLOCK_H__
-
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#ifndef __GDK_FRAME_CLOCK_H__
+#define __GDK_FRAME_CLOCK_H__
+
 #include <gdk/gdkframetimings.h>

 G_BEGIN_DECLS
@@ -15,13 +15,13 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __GDK_FRAME_TIMINGS_H__
-#define __GDK_FRAME_TIMINGS_H__
-
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

+#ifndef __GDK_FRAME_TIMINGS_H__
+#define __GDK_FRAME_TIMINGS_H__
+
 #include <glib-object.h>
 #include <gdk/gdkversionmacros.h>

@@ -477,7 +477,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
      int unscaled_window_height;
      GLint texture_width;
      GLint texture_height;
-      int i, n_rects, n_quads;
+      int i, n_rects;
      GdkTexturedQuad *quads;
      cairo_rectangle_int_t clip_rect;

@@ -530,7 +530,6 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
      glScissor (clip_rect.x, FLIP_Y (clip_rect.y + clip_rect.height),
                 clip_rect.width, clip_rect.height);

-      n_quads = 0;
      n_rects = cairo_region_num_rectangles (clip_region);
      quads = g_new (GdkTexturedQuad, n_rects);
      for (i = 0; i < n_rects; i++)
@@ -560,7 +559,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
                (clipped_src_x + dest.width) / (float)texture_width, clipped_src_y / (float)texture_height,
              };

-              quads[n_quads++] = quad;
+              quads[i] = quad;

              if (impl_window->current_paint.flushed_region)
                {
@@ -579,9 +578,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
            }
        }

-      if (n_quads > 0)
-        gdk_gl_texture_quads (paint_context, GL_TEXTURE_2D, n_quads, quads);
-
+      gdk_gl_texture_quads (paint_context, GL_TEXTURE_2D, n_rects, quads);
      g_free (quads);

      if (alpha_size != 0)
@@ -62,7 +62,7 @@ typedef struct GdkMirDisplayClass
  GdkDisplayClass parent_class;
 } GdkMirDisplayClass;

-static void get_pixel_formats (MirConnection *, MirPixelFormat *sw, MirPixelFormat *hw);
+static void initialize_pixel_formats (GdkMirDisplay *display);

 /**
 * SECTION:mir_interaction
@@ -104,7 +104,6 @@ GdkDisplay *
 _gdk_mir_display_open (const gchar *display_name)
 {
  MirConnection *connection;
-  MirPixelFormat sw_pixel_format, hw_pixel_format;
  GdkMirDisplay *display;

  g_printerr ("gdk_mir_display_open\n");
@@ -112,7 +111,6 @@ _gdk_mir_display_open (const gchar *display_name)
  connection = mir_connect_sync (NULL, "GDK-Mir");
  if (!connection)
     return NULL;
-
  if (!mir_connection_is_valid (connection))
    {
      g_printerr ("Failed to connect to Mir: %s\n", mir_connection_get_error_message (connection));
@@ -120,23 +118,12 @@ _gdk_mir_display_open (const gchar *display_name)
      return NULL;
    }

-  get_pixel_formats (connection, &sw_pixel_format, &hw_pixel_format);
-
-  if (sw_pixel_format == mir_pixel_format_invalid ||
-      hw_pixel_format == mir_pixel_format_invalid)
-    {
-      g_printerr ("Mir display does not support required pixel formats\n");
-      mir_connection_release (connection);
-      return NULL;
-    }
-
  display = g_object_new (GDK_TYPE_MIR_DISPLAY, NULL);

  display->connection = connection;
  GDK_DISPLAY (display)->device_manager = _gdk_mir_device_manager_new (GDK_DISPLAY (display));
  display->screen = _gdk_mir_screen_new (GDK_DISPLAY (display));
-  display->sw_pixel_format = sw_pixel_format;
-  display->hw_pixel_format = hw_pixel_format;
+  initialize_pixel_formats (display);

  g_signal_emit_by_name (display, "opened");

@@ -173,9 +160,8 @@ gdk_mir_display_dispose (GObject *object)
 {
  GdkMirDisplay *display = GDK_MIR_DISPLAY (object);

-  g_clear_object (&display->screen);
-  g_clear_object (&display->keymap);
-  g_clear_pointer (&display->event_source, g_source_unref);
+  g_object_unref (display->screen);
+  display->screen = NULL;

  G_OBJECT_CLASS (gdk_mir_display_parent_class)->dispose (object);
 }
@@ -514,50 +500,41 @@ gdk_mir_display_utf8_to_string_target (GdkDisplay  *display,
 }

 static void
-get_pixel_formats (MirConnection *connection,
-                   MirPixelFormat *sw_pixel_format,
-                   MirPixelFormat *hw_pixel_format)
+initialize_pixel_formats (GdkMirDisplay *display)
 {
  MirPixelFormat formats[mir_pixel_formats];
  unsigned int n_formats, i;

-  mir_connection_get_available_surface_formats (connection, formats,
+  mir_connection_get_available_surface_formats (display->connection, formats,
                                                mir_pixel_formats, &n_formats);

-  if (sw_pixel_format)
-    {
-      *sw_pixel_format = mir_pixel_format_invalid;
+  display->sw_pixel_format = mir_pixel_format_invalid;
+  display->hw_pixel_format = mir_pixel_format_invalid;

-      for (i = 0; i < n_formats; i++)
-        {
-          if (formats[i] == mir_pixel_format_argb_8888)
-            {
-              *sw_pixel_format = formats[i];
-              break;
-            }
-        }
+  for (i = 0; i < n_formats; i++)
+    {
+      switch (formats[i])
+      {
+        case mir_pixel_format_abgr_8888:
+        case mir_pixel_format_xbgr_8888:
+        case mir_pixel_format_argb_8888:
+        case mir_pixel_format_xrgb_8888:
+          display->hw_pixel_format = formats[i];
+          break;
+        default:
+          continue;
+      }
+
+      if (display->hw_pixel_format != mir_pixel_format_invalid)
+        break;
    }

-  if (hw_pixel_format)
+  for (i = 0; i < n_formats; i++)
    {
-      *hw_pixel_format = mir_pixel_format_invalid;
-
-      for (i = 0; i < n_formats; i++)
+      if (formats[i] == mir_pixel_format_argb_8888)
        {
-          switch (formats[i])
-          {
-            case mir_pixel_format_abgr_8888:
-            case mir_pixel_format_xbgr_8888:
-            case mir_pixel_format_argb_8888:
-            case mir_pixel_format_xrgb_8888:
-              *hw_pixel_format = formats[i];
-              break;
-            default:
-              continue;
-          }
-
-          if (*hw_pixel_format != mir_pixel_format_invalid)
-            break;
+          display->sw_pixel_format = formats[i];
+          break;
        }
    }
 }
@@ -828,18 +828,13 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
 	    {
 	      window->x = event->configure.x;
 	      window->y = event->configure.y;
+              window_impl->unscaled_width = xevent->xconfigure.width;
+              window_impl->unscaled_height = xevent->xconfigure.height;
+              window->width = event->configure.width;
+              window->height = event->configure.height;

-              if (window_impl->unscaled_width != xevent->xconfigure.width ||
-                  window_impl->unscaled_height != xevent->xconfigure.height)
-                {
-                  window_impl->unscaled_width = xevent->xconfigure.width;
-                  window_impl->unscaled_height = xevent->xconfigure.height;
-                  window->width = event->configure.width;
-                  window->height = event->configure.height;
-
-                  _gdk_window_update_size (window);
-                  _gdk_x11_window_update_size (window_impl);
-                }
+	      _gdk_window_update_size (window);
+	      _gdk_x11_window_update_size (window_impl);

 	      if (window->resize_count >= 1)
 		{
@@ -939,7 +934,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
      event->selection.selection = gdk_x11_xatom_to_atom_for_display (display, xevent->xselection.selection);
      event->selection.target = gdk_x11_xatom_to_atom_for_display (display, xevent->xselection.target);
      if (xevent->xselection.property == None)
-        event->selection.property = event->selection.target;
+        event->selection.property = GDK_NONE;
      else
        event->selection.property = gdk_x11_xatom_to_atom_for_display (display, xevent->xselection.property);
      event->selection.time = xevent->xselection.time;
@@ -15,8 +15,8 @@
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __GDK_X11_EVENT_SOURCE_H__
-#define __GDK_X11_EVENT_SOURCE_H__
+#ifndef __GDK_EVENT_SOURCE_H__
+#define __GDK_EVENT_SOURCE_H__

 #include "gdkeventtranslator.h"

@@ -40,4 +40,4 @@ void      gdk_x11_event_source_select_events  (GdkEventSource *source,

 G_END_DECLS

-#endif /* __GDK_X11_EVENT_SOURCE_H__ */
+#endif /* __GDK_EVENT_SOURCE_H__ */
--- a/Show More
+++ b/Show More