3.13.6

Make gtk-reftest consult the REFTEST_MODULE_DIR environment
variable to find out where to look for modules, and fix the
libtool hack to construct the .libs subdirectory correctly.

Makefile.am

@@ -24,6 +24,7 @@ MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
 	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
 	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
+	$(srcdir)/m4/gtk-doc.m4 \
 	$(srcdir)/INSTALL \
 	$(srcdir)/README \
 	$(srcdir)/omf.make \
@@ -122,11 +123,11 @@ snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 DISTCHECK_CONFIGURE_FLAGS =		\
-		--enable-gtk-doc 	\
-		--enable-man 		\
-		--disable-rebuilds 	\
-		--disable-maintainer-mode \
-		--enable-introspection
+	--enable-gtk-doc 		\
+	--enable-man 			\
+	--disable-maintainer-mode 	\
+	--enable-introspection  	\
+	--enable-installed-tests
 
 GITIGNOREFILES = \
 	po-properties/Makefile.in.in \

NEWS

@@ -1,3 +1,293 @@
+Overview of Changes in GTK+ 3.13.5 to 3.13.6
+============================================
+
+* Theme
+ - Many Adwaita improvements in details
+ - Much faster blur implementation for shadows
+ - Support symbolic, recolorable pngs
+
+* GtkFileChooser
+ - Fix editing of bookmarks
+ - Use symbolic icons in the path bar
+
+* GtkTextView
+ - Add a vfunc to allow subclasses to draw above/below text
+
+* GtkImage
+ - Support scale factor when loading from resources
+
+* Inspector
+ - Show some widget states and buildable ids
+ - Add GtkTreeSelection to object tree
+
+* Wayland
+ - Support newer protocol versions
+
+* Windows:
+ - Fix handling of input shapes
+ - Support font scaling
+ - Dialog theming fixes
+ - Several crash fixes
+
+* Bugs fixed:
+ 624791	GtkTextBuffer doesn't emit signal "notify" on change of property "text"
+ 638709	utf8_strrcasestr in GtkTextIter makes an invalid read
+ 641638 Avoid pkg-config --atleast-version
+ 705054	Embed manifest into gtk-update-icon-cache.exe
+ 715176	object:state-changed:focused event missing when a text widget regains...
+ 721367	Add gtk_application_get_actions_for_accel()
+ 726224	W32: GDK tries to set GWLP_HWNDPARENT to NULL when it's NULL already
+ 729140	popovers can't always track the widget
+ 729636	Only show title button separator when there is something to separate...
+ 729809	listbox: Add missing ::row-selected emissions
+ 729924	Crash while trying to print
+ 730450	Support non-svg symbolic icons
+ 732137	Fix building quartz backend
+ 733312	Deprecate GtkTreeView:rules-hint
+ 733406	gtk_text_view_scroll_mark_onscreen() not working any more
+ 733416	image: support scale factor when loading from GResource
+ 733610 g_object_unref exceptions using GtkNotebook
+ 733671 W32: Non-CSDed windows have unthemed titlebar
+ 733679 GDK does not handle WM_NCHITTEST
+ 733766 W32: gedit crashes when closing a print dialogue
+ 733767 GtkPrintOperation does not keep itself alive through callbacks
+ 733768 W32: Widgets can't be embedded into foreign windows
+ 733769 W32: Critical error when GTK tries to set opacity for embedded windows
+ 733773 GTK implicitly uses native W32 widgets in some cases, but lacks ICC...
+ 733782 GtkListBoxRowAccessible expects the parent to be a GtkListBox
+ 733923 gtk_widget_get_accessible() fails for an unparented GtkPopover
+ 733925 GtkApplication: load gtk/menus-common.ui resource
+ 733965 Add a way to debug GActions
+ 733979 Combobox is styled like the last child if linked class applied, even...
+ 734033 Avoid initial keyboard focus heuristic selecting labels
+ 734038 GTK does not respect system font scaling
+ 734053 gtkcairoblur: Replace our exponential blur with the box blur from mutter
+ 734129 Popover sometimes fails to get raised above contents
+ 734213 GtkSwitch showing up with "mixed" state when setting it active before...
+ 734292 drag: add missing introspection annotations
+ 734485 Switches are too big, glow effect makes it hard to read "ON"
+ 734526 GtkToolbar: Implement clip
+
+* Translation updates:
+ Arabic
+ Basque
+ Brazilian Portuguese
+ Greek
+ Lithuanian
+ Slovenian
+ Spanish
+
+
+Overview of Changes in GTK+ 3.13.4 to 3.13.5
+============================================
+
+* Adwaita:
+ - Many improvements in details
+ - Style .needs-attention in GtkStackSwitcher
+
+* CSS:
+ - Selectors can now match state pseudo classes on
+   all elements
+
+* GtkListBox:
+ - Rows now have a selectable property and will be
+   styled accordingly
+
+* Inspector:
+ - Add an easy way to change the font
+ - Show widget state and other misc. info
+
+* Wayland:
+ - Fix repaint artifacts
+ - Update xdg-shell
+
+* Windows:
+ - Fix icon theme loading
+
+* Bugs fxed:
+ 591258 Easy to accidentally select first option in popup menus
+ 618852 gtk_text_iter_forward_visible_cursor_position does not move...
+ 707153 Add style for stack switcher items with the needs-attention...
+ 731582 Please use AC_PATH_TOOL to improve cross-compile & multilib...
+ 733099 Regression: gtk_window_set_title() no longer sets header ba...
+ 733174 Missing documentation for GtkSpinButton::change-value and ...
+ 733189 Careless URI construction in GTK+
+ 733321 Tooltips disappear when a new GtkMenu is created
+ 733360 GtkSwitch: css, make box-shadow outsets work for the switch...
+ 733361 GtkProgressBar: css, make box-shadow outsets work for the p...
+ 733407 GtkTextView: use GSlice
+ 733431 Regression: Button not added to action area of dialog
+ 733441 do not mention GtkArrow in the GtkMenuButton docs 
+
+* Translation updates:
+ Greek
+
+
+Overview of Changes in GTK+ 3.13.3 to 3.13.4
+============================================
+
+* Theming:
+ - Adwaita is much more complete
+ - Shadows, reliefs and frames in GtkScrolledWindow, GtkViewport,
+   GtkButton, GtkEntry, GtkFrame, etc are now translated to style
+   classes and themed
+
+* GtkApplication:
+ - gtk_application_prefers_app_menu is a new function to facility
+   adapting UIs to platform expectations
+ - GtkApplication now tries to load menus from resources in the
+   resource path that is defined by GApplication
+ - GtkApplication set up a resource path for loading icons as well
+
+* GtkScrolledWindow:
+ - Scrolling in response to user input (scrollbar clicks, keynav)
+   is now animated
+ - The displacement animation has been replaced edge gradients
+
+* GtkScaleButton:
+ - The orientation is now changed on the fly to make the popup
+   fit into small windows
+
+* GtkEntry:
+ - Activity mode progress is now smooth
+
+* Client-side decorations
+ - The default button layout includes minimize and maximize again
+ - Dialogs are no longer using client-side decorations when
+   use-header-bar is unset
+
+* GTK+ now ships a simple icon theme browser, gtk3-icon-browser
+
+* GtkInspector:
+ - Can change hi-dpi scale on the fly
+ - Can simulate touchscreen at runtime
+ - Shows style properties
+ - Ctrl-Shift-I selects the widget under the pointer
+ - Property editors show property and settings bindings
+
+* Wayland:
+ - Always use CSD under Wayland
+ - Avoid a crash on pointer-less systems
+ - Context menus work now
+
+* Deprecations, removals:
+ - GtkWindow no longer supports resize grips
+ - builtin icons have been deprecated in favor of loading icons
+   from resources
+
+* Bugs fixed:
+ 484640 Improve double click handling in GtkIconView
+ 618852 gtk_text_iter_forward_visible_cursor_position does not move to end...
+ 629129 gtk_text_iter_forward_visible_cursor_position is VERY slow
+ 672676 evince doesn't permit to print more than 100 copies at once
+ 680885 GtkColorButton color swatch suboptimal when color ~= background color
+ 710449 Invalid memory access in "gdk_x11_window_set_opacity" on 64bit pla...
+ 722092 Add GtkApplication resources support
+ 722633 Remove separators from font chooser and file chooser
+ 724084 Provide .error .warning .question classes for GtkEntry (not legibl...
+ 726566 GtkEntryCompletion should emit signal for "no-suggestions" case.
+ 729620 De-uglify GtkCalendar
+ 730730 scrolling is broken when sharing adjustments
+ 730893 Dialogs use headerbars even when DialogsUseHeader is unset
+ 731158 gtkbookmarksmanager.c: save_bookmarks, silly strlen
+ 731297 Get rid of overshooting window/animation
+ 731463 Styling of last column header does not apply to treeview-like cust...
+ 731711 GtkLabel forwards button-press-event after showing a context menu
+ 732134 consider using an alternate durations for transitions of button pr...
+ 732206 wayland: crash with touch but no pointer
+ 732229 Buttons in menus in popovers - alignment and spacing issues
+ 732256 Add a flat style class and use it for flat buttons
+ 732298 adwaita -- progress bars indistinguishable from selected list row
+ 732330 Sort *_DEBUG values alphabetically
+ 732433 Typos in common questions
+ 732441 Selected text background is nearly transparent
+ 732443 Inspector hide and seek
+ 732454 Build error: return_exposes not defined in gdkevents-win32.c due t...
+ 732494 issues active buttons in popovers
+ 732667 cursor blink settings not fully undeprecated
+ 732681 Docs: make GtkWidget:margin-start and margin-end clearer
+ 732861 GtkImage surface documentation incomplete
+ 732894 icontheme: Use correct URI for icons in resource paths
+ 732900 textview calls gtk_widget_set_allocation() on children out of ::si...
+ 732933 horizontal autoscrolling broken
+ 732970 Unselectable GtkLabels with links get the wrong initial cursor
+ 732991 gtk_drag_anim_timeout change the user widget and never restore it
+ 733027 GtkStack doesn't render a background
+ 733076 Handle resolution changes in the GDK backend code
+ 733092 inspector: Do not accidentally change tab in the object notebook
+ 733099 Regression: gtk_window_set_title() no longer sets header bar title
+ 733112 GtkListBox: Add a ::activatable property for rows 
+
+* Translation updates:
+ Hebrew
+ Lithuanian
+ Russian
+ Scottish Gaelic
+ Slovenian
+
+
+Overview of Changes in GTK+ 3.13.2 to 3.13.3
+============================================
+
+* GtkInspector:
+ - Support saving custom CSS
+ - Show GMenus and GActions
+ - Show combobox menus and submenus
+ - Lower the inspector window when picking
+ - Misc. navigation improvements
+
+* Gestures:
+ - Convert most widgets to use gestures internally
+
+* Theming:
+ - Use client-side shadows for menus and tooltips
+ - Include the Adwaita theme
+ - The default theme is now Adwaita
+ - Icon loading now respects limits specified in the icon theme,
+   unless GTK_ICON_LOOKUP_FORCE_SIZE is set
+ - Don't include image content in icon caches, to avoid huge caches
+ - GtkSwitch gained a hover state
+
+* Widget factory:
+ - Improve coverage of GTK+ features
+
+* Wayland:
+ - Support GNOME classic mode
+
+* Deprecations:
+ - Style regions
+ - Support for .icon files
+ - gdk_window_flush, drawing outside of begin/end paint
+
+* Bugs fixed:
+ 721895	Remove GtkIconCache
+729820	GMenuModel submenu-action set 'false' before item activation
+ 730615	a11y private library not included in GIR
+ 730745	Port annotations from Vala
+ 730767	Tab that's being dragged is not updated
+ 730833	RTL in the inspector does not change the icons
+ 730924	Setting a GtkScrolledWindow to visible in a template causes a segfault
+ 731016	Text Drag'n'Drop broken in GtkTextView
+ 731020	3.13.2: PlacesSidebar changes directories on right click
+ 731187	Use csd shadows for menus
+ 731273	minimise and maximise buttons not present in header bars in gnome classic
+ 731299	Wrong function name for gtk_selection_data_get_data
+ 731371	Gtk gets confused by wayland touch events
+ 731377	Add a redirect on the website for the old language bindings page
+ 731382	Current docs still mention GtkList and GtkCList
+ 731429	Incorrect text provided by AtkText text-insert signal for GtkEntry
+ 731602	GTK+ 3.13.2 won't build in Windows
+ 731658	icon theme: Respect directory types for svg icons
+ 731790	GtkHeaderBar subtitle not redisplayed after custom title
+ 731834	GtkPopover is referenced directly in theme css
+ 731866	New window shadows
+ 731908	placessidebar: Use symbolic name for symbolic icon 
+
+* Updated translations:
+ Hebrew
+ Spanish
+
+
 Overview of Changes in GTK+ 3.13.1 to 3.13.2
 ============================================
 

build/Makefile-newvs.am

@@ -0,0 +1,37 @@
+# Centralized autotools file
+# Create the Visual Studio 2012/2013 project files
+# from the Visual Studio 2010 project files
+
+# Author: Fan, Chun-wei
+# November 05, 2012
+
+# MSVC_SLN: name of root project
+
+MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
+
+$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln create_vcxproj copy_filters create_props
+	cat $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$(MSVC_SLN).sln
+
+README.txt: $(top_srcdir)/build/win32/vs10/README.txt
+	cat $(top_srcdir)/build/win32/vs10/README.txt | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/README.txt
+
+create_vcxproj:
+	for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.vcxproj)`; do \
+		case $$F in \
+			*)	cat $(top_builddir)/build/win32/vs10/$$F | sed 's/v100/v$(MSVC_VER)0/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
+			;; \
+		esac; \
+	done
+
+create_props:
+	for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.props)`; do \
+		case $$F in \
+			*)	cat $(top_builddir)/build/win32/vs10/$$F | sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$$F \
+			;; \
+		esac; \
+	done
+
+copy_filters:
+	cp  $(top_srcdir)/build/win32/vs10/*.vcxproj.filters $(top_builddir)/build/win32/vs$(MSVC_VER)/
+
+

build/Makefile.am

@@ -8,6 +8,7 @@ EXTRA_DIST +=	\
 	gen-file-list-gtk.py	\
 	detectenv_msvc.mak	\
 	introspection-msvc.mak	\
+	gtk-introspection-msvc.mak.in	\
 	gtk-introspection-msvc.mak
 
 -include $(top_srcdir)/git.mk

build/gen-file-list-gtk.py

@@ -18,7 +18,7 @@ def gen_gdk_filelist(srcroot, subdir, dest):
 
     vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
 
-    files = vars['gdk_public_h_sources'].split() + \
+    files = vars['gdk_h_sources'].split() + \
             vars['gdk_c_sources'].split() + \
             vars['gdk_enums'].split()
 
@@ -63,7 +63,11 @@ def gen_gtk_filelist(srcroot, subdir, dest):
 			vars['gtk_clipboard_dnd_c_sources'].split() + \
             vars['gtk_other_src'].split()
 
-    sources = [i for i in files if not (i.endswith('private.h')) and i != 'gtktextdisplay.h' and i != 'gtktextlayout.h']
+    sources = [i for i in files \
+               if not (i.endswith('private.h')) \
+               and i != 'gtktextdisplay.h' \
+               and i != 'gtktextlayout.h' \
+               and i != 'gtkx.h']
 
     with open(dest, 'w') as d:
         for i in sources:

build/gtk-introspection-msvc.mak.in

@@ -31,10 +31,6 @@ setgirbuildnev:
 	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
 
-win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib
-	@-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib...
-	@-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
-
 Gdk-$(APIVERSION).gir: gdk_list
 	@-echo Generating Gdk-$(APIVERSION).gir...
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
@@ -50,7 +46,7 @@ Gdk-$(APIVERSION).gir: gdk_list
 	-DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION	\
 	--filelist=gdk_list	-o $@
 
-GdkWin32-$(APIVERSION).gir: gdkwin32_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
+GdkWin32-$(APIVERSION).gir: gdkwin32_list
 	@-echo Generating GdkWin32-$(APIVERSION).gir...
 	$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk	\
 	-I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include	\
@@ -78,7 +74,7 @@ Gtk-$(APIVERSION).gir: gtk_list
 	--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"	\
 	-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"	\
 	$(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"	\
-	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\"	\
+	-DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION@\"	\
 	-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
 	-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\"	\
 	-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\"	\
@@ -105,7 +101,6 @@ all:
 clean:
 	@-del /f/q *.typelib
 	@-del /f/q *.gir
-	@-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib
 	@-del /f/q gtk_list
 	@-del /f/q gdkwin32_list
 	@-del /f/q gdk_list

build/win32/Makefile.am

@@ -1,8 +1,12 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = \
-	crypt \
-	vs9  \
-	vs10
+SUBDIRS =	\
+	crypt	\
+	vs9 	\
+	vs10	\
+	vs11	\
+	vs12
+
+EXTRA_DIST += process-in-win32.py
 
 -include $(top_srcdir)/git.mk

build/win32/process-in-win32.py

@@ -0,0 +1,109 @@
+#!/usr/bin/python
+# vim: encoding=utf-8
+# expand Windows-specific *.in files
+# for Visual Studio Builds
+
+import os
+import sys
+import re
+import string
+import argparse
+
+
+def open_compat(src, mode):
+    if (sys.version_info.major < 3):
+        return open(src, mode)
+    else:
+        return open(src, mode, encoding='utf-8', errors='surrogateescape')
+
+def get_version(srcroot):
+    ver = {}
+    RE_VERSION = re.compile(r'^m4_define\(\[(gtk_\w+)\],\s*\[(\d+)\]\)')
+    RE_FLOAT_VERSION = re.compile(r'^m4_define\(\[(gtk_\w+)\],\s*\[(\d+\.\d*)\]\)')
+    with open(os.path.join(srcroot, 'configure.ac'), 'r') as ac:
+        for i in ac:
+            mo = RE_VERSION.search(i)
+            if mo:
+                ver[mo.group(1).upper()] = int(mo.group(2))
+            mo = RE_FLOAT_VERSION.search(i)
+            if mo:
+                ver[mo.group(1).upper()] = float(mo.group(2))
+
+    ver['GTK_BINARY_AGE'] = 100 * ver['GTK_MINOR_VERSION'] + ver['GTK_MICRO_VERSION']
+    ver['GTK_VERSION'] = '%d.%d.%d' % (ver['GTK_MAJOR_VERSION'],
+                                        ver['GTK_MINOR_VERSION'],
+                                        ver['GTK_MICRO_VERSION'])
+    ver['LT_RELEASE'] = '%d.%d' % (ver['GTK_MAJOR_VERSION'], ver['GTK_MINOR_VERSION'])
+    ver['LT_CURRENT'] = 100 * \
+                        ver['GTK_MINOR_VERSION'] + \
+                        ver['GTK_MICRO_VERSION'] - \
+                        ver['GTK_INTERFACE_AGE']
+    ver['LT_REVISION'] = ver['GTK_INTERFACE_AGE']
+    ver['LT_AGE'] = ver['GTK_BINARY_AGE'] - ver['GTK_INTERFACE_AGE']
+    ver['LT_CURRENT_MINUS_AGE'] = ver['LT_CURRENT'] - ver['LT_AGE']
+    return ver
+
+def process_in(src, dest, vars):
+    RE_VARS = re.compile(r'@(\w+?)@')
+
+    with open_compat(src, 'r') as s:
+        with open_compat(dest, 'w') as d:
+            for i in s:
+                i = RE_VARS.sub(lambda x: str(vars[x.group(1)]), i)
+                d.write(i)
+
+def get_srcroot():
+    if not os.path.isabs(__file__):
+        path = os.path.abspath(__file__)
+    else:
+        path = __file__
+    dirname = os.path.dirname(path)
+    return os.path.abspath(os.path.join(dirname, '..', '..'))
+
+def main(argv):
+    prog_desc = 'Create Various autogenerated Win32-specific Source Files'
+    parser = argparse.ArgumentParser(description=prog_desc)
+    parser.add_argument('--gtkwin32rc', dest='gtkwin32rc', action='store_const',
+                        const=1,
+                        help='Generate gtk-win32.rc')
+
+    parser.add_argument('--gtk3manifest', dest='gtk3manifest', action='store_const',
+                   const=1,
+                   help='Generate libgtk3.manifest')
+
+    args = parser.parse_args()
+    no_args = True
+
+    if args.gtkwin32rc is not None:
+        srcroot = get_srcroot()
+
+        ver = get_version(srcroot)
+
+        target = os.path.join(srcroot, 'gtk', 'gtk-win32.rc')
+        process_in(os.path.join(srcroot, 'gtk', 'gtk-win32.rc.in'),
+                   target + '.intermediate',
+                   ver)
+        fp_r = open_compat(target + '.intermediate', 'r')
+        lines = fp_r.readlines()
+        fp_r.close()
+        fp_w = open_compat(target, 'w')
+        fp_w.writelines([item for item in lines[:-1]])
+
+        fp_w.close()
+        os.unlink(target + '.intermediate')
+
+        no_args = False
+
+    if args.gtk3manifest is not None:
+        manifest = {}
+        manifest['EXE_MANIFEST_ARCHITECTURE'] = '*'
+        process_in(os.path.join(srcroot, 'gtk', 'libgtk3.manifest.in'),
+                   os.path.join(srcroot, 'gtk', 'libgtk3.manifest'),
+                   manifest)
+        no_args = False
+
+    if no_args is True:
+        raise SystemExit('Action argument required.  Please see %s --help for details.' % __file__)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

build/win32/vs10/Makefile.am

@@ -14,6 +14,8 @@ EXTRA_DIST +=	\
 	gtk.vcxprojin	\
 	gtk.vcxproj.filters	\
 	gtk.vcxproj.filtersin	\
+	gtk-encode-symbolic-svg.vcxproj	\
+	gtk-encode-symbolic-svg.vcxproj.filters	\
 	gtk3-demo.vcxproj	\
 	gtk3-demo.vcxproj.filters	\
 	gtk3-demo-application.vcxproj	\
@@ -34,6 +36,7 @@ EXTRA_DIST +=	\
 	gtk-gen-srcs.props	\
 	gtk-ignore-broadway.props	\
 	gtk-install.props	\
+	gtk-version-paths.props.in	\
 	gtk-version-paths.props
 
 -include $(top_srcdir)/git.mk

build/win32/vs10/gtk+.sln

@@ -18,6 +18,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC6131}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
@@ -202,6 +204,22 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.Build.0 = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.ActiveCfg = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.Build.0 = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.ActiveCfg = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.Build.0 = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.ActiveCfg = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.Build.0 = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs10/gtk-build-defines.props

@@ -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_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</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>
@@ -47,4 +47,4 @@
       <Value>$(GtkDefines)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/gtk-encode-symbolic-svg.vcxproj

@@ -0,0 +1,177 @@
+<?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>{3281202A-CD26-4C67-B892-EB34BDBC6131}</ProjectGuid>
+    <RootNamespace>gtkencodesymbolicsvg</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="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" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\gtk\encodesymbolic.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters

@@ -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="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\gtk\encodesymbolic.c"><Filter>Sources</Filter></ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk-gen-srcs.props

@@ -58,14 +58,13 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
 :DONE_GDKCONFIG_H
     </GenGdkConfigHBroadway>
     <GenerateGtkDbusBuiltSources>
-set PATH=$(PATH);$(PythonPath)
-
 cd ..\..\..\gtk
 
-python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
+$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml
 
 cd $(SolutionDir)
     </GenerateGtkDbusBuiltSources>
+    <GenerateGtkWin32RC>$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest</GenerateGtkWin32RC>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtkgensrcsprops</_PropertySheetDisplayName>
@@ -83,5 +82,8 @@ cd $(SolutionDir)
     <BuildMacro Include="GenerateGtkDbusBuiltSources">
       <Value>$(GenerateGtkDbusBuiltSources)</Value>
     </BuildMacro>
+    <BuildMacro Include="GenerateGtkWin32RC">
+      <Value>$(GenerateGtkWin32RC)</Value>
+    </BuildMacro>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/gtk-install.props

@@ -6,7 +6,7 @@
   <PropertyGroup Label="UserMacros">
     <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
     <InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
-    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe</InstalledBins>
+    <InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe;$(BinDir)\gtk-encode-symbolic-svg.exe</InstalledBins>
     <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
     <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
@@ -19,22 +19,22 @@ if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
 if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
 
 
-copy $(BinDir)\*.dll $(CopyDir)\bin
+copy "$(BinDir)\*.dll" $(CopyDir)\bin
 
-copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib
+copy "$(BinDir)\*-$(ApiVersion).lib" $(CopyDir)\lib
 
-copy $(BinDir)\*.exe $(CopyDir)\bin
+copy "$(BinDir)\*.exe" $(CopyDir)\bin
 
 goto DONE_BIN
 
 
 :DO_BROADWAY_BIN
 
-copy $(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll" $(CopyDir)\bin
 
-copy $(BinDir)\gdk-$(ApiVersion).lib $(CopyDir)\lib
+copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
 
-copy $(BinDir)\broadwayd.exe $(CopyDir)\bin
+copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin
 
 
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).dll $(CopyDir)\bin

build/win32/vs10/gtk-version-paths.props.in

@@ -5,6 +5,7 @@
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>3.0</ApiVersion>
+    <GtkVersion>@GTK_VERSION@</GtkVersion>
     <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
     <GtkLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GtkLibtoolCompatibleDllSuffix>
     <GtkSeparateVSDllPrefix />
@@ -29,6 +30,9 @@
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>
+    <BuildMacro Include="GtkVersion">
+      <Value>$(GtkVersion)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkLibtoolCompatibleDllPrefix">
       <Value>$(GtkLibtoolCompatibleDllPrefix)</Value>
     </BuildMacro>

build/win32/vs10/gtk.vcxproj.filtersin

@@ -19,6 +19,7 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.in"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
   <ItemGroup>
 #include "libgtk.vs10.sourcefiles.filters"
@@ -38,4 +39,7 @@
     <ClCompile Include="..\..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <Manifest Include="..\..\..\gtk\libgtk3.manifest"><Filter>Resource Files</Filter></Manifest>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk.vcxprojin

@@ -173,6 +173,20 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSources)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
@@ -195,15 +209,14 @@
     <ClCompile Include="..\..\..\modules\input\imviqr.c" />
     <ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="..\..\..\gtk\libgtk3.manifest" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtka11y.vcxproj">
-      <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="gtk-inspector.vcxproj">
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fd}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs10/install.vcxproj

@@ -207,6 +207,10 @@
       <Project>{3281202a-cd26-4c67-b892-eb34bdbc6130}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="gtk-encode-symbolic-svg.vcxproj">
+      <Project>{3281202a-cd26-4c67-b892-eb34bdbc6131}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs11/Makefile.am

@@ -0,0 +1,45 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk-prebuild.vcxproj	\
+	gdk-win32.vcxproj	\
+	gdk-win32.vcxproj.filters	\
+	gdk.vcxproj	\
+	gdk.vcxproj.filters	\
+	gtk.vcxproj	\
+	gtk.vcxproj.filters	\
+	gtk-encode-symbolic-svg.vcxproj	\
+	gtk-encode-symbolic-svg.vcxproj.filters	\
+	gtk3-demo.vcxproj	\
+	gtk3-demo.vcxproj.filters	\
+	gtk3-demo-application.vcxproj	\
+	gtk3-demo-application.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxproj.filters	\
+	gailutil.vcxproj	\
+	gailutil.vcxproj.filters	\
+	install.vcxproj	\
+	broadwayd.vcxproj	\
+	broadwayd.vcxproj.filters	\
+	gdk-broadway.vcxproj	\
+	gdk-broadway.vcxproj.filters	\
+	gtk-build-defines.props	\
+	gtk-copy-gdk-broadway.props	\
+	gtk-gen-srcs.props	\
+	gtk-ignore-broadway.props	\
+	gtk-install.props	\
+	gtk-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_SLN = gtk+
+
+MSVC_VER = 11
+
+MSVC_VER_LONG = 2012
+
+include $(top_srcdir)/build/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk

build/win32/vs12/Makefile.am

@@ -0,0 +1,45 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk-prebuild.vcxproj	\
+	gdk-win32.vcxproj	\
+	gdk-win32.vcxproj.filters	\
+	gdk.vcxproj	\
+	gdk.vcxproj.filters	\
+	gtk.vcxproj	\
+	gtk.vcxproj.filters	\
+	gtk-encode-symbolic-svg.vcxproj	\
+	gtk-encode-symbolic-svg.vcxproj.filters	\
+	gtk3-demo.vcxproj	\
+	gtk3-demo.vcxproj.filters	\
+	gtk3-demo-application.vcxproj	\
+	gtk3-demo-application.vcxproj.filters	\
+	gtk-inspector.vcxproj	\
+	gtk-inspector.vcxproj.filters	\
+	gailutil.vcxproj	\
+	gailutil.vcxproj.filters	\
+	install.vcxproj	\
+	broadwayd.vcxproj	\
+	broadwayd.vcxproj.filters	\
+	gdk-broadway.vcxproj	\
+	gdk-broadway.vcxproj.filters	\
+	gtk-build-defines.props	\
+	gtk-copy-gdk-broadway.props	\
+	gtk-gen-srcs.props	\
+	gtk-ignore-broadway.props	\
+	gtk-install.props	\
+	gtk-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_SLN = gtk+
+
+MSVC_VER = 12
+
+MSVC_VER_LONG = 2013
+
+include $(top_srcdir)/build/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk

build/win32/vs9/Makefile.am

@@ -9,6 +9,7 @@ EXTRA_DIST +=	\
 	gdk.vcprojin	\
 	gtk.vcproj	\
 	gtk.vcprojin	\
+	gtk-encode-symbolic-svg.vcproj	\
 	gtk3-demo.vcproj	\
 	gtk3-demo-application.vcproj	\
 	gtk-inspector.vcproj	\
@@ -22,6 +23,7 @@ EXTRA_DIST +=	\
 	gtk-gen-srcs.vsprops	\
 	gtk-ignore-broadway.vsprops	\
 	gtk-install.vsprops	\
+	gtk-version-paths.vsprops.in	\
 	gtk-version-paths.vsprops
 
 -include $(top_srcdir)/git.mk

build/win32/vs9/gtk+.sln

@@ -46,6 +46,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gt
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcproj", "{3281202A-CD26-4C67-B892-EB34BDBC6131}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
@@ -60,6 +65,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
 		{3281202A-CD26-4C67-B892-EB34BDBC612F} = {3281202A-CD26-4C67-B892-EB34BDBC612F}
 		{3281202A-CD26-4C67-B892-EB34BDBC6130} = {3281202A-CD26-4C67-B892-EB34BDBC6130}
+		{3281202A-CD26-4C67-B892-EB34BDBC6131} = {3281202A-CD26-4C67-B892-EB34BDBC6131}
 	EndProjectSection
 EndProject
 Global
@@ -234,6 +240,22 @@ Global
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release_Broadway|x64.Build.0 = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|Win32.Build.0 = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.ActiveCfg = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug|x64.Build.0 = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.ActiveCfg = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|Win32.Build.0 = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.ActiveCfg = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release|x64.Build.0 = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|Win32.Build.0 = Debug|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.ActiveCfg = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Debug_Broadway|x64.Build.0 = Debug|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.ActiveCfg = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|Win32.Build.0 = Release|Win32
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.ActiveCfg = Release|x64
+		{3281202A-CD26-4C67-B892-EB34BDBC6131}.Release_Broadway|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk-build-defines.vsprops

@@ -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_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"
+		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>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk-encode-symbolic-svg.vcproj

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

build/win32/vs9/gtk-gen-srcs.vsprops

@@ -57,11 +57,13 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)

 	<UserMacro
 		Name="GenerateGtkDbusBuiltSources"
 		Value="
-set PATH=$(PATH);$(PythonPath)&#x0D;&#x0A;
-
 cd ..\..\..\gtk&#x0D;&#x0A;
-python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
+$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
 cd $(SolutionDir)&#x0D;&#x0A;
 		      "
 	/>
-</VisualStudioPropertySheet>
+	<UserMacro
+		Name="GenerateGtkWin32RC"
+		Value="$(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk-version-paths.vsprops.in

@@ -20,6 +20,10 @@
 		Name="ApiVersion"
 		Value="3.0"
 	/>
+	<UserMacro
+		Name="GtkVersion"
+		Value="@GTK_VERSION@"
+	/>
 	<UserMacro
 		Name="GtkLibtoolCompatibleDllPrefix"
 		Value="lib"

build/win32/vs9/gtk.vcprojin

@@ -192,7 +192,38 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File RelativePath="..\..\..\gtk\gtk-win32.rc.in">
+				<FileConfiguration Name="Debug|Win32">
+				<Tool Name="VCCustomBuildTool"
+						Description="Generating GTK+ Win32 Version Resource..."
+						CommandLine="$(GenerateGtkWin32RC)"
+						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating GTK+ Win32 Version Resource..."
+						CommandLine="$(GenerateGtkWin32RC)"
+						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating GTK+ Win32 Version Resource..."
+						CommandLine="$(GenerateGtkWin32RC)"
+						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating GTK+ Win32 Version Resource..."
+						CommandLine="$(GenerateGtkWin32RC)"
+						Outputs="..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest"
+					/>
+				</FileConfiguration>
+			</File>
 			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
+			<File RelativePath="..\..\..\gtk\libgtk3.manifest" />
 		</Filter>
 		<Filter
 			Name="Source Files"

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [13])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_micro_version], [6])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,7 +41,7 @@ AC_CANONICAL_HOST
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.41.0])
+m4_define([glib_required_version], [2.41.2])
 m4_define([pango_required_version], [1.32.4])
 m4_define([atk_required_version], [2.12.0])
 m4_define([cairo_required_version], [1.12.0])
@@ -184,6 +184,9 @@ case $host in
   *-*-linux*)
     os_linux=yes
     ;;
+  *-*-darwin*)
+    os_darwin=yes
+    ;;
 esac
 
 dnl
@@ -228,7 +231,7 @@ LT_OUTPUT
 AC_SYS_LARGEFILE
 
 AM_PROG_AS
-AC_PATH_PROG(NM, nm, nm)
+AC_PATH_TOOL(NM, nm, nm)
 
 AC_MSG_CHECKING([for some Win32 platform])
 case "$host" in
@@ -245,6 +248,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
 AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
+AM_CONDITIONAL(OS_DARWIN, test "$os_darwin" = "yes")
 
 if test "$os_win32" = "yes"; then
   AC_CHECK_TOOL(WINDRES, windres, no)
@@ -1444,7 +1448,7 @@ AC_ARG_ENABLE(cups,
 if test "x$enable_cups" = "xno"; then
   AM_CONDITIONAL(HAVE_CUPS, false)
 else
-  AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
+  AC_PATH_TOOL(CUPS_CONFIG, cups-config, no)
   if test "x$CUPS_CONFIG" = "xno"; then
     if test "x$enable_cups" = "xauto"; then
       AM_CONDITIONAL(HAVE_CUPS, false)
@@ -1836,9 +1840,10 @@ po-properties/Makefile.in
 demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
-demos/pixbuf-demo/Makefile
 demos/widget-factory/Makefile
+demos/icon-browser/Makefile
 examples/Makefile
+examples/bp/Makefile
 examples/application1/Makefile
 examples/application2/Makefile
 examples/application3/Makefile
@@ -1853,6 +1858,7 @@ tests/Makefile
 tests/visuals/Makefile
 testsuite/Makefile
 testsuite/a11y/Makefile
+testsuite/a11y/state/Makefile
 testsuite/css/Makefile
 testsuite/css/parser/Makefile
 testsuite/gdk/Makefile
@@ -1869,10 +1875,15 @@ docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
 build/Makefile
+build/gtk-introspection-msvc.mak
 build/win32/Makefile
 build/win32/crypt/Makefile
 build/win32/vs9/Makefile
+build/win32/vs9/gtk-version-paths.vsprops
 build/win32/vs10/Makefile
+build/win32/vs10/gtk-version-paths.props
+build/win32/vs11/Makefile
+build/win32/vs12/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -1886,6 +1897,7 @@ gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
+gtk/libgtk3.manifest
 gtk/inspector/Makefile
 gtk/native/Makefile
 util/Makefile

demos/Makefile.am

@@ -1,6 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gtk-demo widget-factory pixbuf-demo
+SUBDIRS = gtk-demo widget-factory icon-browser
 
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -124,6 +124,7 @@ RESOURCES=	$(demos)			\
 		revealer.ui			\
 		theming.ui			\
 		listbox.ui			\
+		popover.ui			\
 		alphatest.png			\
 		apple-red.png			\
 		brick.png			\

demos/gtk-demo/button_box.c

@@ -95,7 +95,7 @@ do_button_box (GtkWidget *do_widget)
                         TRUE, TRUE, 5);
 
     gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Expand", 40, GTK_BUTTONBOX_EXPAND),
+                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
                         TRUE, TRUE, 5);
 
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
@@ -124,7 +124,7 @@ do_button_box (GtkWidget *do_widget)
                         create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
                         TRUE, TRUE, 5);
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Expand", 10, GTK_BUTTONBOX_EXPAND),
+                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
                         TRUE, TRUE, 5);
   }
 

demos/gtk-demo/editable_cells.c

@@ -351,7 +351,6 @@ do_editable_cells (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (items_model);
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_SINGLE);
 

demos/gtk-demo/list_store.c

@@ -284,7 +284,6 @@ do_list_store (GtkWidget *do_widget)
 
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (model);
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
                                        COLUMN_DESCRIPTION);
 

demos/gtk-demo/main.c

@@ -1021,7 +1021,7 @@ main (int argc, char **argv)
     }
   /* -- End of hack -- */
 
-  app = gtk_application_new ("org.gtk.Demo", 0);
+  app = gtk_application_new ("org.gtk.Demo", G_APPLICATION_NON_UNIQUE);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),

demos/gtk-demo/textscroll.c

@@ -16,6 +16,7 @@ scroll_to_end (GtkTextView *textview)
   GtkTextIter iter;
   GtkTextMark *mark;
   char *spaces;
+  char *text;
   static int count;
 
   buffer = gtk_text_view_get_buffer (textview);
@@ -32,11 +33,11 @@ scroll_to_end (GtkTextView *textview)
   spaces = g_strnfill (count++, ' ');
   gtk_text_buffer_insert (buffer, &iter, "\n", -1);
   gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "Scroll to end scroll to end scroll "
-                          "to end scroll to end ",
-                          -1);
+  text = g_strdup_printf ("Scroll to end scroll to end scroll "
+                          "to end scroll to end %d", count);
+  gtk_text_buffer_insert (buffer, &iter, text, -1);
   g_free (spaces);
+  g_free (text);
 
   /* Now scroll the end mark onscreen.
    */
@@ -60,6 +61,7 @@ scroll_to_bottom (GtkTextView *textview)
   GtkTextIter iter;
   GtkTextMark *mark;
   char *spaces;
+  char *text;
   static int count;
 
   buffer = gtk_text_view_get_buffer (textview);
@@ -73,11 +75,11 @@ scroll_to_bottom (GtkTextView *textview)
   spaces = g_strnfill (count++, ' ');
   gtk_text_buffer_insert (buffer, &iter, "\n", -1);
   gtk_text_buffer_insert (buffer, &iter, spaces, -1);
-  gtk_text_buffer_insert (buffer, &iter,
-                          "Scroll to bottom scroll to bottom scroll "
-                          "to bottom scroll to bottom",
-                          -1);
+  text = g_strdup_printf ("Scroll to bottom scroll to bottom scroll "
+                          "to bottom scroll to bottom %d", count);
+  gtk_text_buffer_insert (buffer, &iter, text, -1);
   g_free (spaces);
+  g_free (text);
 
   /* Move the iterator to the beginning of line, so we don't scroll
    * in horizontal direction

demos/gtk-demo/toolpalette.c

@@ -668,7 +668,10 @@ load_icon_items (GtkToolPalette *palette)
           GtkToolItem *item;
           gchar *id = ll->data;
 
-          if (g_strcmp0 (id, "emblem-desktop") == 0)
+          if (g_str_equal (id, "emblem-desktop"))
+            continue;
+
+          if (g_str_has_suffix (id, "-symbolic"))
             continue;
 
           g_message ("Got id '%s'", id);

demos/gtk-demo/tree_store.c

@@ -424,7 +424,6 @@ do_tree_store (GtkWidget *do_widget)
       /* create tree view */
       treeview = gtk_tree_view_new_with_model (model);
       g_object_unref (model);
-      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                    GTK_SELECTION_MULTIPLE);
 

demos/icon-browser/Makefile.am

@@ -0,0 +1,36 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
+        $(GTK_DEP_LIBS)
+
+
+bin_PROGRAMS = gtk3-icon-browser
+
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = gtk3-icon-browser.desktop
+
+gtk3_icon_browser_SOURCES = \
+	main.c \
+	iconbrowserapp.c iconbrowserapp.h \
+	iconbrowserwin.c iconbrowserwin.h \
+	resources.c
+
+BUILT_SOURCES = \
+	resources.c
+
+resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \
+		--target=$@ --sourcedir=$(srcdir) --generate-source
+
+EXTRA_DIST = \
+	iconbrowser.gresource.xml \
+	window.ui
+
+-include $(top_srcdir)/git.mk

demos/icon-browser/app-menu.ui

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="appmenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

demos/icon-browser/gtk3-icon-browser.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Icon Browser
+Comment=An application that shows themed icons
+Exec=gtk3-icon-browser
+Icon=gtk3-icon-browser
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GTK;
+NoDisplay=true

demos/icon-browser/iconbrowser.gresource.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gtk/iconbrowser">
+    <file preprocess="xml-stripblanks">window.ui</file>
+    <file preprocess="xml-stripblanks">app-menu.ui</file>
+  </gresource>
+</gresources>

demos/icon-browser/iconbrowserapp.c

@@ -0,0 +1,80 @@
+#include <gtk/gtk.h>
+
+#include "iconbrowserapp.h"
+#include "iconbrowserwin.h"
+
+struct _IconBrowserApp
+{
+  GtkApplication parent;
+};
+
+struct _IconBrowserAppClass
+{
+  GtkApplicationClass parent_class;
+};
+
+G_DEFINE_TYPE(IconBrowserApp, icon_browser_app, GTK_TYPE_APPLICATION);
+
+static void
+icon_browser_app_init (IconBrowserApp *app)
+{
+}
+
+static void
+quit_activated (GSimpleAction *action,
+                GVariant      *parameter,
+                gpointer       app)
+{
+  g_application_quit (G_APPLICATION (app));
+}
+
+static GActionEntry app_entries[] =
+{
+  { "quit", quit_activated, NULL, NULL, NULL }
+};
+
+static void
+icon_browser_app_startup (GApplication *app)
+{
+  GtkBuilder *builder;
+  GMenuModel *app_menu;
+  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
+
+  G_APPLICATION_CLASS (icon_browser_app_parent_class)->startup (app);
+
+  g_action_map_add_action_entries (G_ACTION_MAP (app),
+                                   app_entries, G_N_ELEMENTS (app_entries),
+                                   app);
+  gtk_application_set_accels_for_action (GTK_APPLICATION (app),
+                                         "app.quit",
+                                         quit_accels);
+
+  builder = gtk_builder_new_from_resource ("/org/gtk/iconbrowser/app-menu.ui");
+  app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
+  gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
+  g_object_unref (builder);
+}
+
+static void
+icon_browser_app_activate (GApplication *app)
+{
+  IconBrowserWindow *win;
+
+  win = icon_browser_window_new (ICON_BROWSER_APP (app));
+  gtk_window_present (GTK_WINDOW (win));
+}
+
+static void
+icon_browser_app_class_init (IconBrowserAppClass *class)
+{
+  G_APPLICATION_CLASS (class)->startup = icon_browser_app_startup;
+  G_APPLICATION_CLASS (class)->activate = icon_browser_app_activate;
+}
+
+IconBrowserApp *
+icon_browser_app_new (void)
+{
+  return g_object_new (ICON_BROWSER_APP_TYPE,
+                       "application-id", "org.gtk.IconBrowser",
+                       NULL);
+}

demos/icon-browser/iconbrowserapp.h

@@ -0,0 +1,19 @@
+#ifndef __ICON_BROWSER_APP_H
+#define __ICON_BROWSER_APP_H
+
+#include <gtk/gtk.h>
+
+
+#define ICON_BROWSER_APP_TYPE (icon_browser_app_get_type ())
+#define ICON_BROWSER_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_BROWSER_APP_TYPE, IconBrowserApp))
+
+
+typedef struct _IconBrowserApp       IconBrowserApp;
+typedef struct _IconBrowserAppClass  IconBrowserAppClass;
+
+
+GType           icon_browser_app_get_type    (void);
+IconBrowserApp *icon_browser_app_new         (void);
+
+
+#endif /* __ICON_BROWSER_APP_H */

demos/icon-browser/iconbrowserwin.c

@@ -0,0 +1,787 @@
+#include "iconbrowserapp.h"
+#include "iconbrowserwin.h"
+#include <gtk/gtk.h>
+
+typedef struct
+{
+  const gchar *id;
+  const gchar *name;
+  const gchar *description;
+} Context;
+
+struct _IconBrowserWindow
+{
+  GtkApplicationWindow parent;
+  GHashTable *contexts;
+
+  GtkWidget *context_list;
+  Context *current_context;
+  gboolean symbolic;
+  GtkWidget *symbolic_radio;
+  GtkTreeModelFilter *filter_model;
+  GtkWidget *details;
+
+  GtkListStore *store;
+  GtkCellRenderer *cell;
+  GtkCellRenderer *text_cell;
+  GtkWidget *search;
+  GtkWidget *searchbar;
+  GtkWidget *searchentry;
+  GtkWidget *list;
+  GtkWidget *image1;
+  GtkWidget *image2;
+  GtkWidget *image3;
+  GtkWidget *image4;
+  GtkWidget *image5;
+  GtkWidget *description;
+};
+
+struct _IconBrowserWindowClass
+{
+  GtkApplicationWindowClass parent_class;
+};
+
+enum {
+  NAME_COLUMN,
+  SYMBOLIC_NAME_COLUMN,
+  DESCRIPTION_COLUMN,
+  CONTEXT_COLUMN
+};
+
+G_DEFINE_TYPE(IconBrowserWindow, icon_browser_window, GTK_TYPE_APPLICATION_WINDOW);
+
+static void
+search_text_changed (GtkEntry *entry)
+{
+  const gchar *text;
+
+  text = gtk_entry_get_text (entry);
+
+  if (text[0] == '\0')
+    return;
+}
+
+static void
+set_image (GtkWidget *image, const gchar *name, gint size)
+{
+  gtk_image_set_from_icon_name (GTK_IMAGE (image), name, 1);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), size);
+}
+
+static void
+selection_changed (GtkIconView *icon_view, IconBrowserWindow *win)
+{
+}
+
+static void
+item_activated (GtkIconView *icon_view, GtkTreePath *path, IconBrowserWindow *win)
+{
+  GtkTreeIter iter;
+  gchar *name;
+  gchar *description;
+  gint column;
+
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (win->filter_model), &iter, path);
+
+  if (win->symbolic)
+    column = SYMBOLIC_NAME_COLUMN;
+  else
+    column = NAME_COLUMN;
+  gtk_tree_model_get (GTK_TREE_MODEL (win->filter_model), &iter,
+                      column, &name,
+                      DESCRIPTION_COLUMN, &description,
+                      -1);
+      
+  if (name == NULL || !gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), name))
+    {
+      g_free (description);
+      return;
+    }
+
+  gtk_window_set_title (GTK_WINDOW (win->details), name);
+  set_image (win->image1, name, 16);
+  set_image (win->image2, name, 24);
+  set_image (win->image3, name, 32);
+  set_image (win->image4, name, 48);
+  set_image (win->image5, name, 64);
+  if (description && description[0])
+    {
+      gtk_label_set_text (GTK_LABEL (win->description), description);
+      gtk_widget_show (win->description);
+    }
+  else
+    {
+      gtk_widget_hide (win->description);
+    }
+
+  gtk_window_present (GTK_WINDOW (win->details));
+
+  g_free (name);
+  g_free (description);
+}
+
+static void
+add_icon (IconBrowserWindow *win,
+          const gchar       *name,
+          const gchar       *description,
+          const gchar       *context)
+{
+  gchar *regular_name;
+  gchar *symbolic_name;
+
+  regular_name = g_strdup (name);
+  if (!gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), regular_name))
+    {
+      g_free (regular_name);
+      regular_name = NULL;
+    }
+
+  symbolic_name = g_strconcat (name, "-symbolic", NULL);
+  if (!gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), symbolic_name))
+    {
+      g_free (symbolic_name);
+      symbolic_name = NULL;
+    }
+  gtk_list_store_insert_with_values (win->store, NULL, -1,
+                                     NAME_COLUMN, regular_name,
+                                     SYMBOLIC_NAME_COLUMN, symbolic_name,
+                                     DESCRIPTION_COLUMN, description,
+                                     CONTEXT_COLUMN, context,
+                                     -1);
+}
+
+static void
+add_context (IconBrowserWindow *win,
+             const gchar       *id,
+             const gchar       *name,
+             const gchar       *description)
+{
+  Context *c;
+  GtkWidget *row;
+
+  c = g_new (Context, 1);
+  c->id = id;
+  c->name = name;
+  c->description = description;
+
+  g_hash_table_insert (win->contexts, (gpointer)id, c);
+
+  row = gtk_label_new (name);
+  g_object_set_data (G_OBJECT (row), "context", c);
+  gtk_widget_show (row);
+  g_object_set (row, "margin", 10, NULL);
+
+  gtk_list_box_insert (GTK_LIST_BOX (win->context_list), row, -1);
+
+  /* set the tooltip on the list box row */
+  row = gtk_widget_get_parent (row);
+  gtk_widget_set_tooltip_text (row, description);
+
+  if (win->current_context == NULL)
+    win->current_context = c;
+}
+
+static void
+selected_context_changed (GtkListBox *list, IconBrowserWindow *win)
+{
+  GtkWidget *row;
+  GtkWidget *label;
+
+  row = GTK_WIDGET (gtk_list_box_get_selected_row (list));
+  if (row == NULL)
+    return;
+
+  label = gtk_bin_get_child (GTK_BIN (row));
+  win->current_context = g_object_get_data (G_OBJECT (label), "context");
+  gtk_tree_model_filter_refilter (win->filter_model);
+}
+
+static void
+populate (IconBrowserWindow *win)
+{
+  add_context (win, "volume", "Volume", "Icons related to audio input and output volume");
+  add_icon (win, "audio-volume-high", "The icon used to indicate high audio volume", "volume");
+  add_icon (win, "audio-volume-low", "The icon used to indicate low audio volume", "volume");
+  add_icon (win, "audio-volume-medium", "The icon used to indicate medium audio volume", "volume");
+  add_icon (win, "audio-volume-muted", "The icon used to indicate the muted state for audio playback", "volume");
+  add_icon (win, "microphone-sensitivity-high", "The icon used to indicate high microphone sensitivity", "volume");
+  add_icon (win, "microphone-sensitivity-low", "The icon used to indicate low microphone sensitivity", "volume");
+  add_icon (win, "microphone-sensitivity-medium", "The icon used to indicate medium microphone sensitivity", "volume");
+  add_icon (win, "microphone-sensitivity-muted", "The icon used to indicate that a microphone is muted", "volume");
+
+  add_context (win, "multimedia", "Multimedia", "Icons related to playback of media");
+  add_icon (win, "media-playlist-repeat", "The icon for the repeat mode of a media player", "multimedia");
+  add_icon (win, "media-playlist-repeat-song", "The icon for repeating a song in a media player", "multimedia");
+  add_icon (win, "media-playlist-shuffle", "The icon for the shuffle mode of a media player", "multimedia");
+  add_icon (win, "media-playlist-consecutive", "The icon for consecutive mode of a media player", "multimedia");
+  add_icon (win, "media-skip-backward", "The icon for the skip backward action of a media player", "multimedia");
+  add_icon (win, "media-seek-backward", "The icon for the seek backward action of a media player", "multimedia");
+  add_icon (win, "media-playback-start", "The icon for the start playback action of a media player", "multimedia");
+  add_icon (win, "media-seek-forward", "The icon for the seek forward action of a media player", "multimedia");
+  add_icon (win, "media-skip-forward", "The icon for the skip forward action of a media player", "multimedia");
+  add_icon (win, "media-playback-stop", "The icon for the stop action of a media player", "multimedia");
+  add_icon (win, "media-playback-pause", "The icon for the pause action of a media player", "multimedia");
+  add_icon (win, "media-eject", "The icon for the eject action of a media player or file manager", "multimedia");
+  add_icon (win, "media-record", "The icon for the record action of a media application", "multimedia");
+  add_icon (win, "media-view-subtitles", "The icon used to show subtitles in a media player", "multimedia");
+
+  add_context (win, "network", "Network", "Icons related to network status");
+  add_icon (win, "network-transmit-receive", "The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network", "network");
+  add_icon (win, "network-transmit", "The icon used when data is being transmitted, while the computing device is connected to a network", "network");
+  add_icon (win, "network-receive", "The icon used when data is being received, while the computing device is connected to a network", "network");
+  add_icon (win, "network-idle", "The icon used when no data is being transmitted or received, while the computing device is connected to a network", "network");
+ add_icon (win, "network-error", "The icon used when an error occurs trying to intialize the network connection of the computing device", "network");
+  add_icon (win, "network-offline", "The icon used when the computing device is disconnected from the network", "network");
+
+  add_context (win, "weather", "Weather", "Icons about weather conditions");
+  add_icon (win, "weather-clear", "The icon used while the weather for a region is “clear skies”", "weather");
+  add_icon (win, "weather-clear-night", "The icon used while the weather for a region is “clear skies” during the night", "weather");
+  add_icon (win, "weather-few-clouds", "The icon used while the weather for a region is “partly cloudy”", "weather");
+  add_icon (win, "weather-few-clouds-night", "The icon used while the weather for a region is “partly cloudy” during the night", "weather");
+  add_icon (win, "weather-fog", "The icon used while the weather for a region is “foggy”", "weather");
+  add_icon (win, "weather-overcast", "The icon used while the weather for a region is “overcast”", "weather");
+  add_icon (win, "weather-severe-alert", "The icon used while a sever weather alert is in effect for a region", "weather");
+  add_icon (win, "weather-showers", "The icon used while rain showers are occurring in a region", "weather");
+  add_icon (win, "weather-showers-scattered", "The icon used while scattered rain showers are occurring in a region", "weather");
+  add_icon (win, "weather-snow", "The icon used while snow showers are occurring in a region", "weather");
+  add_icon (win, "weather-storm", "The icon used while storms are occurring in a region", "weather");
+
+  add_context (win, "navigation", "Navigation", "Icons for navigation in the user interface of a program");
+  add_icon (win, "go-first", "The icon for the go to the first item in a list", "navigation");
+  add_icon (win, "go-previous", "The icon for the go to the previous item in a list", "navigation");
+  add_icon (win, "go-next", "The icon for the go to the next item in a list", "navigation");
+  add_icon (win, "go-last", "The icon for the go to the last item in a list", "navigation");
+  add_icon (win, "go-bottom", "The icon for the go to bottom of a list", "navigation");
+  add_icon (win, "go-down", "The icon for the go down in a list", "navigation");
+  add_icon (win, "go-up", "The icon for the go up in a list", "navigation");
+  add_icon (win, "go-top", "The icon for the go to the top of a list", "navigation");
+  add_icon (win, "go-home", "The icon for the go to home location", "navigation");
+  add_icon (win, "go-jump", "The icon for the jump to action", "navigation");
+
+  add_context (win, "editing", "Editing", "Icons related to editing a document");
+  add_icon (win, "format-indent-less", "The icon for the decrease indent formatting action", "editing");
+  add_icon (win, "format-indent-more", "The icon for the increase indent formatting action", "editing");
+  add_icon (win, "format-justify-center", "The icon for the center justification formatting action", "editing");
+  add_icon (win, "format-justify-fill", "The icon for the fill justification formatting action", "editing");
+  add_icon (win, "format-justify-left", "The icon for the left justification formatting action", "editing");
+  add_icon (win, "format-justify-right", "The icon for the right justification action", "editing");
+  add_icon (win, "format-text-direction-ltr", "The icon for the left-to-right text formatting action", "editing");
+  add_icon (win, "format-text-direction-rtl", "The icon for the right-to-left formatting action", "editing");
+  add_icon (win, "format-text-bold", "The icon for the bold text formatting action", "editing");
+  add_icon (win, "format-text-italic", "The icon for the italic text formatting action", "editing");
+  add_icon (win, "format-text-underline", "The icon for the underlined text formatting action", "editing");
+  add_icon (win, "format-text-strikethrough", "The icon for the strikethrough text formatting action", "editing");
+  add_icon (win, "edit-clear", "The icon for the clear action", "editing");
+  add_icon (win, "edit-clear-all", "", "editing");
+  add_icon (win, "edit-copy", "The icon for the copy action", "editing");
+  add_icon (win, "edit-cut", "The icon for the cut action", "editing");
+  add_icon (win, "edit-delete", "The icon for the delete action", "editing");
+  add_icon (win, "edit-find-replace", "The icon for the find and replace action", "editing");
+  add_icon (win, "edit-paste", "The icon for the paste action", "editing");
+  add_icon (win, "edit-redo", "The icon for the redo action", "editing");
+  add_icon (win, "edit-select-all", "The icon for the select all action", "editing");
+  add_icon (win, "edit-select", "", "editing");
+  add_icon (win, "edit-undo", "The icon for the undo action", "editing");
+  add_icon (win, "document-properties", "The icon for the action to view the properties of a document in an application", "editing");
+  add_icon (win, "document-new", "The icon used for the action to create a new document", "editing");
+  add_icon (win, "document-open", "The icon used for the action to open a document", "editing");
+  add_icon (win, "document-open-recent", "The icon used for the action to open a document that was recently opened", "editing");
+  add_icon (win, "document-save", "The icon for the save action. Should be an arrow pointing down and toward a hard disk", "editing");
+  add_icon (win, "document-save-as", "The icon for the save as action", "editing");
+  add_icon (win, "document-send", "The icon for the send action. Should be an arrow pointing up and away from a hard disk", "editing");
+  add_icon (win, "document-page-setup", "The icon for the page setup action of a document editor", "editing");
+  add_icon (win, "changes-allow", "", "other");
+  add_icon (win, "changes-prevent", "", "other");
+  add_icon (win, "object-flip-horizontal", "The icon for the action to flip an object horizontally", "editing");
+  add_icon (win, "object-flip-vertical", "The icon for the action to flip an object vertically", "editing");
+  add_icon (win, "object-rotate-left", "The icon for the rotate left action performed on an object", "editing");
+  add_icon (win, "object-rotate-right", "The icon for the rotate rigt action performed on an object", "editing");
+  add_icon (win, "insert-image", "The icon for the insert image action of an application", "editing");
+  add_icon (win, "insert-link", "The icon for the insert link action of an application", "editing");
+  add_icon (win, "insert-object", "The icon for the insert object action of an application", "editing");
+  add_icon (win, "insert-text", "The icon for the insert text action of an application", "editing");
+  add_icon (win, "accessories-text-editor", "The icon used for the desktop's text editing accessory program", "editing");
+
+  add_context (win, "view", "View Controls", "Icons for view controls in a user interface");
+  add_icon (win, "view-list", "The icon used for “List“ view mode", "view");
+  add_icon (win, "view-grid", "The icon used for “Grid“ view mode (as opposed to “List“)", "view");
+  add_icon (win, "view-fullscreen", "The icon used for the “Fullscreen” item in the application's “View” menu", "view");
+  add_icon (win, "view-restore", "The icon used by an application for leaving the fullscreen view, and returning to a normal windowed view", "view");
+  add_icon (win, "zoom-fit-best", "The icon used for the “Best Fit” item in the application's “View” menu", "view");
+  add_icon (win, "zoom-in", "The icon used for the “Zoom in” item in the application's “View” menu", "view");
+  add_icon (win, "zoom-out", "The icon used for the “Zoom Out” item in the application's “View” menu ", "view");
+  add_icon (win, "zoom-original", "The icon used for the “Original Size” item in the application's “View” menu", "view");
+  add_icon (win, "view-continuous", "The icon used for a continuous view mode", "view");
+  add_icon (win, "view-paged", "The icon used for a paged view mode (as opposed to continuous)", "view");
+  add_icon (win, "view-dual", "The icon used for a side-by-side view of paginated content", "view");
+  add_icon (win, "view-wrapped", "The icon used to indicate a wrap-around to the beginning", "view");
+
+  add_context (win, "calendar", "Calendar, Tasks and Alarms", "Icons related to calendars, tasks and alarms");
+  add_icon (win, "task-due", "The icon used when a task is due soon", "calendar");
+  add_icon (win, "task-past-due", "The icon used when a task that was due, has been left incomplete", "calendar");
+  add_icon (win, "appointment-soon", "The icon used when an appointment will occur soon", "calendar");
+  add_icon (win, "appointment-missed", "The icon used when an appointment was missed", "calendar");
+  add_icon (win, "alarm", "The icon used for alarms when a task or appointment is due", "calendar");
+
+  add_context (win, "communication", "Communication", "Icons related email, phone calls, IM and other forms of communication");
+  add_icon (win, "mail-unread", "The icon used for an electronic mail that is unread", "communication");
+  add_icon (win, "mail-read", "The icon used for an electronic mail that is read", "communication");
+  add_icon (win, "mail-replied", "The icon used for an electronic mail that has been replied to", "communication");
+  add_icon (win, "mail-attachment", "The icon used for an electronic mail that contains attachments", "communication");
+  add_icon (win, "mail-mark-important", "The icon for the mark as important action of an electronic mail application", "communication");
+  add_icon (win, "mail-send", "The icon for the send action of an electronic mail application", "communication");
+  add_icon (win, "mail-send-receive", "The icon for the send and receive action of an electronic mail application", "communication");
+  add_icon (win, "call-start", "The icon used for initiating or accepting a call", "communication");
+  add_icon (win, "call-stop", "The icon used for stopping a current call", "communication");
+  add_icon (win, "call-missed", "The icon used to show a missed call", "communication");
+  add_icon (win, "user-available", "The icon used when a user on a chat network is available to initiate a conversation with", "communication");
+  add_icon (win, "user-offline", "The icon used when a user on a chat network is not available", "communication");
+  add_icon (win, "user-idle", "The icon used when a user on a chat network has not been an active participant in any chats on the network, for an extended period of time", "communication");
+  add_icon (win, "user-invisible", "The icon used when a user is on a chat network, but is invisible to others", "communication");
+  add_icon (win, "user-busy", "The icon used when a user is on a chat network, and has marked himself as busy", "communication");
+  add_icon (win, "user-away", "The icon used when a user on a chat network is away from their keyboard and the chat program", "communication");
+  add_icon (win, "user-status-pending", "The icon used when the current user status on a chat network is not known", "communication");
+
+  add_context (win, "devices", "Devices and Media", "Icons for devices and media");
+  add_icon (win, "audio-input-microphone", "The icon used for the microphone audio input device", "devices");
+  add_icon (win, "camera-web", "The fallback icon for web cameras", "devices");
+  add_icon (win, "camera-photo", "The icon used for a digital still camera devices", "devices");
+  add_icon (win, "input-keyboard", "The icon used for the keyboard input device", "devices");
+  add_icon (win, "printer", "The icon used for a printer device", "devices");
+  add_icon (win, "video-display", "The icon used for the monitor that video gets displayed to", "devices");
+  add_icon (win, "computer", "The icon used for the computing device as a whole", "devices");
+  add_icon (win, "media-optical", "The icon used for physical optical media such as CD and DVD", "devices");
+  add_icon (win, "phone", "The icon used for phone devices which support connectivity to the PC, such as VoIP, cellular, or possibly landline phones", "devices");
+  add_icon (win, "input-dialpad", "The icon used for dialpad input devices", "devices");
+  add_icon (win, "input-touchpad", "The icon used for touchpad input devices", "devices");
+  add_icon (win, "scanner", "The icon used for a scanner device", "devices");
+  add_icon (win, "audio-card", "The icon used for the audio rendering device", "devices");
+  add_icon (win, "input-gaming", "The icon used for the gaming input device", "devices");
+  add_icon (win, "input-mouse", "The icon used for the mousing input device", "devices");
+  add_icon (win, "multimedia-player", "The icon used for generic multimedia playing devices", "devices");
+  add_icon (win, "audio-headphones", "The icon used for headphones", "devices");
+  add_icon (win, "audio-headset", "The icon used for headsets", "devices");
+  add_icon (win, "display-projector", "The icon used for projectors", "devices");
+  add_icon (win, "media-removable", "The icon used for generic removable media", "devices");
+  add_icon (win, "printer-network", "The icon used for printers which are connected via the network", "devices");
+  add_icon (win, "audio-speakers", "The icon used for speakers", "devices");
+  add_icon (win, "camera-video", "The fallback icon for video cameras", "devices");
+  add_icon (win, "drive-optical", "The icon used for optical media drives such as CD and DVD", "devices");
+  add_icon (win, "drive-removable-media", "The icon used for removable media drives", "devices");
+  add_icon (win, "input-tablet", "The icon used for graphics tablet input devices", "devices");
+  add_icon (win, "network-wireless", "The icon used for wireless network connections", "devices");
+  add_icon (win, "network-wired", "The icon used for wired network connections", "devices");
+  add_icon (win, "media-floppy", "The icon used for physical floppy disk media", "devices");
+  add_icon (win, "media-flash", "The fallback icon used for flash media, such as memory stick and SD", "devices");
+
+  add_context (win, "contenttypes", "Content Types", "Icons for different types of data, such as audio or image files");
+  add_icon (win, "application-certificate", "", "contenttypes"); 
+  add_icon (win, "application-rss+xml", "", "contenttypes"); 
+  add_icon (win, "application-x-appliance", "", "contenttypes"); 
+  add_icon (win, "audio-x-generic", "The icon used for generic audio file types", "contenttypes");
+  add_icon (win, "folder", "The standard folder icon used to represent directories on local filesystems, mail folders, and other hierarchical groups", "contenttypes");
+  add_icon (win, "text-x-generic", "The icon used for generic text file types", "contenttypes");
+  add_icon (win, "video-x-generic", "The icon used for generic video file types", "contenttypes");
+  add_icon (win, "x-office-calendar", "The icon used for generic calendar file types", "contenttypes");
+
+  add_context (win, "emotes", "Emotes", "Icons for emotions that are expressed through text chat applications such as :-) or :-P in IRC or instant messengers");
+  add_icon (win, "face-angel", "The icon used for the 0:-) emote", "emotes");
+  add_icon (win, "face-angry", "The icon used for the X-( emote", "emotes");
+  add_icon (win, "face-cool", "The icon used for the B-) emote", "emotes");
+  add_icon (win, "face-crying", "The icon used for the :'( emote", "emotes");
+  add_icon (win, "face-devilish", "The icon used for the >:-) emote", "emotes");
+  add_icon (win, "face-embarrassed", "The icon used for the :-[ emote", "emotes");
+  add_icon (win, "face-kiss", "The icon used for the :-* emote", "emotes");
+  add_icon (win, "face-laugh", "The icon used for the :-)) emote", "emotes");
+  add_icon (win, "face-monkey", "The icon used for the :-(|) emote", "emotes");
+  add_icon (win, "face-plain", "The icon used for the :-| emote", "emotes");
+  add_icon (win, "face-raspberry", "The icon used for the :-P emote", "emotes");
+  add_icon (win, "face-sad", "The icon used for the :-( emote", "emotes");
+  add_icon (win, "face-shutmouth", "The 'shut mouth' emote", "emotes"); 
+  add_icon (win, "face-sick", "The icon used for the :-& emote", "emotes");
+  add_icon (win, "face-smile", "The icon used for the :-) emote", "emotes");
+  add_icon (win, "face-smile-big", "The icon used for the :-D emote", "emotes");
+  add_icon (win, "face-smirk", "The icon used for the :-! emote", "emotes");
+  add_icon (win, "face-surprise", "The icon used for the :-0 emote", "emotes");
+  add_icon (win, "face-tired", "The icon used for the |-) emote", "emotes");
+  add_icon (win, "face-uncertain", "The icon used for the :-/ emote", "emotes");
+  add_icon (win, "face-wink", "The icon used for the ;-) emote", "emotes");
+  add_icon (win, "face-worried", "The icon used for the :-S emote", "emotes");
+  add_icon (win, "face-yawn", "", "emotes"); 
+
+  add_context (win, "general", "General", "Generally useful icons that don't fit in a particular category");
+  add_icon (win, "edit-find", "The icon for generic search actions", "general");
+  add_icon (win, "content-loading", "The icon used to indicate that content is loading", "general"); 
+  add_icon (win, "open-menu", "The icon used for a menu button in the header bar", "general"); 
+  add_icon (win, "view-more", "The icon used for a  “View More“ action", "general"); 
+  add_icon (win, "tab-new", "The icon used for a “New Tab“ action", "general"); 
+  add_icon (win, "bookmark-new", "The icon used for creating a new bookmark", "general"); 
+  add_icon (win, "mark-location", "The icon used to mark a location on a map", "general"); 
+  add_icon (win, "find-location", "The icon used for a  “Search location“ action", "general"); 
+  add_icon (win, "send-to", "The icon used for a  “Send to“ action", "general"); 
+  add_icon (win, "object-select", "The icon used for generic selection actions", "general"); 
+  add_icon (win, "window-close", "The icon used for actions that close a view, such as window or tab close button", "general");
+  add_icon (win, "view-refresh", "The icon used for the “Refresh” item in the application's “View” menu", "general");
+  add_icon (win, "process-stop", "The icon used for the “Stop” action in applications with actions that may take a while to process, such as web page loading in a browser", "general");
+  add_icon (win, "action-unavailable", "The icon used to indicate that an action is currently unavailable, such as “Pause“ when no media is playing", "general"); 
+  add_icon (win, "document-print", "The icon for the print action of an application", "general");
+  add_icon (win, "printer-printing", "The icon used while a print job is successfully being spooled to a printing device", "general");
+  add_icon (win, "printer-warning", "The icon used when a recoverable problem occurs while attempting to printing", "general"); 
+  add_icon (win, "printer-error", "The icon used when an error occurs while attempting to print", "general");
+  add_icon (win, "dialog-information", "The icon used when a dialog is opened to give information to the user that may be pertinent to the requested action", "general");
+  add_icon (win, "dialog-question", "The icon used when a dialog is opened to ask a simple question of the user", "general");
+  add_icon (win, "dialog-warning", "The icon used when a dialog is opened to warn the user of impending issues with the requested action", "general");
+  add_icon (win, "dialog-password", "The icon used when a dialog requesting the authentication credentials for a user is opened", "general");
+  add_icon (win, "dialog-error", "The icon used when a dialog is opened to explain an error condition to the user", "general");
+  add_icon (win, "list-add", "The icon for the add to list action", "general");
+  add_icon (win, "list-remove", "The icon for the remove from list action", "general");
+  add_icon (win, "non-starred", "The icon used to indicate that an object is not 'starred'", "general"); 
+  add_icon (win, "semi-starred", "The icon used to indicate that an object has is 'half-starred'", "general"); 
+  add_icon (win, "starred", "The icon used to indicate that an object is 'starred'", "general"); 
+  add_icon (win, "star-new", "The used for the “New Star“ action", "general"); 
+  add_icon (win, "security-low", "The icon used to indicate that the security level of a connection is presumed to be insecure, either by using weak encryption, or by using a certificate that the could not be automatically verified, and which the user has not chosent to trust", "general");
+  add_icon (win, "security-medium", "The icon used to indicate that the security level of a connection is presumed to be secure, using strong encryption, and a certificate that could not be automatically verified, but which the user has chosen to trust", "general");
+  add_icon (win, "security-high", "The icon used to indicate that the security level of a connection is known to be secure, using strong encryption and a valid certificate", "general");
+  add_icon (win, "user-trash", "The icon for the user's “Trash” place in the file system", "other");
+  add_icon (win, "user-trash-full", "The icon for the user's “Trash” in the file system, when there are items in the “Trash” waiting for disposal or recovery", "general");
+  add_icon (win, "emblem-system", "The icon used as an emblem for directories that contain system libraries, settings, and data", "general");
+  add_icon (win, "avatar-default", "The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar", "general"); 
+  add_icon (win, "emblem-synchronizing", "The icon used as an emblem to indicate that a a synchronizing operation is in process", "general"); 
+  add_icon (win, "emblem-shared", "The icon used as an emblem for files and directories that are shared to other users", "general");
+  add_icon (win, "folder-download", "The icon representing the location in the file system where downloaded files are stored", "general"); 
+  add_icon (win, "help-browser", "The icon used for the desktop's help browsing application", "general");
+
+  add_context (win, "other", "Other", "Icons which have may be too specialized and not of general interest");
+  add_icon (win, "view-sort-ascending", "The icon used for the “Sort Ascending” item in the application's “View” menu, or in a button for changing the sort method for a list", "other");
+  add_icon (win, "view-sort-descending", "The icon used for the “Sort Descending” item in the application's “View” menu, or in a button for changing the sort method for a list", "other");
+  add_icon (win, "document-revert", "The icon for the action of reverting to a previous version of a document", "other");
+  add_icon (win, "address-book-new", "The icon used for the action to create a new address book", "other");
+  add_icon (win, "application-exit", "The icon used for exiting an application. Typically this is seen in the application's menus as File->Quit", "other");
+  add_icon (win, "appointment-new", "The icon used for the action to create a new appointment in a calendaring application", "other");
+  add_icon (win, "contact-new", "The icon used for the action to create a new contact in an address book application", "other");
+  add_icon (win, "document-print-preview", "The icon for the print preview action of an application", "other");
+  add_icon (win, "folder-new", "The icon for creating a new folder", "other");
+  add_icon (win, "help-about", "The icon for the About item in the Help menu", "other");
+  add_icon (win, "help-contents", "The icon for Contents item in the Help menu", "other");
+  add_icon (win, "help-faq", "The icon for the FAQ item in the Help menu", "other");
+  add_icon (win, "list-remove-all", "", "other");
+  add_icon (win, "mail-forward", "The icon for the forward action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-junk", "The icon for the mark as junk action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-notjunk", "The icon for the mark as not junk action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-read", "The icon for the mark as read action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-unread", "The icon for the mark as unread action of an electronic mail application", "other");
+  add_icon (win, "mail-message-new", "The icon for the compose new mail action of an electronic mail application", "other");
+  add_icon (win, "mail-reply-all", "The icon for the reply to all action of an electronic mail application", "other");
+  add_icon (win, "mail-reply-sender", "The icon for the reply to sender action of an electronic mail application", "other");
+  add_icon (win, "pan-down", "", "other"); 
+  add_icon (win, "pan-end", "", "other"); 
+  add_icon (win, "pan-start", "", "other"); 
+  add_icon (win, "pan-up", "", "other"); 
+  add_icon (win, "system-lock-screen", "The icon used for the “Lock Screen” item in the desktop's panel application", "other");
+  add_icon (win, "system-log-out", "The icon used for the “Log Out” item in the desktop's panel application", "other");
+  add_icon (win, "system-run", "The icon used for the “Run Application...” item in the desktop's panel application", "other");
+  add_icon (win, "system-search", "The icon used for the “Search” item in the desktop's panel application", "other");
+  add_icon (win, "system-reboot", "The icon used for the “Reboot” item in the desktop's panel application", "other");
+  add_icon (win, "system-shutdown", "The icon used for the “Shutdown” item in the desktop's panel application", "other");
+  add_icon (win, "tools-check-spelling", "The icon used for the “Check Spelling” item in the application's “Tools” menu", "other");
+  add_icon (win, "window-maximize", "", "other"); 
+  add_icon (win, "window-minimize", "", "other"); 
+  add_icon (win, "window-restore", "", "other"); 
+  add_icon (win, "window-new", "The icon used for the “New Window” item in the application's “Windows” menu", "other");
+  add_icon (win, "accessories-calculator", "The icon used for the desktop's calculator accessory program", "other"); 
+  add_icon (win, "accessories-character-map", "The icon used for the desktop's international and extended text character accessory program", "other");
+  add_icon (win, "accessories-dictionary", "The icon used for the desktop's dictionary accessory program", "other");
+  add_icon (win, "multimedia-volume-control", "The icon used for the desktop's hardware volume control application", "other");
+  add_icon (win, "preferences-desktop-accessibility", "The icon used for the desktop's accessibility preferences", "other");
+  add_icon (win, "preferences-desktop-display", "", "other"); 
+  add_icon (win, "preferences-desktop-font", "The icon used for the desktop's font preferences", "other");
+  add_icon (win, "preferences-desktop-keyboard", "The icon used for the desktop's keyboard preferences", "other");
+  add_icon (win, "preferences-desktop-keyboard-shortcuts", "", "other"); 
+  add_icon (win, "preferences-desktop-locale", "The icon used for the desktop's locale preferences", "other");
+  add_icon (win, "preferences-desktop-remote-desktop", "", "other"); 
+  add_icon (win, "preferences-desktop-multimedia", "The icon used for the desktop's multimedia preferences", "other");
+  add_icon (win, "preferences-desktop-screensaver", "The icon used for the desktop's screen saving preferences", "other");
+  add_icon (win, "preferences-desktop-theme", "The icon used for the desktop's theme preferences", "other");
+  add_icon (win, "preferences-desktop-wallpaper", "The icon used for the desktop's wallpaper preferences", "other");
+  add_icon (win, "preferences-system-privacy", "", "other"); 
+  add_icon (win, "preferences-system-windows", "", "other"); 
+  add_icon (win, "system-file-manager", "The icon used for the desktop's file management application", "other");
+  add_icon (win, "system-software-install", "The icon used for the desktop's software installer application", "other");
+  add_icon (win, "system-software-update", "The icon used for the desktop's software updating application", "other");
+  add_icon (win, "system-users", "", "other"); 
+  add_icon (win, "user-info", "", "other"); 
+  add_icon (win, "utilities-system-monitor", "The icon used for the desktop's system resource monitor application", "other");
+  add_icon (win, "utilities-terminal", "The icon used for the desktop's terminal emulation application. ", "other");
+  add_icon (win, "application-x-addon", "", "other");
+  add_icon (win, "application-x-executable", "The icon used for executable file types", "other");
+  add_icon (win, "font-x-generic", "The icon used for generic font file types", "other");
+  add_icon (win, "image-x-generic", "The icon used for generic image file types", "other");
+  add_icon (win, "package-x-generic", "The icon used for generic package file types", "other");
+  add_icon (win, "text-html", "The icon used for HTML text file types", "other");
+  add_icon (win, "text-x-generic-template", "The icon used for generic text templates", "other");
+  add_icon (win, "text-x-preview", "", "other"); 
+  add_icon (win, "text-x-script", "The icon used for script file types, such as shell scripts", "other");
+  add_icon (win, "x-office-address-book", "The icon used for generic address book file types", "other");
+  add_icon (win, "x-office-document", "The icon used for generic document and letter file types", "other");
+  add_icon (win, "x-office-document-template", "", "other"); 
+  add_icon (win, "x-office-presentation", "The icon used for generic presentation file types", "other");
+  add_icon (win, "x-office-presentation-template", "", "other"); 
+  add_icon (win, "x-office-spreadsheet", "The icon used for generic spreadsheet file types", "other");
+  add_icon (win, "x-office-spreadsheet-template", "", "other"); 
+  add_icon (win, "x-package-repository", "", "other"); 
+  add_icon (win, "applications-accessories", "The icon for the “Accessories” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-development", "The icon for the “Programming” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-engineering", "The icon for the “Engineering” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-games", "The icon for the “Games” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-graphics", "The icon for the “Graphics” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-internet", "The icon for the “Internet” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-multimedia", "The icon for the “Multimedia” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-office", "The icon for the “Office” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-other", "The icon for the “Other” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-science", "The icon for the “Science” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-system", "The icon for the “System Tools” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-utilities", "The icon for the “Utilities” sub-menu of the Programs menu", "other");
+  add_icon (win, "preferences-desktop", "The icon for the “Desktop Preferences” category", "other");
+  add_icon (win, "preferences-desktop-peripherals", "The icon for the “Peripherals” sub-category of the “Desktop Preferences” category", "other");
+  add_icon (win, "preferences-desktop-personal", "The icon for the “Personal” sub-category of the “Desktop Preferences” category", "other");
+  add_icon (win, "preferences-other", "The icon for the “Other” preferences category", "other");
+  add_icon (win, "preferences-system", "The icon for the “System Preferences” category", "other");
+  add_icon (win, "preferences-system-network", "The icon for the “Network” sub-category of the “System Preferences” category", "other");
+  add_icon (win, "system-help", "The icon for the “Help” system category", "other");
+  add_icon (win, "battery", "The icon used for the system battery device", "other");
+  add_icon (win, "computer-apple-ipad", "", "other"); 
+  add_icon (win, "colorimeter-colorhug", "", "other"); 
+  add_icon (win, "drive-harddisk", "The icon used for hard disk drives", "other");
+  add_icon (win, "drive-harddisk-ieee1394", "", "other"); 
+  add_icon (win, "drive-harddisk-system", "", "other"); 
+  add_icon (win, "drive-multidisk", "", "other"); 
+  add_icon (win, "media-optical-bd", "", "other"); 
+  add_icon (win, "media-optical-cd-audio", "", "other"); 
+  add_icon (win, "media-optical-dvd", "", "other"); 
+  add_icon (win, "media-tape", "The icon used for generic physical tape media", "other");
+  add_icon (win, "media-zip", "", "other"); 
+  add_icon (win, "modem", "The icon used for modem devices", "other");
+  add_icon (win, "multimedia-player-apple-ipod-touch", "", "other"); 
+  add_icon (win, "network-vpn", "", "other"); 
+  add_icon (win, "pda", "This is the fallback icon for Personal Digial Assistant devices. Primary use of this icon is for PDA devices connected to the PC. Connection medium is not an important aspect of the icon. The metaphor for this fallback icon should be a generic PDA device icon", "other");
+  add_icon (win, "phone-apple-iphone", "", "other"); 
+  add_icon (win, "uninterruptible-power-supply", "", "other"); 
+  add_icon (win, "emblem-default", "The icon used as an emblem to specify the default selection of a printer for example", "other");
+  add_icon (win, "emblem-documents", "The icon used as an emblem for the directory where a user's documents are stored", "other");
+  add_icon (win, "emblem-downloads", "The icon used as an emblem for the directory where a user's downloads from the internet are stored", "other");
+  add_icon (win, "emblem-favorite", "The icon used as an emblem for files and directories that the user marks as favorites", "other");
+  add_icon (win, "emblem-generic", "", "other"); 
+  add_icon (win, "emblem-important", "The icon used as an emblem for files and directories that are marked as important by the user", "other");
+  add_icon (win, "emblem-mail", "The icon used as an emblem to specify the directory where the user's electronic mail is stored", "other");
+  add_icon (win, "emblem-new", "", "other"); 
+  add_icon (win, "emblem-ok", "", "other"); 
+  add_icon (win, "emblem-package", "", "other"); 
+  add_icon (win, "emblem-photos", "The icon used as an emblem to specify the directory where the user stores photographs", "other");
+  add_icon (win, "emblem-readonly", "The icon used as an emblem for files and directories which can not be written to by the user", "other");
+  add_icon (win, "emblem-symbolic-link", "The icon used as an emblem for files and direcotires that are links to other files or directories on the filesystem", "other");
+  add_icon (win, "emblem-synchronized", "The icon used as an emblem for files or directories that are configured to be synchronized to another device", "other");
+  add_icon (win, "emblem-unreadable", "The icon used as an emblem for files and directories that are inaccessible. ", "other");
+  add_icon (win, "emblem-urgent", "", "other"); 
+  add_icon (win, "emblem-videos", "", "other"); 
+  add_icon (win, "emblem-web", "", "other"); 
+  add_icon (win, "folder-documents", "", "other"); 
+  add_icon (win, "folder-download", "", "other"); 
+  add_icon (win, "folder-music", "", "other"); 
+  add_icon (win, "folder-pictures", "", "other"); 
+  add_icon (win, "folder-documents", "", "other"); 
+  add_icon (win, "folder-publicshare", "", "other"); 
+  add_icon (win, "folder-remote", "The icon used for normal directories on a remote filesystem", "other");
+  add_icon (win, "folder-saved-search", "", "other"); 
+  add_icon (win, "folder-templates", "", "other"); 
+  add_icon (win, "folder-videos", "", "other"); 
+  add_icon (win, "network-server", "The icon used for individual host machines under the “Network Servers” place in the file manager", "other");
+  add_icon (win, "network-workgroup", "The icon for the “Network Servers” place in the desktop's file manager, and workgroups within the network", "other");
+  add_icon (win, "start-here", "The icon used by the desktop's main menu for accessing places, applications, and other features", "other");
+  add_icon (win, "user-bookmarks", "The icon for the user's special “Bookmarks” place", "other");
+  add_icon (win, "user-desktop", "The icon for the special “Desktop” directory of the user", "other");
+  add_icon (win, "user-home", "The icon for the special “Home” directory of the user", "other");
+  add_icon (win, "airplane-mode", "", "other"); 
+  add_icon (win, "battery-caution-charging", "", "other"); 
+  add_icon (win, "battery-caution", "The icon used when the battery is below 40%", "other");
+  add_icon (win, "battery-empty-charging", "", "other"); 
+  add_icon (win, "battery-empty", "", "other"); 
+  add_icon (win, "battery-full-charged", "", "other"); 
+  add_icon (win, "battery-full-charging", "", "other"); 
+  add_icon (win, "battery-full", "", "other"); 
+  add_icon (win, "battery-good-charging", "", "other"); 
+  add_icon (win, "battery-good", "", "other"); 
+  add_icon (win, "battery-low-charging", "", "other"); 
+  add_icon (win, "battery-low", "The icon used when the battery is below 20%", "other");
+  add_icon (win, "battery-missing", "", "other"); 
+  add_icon (win, "bluetooth-active", "", "other"); 
+  add_icon (win, "bluetooth-disabled", "", "other"); 
+  add_icon (win, "channel-insecure", "", "other"); 
+  add_icon (win, "channel-secure", "", "other"); 
+  add_icon (win, "computer-fail", "", "other"); 
+  add_icon (win, "display-brightness", "", "other"); 
+  add_icon (win, "keyboard-brightness", "", "other"); 
+  add_icon (win, "folder-drag-accept", "The icon used for a folder while an object is being dragged onto it, that is of a type that the directory can contain", "other");
+  add_icon (win, "folder-open", "The icon used for folders, while their contents are being displayed within the same window. This icon would normally be shown in a tree or list view, next to the main view of a folder's contents", "other");
+  add_icon (win, "folder-visiting", "The icon used for folders, while their contents are being displayed in another window. This icon would typically be used when using multiple windows to navigate the hierarchy, such as in Nautilus's spatial mode", "other");
+  add_icon (win, "image-loading", "The icon used when another image is being loaded, such as thumnails for larger images in the file manager", "other");
+  add_icon (win, "image-missing", "The icon used when another image could not be loaded", "other");
+  add_icon (win, "mail-signed", "The icon used for an electronic mail that contains a signature", "other");
+  add_icon (win, "mail-signed-verified", "The icon used for an electronic mail that contains a signature which has also been verified by the security system", "other");
+  add_icon (win, "network-cellular-3g", "", "other"); 
+  add_icon (win, "network-cellular-4g", "", "other"); 
+  add_icon (win, "network-cellular-edge", "", "other"); 
+  add_icon (win, "network-cellular-gprs", "", "other"); 
+  add_icon (win, "network-cellular-umts", "", "other"); 
+  add_icon (win, "network-cellular-acquiring", "", "other"); 
+  add_icon (win, "network-cellular-connected", "", "other"); 
+  add_icon (win, "network-cellular-no-route", "", "other"); 
+  add_icon (win, "network-cellular-offline", "", "other"); 
+  add_icon (win, "network-cellular-signal-excellent", "", "other"); 
+  add_icon (win, "network-cellular-signal-good", "", "other"); 
+  add_icon (win, "network-cellular-signal-ok", "", "other"); 
+  add_icon (win, "network-cellular-signal-weak", "", "other"); 
+  add_icon (win, "network-cellular-signal-none", "", "other"); 
+  add_icon (win, "network-vpn-acquiring", "", "other"); 
+  add_icon (win, "network-vpn", "", "other"); 
+  add_icon (win, "network-wired-acquiring", "", "other"); 
+  add_icon (win, "network-wired-disconnected", "", "other"); 
+  add_icon (win, "network-wired-no-route", "", "other"); 
+  add_icon (win, "network-wired-offline", "", "other"); 
+  add_icon (win, "network-wireless-acquiring", "", "other"); 
+  add_icon (win, "network-wireless-connected", "", "other"); 
+  add_icon (win, "network-wireless-encrypted", "", "other"); 
+  add_icon (win, "network-wireless-hotspot", "", "other"); 
+  add_icon (win, "network-wireless-no-route", "", "other"); 
+  add_icon (win, "network-wireless-offline", "", "other"); 
+  add_icon (win, "network-wireless-signal-excellent", "", "other"); 
+  add_icon (win, "network-wireless-signal-good", "", "other"); 
+  add_icon (win, "network-wireless-signal-ok", "", "other"); 
+  add_icon (win, "network-wireless-signal-weak", "", "other"); 
+  add_icon (win, "network-wireless-signal-none", "", "other"); 
+  add_icon (win, "rotation-allowed", "", "other"); 
+  add_icon (win, "rotation-locked", "", "other"); 
+  add_icon (win, "software-update-available", "The icon used when an update is available for software installed on the computing device, through the system software update program", "other");
+  add_icon (win, "software-update-urgent", "The icon used when an urgent update is available through the system software update program", "other");
+  add_icon (win, "sync-error", "The icon used when an error occurs while attempting to synchronize data from the computing device, to another device", "other");
+  add_icon (win, "sync-synchronizing", "The icon used while data is successfully synchronizing to another device", "other");
+  add_icon (win, "touchpad-disabled", "", "other"); 
+  add_icon (win, "trophy-bronze", "", "other"); 
+  add_icon (win, "trophy-silver", "", "other"); 
+  add_icon (win, "trophy-gold", "", "other"); 
+}
+
+static gboolean
+key_press_event_cb (GtkWidget    *widget,
+                    GdkEvent     *event,
+                    GtkSearchBar *bar)
+{
+  return gtk_search_bar_handle_event (bar, event);
+}
+
+static gboolean
+icon_visible_func (GtkTreeModel *model,
+                   GtkTreeIter  *iter,
+                   gpointer      data)
+{
+  IconBrowserWindow *win = data;
+  gchar *context;
+  gchar *name;
+  gint column;
+  gboolean visible;
+
+  if (win->symbolic)
+    column = SYMBOLIC_NAME_COLUMN;
+  else
+    column = NAME_COLUMN;
+
+  gtk_tree_model_get (model, iter,
+                      column, &name,
+                      CONTEXT_COLUMN, &context,
+                      -1);
+
+  visible = name != NULL && win->current_context != NULL && g_strcmp0 (context, win->current_context->id) == 0;
+
+  g_free (name);
+  g_free (context);
+
+  return visible;
+}
+
+static void
+symbolic_toggled (GtkToggleButton *toggle, IconBrowserWindow *win)
+{
+  gint column;
+
+  win->symbolic = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));
+
+  if (win->symbolic)
+    column = SYMBOLIC_NAME_COLUMN;
+  else
+    column = NAME_COLUMN;
+
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->cell, "icon-name", column, NULL);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->text_cell, "text", column, NULL);
+  
+  gtk_tree_model_filter_refilter (win->filter_model);
+  gtk_widget_queue_draw (win->list);
+}
+
+static void
+icon_browser_window_init (IconBrowserWindow *win)
+{
+  gtk_widget_init_template (GTK_WIDGET (win));
+
+  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
+
+  g_object_bind_property (win->search, "active",
+                          win->searchbar, "search-mode-enabled",
+                          G_BINDING_BIDIRECTIONAL);
+
+//  gtk_tree_view_set_search_entry (GTK_TREE_VIEW (win->list), GTK_ENTRY (win->searchentry));
+  g_signal_connect (win, "key-press-event", G_CALLBACK (key_press_event_cb), win->searchbar);
+
+  gtk_tree_model_filter_set_visible_func (win->filter_model, icon_visible_func, win, NULL);
+  gtk_window_set_transient_for (GTK_WINDOW (win->details), GTK_WINDOW (win));
+
+  symbolic_toggled (GTK_TOGGLE_BUTTON (win->symbolic_radio), win);
+
+  populate (win);
+}
+
+static void
+icon_browser_window_class_init (IconBrowserWindowClass *class)
+{
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
+                                               "/org/gtk/iconbrowser/window.ui");
+
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, context_list);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, filter_model);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, symbolic_radio);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, details);
+
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, store);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, cell);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, text_cell);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, search);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, searchbar);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, searchentry);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, list);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image1);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image2);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image3);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image4);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image5);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, description);
+
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), selection_changed);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), item_activated);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), selected_context_changed);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), symbolic_toggled);
+}
+
+IconBrowserWindow *
+icon_browser_window_new (IconBrowserApp *app)
+{
+  return g_object_new (ICON_BROWSER_WINDOW_TYPE, "application", app, NULL);
+}

demos/icon-browser/iconbrowserwin.h

@@ -0,0 +1,20 @@
+#ifndef __ICON_BROWSER_WIN_H
+#define __ICON_BROWSER_WIN_H
+
+#include <gtk/gtk.h>
+#include "iconbrowserapp.h"
+
+
+#define ICON_BROWSER_WINDOW_TYPE (icon_browser_window_get_type ())
+#define ICON_BROWSER_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ICON_BROWSER_WINDOW_TYPE, IconBrowserWindow))
+
+
+typedef struct _IconBrowserWindow         IconBrowserWindow;
+typedef struct _IconBrowserWindowClass    IconBrowserWindowClass;
+
+
+GType              icon_browser_window_get_type     (void);
+IconBrowserWindow *icon_browser_window_new          (IconBrowserApp    *app);
+
+
+#endif /* __ICON_BROWSER_WIN_H */

demos/icon-browser/main.c

@@ -0,0 +1,8 @@
+#include <gtk/gtk.h>
+#include <iconbrowserapp.h>
+
+int
+main (int argc, char *argv[])
+{
+  return g_application_run (G_APPLICATION (icon_browser_app_new ()), argc, argv);
+}

demos/icon-browser/window.ui

@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.8 -->
+  <object class="GtkListStore" id="store">
+    <columns>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeModelFilter" id="filter_model">
+    <property name="child_model">store</property>
+  </object>
+  <template class="IconBrowserWindow" parent="GtkApplicationWindow">
+    <property name="title" translatable="yes">Icon Browser</property>
+    <property name="default-width">600</property>
+    <property name="default-height">800</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header">
+        <property name="visible">True</property>
+        <property name="title" translatable="yes">Icon Browser</property>
+        <property name="show-close-button">True</property>
+        <child type="title">
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkRadioButton" id="normal_radio">
+                <property name="visible">True</property>
+                <property name="draw_indicator">False</property>
+                <property name="label" translatable="yes">Normal</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="symbolic_radio">
+                <property name="visible">True</property>
+                <property name="draw_indicator">False</property>
+                <property name="label" translatable="yes">Symbolic</property>
+                <property name="group">normal_radio</property>
+                <signal name="toggled" handler="symbolic_toggled"/>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="search">
+            <property name="visible">False</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="search-icon">
+                <property name="visible">True</property>
+                <property name="icon-name">edit-find-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="orientation">horizontal</property>
+        <child>
+          <object class="GtkListBox" id="context_list">
+            <property name="visible">True</property>
+            <property name="selection_mode">single</property>
+            <signal name="selected-rows-changed" handler="selected_context_changed"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="content_box">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkSearchBar" id="searchbar">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkSearchEntry" id="searchentry">
+                    <signal name="search-changed" handler="search_text_changed"/>
+                    <property name="visible">True</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="sw">
+                <property name="visible">True</property>
+                <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>
+                    <property name="model">filter_model</property>
+                    <signal name="selection_changed" handler="selection_changed"/>
+                    <signal name="item_activated" handler="item_activated"/>
+                    <child>
+                      <object class="GtkCellRendererPixbuf" id="cell">
+                        <property name="xpad">10</property>
+                        <property name="ypad">10</property>
+                        <property name="stock-size">5</property>
+                        <property name="follow-state">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkCellRendererText" id="text_cell">
+                        <property name="xpad">10</property>
+                        <property name="ypad">10</property>
+                        <property name="xalign">0.5</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+  <object class="GtkSizeGroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="normal_radio"/>
+      <widget name="symbolic_radio"/>
+      <widget name="search"/>
+    </widgets>
+  </object>
+  <object class="GtkDialog" id="details">
+    <property name="modal">True</property>
+    <property name="use-header-bar">1</property>
+    <property name="resizable">False</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <child>
+          <object class="GtkGrid">
+            <property name="visible">True</property>
+            <property name="margin">10</property>
+            <property name="row-spacing">10</property>
+            <property name="column-spacing">10</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="image3">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="image4">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+              </object>
+              <packing>
+                <property name="left-attach">3</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="image5">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">end</property>
+              </object>
+              <packing>
+                <property name="left-attach">4</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="label">16x16</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="label">24x24</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="label">32x32</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left-attach">2</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="label">48x48</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left-attach">3</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="xpad">4</property>
+                <property name="ypad">4</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="label">64x64</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left-attach">4</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="description">
+                <property name="visible">True</property>
+                <property name="wrap">True</property>
+                <property name="max-width-chars">60</property>
+                <property name="xalign">0</property>
+                <property name="valign">start</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
+                <property name="width">5</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

demos/pixbuf-demo/Makefile.am

@@ -1,41 +0,0 @@
-## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl
-
-AM_CPPFLAGS = 				\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la	\
-	$(GTK_DEP_LIBS)			\
-	$(MATH_LIB)
-
-noinst_PROGRAMS = 		\
-	pixbuf-demo
-
-pixbuf_demo_DEPENDENCIES = $(DEPS)
-
-pixbuf_demo_LDADD = $(LDADDS)
-
-pixbuf_demo_SOURCES = pixbuf-demo.c
-
-EXTRA_DIST +=			\
-	apple-red.png		\
-	background.jpg		\
-	gnome-applets.png	\
-	gnome-calendar.png	\
-	gnome-foot.png		\
-	gnome-gimp.png		\
-	gnome-gmush.png		\
-	gnome-gsame.png		\
-	gnu-keys.png
-
--include $(top_srcdir)/git.mk

demos/pixbuf-demo/pixbuf-demo.c

@@ -1,215 +0,0 @@
-/* GdkPixbuf library - Scaling and compositing demo
- *
- * Copyright (C) 1999 The Free Software Foundation
- *
- * Authors: Federico Mena-Quintero <federico@gimp.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <math.h>
-
-
-
-#define BACKGROUND_NAME "background.jpg"
-
-static const char *image_names[] = {
-	"apple-red.png",
-	"gnome-applets.png",
-	"gnome-calendar.png",
-	"gnome-foot.png",
-	"gnome-gmush.png",
-	"gnome-gimp.png",
-	"gnome-gsame.png",
-	"gnu-keys.png"
-};
-
-#define N_IMAGES (sizeof (image_names) / sizeof (image_names[0]))
-
-/* Current frame */
-static GdkPixbuf *frame;
-
-/* Background image */
-static GdkPixbuf *background;
-static int back_width, back_height;
-
-/* Images */
-static GdkPixbuf *images[N_IMAGES];
-
-/* Widgets */
-static GtkWidget *da;
-
-
-
-/* Loads the images for the demo and returns whether the operation succeeded */
-static gboolean
-load_pixbufs (void)
-{
-	int i;
-
-        /* We pass NULL for the error return location, we don't care
-         * about the error message.
-         */
-        
-	background = gdk_pixbuf_new_from_file (BACKGROUND_NAME, NULL);
-	if (!background)
-		return FALSE;
-
-	back_width = gdk_pixbuf_get_width (background);
-	back_height = gdk_pixbuf_get_height (background);
-
-	for (i = 0; i < N_IMAGES; i++) {
-		images[i] = gdk_pixbuf_new_from_file (image_names[i], NULL);
-		if (!images[i])
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* Expose callback for the drawing area */
-static gboolean
-draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
-{
-        gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
-        cairo_paint (cr);
-
-	return TRUE;
-}
-
-#define CYCLE_TIME 3000000 /* 3 seconds */
-
-static gint64 start_time;
-
-/* Handler to regenerate the frame */
-static gboolean
-on_tick (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       data)
-{
-	gint64	current_time;
-	double f;
-	int i;
-	double xmid, ymid;
-	double radius;
-
-	gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
-			      frame, 0, 0);
-
-        if (start_time == 0)
-          start_time = gdk_frame_clock_get_frame_time (frame_clock);
-
-	current_time = gdk_frame_clock_get_frame_time (frame_clock);
-	f = ((current_time - start_time) % CYCLE_TIME) / (double)CYCLE_TIME;
-
-	xmid = back_width / 2.0;
-	ymid = back_height / 2.0;
-
-	radius = MIN (xmid, ymid) / 2.0;
-
-	for (i = 0; i < N_IMAGES; i++) {
-		double ang;
-		int xpos, ypos;
-		int iw, ih;
-		double r;
-		GdkRectangle r1, r2, dest;
-		double k;
-
-		ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
-
-		iw = gdk_pixbuf_get_width (images[i]);
-		ih = gdk_pixbuf_get_height (images[i]);
-
-		r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
-
-		xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
-		ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
-
-		k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
-		k = 2.0 * k * k;
-		k = MAX (0.25, k);
-
-		r1.x = xpos;
-		r1.y = ypos;
-		r1.width = iw * k;
-		r1.height = ih * k;
-
-		r2.x = 0;
-		r2.y = 0;
-		r2.width = back_width;
-		r2.height = back_height;
-
-		if (gdk_rectangle_intersect (&r1, &r2, &dest))
-			gdk_pixbuf_composite (images[i],
-					      frame,
-					      dest.x, dest.y,
-					      dest.width, dest.height,
-					      xpos, ypos,
-					      k, k,
-					      GDK_INTERP_NEAREST,
-					      ((i & 1)
-					       ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
-					       : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
-	}
-
-	gtk_widget_queue_draw (da);
-
-	return G_SOURCE_CONTINUE;
-}
-
-/* Destroy handler for the window */
-static void
-destroy_cb (GObject *object, gpointer data)
-{
-	gtk_main_quit ();
-}
-
-int
-main (int argc, char **argv)
-{
-	GtkWidget *window;
-
-	gtk_init (&argc, &argv);
-
-	if (!load_pixbufs ()) {
-		g_message ("main(): Could not load all the pixbufs!");
-		exit (EXIT_FAILURE);
-	}
-
-	frame = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, back_width, back_height);
-
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	gtk_widget_set_size_request (window, back_width, back_height);
-
-	g_signal_connect (window, "destroy",
-			  G_CALLBACK (destroy_cb), NULL);
-
-	da = gtk_drawing_area_new ();
-
-	g_signal_connect (da, "draw",
-			  G_CALLBACK (draw_cb), NULL);
-
-	gtk_container_add (GTK_CONTAINER (window), da);
-
-	gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
-
-	gtk_widget_show_all (window);
-	gtk_main ();
-
-	return 0;
-}

demos/widget-factory/Makefile.am

@@ -60,6 +60,7 @@ uninstall-update-icon-cache:
 
 EXTRA_DIST += \
 	widget-factory.ui \
+	menus.ui \
 	widget-factory.gresource.xml
 
 -include $(top_srcdir)/git.mk

demos/widget-factory/menus.ui

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="app-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="accel">&lt;Primary&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

demos/widget-factory/widget-factory.c

@@ -1,5 +1,4 @@
-/* widget-factory: a collection of widgets in a single page, for easy
- *                 theming
+/* widget-factory: a collection of widgets, for easy theme testing
  *
  * Copyright (C) 2011 Canonical Ltd
  *
@@ -17,7 +16,6 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by Andrea Cimitan <andrea.cimitan@canonical.com>
- *
  */
 
 #include "config.h"
@@ -38,20 +36,6 @@ change_theme_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
-static void
-change_toolbar_state (GSimpleAction *action,
-                      GVariant      *state,
-                      gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GtkWidget *toolbar;
-
-  toolbar = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "toolbar"));
-  gtk_widget_set_visible (toolbar, g_variant_get_boolean (state));
-
-  g_simple_action_set_state (action, state);
-}
-
 static void
 activate_search (GSimpleAction *action,
                  GVariant      *parameter,
@@ -87,14 +71,17 @@ activate_about (GSimpleAction *action,
     "Cosimo Cecchi",
     NULL
   };
+  gchar *version;
+
+  version = g_strdup_printf ("%s\nRunning against GTK+ %d.%d.%d",
+                             PACKAGE_VERSION,
+                             gtk_get_major_version (),
+                             gtk_get_minor_version (),
+                             gtk_get_micro_version ());
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
                          "program-name", "GTK+ Widget Factory",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
-                                                     PACKAGE_VERSION,
-                                                     gtk_get_major_version (),
-                                                     gtk_get_minor_version (),
-                                                     gtk_get_micro_version ()),
+                         "version", version,
                          "copyright", "(C) 1997-2013 The GTK+ Team",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org",
@@ -103,6 +90,8 @@ activate_about (GSimpleAction *action,
                          "logo-icon-name", "gtk3-widget-factory",
                          "title", "About GTK+ Widget Factory",
                          NULL);
+
+  g_free (version);
 }
 
 static void
@@ -156,14 +145,20 @@ dismiss (GtkWidget *button)
 }
 
 static gint pulse_time = 250;
-static guint pulse_id = 0;
+static gint pulse_entry_mode = 0;
 
 static gboolean
 pulse_it (GtkWidget *widget)
 {
-  gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
+  guint pulse_id;
+
+  if (GTK_IS_ENTRY (widget))
+    gtk_entry_progress_pulse (GTK_ENTRY (widget));
+  else
+    gtk_progress_bar_pulse (GTK_PROGRESS_BAR (widget));
 
   pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
+  g_object_set_data (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id));
 
   return G_SOURCE_REMOVE;
 }
@@ -172,80 +167,69 @@ static void
 update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)
 {
   gdouble value;
+  guint pulse_id;
 
   value = gtk_adjustment_get_value (adjustment);
 
+  pulse_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget), "pulse_id"));
+
   /* vary between 50 and 450 */
   pulse_time = 50 + 4 * value;
 
-  if (value == 100 && pulse_id != 0)
+  if (value == 100)
     {
-      g_source_remove (pulse_id);
-      pulse_id = 0;
+      if (pulse_id != 0)
+        {
+          g_source_remove (pulse_id);
+          g_object_set_data (G_OBJECT (widget), "pulse_id", NULL);
+        }
     }
-  else if (value < 100 && pulse_id == 0)
+  else if (value < 100)
     {
-      pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
+      if (pulse_id == 0 && (GTK_IS_PROGRESS_BAR (widget) || pulse_entry_mode % 3 == 2))
+        {
+          pulse_id = g_timeout_add (pulse_time, (GSourceFunc)pulse_it, widget);
+          g_object_set_data (G_OBJECT (widget), "pulse_id", GUINT_TO_POINTER (pulse_id));
+        }
     }
 }
 
-static guint pulse_entry_id = 0;
-
-static gboolean
-pulse_entry (GtkEntry *entry)
-{
-  gtk_entry_progress_pulse (entry);
-
-  pulse_entry_id = g_timeout_add (100, (GSourceFunc)pulse_entry, entry);
-
-  return G_SOURCE_REMOVE;
-}
-
 static void
 on_entry_icon_release (GtkEntry            *entry,
                        GtkEntryIconPosition icon_pos,
                        GdkEvent            *event,
                        gpointer             user_data)
 {
-  static int num = 0;
+  guint pulse_id;
 
   if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
     return;
 
-  num++;
+  pulse_entry_mode++;
 
-  if (num % 3 == 0)
+  if (pulse_entry_mode % 3 == 0)
     {
-      if (pulse_entry_id > 0)
-        g_source_remove (pulse_entry_id);
+      pulse_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry), "pulse_id"));
+      if (pulse_id != 0)
+        {
+          g_source_remove (pulse_id);
+          g_object_set_data (G_OBJECT (entry), "pulse_id", NULL);
+        }
       gtk_entry_set_progress_fraction (entry, 0);
     }
-  else if (num % 3 == 1)
+  else if (pulse_entry_mode % 3 == 1)
     gtk_entry_set_progress_fraction (entry, 0.25);
-  else if (num % 3 == 2)
+  else if (pulse_entry_mode % 3 == 2)
     {
-      gtk_entry_set_progress_pulse_step (entry, 0.1);
-      pulse_entry (entry);
+      if (pulse_time - 50 < 400)
+        {
+          gtk_entry_set_progress_pulse_step (entry, 0.1);
+          pulse_it (GTK_WIDGET (entry));
+        }
     }
 
 }
 
-static void
-startup (GApplication *app)
-{
-  GtkBuilder *builder;
-  GMenuModel *appmenu;
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", NULL);
-
-  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
-
-  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
-
-  g_object_unref (builder);
-}
-
 static void
 update_header (GtkListBoxRow *row,
                GtkListBoxRow *before,
@@ -281,26 +265,336 @@ close_dialog (GtkWidget *dialog)
   gtk_widget_hide (dialog);
 }
 
+static void
+set_needs_attention (GtkWidget *page, gboolean needs_attention)
+{
+  GtkWidget *stack;
+
+  stack = gtk_widget_get_parent (page);
+  gtk_container_child_set (GTK_CONTAINER (stack), page,
+                           "needs-attention", needs_attention,
+                           NULL);
+}
+
+static gboolean
+demand_attention (gpointer stack)
+{
+  GtkWidget *page;
+
+  page = gtk_stack_get_child_by_name (GTK_STACK (stack), "page3");
+  set_needs_attention (page, TRUE);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+action_dialog_button_clicked (GtkButton *button, GtkWidget *page)
+{
+  g_timeout_add (1000, demand_attention, page);
+}
+
+static void
+page_changed_cb (GtkWidget *stack, GParamSpec *pspec, gpointer data)
+{
+  const gchar *name;
+  GtkWidget *page;
+
+  if (gtk_widget_in_destruction (stack))
+    return;
+
+  name = gtk_stack_get_visible_child_name (GTK_STACK (stack));
+  if (g_str_equal (name, "page3"))
+    {
+      page = gtk_stack_get_visible_child (GTK_STACK (stack));
+      set_needs_attention (GTK_WIDGET (page), FALSE);
+    }
+}
+
+static void
+populate_model (GtkTreeStore *store)
+{
+  GtkTreeIter iter, parent0, parent1, parent2, parent3;
+
+  gtk_tree_store_append (store, &iter, NULL);
+  gtk_tree_store_set (store, &iter,
+                      0, "Charlemagne",
+                      1, "742",
+                      2, "814",
+                      -1);
+  parent0 = iter;
+  gtk_tree_store_append (store, &iter, &parent0);
+  gtk_tree_store_set (store, &iter,
+                      0, "Pepin the Short",
+                      1, "714",
+                      2, "768",
+                      -1);
+  parent1 = iter;
+  gtk_tree_store_append (store, &iter, &parent1);
+  gtk_tree_store_set (store, &iter,
+                      0, "Charles Martel",
+                      1, "688",
+                      2, "741",
+                      -1);
+  parent2 = iter;
+  gtk_tree_store_append (store, &iter, &parent2);
+  gtk_tree_store_set (store, &iter,
+                      0, "Pepin of Herstal",
+                      1, "635",
+                      2, "714",
+                      -1);
+  parent3 = iter;
+  gtk_tree_store_append (store, &iter, &parent3);
+  gtk_tree_store_set (store, &iter,
+                      0, "Ansegisel",
+                      1, "602 or 610",
+                      2, "murdered before 679",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent3);
+  gtk_tree_store_set (store, &iter,
+                      0, "Begga",
+                      1, "615",
+                      2, "693",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent2);
+  gtk_tree_store_set (store, &iter,
+                      0, "Alpaida",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent1);
+  gtk_tree_store_set (store, &iter,
+                      0, "Rotrude",
+                      -1);
+  parent2 = iter;
+  gtk_tree_store_append (store, &iter, &parent2);
+  gtk_tree_store_set (store, &iter,
+                      0, "Liévin de Trèves",
+                      -1);
+  parent3 = iter;
+  gtk_tree_store_append (store, &iter, &parent3);
+  gtk_tree_store_set (store, &iter,
+                      0, "Guérin",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent3);
+  gtk_tree_store_set (store, &iter,
+                      0, "Gunza",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent2);
+  gtk_tree_store_set (store, &iter,
+                      0, "Willigarde de Bavière",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent0);
+  gtk_tree_store_set (store, &iter,
+                      0, "Bertrada of Laon",
+                      1, "710",
+                      2, "783",
+                      -1);
+  parent1 = iter;
+  gtk_tree_store_append (store, &iter, &parent1);
+  gtk_tree_store_set (store, &iter,
+                      0, "Caribert of Laon",
+                      2, "before 762",
+                      -1);
+  parent2 = iter;
+  gtk_tree_store_append (store, &iter, &parent2);
+  gtk_tree_store_set (store, &iter,
+                      0, "Unknown",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent2);
+  gtk_tree_store_set (store, &iter,
+                      0, "Bertrada of Prüm",
+                      1, "ca. 670",
+                      2, "after 721",
+                      -1);
+  gtk_tree_store_append (store, &iter, &parent1);
+  gtk_tree_store_set (store, &iter,
+                      0, "Gisele of Aquitaine",
+                      -1);
+}
+
+static void
+update_title_header (GtkListBoxRow *row,
+                     GtkListBoxRow *before,
+                     gpointer       data)
+{
+  GtkWidget *header;
+  gchar *title;
+
+  header = gtk_list_box_row_get_header (row);
+  title = (gchar *)g_object_get_data (G_OBJECT (row), "title");
+  if (!header && title)
+    {
+      title = g_strdup_printf ("<b>%s</b>", title);
+
+      header = gtk_label_new (title);
+      gtk_label_set_use_markup (GTK_LABEL (header), TRUE);
+      gtk_widget_set_halign (header, GTK_ALIGN_START);
+      gtk_widget_set_margin_top (header, 12);
+      gtk_widget_set_margin_start (header, 6);
+      gtk_widget_set_margin_end (header, 6);
+      gtk_widget_set_margin_bottom (header, 6);
+      gtk_widget_show (header);
+
+      gtk_list_box_row_set_header (row, header);
+
+      g_free (title);
+    }
+}
+
+static void
+populate_colors (GtkWidget *widget)
+{
+  struct { const gchar *name; const gchar *color; const gchar *title; } colors[] = {
+    { "2.5", "#C8828C", "Red" },
+    { "5", "#C98286", NULL },
+    { "7.5", "#C9827F", NULL },
+    { "10", "#C98376", NULL },
+    { "2.5", "#C8856D", "Red/Yellow" },
+    { "5", "#C58764", NULL },
+    { "7.5", "#C1895E", NULL },
+    { "10", "#BB8C56", NULL },
+    { "2.5", "#B58F4F", "Yellow" },
+    { "5", "#AD924B", NULL },
+    { "7.5", "#A79548", NULL },
+    { "10", "#A09749", NULL },
+    { "2.5", "#979A4E", "Yellow/Green" },
+    { "5", "#8D9C55", NULL },
+    { "7.5", "#7F9F62", NULL },
+    { "10", "#73A06E", NULL },
+    { "2.5", "#65A27C", "Green" },
+    { "5", "#5CA386", NULL },
+    { "7.5", "#57A38D", NULL },
+    { "10", "#52A394", NULL },
+    { "2.5", "#4EA39A", "Green/Blue" },
+    { "5", "#49A3A2", NULL },
+    { "7.5", "#46A2AA", NULL },
+    { "10", "#46A1B1", NULL },
+    { "2.5", "#49A0B8", "Blue" },
+    { "5", "#529EBD", NULL },
+    { "7.5", "#5D9CC1", NULL },
+    { "10", "#689AC3", NULL },
+    { "2.5", "#7597C5", "Blue/Purple" },
+    { "5", "#8095C6", NULL },
+    { "7.5", "#8D91C6", NULL },
+    { "10", "#988EC4", NULL },
+    { "2.5", "#A08CC1", "Purple" },
+    { "5", "#A88ABD", NULL },
+    { "7.5", "#B187B6", NULL },
+    { "10", "#B786B0", NULL },
+    { "2.5", "#BC84A9", "Purple/Red" },
+    { "5", "#C183A0", NULL },
+    { "7.5", "#C48299", NULL },
+    { "10", "#C68292", NULL }
+  };
+  gint i;
+  GtkWidget *row, *box, *label, *swatch;
+  GdkRGBA rgba;
+
+  gtk_list_box_set_header_func (GTK_LIST_BOX (widget), update_title_header, NULL, NULL);
+                             
+  for (i = 0; i < G_N_ELEMENTS (colors); i++)
+    {
+      row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
+      label = gtk_label_new (colors[i].name);
+      g_object_set (label,
+                    "halign", GTK_ALIGN_START,
+                    "valign", GTK_ALIGN_CENTER,
+                    "margin", 6,
+                    "xalign", 0.0,
+                    NULL);
+      gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
+      gdk_rgba_parse (&rgba, colors[i].color);
+      swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
+                             "rgba", &rgba,
+                             "selectable", FALSE,
+                             "halign", GTK_ALIGN_END,
+                             "valign", GTK_ALIGN_CENTER,
+                             "margin", 6,
+                             "height-request", 24,
+                             NULL);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_container_add (GTK_CONTAINER (box), swatch);
+      gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE, 0);
+      gtk_widget_show_all (row);
+      gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
+      row = gtk_widget_get_parent (row);
+      gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
+      if (colors[i].title)
+        g_object_set_data (G_OBJECT (row), "title", (gpointer)colors[i].title);
+    }
+
+  gtk_list_box_invalidate_headers (GTK_LIST_BOX (widget));
+}
+
+static void
+row_activated (GtkListBox *box, GtkListBoxRow *row)
+{
+  GtkWidget *image;
+  GtkWidget *dialog;
+
+  image = (GtkWidget *)g_object_get_data (G_OBJECT (row), "image");
+  dialog = (GtkWidget *)g_object_get_data (G_OBJECT (row), "dialog");
+
+  if (image)
+    {
+      if (gtk_widget_get_opacity (image) > 0)
+        gtk_widget_set_opacity (image, 0);
+      else
+        gtk_widget_set_opacity (image, 1);
+    }
+  else if (dialog)
+    {
+      gtk_window_present (GTK_WINDOW (dialog));
+    }
+}
+
+static void
+set_accel (GtkApplication *app, GtkWidget *widget)
+{
+  GtkWidget *accel_label;
+  const gchar *action;
+  gchar **accels;
+  guint key;
+  GdkModifierType mods;
+
+  accel_label = gtk_bin_get_child (GTK_BIN (widget));
+  g_assert (GTK_IS_ACCEL_LABEL (accel_label));
+
+  action = gtk_actionable_get_action_name (GTK_ACTIONABLE (widget));
+  accels = gtk_application_get_accels_for_action (app, action);
+
+  gtk_accelerator_parse (accels[0], &key, &mods);
+  gtk_accel_label_set_accel (GTK_ACCEL_LABEL (accel_label), key, mods);
+
+  g_strfreev (accels);
+}
+
 static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
   GtkWindow *window;
   GtkWidget *widget;
+  GtkWidget *widget2;
+  GtkWidget *stack;
   GtkWidget *dialog;
   GtkAdjustment *adj;
   static GActionEntry win_entries[] = {
     { "dark", NULL, NULL, "false", change_theme_state },
-    { "toolbar", NULL, NULL, "true", change_toolbar_state },
     { "search", activate_search, NULL, NULL, NULL },
     { "delete", activate_delete, NULL, NULL, NULL }
   };
-  GError *error = NULL;
+  struct {
+    const gchar *action_and_target;
+    const gchar *accelerators[2];
+  } accels[] = {
+    { "app.about", { "F1", NULL } },
+    { "app.quit", { "<Primary>q", NULL } },
+    { "win.dark", { "<Primary>d", NULL } },
+    { "win.search", { "<Primary>s", NULL } },
+    { "win.delete", { "Delete", NULL } }
+  };
+  gint i;
 
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/ui/widget-factory.ui", &error);
-  if (error)
-    g_print ("error: %s\n", error->message);
+  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui");
   gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
   gtk_builder_connect_signals (builder, NULL);
 
@@ -310,11 +604,27 @@ activate (GApplication *app)
                                    win_entries, G_N_ELEMENTS (win_entries),
                                    window);
 
+  for (i = 0; i < G_N_ELEMENTS (accels); i++)
+    gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
+  gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
+  g_action_map_add_action (G_ACTION_MAP (window),
+                           G_ACTION (g_property_action_new ("statusbar", widget, "visible")));
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
+  g_action_map_add_action (G_ACTION_MAP (window),
+                           G_ACTION (g_property_action_new ("toolbar", widget, "visible")));
+
+  adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment1");
+
   widget = (GtkWidget *)gtk_builder_get_object (builder, "progressbar3");
-  pulse_id = g_timeout_add (250, (GSourceFunc)pulse_it, widget);
-  g_signal_connect (gtk_builder_get_object (builder, "adjustment1"),
-                    "value-changed",
-                    G_CALLBACK (update_pulse_time), widget);
+  g_signal_connect (adj, "value-changed", G_CALLBACK (update_pulse_time), widget);
+  update_pulse_time (adj, widget);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "entry1");
+  g_signal_connect (adj, "value-changed", G_CALLBACK (update_pulse_time), widget);
+  update_pulse_time (adj, widget);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "page2dismiss");
   g_signal_connect (widget, "clicked", G_CALLBACK (dismiss), NULL);
@@ -325,6 +635,15 @@ activate (GApplication *app)
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "listbox");
   gtk_list_box_set_header_func (GTK_LIST_BOX (widget), update_header, NULL, NULL);
+  g_signal_connect (widget, "row-activated", G_CALLBACK (row_activated), NULL);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow3");
+  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow3image");
+  g_object_set_data (G_OBJECT (widget), "image", widget2);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "listboxrow4");
+  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");
+  g_object_set_data (G_OBJECT (widget), "dialog", widget2);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
   g_object_set_data (G_OBJECT (window), "toolbar", widget);
@@ -346,11 +665,28 @@ activate (GApplication *app)
   widget = (GtkWidget *)gtk_builder_get_object (builder, "action_dialog_button");
   g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
 
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "act_action_dialog");
+  stack = (GtkWidget *)gtk_builder_get_object (builder, "toplevel_stack");
+  g_signal_connect (widget, "clicked", G_CALLBACK (action_dialog_button_clicked), stack);
+  g_signal_connect (stack, "notify::visible-child-name", G_CALLBACK (page_changed_cb), NULL);
+
   dialog = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog");
   g_signal_connect (dialog, "response", G_CALLBACK (close_dialog), NULL);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "preference_dialog_button");
   g_signal_connect (widget, "clicked", G_CALLBACK (show_dialog), dialog);
 
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "charletree");
+  populate_model ((GtkTreeStore *)gtk_tree_view_get_model (GTK_TREE_VIEW (widget)));
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (widget));
+
+  populate_colors ((GtkWidget *)gtk_builder_get_object (builder, "munsell"));
+
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "quitmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "deletemenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "searchmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "darkmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "aboutmenuitem")));
+
   gtk_widget_show_all (GTK_WIDGET (window));
 
   g_object_unref (builder);
@@ -363,24 +699,21 @@ main (int argc, char *argv[])
   static GActionEntry app_entries[] = {
     { "about", activate_about, NULL, NULL, NULL },
     { "quit", activate_quit, NULL, NULL, NULL },
-
     { "main", NULL, "s", "'steak'", NULL },
     { "wine", NULL, NULL, "false", NULL },
     { "beer", NULL, NULL, "false", NULL },
     { "water", NULL, NULL, "true", NULL },
     { "dessert", NULL, "s", "'bars'", NULL },
     { "pay", NULL, "s", NULL, NULL }
-
   };
   gint status;
 
-  app = gtk_application_new ("org.gtk.WidgetFactory", 0);
+  app = gtk_application_new ("org.gtk.WidgetFactory", G_APPLICATION_NON_UNIQUE);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),
                                    app);
 
-  g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
   g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
 
   status = g_application_run (G_APPLICATION (app), argc, argv);

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

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/ui">
+  <gresource prefix="/org/gtk/WidgetFactory">
     <file preprocess="xml-stripblanks">widget-factory.ui</file>
   </gresource>
+  <gresource prefix="/org/gtk/WidgetFactory/gtk">
+    <file preprocess="xml-stripblanks">menus.ui</file>
+  </gresource>
 </gresources>

docs/reference/gtk/Makefile.am

@@ -153,8 +153,10 @@ content_files =					\
 	x11.sgml				\
 	gtk3-demo.xml				\
 	gtk3-widget-factory.xml			\
+	gtk3-icon-browser.xml			\
 	gtk-query-immodules-3.0.xml		\
 	gtk-update-icon-cache.xml		\
+	gtk-encode-symbolic-svg.xml		\
 	gtk-launch.xml				\
 	broadwayd.xml				\
 	input-handling.xml			\
@@ -179,125 +181,6 @@ expand_content_files = 				\
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
-	$(top_srcdir)/gtk/stock-icons/24/help-about.png			\
-	$(top_srcdir)/gtk/stock-icons/24/list-add.png			\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png			\
-	$(top_srcdir)/gtk/stock-icons/24/format-text-bold.png		\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-optical.png		\
-	$(top_srcdir)/gtk/stock-icons/24/edit-clear.png			\
-	$(top_srcdir)/gtk/stock-icons/24/window-close.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-connect.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-convert.png		\
-	$(top_srcdir)/gtk/stock-icons/24/edit-copy.png			\
-	$(top_srcdir)/gtk/stock-icons/24/edit-cut.png			\
-	$(top_srcdir)/gtk/stock-icons/24/edit-delete.png		\
-	$(top_srcdir)/gtk/stock-icons/48/dialog-password.png		\
-	$(top_srcdir)/gtk/stock-icons/48/dialog-error.png		\
-	$(top_srcdir)/gtk/stock-icons/48/dialog-information.png		\
-	$(top_srcdir)/gtk/stock-icons/48/dialog-question.png		\
-	$(top_srcdir)/gtk/stock-icons/48/dialog-warning.png		\
-	$(top_srcdir)/gtk/stock-icons/24/folder.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-disconnect.png		\
-	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd.png			\
-	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd-multiple.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-edit.png			\
-	$(top_srcdir)/gtk/stock-icons/24/system-run.png			\
-	$(top_srcdir)/gtk/stock-icons/24/text-x-generic.png		\
-	$(top_srcdir)/gtk/stock-icons/24/edit-find.png			\
-	$(top_srcdir)/gtk/stock-icons/24/edit-find-replace.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-bottom.png			\
-	$(top_srcdir)/gtk/stock-icons/24/go-first-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-first-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-last-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-last-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-top.png			\
-	$(top_srcdir)/gtk/stock-icons/24/go-previous-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-previous-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-down.png			\
-	$(top_srcdir)/gtk/stock-icons/24/go-next-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-next-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-up.png			\
-	$(top_srcdir)/gtk/stock-icons/24/drive-harddisk.png		\
-	$(top_srcdir)/gtk/stock-icons/24/network-idle.png		\
-	$(top_srcdir)/gtk/stock-icons/24/help-contents.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-home.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-index.png			\
-	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/format-indent-more-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/format-indent-less-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/format-text-italic.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-jump-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/go-jump-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/format-justify-center.png	\
-	$(top_srcdir)/gtk/stock-icons/24/format-justify-fill.png	\
-	$(top_srcdir)/gtk/stock-icons/24/format-justify-left.png	\
-	$(top_srcdir)/gtk/stock-icons/24/format-justify-right.png	\
-	$(top_srcdir)/gtk/stock-icons/24/image-missing.png		\
-	$(top_srcdir)/gtk/stock-icons/24/document-new.png		\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-no.png			\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-ok.png			\
-	$(top_srcdir)/gtk/stock-icons/24/document-open.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-landscape.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-portrait.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-landscape.png \
-	$(top_srcdir)/gtk/stock-icons/24/gtk-orientation-reverse-portrait.png \
-	$(top_srcdir)/gtk/stock-icons/24/edit-paste.png			\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-preferences.png		\
-	$(top_srcdir)/gtk/stock-icons/24/document-print.png		\
-	$(top_srcdir)/gtk/stock-icons/24/printer-error.png		\
-	$(top_srcdir)/gtk/stock-icons/24/printer-paused.png		\
-	$(top_srcdir)/gtk/stock-icons/24/document-print-preview.png	\
-	$(top_srcdir)/gtk/stock-icons/24/printer-info.png		\
-	$(top_srcdir)/gtk/stock-icons/24/printer-warning.png		\
-	$(top_srcdir)/gtk/stock-icons/24/document-properties.png	\
-	$(top_srcdir)/gtk/stock-icons/24/application-exit.png		\
-	$(top_srcdir)/gtk/stock-icons/24/edit-redo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/edit-redo-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/view-refresh.png		\
-	$(top_srcdir)/gtk/stock-icons/24/list-remove.png		\
-	$(top_srcdir)/gtk/stock-icons/24/document-revert-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/document-revert-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-floppy.png		\
-	$(top_srcdir)/gtk/stock-icons/24/document-save.png		\
-	$(top_srcdir)/gtk/stock-icons/24/document-save-as.png		\
-	$(top_srcdir)/gtk/stock-icons/24/edit-select-all.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-select-color.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-color-picker.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-font.png			\
-	$(top_srcdir)/gtk/stock-icons/24/view-sort-ascending.png	\
-	$(top_srcdir)/gtk/stock-icons/24/view-sort-descending.png	\
-	$(top_srcdir)/gtk/stock-icons/24/tools-check-spelling.png	\
-	$(top_srcdir)/gtk/stock-icons/24/process-stop.png		\
-	$(top_srcdir)/gtk/stock-icons/24/format-text-strikethrough.png	\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-undelete-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/24/format-text-underline.png	\
-	$(top_srcdir)/gtk/stock-icons/24/edit-undo-ltr.png		\
-	$(top_srcdir)/gtk/stock-icons/24/edit-undo-rtl.png		\
-	$(top_srcdir)/gtk/stock-icons/20/gtk-yes.png			\
-	$(top_srcdir)/gtk/stock-icons/24/zoom-original.png		\
-	$(top_srcdir)/gtk/stock-icons/24/zoom-fit-best.png		\
-	$(top_srcdir)/gtk/stock-icons/24/zoom-in.png			\
-	$(top_srcdir)/gtk/stock-icons/24/zoom-out.png			\
-	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-seek-forward-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-skip-forward-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-playback-pause.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-playback-start-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-seek-backward-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-record.png		\
-	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-ltr.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-skip-backward-rtl.png	\
-	$(top_srcdir)/gtk/stock-icons/24/media-playback-stop.png	\
-	$(top_srcdir)/gtk/stock-icons/24/view-fullscreen.png		\
-	$(top_srcdir)/gtk/stock-icons/24/view-restore.png		\
-	$(top_srcdir)/gtk/stock-icons/24/gtk-page-setup.png		\
 	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
 	$(srcdir)/images/action-bar.png					\
@@ -451,9 +334,11 @@ EXTRA_DIST += version.xml.in gtk3.types.in
 man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
 	gtk-update-icon-cache.1		\
+	gtk-encode-symbolic-svg.1	\
 	gtk-launch.1			\
 	gtk3-demo.1			\
 	gtk3-widget-factory.1		\
+	gtk3-icon-browser.1		\
 	broadwayd.1
 
 if ENABLE_MAN

docs/reference/gtk/gtk-docs.sgml

@@ -395,8 +395,10 @@
     <title>GTK+ Tools</title>
     <xi:include href="gtk3-demo.xml" />
     <xi:include href="gtk3-widget-factory.xml" />
+    <xi:include href="gtk3-icon-browser.xml" />
     <xi:include href="gtk-query-immodules-3.0.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
+    <xi:include href="gtk-encode-symbolic-svg.xml" />
     <xi:include href="gtk-launch.xml" />
     <xi:include href="broadwayd.xml" />
   </part>

docs/reference/gtk/gtk-encode-symbolic-svg.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk-encode-symbolic-svg">
+
+<refentryinfo>
+  <title>gtk-encode-symbolic-svg</title>
+  <productname>GTK+</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Alexander</firstname>
+      <surname>Larsson</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk-encode-symbolic-svg</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk-encode-symbolic-svg</refname>
+  <refpurpose>Symbolic icon conversion utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk-encode-symbolic-svg</command>
+<arg choice="opt">OPTION...</arg>
+<arg choice="plain"><replaceable>PATH</replaceable></arg>
+<arg choice="plain"><replaceable>WIDTH</replaceable>x<replaceable>HEIGHT</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+  <command>gtk-encode-symbolic-svg</command> converts symbolic svg icons into
+  specially prepared png files. GTK+ can load and recolor these pngs, just like
+  original svgs, but loading them is much faster.
+</para>
+<para>
+  <replaceable>PATH</replaceable> is the name of a symbolic svg file,
+  <replaceable>WIDTH</replaceable>x<replaceable>HEIGHT</replaceable> are the
+  desired dimensions for the generated png file.
+</para>
+<para>
+  To distinguish them from ordinary pngs, the generated files have the extension
+  <filename>.symbolic.png</filename>.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>-o <replaceable>DIRECTORY</replaceable></term>
+    <term>--output <replaceable>DIRECTORY</replaceable></term>
+    <listitem><para>Write png files to <replaceable>DIRECTORY</replaceable>
+         instead of the current working directory.</para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk-update-icon-cache.xml

@@ -32,7 +32,10 @@
 <command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
-<arg choice="opt">--index-only</arg>
+<group>
+  <arg choice="plain">--index-only</arg>
+  <arg choice="plain">--include-image-data</arg>
+</group>
 <arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
 <arg choice="opt">--quiet</arg>
 <arg choice="opt">--validate</arg>
@@ -87,6 +90,12 @@
     </para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term>--include-image-data</term>
+    <listitem><para>Include image data in the cache.
+    </para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term>--source</term>
     <term>-c</term>

docs/reference/gtk/gtk3-icon-browser.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk3-icon-browser">
+
+<refentryinfo>
+  <title>gtk3-icon-browser</title>
+  <productname>GTK+</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk3-icon-browser</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk3-icon-browser</refname>
+  <refpurpose>List themed icons</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk3-icon-browser</command>
+<arg choice="opt">--help</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk3-icon-browswer</command> is a utility to explore the icons
+in the current icon theme. It shows icons in various sizes, their symbolic
+variants where available, as well as a description of the icon and its context.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+  <para>The following options are understood:</para>
+  <variablelist>
+    <varlistentry>
+    <term><option>-h</option>, <option>--help</option></term>
+      <listitem><para>Show help options</para></listitem>
+    </varlistentry>
+  </variablelist>
+</refsect1>
+
+</refentry>

docs/reference/gtk/gtk3-sections.txt

@@ -558,6 +558,10 @@ gtk_list_box_row_get_header
 gtk_list_box_row_get_type
 gtk_list_box_row_set_header
 gtk_list_box_row_get_index
+gtk_list_box_row_set_activatable
+gtk_list_box_row_get_activatable
+gtk_list_box_row_set_selectable
+gtk_list_box_row_get_selectable
 
 <SUBSECTION Standard>
 GTK_IS_LIST_BOX
@@ -1923,6 +1927,7 @@ gtk_image_new_from_animation
 gtk_image_new_from_icon_name
 gtk_image_new_from_gicon
 gtk_image_new_from_resource
+gtk_image_new_from_surface
 gtk_image_set_from_file
 gtk_image_set_from_icon_set
 gtk_image_set_from_pixbuf
@@ -1931,6 +1936,7 @@ gtk_image_set_from_animation
 gtk_image_set_from_icon_name
 gtk_image_set_from_gicon
 gtk_image_set_from_resource
+gtk_image_set_from_surface
 gtk_image_clear
 gtk_image_new
 gtk_image_set_pixel_size
@@ -5865,6 +5871,7 @@ gtk_widget_path_iter_get_name
 gtk_widget_path_iter_get_object_type
 gtk_widget_path_iter_get_siblings
 gtk_widget_path_iter_get_sibling_index
+gtk_widget_path_iter_get_state
 gtk_widget_path_iter_has_class
 gtk_widget_path_iter_has_name
 gtk_widget_path_iter_has_qclass
@@ -5877,6 +5884,7 @@ gtk_widget_path_iter_remove_class
 gtk_widget_path_iter_remove_region
 gtk_widget_path_iter_set_name
 gtk_widget_path_iter_set_object_type
+gtk_widget_path_iter_set_state
 gtk_widget_path_length
 gtk_widget_path_new
 gtk_widget_path_prepend_type
@@ -5977,6 +5985,7 @@ GTK_STYLE_CLASS_ENTRY
 GTK_STYLE_CLASS_ERROR
 GTK_STYLE_CLASS_EXPANDER
 GTK_STYLE_CLASS_FRAME
+GTK_STYLE_CLASS_FLAT
 GTK_STYLE_CLASS_GRIP
 GTK_STYLE_CLASS_HEADER
 GTK_STYLE_CLASS_HIGHLIGHT
@@ -5998,6 +6007,7 @@ GTK_STYLE_CLASS_MESSAGE_DIALOG
 GTK_STYLE_CLASS_NEEDS_ATTENTION
 GTK_STYLE_CLASS_NOTEBOOK
 GTK_STYLE_CLASS_OSD
+GTK_STYLE_CLASS_OVERSHOOT
 GTK_STYLE_CLASS_PANE_SEPARATOR
 GTK_STYLE_CLASS_POPUP
 GTK_STYLE_CLASS_PRIMARY_TOOLBAR
@@ -6018,7 +6028,9 @@ GTK_STYLE_CLASS_SIDEBAR
 GTK_STYLE_CLASS_SLIDER
 GTK_STYLE_CLASS_SPINBUTTON
 GTK_STYLE_CLASS_SPINNER
+GTK_STYLE_CLASS_SUBTITLE
 GTK_STYLE_CLASS_SUGGESTED_ACTION
+GTK_STYLE_CLASS_TITLE
 GTK_STYLE_CLASS_TITLEBAR
 GTK_STYLE_CLASS_TOOLBAR
 GTK_STYLE_CLASS_TOOLTIP
@@ -6695,6 +6707,7 @@ gtk_icon_theme_set_search_path
 gtk_icon_theme_get_search_path
 gtk_icon_theme_append_search_path
 gtk_icon_theme_prepend_search_path
+gtk_icon_theme_add_resource_path
 gtk_icon_theme_set_custom_theme
 gtk_icon_theme_has_icon
 gtk_icon_theme_lookup_icon
@@ -7389,10 +7402,12 @@ gtk_application_uninhibit
 gtk_application_is_inhibited
 
 <SUBSECTION>
+gtk_application_prefers_app_menu
 gtk_application_get_app_menu
 gtk_application_set_app_menu
 gtk_application_get_menubar
 gtk_application_set_menubar
+gtk_application_get_menu_by_id
 
 gtk_application_add_accelerator
 gtk_application_remove_accelerator
@@ -7400,6 +7415,7 @@ gtk_application_remove_accelerator
 gtk_application_list_action_descriptions
 gtk_application_get_accels_for_action
 gtk_application_set_accels_for_action
+gtk_application_get_actions_for_accel
 
 <SUBSECTION Standard>
 GTK_TYPE_APPLICATION

docs/reference/gtk/question_index.sgml

@@ -134,7 +134,7 @@ reference counting, not floating reference counting.
 </para>
 
 <para>
-To to get this, you must acquire a reference to the widget and drop the
+To get this, you must acquire a reference to the widget and drop the
 floating reference (<quote>ref and sink</quote> in GTK+ parlance) after
 creating it:
 <informalexample><programlisting>
@@ -437,7 +437,7 @@ gtk_image_new_from_file() <footnote><para> If the file load fails,
 gtk_image_new_from_file() will display no image graphic &mdash; to detect
 a failed load yourself, use gdk_pixbuf_new_from_file() directly, then
 gtk_image_new_from_pixbuf().</para></footnote>.
-To load an image for another purpose, use gdk_pixbuf_new_from_file(). To i
+To load an image for another purpose, use gdk_pixbuf_new_from_file(). To
 load an animation, use gdk_pixbuf_animation_new_from_file().
 gdk_pixbuf_animation_new_from_file() can also load non-animated images, so
 use it in combination with gdk_pixbuf_animation_is_static_image() to load a

docs/reference/gtk/running.sgml

@@ -139,32 +139,16 @@ additional environment variables.
   to print out different types of debugging information.
   <variablelist>
     <varlistentry>
-      <term>misc</term>
-      <listitem><para>Miscellaneous information</para></listitem>
+      <term>actions</term>
+      <listitem><para>Actions and menu models.</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>plugsocket</term>
-      <listitem><para>Cross-process embedding</para></listitem>
+      <term>baselines</term>
+      <listitem><para>Baselines.</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>text</term>
-      <listitem><para>Text widget internals</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>tree</term>
-      <listitem><para>Tree widget internals</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>updates</term>
-      <listitem><para>Visual feedback about window updates</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>keybindings</term>
-      <listitem><para>Keybindings</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>modules</term>
-      <listitem><para>Loading of modules</para></listitem>
+      <term>builder</term>
+      <listitem><para>GtkBuilder support</para></listitem>
     </varlistentry>
     <varlistentry>
       <term>geometry</term>
@@ -175,36 +159,60 @@ additional environment variables.
       <listitem><para>Icon themes</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>printing</term>
-      <listitem><para>Printing support</para></listitem>
+      <term>interactive</term>
+      <listitem><para>Open the <link linkend="interactive-debugging">interactive debugger</link>.</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>builder</term>
-      <listitem><para>GtkBuilder support</para></listitem>
+      <term>keybindings</term>
+      <listitem><para>Keybindings</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>size-request</term>
-      <listitem><para>Size requests</para></listitem>
+      <term>misc</term>
+      <listitem><para>Miscellaneous information</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>modules</term>
+      <listitem><para>Loading of modules</para></listitem>
     </varlistentry>
     <varlistentry>
       <term>no-css-cache</term>
       <listitem><para>Bypass caching for CSS style properties.</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>baselines</term>
-      <listitem><para>Baselines.</para></listitem>
+      <term>no-pixel-cache</term>
+      <listitem><para>Disable the pixel cache.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>plugsocket</term>
+      <listitem><para>Cross-process embedding</para></listitem>
     </varlistentry>
     <varlistentry>
       <term>pixel-cache</term>
       <listitem><para>Pixel cache.</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>no-pixel-cache</term>
-      <listitem><para>Disable the pixel cache.</para></listitem>
+      <term>printing</term>
+      <listitem><para>Printing support</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>interactive</term>
-      <listitem><para>Open the <link linkend="interactive-debugging">interactive debugger</link>.</para></listitem>
+      <term>size-request</term>
+      <listitem><para>Size requests</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>text</term>
+      <listitem><para>Text widget internals</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>touchscreen</term>
+      <listitem><para>Pretend the pointer is a touchscreen device</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>tree</term>
+      <listitem><para>Tree widget internals</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>updates</term>
+      <listitem><para>Visual feedback about window updates</para></listitem>
     </varlistentry>
 
   </variablelist>
@@ -372,20 +380,24 @@ nevertheless.
   to print out different types of debugging information.
   <variablelist>
     <varlistentry>
-      <term>misc</term>
-      <listitem><para>Miscellaneous information</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>events</term>
-      <listitem><para>Show all events received by GDK</para></listitem>
+      <term>cursor</term>
+      <listitem><para>Information about cursor objects (only win32)</para></listitem>
     </varlistentry>
     <varlistentry>
       <term>dnd</term>
       <listitem><para>Information about drag-and-drop</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>xim</term>
-      <listitem><para>Information about XIM support</para></listitem>
+      <term>draw</term>
+      <listitem><para>Information about drawing operations (only win32)</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>eventloop</term>
+      <listitem><para>Information about event loop operation (mostly Quartz)</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>misc</term>
+      <listitem><para>Miscellaneous information</para></listitem>
     </varlistentry>
     <varlistentry>
       <term>nograbs</term>
@@ -396,16 +408,8 @@ nevertheless.
       <listitem><para>Simulate a multi-monitor setup</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>cursor</term>
-      <listitem><para>Information about cursor objects (only win32)</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>draw</term>
-      <listitem><para>Information about drawing operations (only win32)</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>eventloop</term>
-      <listitem><para>Information about event loop operation (mostly Quartz)</para></listitem>
+      <term>xim</term>
+      <listitem><para>Information about XIM support</para></listitem>
     </varlistentry>
 
   </variablelist>

docs/tools/widgets.c

@@ -35,7 +35,6 @@ new_widget_info (const char *name,
   else
     {
       info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_has_resize_grip (GTK_WINDOW (info->window), FALSE);
       gtk_container_set_border_width (GTK_CONTAINER (info->window), 12);
       info->include_decorations = FALSE;
       gtk_widget_show_all (widget);

examples/Makefile.am

@@ -1,4 +1,5 @@
 SUBDIRS = \
+	bp \
 	application1 application2 application3 \
 	application4 application5 application6 \
 	application7 application8 application9 \
@@ -10,7 +11,6 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gdk			\
 	-DGDK_DISABLE_DEPRECATED		\
 	-DGTK_DISABLE_DEPRECATED		\
-	-DSRCDIR=\"$(abs_srcdir)\"		\
 	$(GTK_DEBUG_FLAGS)			\
 	$(GTK_DEP_CFLAGS)
 
@@ -22,7 +22,6 @@ LDADD = \
 noinst_PROGRAMS = \
 	hello-world				\
 	window-default				\
-	bloatpad				\
 	plugman					\
 	sunny					\
 	action-namespace			\

examples/application10/window.ui

@@ -55,17 +55,11 @@
             <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="visible">True</property>
+                <property name="direction">none</property>
                 <property name="use-popover">True</property>
                 <style>
                   <class name="image-button"/>
                 </style>
-                <child>
-                  <object class="GtkImage" id="gears-icon">
-                    <property name="visible">True</property>
-                    <property name="icon-name">emblem-system-symbolic</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="pack-type">end</property>

examples/application8/window.ui

@@ -41,17 +41,11 @@
             <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="visible">True</property>
+                <property name="direction">none</property>
                 <property name="use-popover">True</property>
                 <style>
                   <class name="image-button"/>
                 </style>
-                <child>
-                  <object class="GtkImage" id="gears-icon">
-                    <property name="visible">True</property>
-                    <property name="icon-name">emblem-system-symbolic</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="pack-type">end</property>

examples/application9/window.ui

@@ -58,17 +58,11 @@
             <child>
               <object class="GtkMenuButton" id="gears">
                 <property name="visible">True</property>
+                <property name="direction">none</property>
                 <property name="use-popover">True</property>
                 <style>
                   <class name="image-button"/>
                 </style>
-                <child>
-                  <object class="GtkImage" id="gears-icon">
-                    <property name="visible">True</property>
-                    <property name="icon-name">emblem-system-symbolic</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="pack-type">end</property>

examples/bp/Makefile.am

@@ -0,0 +1,31 @@
+AM_CPPFLAGS = \
+	-DSRCDIR=\"$(abs_srcdir)\"	\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+LDADD = \
+        $(top_builddir)/gtk/libgtk-3.la \
+        $(top_builddir)/gdk/libgdk-3.la \
+        $(GTK_DEP_LIBS)
+
+noinst_PROGRAMS = bloatpad
+
+
+bloatpad_SOURCES = bloatpad.c
+nodist_bloatpad_SOURCES = bloatpad-gresources.c
+
+resource_files = \
+	bloatpad.gresources.xml		\
+	gtk/menus.ui
+
+bloatpad-gresources.c: $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+CLEANFILES = bloatpad-gresources.c
+
+EXTRA_DIST = $(resource_files)
+
+-include $(top_srcdir)/git.mk

examples/bp/bloatpad.c

@@ -383,6 +383,12 @@ response (GtkDialog *dialog,
   const gchar *str;
   gchar **accels;
 
+  if (response_id == GTK_RESPONSE_CLOSE)
+    {
+      gtk_widget_destroy (GTK_WIDGET (dialog));
+      return;
+    }
+
   action = gtk_combo_box_get_active_id (combo);
 
   if (!action)
@@ -417,6 +423,7 @@ edit_accels (GSimpleAction *action,
   g_signal_connect (combo, "changed", G_CALLBACK (combo_changed), dialog);
   entry = gtk_entry_new ();
   gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), entry);
+  gtk_dialog_add_button (GTK_DIALOG (dialog), "Close", GTK_RESPONSE_CLOSE);
   gtk_dialog_add_button (GTK_DIALOG (dialog), "Set", GTK_RESPONSE_APPLY);
   g_signal_connect (dialog, "response", G_CALLBACK (response), dialog);
   g_object_set_data (G_OBJECT (dialog), "combo", combo);
@@ -509,7 +516,6 @@ bloat_pad_startup (GApplication *application)
 {
   BloatPad *bloatpad = (BloatPad*) application;
   GtkApplication *app = GTK_APPLICATION (application);
-  GtkBuilder *builder;
   GMenu *menu;
   GMenuItem *item;
   GIcon *icon;
@@ -537,97 +543,12 @@ bloat_pad_startup (GApplication *application)
 
   g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries, G_N_ELEMENTS (app_entries), application);
 
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_string (builder,
-                               "<interface>"
-                               "  <menu id='app-menu'>"
-                               "    <section>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_New Window</attribute>"
-                               "        <attribute name='action'>app.new</attribute>"
-                               "      </item>"
-                               "    </section>"
-                               "    <section>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_About Bloatpad</attribute>"
-                               "        <attribute name='action'>app.about</attribute>"
-                               "      </item>"
-                               "    </section>"
-                               "    <section>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_Quit</attribute>"
-                               "        <attribute name='action'>app.quit</attribute>"
-                               "      </item>"
-                               "    </section>"
-                               "  </menu>"
-                               "  <menu id='menubar'>"
-                               "    <submenu>"
-                               "      <attribute name='label' translatable='yes'>_Edit</attribute>"
-                               "      <section>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Copy</attribute>"
-                               "          <attribute name='action'>win.copy</attribute>"
-                               "        </item>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Paste</attribute>"
-                               "          <attribute name='action'>win.paste</attribute>"
-                               "        </item>"
-                               "      </section>"
-                               "      <section>"
-                               "        <item>"
-                               "          <attribute name='label'>Clear (always shown)</attribute>"
-                               "          <attribute name='action'>win.clear</attribute>"
-                                                   /* action should never be missing (so always shown) */
-                               "          <attribute name='hidden-when'>action-missing</attribute>"
-                               "        </item>"
-                               "        <item>"
-                               "          <attribute name='label'>Clear (hidden when no text)</attribute>"
-                               "          <attribute name='hidden-when'>action-disabled</attribute>"
-                               "          <attribute name='action'>win.clear</attribute>"
-                               "        </item>"
-                               "        <item>"
-                               "          <attribute name='label'>Spell check (does nothing, hides)</attribute>"
-                               "          <attribute name='hidden-when'>action-missing</attribute>"
-                               "          <attribute name='action'>win.spell-check</attribute>"
-                               "        </item>"
-                               "      </section>"
-                               "      <section>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>Accelerators...</attribute>"
-                               "          <attribute name='action'>app.edit-accels</attribute>"
-                               "        </item>"
-                               "      </section>"
-                               "    </submenu>"
-                               "    <submenu>"
-                               "      <attribute name='label' translatable='yes'>_View</attribute>"
-                               "      <section>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Fullscreen</attribute>"
-                               "          <attribute name='action'>win.fullscreen</attribute>"
-                               "        </item>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Look Busy</attribute>"
-                               "          <attribute name='action'>win.busy</attribute>"
-                               "        </item>"
-                               "      </section>"
-                               "    </submenu>"
-                               "    <submenu id='icon-menu'>"
-                               "      <attribute name='label' translatable='yes'>_Icons</attribute>"
-                               "    </submenu>"
-                               "    <submenu id='time-menu'>"
-                               "      <attribute name='label' translatable='yes'>Time</attribute>"
-                               "      <attribute name='submenu-action'>app.time-active</attribute>"
-                               "    </submenu>"
-                               "  </menu>"
-                               "</interface>", -1, NULL);
-  gtk_application_set_app_menu (app, G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
-  gtk_application_set_menubar (app, G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
   for (i = 0; i < G_N_ELEMENTS (accels); i++)
     gtk_application_set_accels_for_action (app, accels[i].action_and_target, accels[i].accelerators);
 
-  menu = G_MENU (gtk_builder_get_object (builder, "icon-menu"));
+  menu = gtk_application_get_menu_by_id (GTK_APPLICATION (application), "icon-menu");
 
-  file = g_file_new_for_path (SRCDIR "/../gtk/stock-icons/16/help-about.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);
@@ -643,7 +564,7 @@ bloat_pad_startup (GApplication *application)
   g_object_unref (item);
   g_object_unref (icon);
 
-  if (g_file_get_contents (SRCDIR "/../gtk/stock-icons/16/list-add.png", &data, &size, NULL))
+  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);
@@ -655,19 +576,19 @@ bloat_pad_startup (GApplication *application)
       g_bytes_unref (bytes);
     }
 
-  icon = G_ICON (gdk_pixbuf_new_from_file (SRCDIR "/../gtk/stock-icons/16/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_path (SRCDIR "/../gtk/stock-icons/16/edit-paste.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_path (SRCDIR "/../gtk/stock-icons/16/edit-copy.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);
@@ -691,8 +612,7 @@ bloat_pad_startup (GApplication *application)
 
   dump_accels (GTK_APPLICATION (application));
   //gtk_application_set_menubar (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
-  bloatpad->time = G_MENU (gtk_builder_get_object (builder, "time-menu"));
-  g_object_unref (builder);
+  bloatpad->time = gtk_application_get_menu_by_id (GTK_APPLICATION (application), "time-menu");
 }
 
 static void
@@ -738,7 +658,7 @@ bloat_pad_new (void)
   g_set_application_name ("Bloatpad");
 
   bloat_pad = g_object_new (bloat_pad_get_type (),
-                            "application-id", "org.gtk.Test.bloatpad",
+                            "application-id", "org.gtk.bloatpad",
                             "flags", G_APPLICATION_HANDLES_OPEN,
                             "inactivity-timeout", 30000,
                             "register-session", TRUE,

examples/bp/bloatpad.gresources.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<gresources>
+  <gresource prefix="/org/gtk/bloatpad">
+    <file preprocess="xml-stripblanks">gtk/menus.ui</file>
+  </gresource>
+</gresources>

examples/bp/gtk/menus.ui

@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<interface>
+  <menu id='app-menu'>
+    <section>
+      <item>
+        <attribute name='label' translatable='yes'>_New Window</attribute>
+        <attribute name='action'>app.new</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name='label' translatable='yes'>_About Bloatpad</attribute>
+        <attribute name='action'>app.about</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name='label' translatable='yes'>_Quit</attribute>
+        <attribute name='action'>app.quit</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id='menubar'>
+    <submenu>
+      <attribute name='label' translatable='yes'>_Edit</attribute>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Copy</attribute>
+          <attribute name='action'>win.copy</attribute>
+        </item>
+        <item>
+          <attribute name='label' translatable='yes'>_Paste</attribute>
+          <attribute name='action'>win.paste</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <!-- action should never be missing (so always shown) -->
+          <attribute name='label'>Clear (always shown)</attribute>
+          <attribute name='action'>win.clear</attribute>
+          <attribute name='hidden-when'>action-missing</attribute>
+        </item>
+        <item>
+          <attribute name='label'>Clear (hidden when no text)</attribute>
+          <attribute name='hidden-when'>action-disabled</attribute>
+          <attribute name='action'>win.clear</attribute>
+        </item>
+        <item>
+          <attribute name='label'>Spell check (does nothing, hides)</attribute>
+          <attribute name='hidden-when'>action-missing</attribute>
+          <attribute name='action'>win.spell-check</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>Accelerators...</attribute>
+          <attribute name='action'>app.edit-accels</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name='label' translatable='yes'>_View</attribute>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Fullscreen</attribute>
+          <attribute name='action'>win.fullscreen</attribute>
+        </item>
+        <item>
+          <attribute name='label' translatable='yes'>_Look Busy</attribute>
+          <attribute name='action'>win.busy</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu id='icon-menu'>
+      <attribute name='label' translatable='yes'>_Icons</attribute>
+    </submenu>
+    <submenu id='time-menu'>
+      <attribute name='label' translatable='yes'>Time</attribute>
+      <attribute name='submenu-action'>app.time-active</attribute>
+    </submenu>
+  </menu>
+</interface>

gdk/Makefile.am

@@ -194,8 +194,8 @@ endif # USE_QUARTZ
 if USE_WIN32
 libgdk_3_la_SOURCES += gdkkeynames.c
 libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
 endif # USE_WIN32
 
 if USE_BROADWAY
@@ -346,9 +346,13 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
 
 if OS_WIN32
+gdk.def: libgdk-3.la
+	echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
+	echo "EXPORTS" >>$@
+	objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
 install-def-file: gdk.def
 	mkdir -p $(DESTDIR)$(libdir)
-	$(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+	$(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 uninstall-def-file:
 	-rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
 else

gdk/broadway/gdkprivate-broadway.h

@@ -45,8 +45,6 @@ void     _gdk_broadway_window_register_dnd (GdkWindow      *window);
 GdkDragContext * _gdk_broadway_window_drag_begin (GdkWindow *window,
 						  GdkDevice *device,
 						  GList     *targets);
-gboolean _gdk_broadway_window_queue_antiexpose  (GdkWindow *window,
-						 cairo_region_t *area);
 void     _gdk_broadway_window_translate         (GdkWindow *window,
 						 cairo_region_t *area,
 						 gint       dx,

gdk/broadway/gdkwindow-broadway.c

@@ -368,16 +368,6 @@ _gdk_broadway_window_destroy (GdkWindow *window,
 				       impl->id);
 }
 
-static gboolean
-gdk_window_broadway_resize_cairo_surface (GdkWindow       *window,
-					  cairo_surface_t *surface,
-					  gint             width,
-					  gint             height)
-{
-  /* Image surfaces cannot be resized */
-  return FALSE;
-}
-
 static void
 gdk_broadway_window_destroy_foreign (GdkWindow *window)
 {
@@ -1001,6 +991,13 @@ gdk_broadway_window_get_input_shape (GdkWindow *window)
   return NULL;
 }
 
+static void
+gdk_broadway_window_end_paint (GdkWindow *window)
+{
+  GdkWindowImplBroadway *impl;
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  impl->dirty = TRUE;
+}
 
 static gboolean
 gdk_window_broadway_set_static_gravities (GdkWindow *window,
@@ -1483,18 +1480,6 @@ gdk_broadway_window_set_composited (GdkWindow *window,
 {
 }
 
-static void
-gdk_broadway_window_process_updates_recurse (GdkWindow *window,
-					     cairo_region_t *region)
-{
-  GdkWindowImplBroadway *impl;
-
-  _gdk_window_process_updates_recurse (window, region);
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
-  impl->dirty = TRUE;
-}
-
 void
 _gdk_broadway_display_before_process_all_updates (GdkDisplay *display)
 {
@@ -1505,13 +1490,6 @@ _gdk_broadway_display_after_process_all_updates (GdkDisplay *display)
 {
 }
 
-gboolean
-_gdk_broadway_window_queue_antiexpose (GdkWindow *window,
-				       cairo_region_t *area)
-{
-  return TRUE;
-}
-
 guint32
 gdk_broadway_get_last_seen_time (GdkWindow  *window)
 {
@@ -1549,12 +1527,11 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
   impl_class->shape_combine_region = gdk_window_broadway_shape_combine_region;
   impl_class->input_shape_combine_region = gdk_window_broadway_input_shape_combine_region;
   impl_class->set_static_gravities = gdk_window_broadway_set_static_gravities;
-  impl_class->queue_antiexpose = _gdk_broadway_window_queue_antiexpose;
   impl_class->destroy = _gdk_broadway_window_destroy;
   impl_class->destroy_foreign = gdk_broadway_window_destroy_foreign;
-  impl_class->resize_cairo_surface = gdk_window_broadway_resize_cairo_surface;
   impl_class->get_shape = gdk_broadway_window_get_shape;
   impl_class->get_input_shape = gdk_broadway_window_get_input_shape;
+  impl_class->end_paint = gdk_broadway_window_end_paint;
   impl_class->beep = gdk_broadway_window_beep;
 
   impl_class->focus = gdk_broadway_window_focus;
@@ -1598,7 +1575,6 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
   impl_class->destroy_notify = gdk_broadway_window_destroy_notify;
   impl_class->register_dnd = _gdk_broadway_window_register_dnd;
   impl_class->drag_begin = _gdk_broadway_window_drag_begin;
-  impl_class->process_updates_recurse = gdk_broadway_window_process_updates_recurse;
   impl_class->sync_rendering = _gdk_broadway_window_sync_rendering;
   impl_class->simulate_key = _gdk_broadway_window_simulate_key;
   impl_class->simulate_button = _gdk_broadway_window_simulate_button;

gdk/gdkdevice.c

@@ -748,6 +748,10 @@ gdk_device_get_mode (GdkDevice *device)
  * device is active and whether the device’s range is mapped to the
  * entire screen or to a single window.
  *
+ * Note: This is only meaningful for floating devices, master devices (and
+ * slaves connected to these) drive the pointer cursor, which is not limited
+ * by the input mode.
+ *
  * Returns: %TRUE if the mode was successfully changed.
  **/
 gboolean

gdk/gdkdevicemanager.c

@@ -110,6 +110,17 @@
  * it is possible to get the source (slave) device that the event originated
  * from via gdk_event_get_source_device().
  *
+ * On a standard session, all physical devices are connected by default to
+ * the "Virtual Core Pointer/Keyboard" master devices, hence routing all events
+ * through these. This behavior is only modified by device grabs, where the
+ * slave device is temporarily detached for as long as the grab is held, and
+ * more permanently by user modifications to the device hierarchy.
+ *
+ * On certain application specific setups, it may make sense
+ * to detach a physical device from its master pointer, and mapping it to
+ * an specific window. This can be achieved by the combination of
+ * gdk_device_grab() and gdk_device_set_mode().
+ *
  * In order to listen for events coming from devices
  * other than a virtual device, gdk_window_set_device_events() must be
  * called. Generally, this function can be used to modify the event mask

gdk/gdkinternals.h

@@ -205,7 +205,11 @@ struct _GdkWindow
 
   cairo_pattern_t *background;
 
-  GSList *paint_stack;
+  struct {
+    cairo_region_t *region;
+    cairo_surface_t *surface;
+    gboolean surface_needs_composite;
+  } current_paint;
 
   cairo_region_t *update_area;
   guint update_freeze_count;
@@ -266,8 +270,6 @@ struct _GdkWindow
   cairo_region_t *shape;
   cairo_region_t *input_shape;
 
-  cairo_surface_t *cairo_surface;
-
   GList *devices_inside;
   GHashTable *device_events;
 
@@ -343,6 +345,8 @@ gboolean   _gdk_window_update_viewable   (GdkWindow      *window);
 void       _gdk_window_process_updates_recurse (GdkWindow *window,
                                                 cairo_region_t *expose_region);
 
+void       _gdk_screen_set_resolution    (GdkScreen      *screen,
+                                          gdouble         dpi);
 void       _gdk_screen_close             (GdkScreen      *screen);
 
 /*****************************************
@@ -372,9 +376,6 @@ GdkWindow * _gdk_window_find_descendant_at (GdkWindow *toplevel,
                                             double *found_x,
                                             double *found_y);
 
-void _gdk_window_add_damage (GdkWindow *toplevel,
-                             cairo_region_t *damaged_region);
-
 GdkEvent * _gdk_make_event (GdkWindow    *window,
                             GdkEventType  type,
                             GdkEvent     *event_in_queue,

gdk/gdkoffscreenwindow.c

@@ -542,23 +542,10 @@ gdk_offscreen_window_get_geometry (GdkWindow *window,
     }
 }
 
-static gboolean
+static void
 gdk_offscreen_window_queue_antiexpose (GdkWindow *window,
 				       cairo_region_t *area)
 {
-  return FALSE;
-}
-
-static gboolean
-gdk_offscreen_window_resize_cairo_surface (GdkWindow       *window,
-                                           cairo_surface_t *surface,
-                                           gint             width,
-                                           gint             height)
-{
-  /* No-op.  The surface gets resized in
-   * gdk_offscreen_window_move_resize_internal().
-   */
-  return TRUE;
 }
 
 /**
@@ -664,13 +651,6 @@ gdk_offscreen_window_set_transient_for (GdkWindow *window,
 {
 }
 
-static void
-gdk_offscreen_window_process_updates_recurse (GdkWindow *window,
-                                              cairo_region_t *region)
-{
-  _gdk_window_process_updates_recurse (window, region);
-}
-
 static void
 gdk_offscreen_window_get_frame_extents (GdkWindow    *window,
 					GdkRectangle *rect)
@@ -727,7 +707,6 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
   impl_class->queue_antiexpose = gdk_offscreen_window_queue_antiexpose;
   impl_class->destroy = gdk_offscreen_window_destroy;
   impl_class->destroy_foreign = NULL;
-  impl_class->resize_cairo_surface = gdk_offscreen_window_resize_cairo_surface;
   impl_class->get_shape = NULL;
   impl_class->get_input_shape = NULL;
   impl_class->beep = NULL;
@@ -774,7 +753,6 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
   impl_class->destroy_notify = NULL;
   impl_class->register_dnd = gdk_offscreen_window_do_nothing;
   impl_class->drag_begin = NULL;
-  impl_class->process_updates_recurse = gdk_offscreen_window_process_updates_recurse;
   impl_class->sync_rendering = NULL;
   impl_class->simulate_key = NULL;
   impl_class->simulate_button = NULL;

gdk/gdkscreen.c

@@ -98,8 +98,8 @@ gdk_screen_class_init (GdkScreenClass *klass)
 				   g_param_spec_double ("resolution",
 							P_("Font resolution"),
 							P_("The resolution for fonts on the screen"),
-							-G_MAXDOUBLE,
-							G_MAXDOUBLE,
+							-1.0,
+							10000.0,
 							-1.0,
 							G_PARAM_READWRITE|G_PARAM_STATIC_NAME|
 							G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
@@ -459,6 +459,31 @@ gdk_screen_set_resolution (GdkScreen *screen,
 {
   g_return_if_fail (GDK_IS_SCREEN (screen));
 
+  if (dpi < 0)
+    dpi = -1.0;
+
+  screen->resolution_set = TRUE;
+
+  if (screen->resolution != dpi)
+    {
+      screen->resolution = dpi;
+
+      g_object_notify (G_OBJECT (screen), "resolution");
+    }
+}
+
+/* Just like gdk_screen_set_resolution(), but doesn't change
+ * screen->resolution. This is us to allow us to distinguish
+ * resolution changes that the backend picks up from resolution
+ * changes made through the public API - perhaps using
+ * g_object_set(<GtkSetting>, "gtk-xft-dpi", ...);
+ */
+void
+_gdk_screen_set_resolution (GdkScreen *screen,
+                            gdouble    dpi)
+{
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+
   if (dpi < 0)
     dpi = -1.0;
 

gdk/gdkscreenprivate.h

@@ -35,6 +35,7 @@ struct _GdkScreen
 
   cairo_font_options_t *font_options;
   gdouble resolution; /* pixels/points scale factor for fonts */
+  guint resolution_set : 1; /* resolution set through public API */
   guint closed : 1;
 };
 

gdk/gdkwindow.c

@@ -147,18 +147,8 @@ enum {
   PROP_CURSOR
 };
 
-struct _GdkWindowPaint
-{
-  cairo_region_t *region;
-  cairo_surface_t *surface;
-};
-
 /* Global info */
 
-static void             gdk_window_drop_cairo_surface (GdkWindow *private);
-
-static void gdk_window_free_paint_stack (GdkWindow *window);
-
 static void gdk_window_finalize   (GObject              *object);
 
 static void gdk_window_set_property (GObject      *object,
@@ -170,8 +160,7 @@ static void gdk_window_get_property (GObject      *object,
                                      GValue       *value,
                                      GParamSpec   *pspec);
 
-static void gdk_window_clear_backing_region (GdkWindow *window,
-					     cairo_region_t *region);
+static void gdk_window_clear_backing_region (GdkWindow *window);
 
 static void recompute_visible_regions   (GdkWindow *private,
 					 gboolean recalculate_children);
@@ -477,8 +466,6 @@ gdk_window_finalize (GObject *object)
 	_gdk_window_destroy (window, TRUE);
     }
 
-  gdk_window_drop_cairo_surface (window);
-
   if (window->impl)
     {
       g_object_unref (window->impl);
@@ -1002,18 +989,6 @@ recompute_visible_regions_internal (GdkWindow *private,
 					      FALSE);
 	}
     }
-
-  if (private->cairo_surface)
-    {
-      if (!gdk_window_has_impl (private) ||
-          !GDK_WINDOW_IMPL_GET_CLASS (private->impl)->resize_cairo_surface (private,
-                                                                            private->cairo_surface,
-                                                                            private->width,
-                                                                            private->height))
-        {
-          gdk_window_drop_cairo_surface (private);
-        }
-    }
 }
 
 /* Call this when private has changed in one or more of these ways:
@@ -1318,8 +1293,8 @@ gdk_window_new (GdkWindow     *parent,
       if (GDK_WINDOW_TYPE (parent) != GDK_WINDOW_ROOT)
 	g_warning (G_STRLOC "Toplevel windows must be created as children of\n"
 		   "of a window of type GDK_WINDOW_ROOT or GDK_WINDOW_FOREIGN");
-    case GDK_WINDOW_CHILD:
       break;
+    case GDK_WINDOW_CHILD:
       break;
     default:
       g_warning (G_STRLOC "cannot make windows of type %d", window->window_type);
@@ -1531,10 +1506,6 @@ gdk_window_reparent (GdkWindow *window,
   if (is_parent_of (window, new_parent))
     return;
 
-  /* This might be wrong in the new parent, e.g. for non-native surfaces.
-     To make sure we're ok, just wipe it. */
-  gdk_window_drop_cairo_surface (window);
-
   impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
   old_parent = window->parent;
 
@@ -1716,8 +1687,6 @@ gdk_window_ensure_native (GdkWindow *window)
 
   /* Need to create a native window */
 
-  gdk_window_drop_cairo_surface (window);
-
   screen = gdk_window_get_screen (window);
   display = gdk_screen_get_display (screen);
   parent = window->parent;
@@ -1847,6 +1816,18 @@ window_remove_from_pointer_info (GdkWindow  *window,
                                      window);
 }
 
+static void
+gdk_window_free_current_paint (GdkWindow *window)
+{
+  cairo_surface_destroy (window->current_paint.surface);
+  window->current_paint.surface = NULL;
+
+  cairo_region_destroy (window->current_paint.region);
+  window->current_paint.region = NULL;
+
+  window->current_paint.surface_needs_composite = FALSE;
+}
+
 /**
  * _gdk_window_destroy_hierarchy:
  * @window: a #GdkWindow
@@ -1889,7 +1870,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
   if (temp_window == window)
     g_object_set_qdata (G_OBJECT (screen), quark_pointer_window, NULL);
 
-
   switch (window->window_type)
     {
     case GDK_WINDOW_ROOT:
@@ -1952,7 +1932,7 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
               gdk_window_set_frame_clock (window, NULL);
             }
 
-	  gdk_window_free_paint_stack (window);
+          gdk_window_free_current_paint (window);
 
           if (window->background)
             {
@@ -1987,8 +1967,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
 
 	  _gdk_window_clear_update_area (window);
 
-	  gdk_window_drop_cairo_surface (window);
-
 	  impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
 
 	  if (gdk_window_has_impl (window))
@@ -2748,8 +2726,6 @@ gdk_window_begin_paint_region (GdkWindow       *window,
 {
   GdkRectangle clip_box;
   GdkWindowImplClass *impl_class;
-  GdkWindowPaint *paint;
-  GSList *list;
   double sx, sy;
   gboolean needs_surface;
 
@@ -2759,43 +2735,46 @@ gdk_window_begin_paint_region (GdkWindow       *window,
       !gdk_window_has_impl (window))
     return;
 
+  if (window->current_paint.surface != NULL)
+    {
+      g_warning ("gdk_window_begin_paint_region called while a paint was "
+                 "alredy in progress. This is not allowed.");
+      return;
+    }
+
   impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
 
   needs_surface = TRUE;
   if (impl_class->begin_paint_region)
     needs_surface = impl_class->begin_paint_region (window, region);
 
-  paint = g_new0 (GdkWindowPaint, 1);
-  paint->region = cairo_region_copy (region);
+  window->current_paint.region = cairo_region_copy (region);
 
-  cairo_region_intersect (paint->region, window->clip_region);
-  cairo_region_get_extents (paint->region, &clip_box);
+  cairo_region_intersect (window->current_paint.region, window->clip_region);
+  cairo_region_get_extents (window->current_paint.region, &clip_box);
 
   if (needs_surface)
     {
-      paint->surface = gdk_window_create_similar_surface (window,
-							  gdk_window_get_content (window),
-							  MAX (clip_box.width, 1),
-							  MAX (clip_box.height, 1));
+      window->current_paint.surface = gdk_window_create_similar_surface (window,
+                                                                         gdk_window_get_content (window),
+                                                                         MAX (clip_box.width, 1),
+                                                                         MAX (clip_box.height, 1));
       sx = sy = 1;
 #ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE
-      cairo_surface_get_device_scale (paint->surface, &sx, &sy);
+      cairo_surface_get_device_scale (window->current_paint.surface, &sx, &sy);
 #endif
-      cairo_surface_set_device_offset (paint->surface, -clip_box.x*sx, -clip_box.y*sy);
-    }
+      cairo_surface_set_device_offset (window->current_paint.surface, -clip_box.x*sx, -clip_box.y*sy);
 
-  for (list = window->paint_stack; list != NULL; list = list->next)
+      window->current_paint.surface_needs_composite = TRUE;
+    }
+  else
     {
-      GdkWindowPaint *tmp_paint = list->data;
-
-      cairo_region_subtract (tmp_paint->region, paint->region);
+      window->current_paint.surface = gdk_window_ref_impl_surface (window);
+      window->current_paint.surface_needs_composite = FALSE;
     }
 
-  window->paint_stack = g_slist_prepend (window->paint_stack, paint);
-
-  if (!cairo_region_is_empty (paint->region))
-    gdk_window_clear_backing_region (window,
-				     paint->region);
+  if (!cairo_region_is_empty (window->current_paint.region))
+    gdk_window_clear_backing_region (window);
 }
 
 /**
@@ -2815,7 +2794,6 @@ void
 gdk_window_end_paint (GdkWindow *window)
 {
   GdkWindow *composited;
-  GdkWindowPaint *paint;
   GdkWindowImplClass *impl_class;
   GdkRectangle clip_box = { 0, };
   cairo_region_t *full_clip;
@@ -2827,7 +2805,7 @@ gdk_window_end_paint (GdkWindow *window)
       !gdk_window_has_impl (window))
     return;
 
-  if (window->paint_stack == NULL)
+  if (window->current_paint.surface == NULL)
     {
       g_warning (G_STRLOC": no preceding call to gdk_window_begin_paint_region(), see documentation");
       return;
@@ -2838,42 +2816,44 @@ gdk_window_end_paint (GdkWindow *window)
   if (impl_class->end_paint)
     impl_class->end_paint (window);
 
-  paint = window->paint_stack->data;
-
-  window->paint_stack = g_slist_delete_link (window->paint_stack,
-					     window->paint_stack);
-
-
-  if (paint->surface != NULL)
+  if (window->current_paint.surface_needs_composite)
     {
-      cairo_region_get_extents (paint->region, &clip_box);
-      full_clip = cairo_region_copy (window->clip_region);
-      cairo_region_intersect (full_clip, paint->region);
+      cairo_surface_t *surface;
+      gboolean skip_alpha_blending;
 
-      cr = gdk_cairo_create (window);
-      cairo_set_source_surface (cr, paint->surface, 0, 0);
+      cairo_region_get_extents (window->current_paint.region, &clip_box);
+      full_clip = cairo_region_copy (window->clip_region);
+      cairo_region_intersect (full_clip, window->current_paint.region);
+
+      surface = gdk_window_ref_impl_surface (window);
+      cr = cairo_create (surface);
+      cairo_surface_destroy (surface);
+
+      cairo_set_source_surface (cr, window->current_paint.surface, 0, 0);
       gdk_cairo_region (cr, full_clip);
       cairo_clip (cr);
-      if (gdk_window_has_impl (window) ||
-	  window->alpha == 255)
-	{
-	  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-	  cairo_paint (cr);
-	}
+
+      /* We can skip alpha blending for a fast composite case
+       * if we have an impl window or we're a fully opaque window. */
+      skip_alpha_blending = (gdk_window_has_impl (window) ||
+                             window->alpha == 255);
+
+      if (skip_alpha_blending)
+        {
+          cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+          cairo_paint (cr);
+        }
       else
-	{
-	  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-	  cairo_paint_with_alpha (cr, window->alpha / 255.0);
-	}
+        {
+          cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+          cairo_paint_with_alpha (cr, window->alpha / 255.0);
+        }
 
       cairo_destroy (cr);
       cairo_region_destroy (full_clip);
-
-      cairo_surface_destroy (paint->surface);
     }
 
-  cairo_region_destroy (paint->region);
-  g_free (paint);
+  gdk_window_free_current_paint (window);
 
   /* find a composited window in our hierarchy to signal its
    * parent to redraw, calculating the clip box as we go...
@@ -2899,51 +2879,15 @@ gdk_window_end_paint (GdkWindow *window)
     }
 }
 
-static void
-gdk_window_free_paint_stack (GdkWindow *window)
-{
-  if (window->paint_stack)
-    {
-      GSList *tmp_list = window->paint_stack;
-
-      while (tmp_list)
-	{
-	  GdkWindowPaint *paint = tmp_list->data;
-
-	  if (tmp_list == window->paint_stack &&
-	      paint->surface != NULL)
-	    cairo_surface_destroy (paint->surface);
-
-	  cairo_region_destroy (paint->region);
-	  g_free (paint);
-
-	  tmp_list = tmp_list->next;
-	}
-
-      g_slist_free (window->paint_stack);
-      window->paint_stack = NULL;
-    }
-}
-
 /**
  * gdk_window_flush:
  * @window: a #GdkWindow
  *
- * Flush all outstanding cached operations on a window, leaving the
- * window in a state which reflects all that has been drawn before.
- *
- * Gdk uses multiple kinds of caching to get better performance and
- * nicer drawing. For instance, during exposes all paints to a window
- * using double buffered rendering are keep on a surface until the last
- * window has been exposed.
- *
- * Normally this should be completely invisible to applications, as
- * we automatically flush the windows when required, but this might
- * be needed if you for instance mix direct native drawing with
- * gdk drawing. For Gtk widgets that don’t use double buffering this
- * will be called automatically before sending the expose event.
+ * This function does nothing.
  *
  * Since: 2.18
+ *
+ * Deprecated: 3.14
  **/
 void
 gdk_window_flush (GdkWindow *window)
@@ -2972,23 +2916,8 @@ gdk_window_get_clip_region (GdkWindow *window)
 
   result = cairo_region_copy (window->clip_region);
 
-  if (window->paint_stack)
-    {
-      cairo_region_t *paint_region = cairo_region_create ();
-      GSList *tmp_list = window->paint_stack;
-
-      while (tmp_list)
-	{
-	  GdkWindowPaint *paint = tmp_list->data;
-
-	  cairo_region_union (paint_region, paint->region);
-
-	  tmp_list = tmp_list->next;
-	}
-
-      cairo_region_intersect (result, paint_region);
-      cairo_region_destroy (paint_region);
-    }
+  if (window->current_paint.region != NULL)
+    cairo_region_intersect (result, window->current_paint.region);
 
   return result;
 }
@@ -3014,20 +2943,17 @@ gdk_window_get_visible_region (GdkWindow *window)
 }
 
 static void
-gdk_window_clear_backing_region (GdkWindow *window,
-				 cairo_region_t *region)
+gdk_window_clear_backing_region (GdkWindow *window)
 {
-  GdkWindowPaint *paint = window->paint_stack->data;
-  cairo_region_t *clip;
   GdkWindow *bg_window;
   cairo_pattern_t *pattern = NULL;
   int x_offset = 0, y_offset = 0;
   cairo_t *cr;
 
-  if (GDK_WINDOW_DESTROYED (window) || paint->surface == NULL)
+  if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  cr = cairo_create (paint->surface);
+  cr = cairo_create (window->current_paint.surface);
 
   for (bg_window = window; bg_window; bg_window = bg_window->parent)
     {
@@ -3048,99 +2974,52 @@ gdk_window_clear_backing_region (GdkWindow *window,
   else
     cairo_set_source_rgb (cr, 0, 0, 0);
 
-  clip = cairo_region_copy (paint->region);
-  cairo_region_intersect (clip, region);
-
-  gdk_cairo_region (cr, clip);
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+  gdk_cairo_region (cr, window->current_paint.region);
   cairo_fill (cr);
 
   cairo_destroy (cr);
-
-  cairo_region_destroy (clip);
-}
-
-static void
-gdk_window_drop_cairo_surface (GdkWindow *window)
-{
-  if (window->cairo_surface)
-    {
-      cairo_surface_finish (window->cairo_surface);
-      cairo_surface_set_user_data (window->cairo_surface, &gdk_window_cairo_key,
-				   NULL, NULL);
-      window->cairo_surface = NULL;
-    }
-}
-
-static void
-gdk_window_cairo_surface_destroy (void *data)
-{
-  GdkWindow *window = data;
-
-  window->cairo_surface = NULL;
 }
 
+/* This returns either the current working surface on the paint stack
+ * or the actual impl surface of the window. This should not be used
+ * from very many places: be careful! */
 static cairo_surface_t *
-gdk_window_create_cairo_surface (GdkWindow *window,
-				 int width,
-				 int height)
+ref_window_surface (GdkWindow *window)
 {
-  cairo_surface_t *surface, *subsurface;
-
-  surface = gdk_window_ref_impl_surface (window);
-  if (gdk_window_has_impl (window))
-    return surface;
-
-  subsurface = cairo_surface_create_for_rectangle (surface,
-                                                   window->abs_x,
-                                                   window->abs_y,
-                                                   width,
-                                                   height);
-  cairo_surface_destroy (surface);
-  return subsurface;
+  if (window->impl_window->current_paint.surface)
+    return cairo_surface_reference (window->impl_window->current_paint.surface);
+  else
+    return gdk_window_ref_impl_surface (window);
 }
 
-
+/* This is used in places like gdk_cairo_set_source_window and
+ * other places to take "screenshots" of windows. Thus, we allow
+ * it to be used outside of a begin_paint / end_paint. */
 cairo_surface_t *
 _gdk_window_ref_cairo_surface (GdkWindow *window)
 {
   cairo_surface_t *surface;
-  GdkWindowPaint *paint;
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
-  paint = NULL;
-  if (window->impl_window->paint_stack)
-    paint = window->impl_window->paint_stack->data;
+  surface = ref_window_surface (window);
 
-  if (paint && paint->surface != NULL)
+  if (gdk_window_has_impl (window))
     {
-      surface = cairo_surface_create_for_rectangle (paint->surface,
-						    window->abs_x,
-						    window->abs_y,
-						    window->width,
-						    window->height);
+      return surface;
     }
   else
     {
-      if (!window->cairo_surface)
-	{
-	  window->cairo_surface = gdk_window_create_cairo_surface (window,
-                                                                   window->width,
-                                                                   window->height);
-
-	  if (window->cairo_surface)
-	    {
-	      cairo_surface_set_user_data (window->cairo_surface, &gdk_window_cairo_key,
-					   window, gdk_window_cairo_surface_destroy);
-	    }
-	}
-      else
-	cairo_surface_reference (window->cairo_surface);
-
-      surface = window->cairo_surface;
+      cairo_surface_t *subsurface;
+      subsurface = cairo_surface_create_for_rectangle (surface,
+                                                       window->abs_x,
+                                                       window->abs_y,
+                                                       window->width,
+                                                       window->height);
+      cairo_surface_destroy (surface);
+      return subsurface;
     }
-
-  return surface;
 }
 
 /**
@@ -3160,28 +3039,24 @@ _gdk_window_ref_cairo_surface (GdkWindow *window)
 cairo_t *
 gdk_cairo_create (GdkWindow *window)
 {
-  GdkWindowPaint *paint;
-  cairo_surface_t *surface;
   cairo_region_t *region;
+  cairo_surface_t *surface;
   cairo_t *cr;
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
   surface = _gdk_window_ref_cairo_surface (window);
+
   cr = cairo_create (surface);
 
-  if (window->impl_window->paint_stack)
-    {
-      paint = window->impl_window->paint_stack->data;
-
-      region = cairo_region_copy (paint->region);
-      cairo_region_translate (region, -window->abs_x, -window->abs_y);
-      gdk_cairo_region (cr, region);
-      cairo_region_destroy (region);
-   }
+  if (window->impl_window->current_paint.region != NULL)
+    region = cairo_region_copy (window->impl_window->current_paint.region);
   else
-    gdk_cairo_region (cr, window->clip_region);
+    region = cairo_region_copy (window->clip_region);
 
+  cairo_region_translate (region, -window->abs_x, -window->abs_y);
+  gdk_cairo_region (cr, region);
+  cairo_region_destroy (region);
   cairo_clip (cr);
 
   cairo_surface_destroy (surface);
@@ -3335,37 +3210,52 @@ gdk_window_schedule_update (GdkWindow *window)
                                    GDK_FRAME_CLOCK_PHASE_PAINT);
 }
 
+static void
+gdk_window_add_damage (GdkWindow *toplevel,
+                       cairo_region_t *damaged_region)
+{
+  GdkDisplay *display;
+  GdkEvent event = { 0, };
+
+  /* This function only makes sense for offscreen windows. */
+  g_assert (gdk_window_is_offscreen (toplevel));
+
+  event.expose.type = GDK_DAMAGE;
+  event.expose.window = toplevel;
+  event.expose.send_event = FALSE;
+  event.expose.region = damaged_region;
+  cairo_region_get_extents (event.expose.region, &event.expose.area);
+
+  display = gdk_window_get_display (event.expose.window);
+  _gdk_event_queue_append (display, gdk_event_copy (&event));
+}
+
 static void
 _gdk_window_process_updates_recurse_helper (GdkWindow *window,
-                                            cairo_region_t *expose_region,
-                                            int dx, int dy)
+                                            cairo_region_t *expose_region)
 {
   GdkWindow *child;
   cairo_region_t *clipped_expose_region;
-  GdkRectangle clip_box;
   GList *l, *children;
 
+  if (window->destroyed)
+    return;
+
+  if (window->alpha == 0 && !gdk_window_has_impl (window))
+    return;
+
   clipped_expose_region = cairo_region_copy (expose_region);
-  cairo_region_translate (clipped_expose_region, dx, dy);
+
+  if (!gdk_window_has_impl (window))
+    cairo_region_translate (clipped_expose_region, -window->x, -window->y);
+
   cairo_region_intersect (clipped_expose_region, window->clip_region);
 
-  if (cairo_region_is_empty (clipped_expose_region) || window->destroyed)
+  if (cairo_region_is_empty (clipped_expose_region))
     goto out;
 
-  if (gdk_window_is_offscreen (window->impl_window) &&
-      gdk_window_has_impl (window))
-    _gdk_window_add_damage ((GdkWindow *) window->impl_window, clipped_expose_region);
-
-  if (window->alpha != 255 && !gdk_window_has_impl (window))
-    {
-      if (window->alpha == 0)
-        goto out;
-
-      cairo_region_get_extents (clipped_expose_region, &clip_box);
-      clip_box.x += window->abs_x;
-      clip_box.y += window->abs_y;
-      /* TODO: How do we now do subwindow alphas */
-    }
+  if (gdk_window_is_offscreen (window))
+    gdk_window_add_damage (window, clipped_expose_region);
 
   /* Paint the window before the children, clipped to the window region */
 
@@ -3410,7 +3300,7 @@ _gdk_window_process_updates_recurse_helper (GdkWindow *window,
 
       /* Client side child, expose */
       if (child->impl == window->impl)
-        _gdk_window_process_updates_recurse_helper ((GdkWindow *)child, clipped_expose_region, -child->x, -child->y);
+        _gdk_window_process_updates_recurse_helper ((GdkWindow *)child, clipped_expose_region);
     }
 
   g_list_free_full (children, g_object_unref);
@@ -3423,7 +3313,7 @@ void
 _gdk_window_process_updates_recurse (GdkWindow *window,
                                      cairo_region_t *expose_region)
 {
-  _gdk_window_process_updates_recurse_helper (window, expose_region, 0, 0);
+  _gdk_window_process_updates_recurse_helper (window, expose_region);
 }
 
 
@@ -3451,8 +3341,6 @@ static void
 gdk_window_process_updates_internal (GdkWindow *window)
 {
   GdkWindowImplClass *impl_class;
-  gboolean save_region = FALSE;
-  GdkRectangle clip_box;
   GdkWindow *toplevel;
 
   toplevel = gdk_window_get_toplevel (window);
@@ -3490,15 +3378,17 @@ gdk_window_process_updates_internal (GdkWindow *window)
 	      g_usleep (70000);
 	    }
 
-	  cairo_region_get_extents (update_area, &clip_box);
-	  expose_region = cairo_region_copy (update_area);
 	  impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
-	  save_region = impl_class->queue_antiexpose (window, update_area);
+
+          if (impl_class->queue_antiexpose)
+            impl_class->queue_antiexpose (window, update_area);
+
+	  expose_region = cairo_region_copy (update_area);
           impl_class->process_updates_recurse (window, expose_region);
 	  cairo_region_destroy (expose_region);
 	}
-      if (!save_region)
-	cairo_region_destroy (update_area);
+
+      cairo_region_destroy (update_area);
     }
 
   window->in_update = FALSE;
@@ -4557,7 +4447,7 @@ get_all_native_children (GdkWindow *window,
 }
 
 
-static inline void
+static gboolean
 gdk_window_raise_internal (GdkWindow *window)
 {
   GdkWindow *parent = window->parent;
@@ -4565,11 +4455,13 @@ gdk_window_raise_internal (GdkWindow *window)
   GList *native_children;
   GList *l, listhead;
   GdkWindowImplClass *impl_class;
+  gboolean did_raise = FALSE;
 
-  if (parent)
+  if (parent && parent->children->data != window)
     {
       parent->children = g_list_remove (parent->children, window);
       parent->children = g_list_prepend (parent->children, window);
+      did_raise = TRUE;
     }
 
   impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
@@ -4617,8 +4509,9 @@ gdk_window_raise_internal (GdkWindow *window)
 
 	  g_list_free (native_children);
 	}
-
     }
+
+  return did_raise;
 }
 
 /* Returns TRUE If the native window was mapped or unmapped */
@@ -4709,7 +4602,7 @@ gdk_window_show_internal (GdkWindow *window, gboolean raise)
 {
   GdkWindowImplClass *impl_class;
   gboolean was_mapped, was_viewable;
-  gboolean did_show;
+  gboolean did_show, did_raise = FALSE;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -4720,8 +4613,10 @@ gdk_window_show_internal (GdkWindow *window, gboolean raise)
   was_viewable = window->viewable;
 
   if (raise)
-    /* Keep children in (reverse) stacking order */
-    gdk_window_raise_internal (window);
+    {
+      /* Keep children in (reverse) stacking order */
+      did_raise = gdk_window_raise_internal (window);
+    }
 
   if (gdk_window_has_impl (window))
     {
@@ -4757,7 +4652,7 @@ gdk_window_show_internal (GdkWindow *window, gboolean raise)
 	_gdk_make_event (window, GDK_MAP, NULL, FALSE);
     }
 
-  if (!was_mapped || raise)
+  if (!was_mapped || did_raise)
     {
       recompute_visible_regions (window, FALSE);
 
@@ -4805,15 +4700,18 @@ gdk_window_show_unraised (GdkWindow *window)
 void
 gdk_window_raise (GdkWindow *window)
 {
+  gboolean did_raise;
+
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (window->destroyed)
     return;
 
   /* Keep children in (reverse) stacking order */
-  gdk_window_raise_internal (window);
+  did_raise = gdk_window_raise_internal (window);
 
-  if (!gdk_window_is_toplevel (window) &&
+  if (did_raise &&
+      !gdk_window_is_toplevel (window) &&
       gdk_window_is_viewable (window) &&
       !window->input_only)
     gdk_window_invalidate_region_full (window, window->clip_region, TRUE);
@@ -5466,6 +5364,11 @@ gdk_window_move_resize_internal (GdkWindow *window,
       return;
     }
 
+  if (width == 0)
+    width = 1;
+  if (height == 0)
+    height = 1;
+
   /* Bail early if no change */
   if (window->width == width &&
       window->height == height &&
@@ -5497,11 +5400,7 @@ gdk_window_move_resize_internal (GdkWindow *window,
     }
   if (!(width < 0 && height < 0))
     {
-      if (width < 1)
-	width = 1;
       window->width = width;
-      if (height < 1)
-	height = 1;
       window->height = height;
     }
 
@@ -6790,21 +6689,6 @@ gdk_window_is_shaped (GdkWindow *window)
   return window->shaped;
 }
 
-void
-_gdk_window_add_damage (GdkWindow *toplevel,
-			cairo_region_t *damaged_region)
-{
-  GdkDisplay *display;
-  GdkEvent event = { 0, };
-  event.expose.type = GDK_DAMAGE;
-  event.expose.window = toplevel;
-  event.expose.send_event = FALSE;
-  event.expose.region = damaged_region;
-  cairo_region_get_extents (event.expose.region, &event.expose.area);
-  display = gdk_window_get_display (event.expose.window);
-  _gdk_event_queue_append (display, gdk_event_copy (&event));
-}
-
 /* Gets the toplevel for a window as used for events,
    i.e. including offscreen parents */
 static GdkWindow *

gdk/gdkwindow.h

@@ -740,7 +740,7 @@ void	      gdk_window_begin_paint_region (GdkWindow          *window,
 					     const cairo_region_t    *region);
 GDK_AVAILABLE_IN_ALL
 void	      gdk_window_end_paint          (GdkWindow          *window);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void	      gdk_window_flush             (GdkWindow          *window);
 
 GDK_AVAILABLE_IN_ALL

gdk/gdkwindowimpl.c

@@ -39,10 +39,18 @@ gdk_window_impl_beep (GdkWindow *window)
   return FALSE;
 }
 
+static void
+gdk_window_impl_process_updates_recurse (GdkWindow      *window,
+                                         cairo_region_t *region)
+{
+  _gdk_window_process_updates_recurse (window, region);
+}
+
 static void
 gdk_window_impl_class_init (GdkWindowImplClass *impl_class)
 {
   impl_class->beep = gdk_window_impl_beep;
+  impl_class->process_updates_recurse = gdk_window_impl_process_updates_recurse;
 }
 
 static void

gdk/gdkwindowimpl.h

@@ -126,12 +126,10 @@ struct _GdkWindowImplClass
 
   /* Called before processing updates for a window. This gives the windowing
    * layer a chance to save the region for later use in avoiding duplicate
-   * exposes. The return value indicates whether the function has a saved
-   * the region; if the result is TRUE, then the windowing layer is responsible
-   * for destroying the region later.
+   * exposes.
    */
-  gboolean     (* queue_antiexpose)     (GdkWindow       *window,
-					 cairo_region_t  *update_area);
+  void     (* queue_antiexpose)     (GdkWindow       *window,
+                                     cairo_region_t  *update_area);
 
 /* Called to do the windowing system specific part of gdk_window_destroy(),
  *
@@ -158,15 +156,6 @@ struct _GdkWindowImplClass
   */
   void         (*destroy_foreign)       (GdkWindow       *window);
 
-  /* Resizes @surface to a new size. If successful, return %TRUE.
-   * If the backend cannot resize surfaces, return %FALSE and a new
-   * surface will be created instead.
-   */
-  gboolean     (* resize_cairo_surface) (GdkWindow       *window,
-                                         cairo_surface_t *surface,
-                                         gint             width,
-                                         gint             height);
-
   /* optional */
   gboolean     (* beep)                 (GdkWindow       *window);
 

gdk/quartz/gdkscreen-quartz.c

@@ -75,8 +75,8 @@ gdk_quartz_screen_init (GdkQuartzScreen *quartz_screen)
   NSScreen *nsscreen;
 
   nsscreen = [[NSScreen screens] objectAtIndex:0];
-  gdk_screen_set_resolution (screen,
-                             72.0 * [nsscreen userSpaceScaleFactor]);
+  _gdk_screen_set_resolution (screen,
+                              72.0 * [nsscreen userSpaceScaleFactor]);
 
   gdk_quartz_screen_calculate_layout (quartz_screen);
 

gdk/quartz/gdkwindow-quartz.c

@@ -137,37 +137,6 @@ gdk_window_impl_quartz_get_context (GdkWindowImplQuartz *window_impl,
   CGContextSaveGState (cg_context);
   CGContextSetAllowsAntialiasing (cg_context, antialias);
 
-  /* We'll emulate the clipping caused by double buffering here */
-  if (window_impl->begin_paint_count != 0)
-    {
-      CGRect rect;
-      CGRect *cg_rects;
-      gint n_rects, i;
-
-      n_rects = cairo_region_num_rectangles (window_impl->paint_clip_region);
-
-      if (n_rects == 1)
-	cg_rects = ▭
-      else
-	cg_rects = g_new (CGRect, n_rects);
-
-      for (i = 0; i < n_rects; i++)
-	{
-          cairo_rectangle_int_t cairo_rect;
-          cairo_region_get_rectangle (window_impl->paint_clip_region,
-                                      i, &cairo_rect);
-	  cg_rects[i].origin.x = cairo_rect.x;
-	  cg_rects[i].origin.y = cairo_rect.y;
-	  cg_rects[i].size.width = cairo_rect.width;
-	  cg_rects[i].size.height = cairo_rect.height;
-	}
-
-      CGContextClipToRects (cg_context, cg_rects, n_rects);
-
-      if (cg_rects != &rect)
-        g_free (cg_rects);
-    }
-
   return cg_context;
 }
 
@@ -379,12 +348,7 @@ gdk_window_impl_quartz_begin_paint_region (GdkWindow       *window,
   cairo_region_translate (clipped_and_offset_region,
                      window->abs_x, window->abs_y);
 
-  if (impl->begin_paint_count == 0)
-    impl->paint_clip_region = cairo_region_reference (clipped_and_offset_region);
-  else
-    cairo_region_union (impl->paint_clip_region, clipped_and_offset_region);
-
-  impl->begin_paint_count++;
+  impl->paint_clip_region = cairo_region_reference (clipped_and_offset_region);
 
   if (cairo_region_is_empty (clipped_and_offset_region))
     goto done;
@@ -423,13 +387,8 @@ gdk_window_impl_quartz_end_paint (GdkWindow *window)
 {
   GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
 
-  impl->begin_paint_count--;
-
-  if (impl->begin_paint_count == 0)
-    {
-      cairo_region_destroy (impl->paint_clip_region);
-      impl->paint_clip_region = NULL;
-    }
+  cairo_region_destroy (impl->paint_clip_region);
+  impl->paint_clip_region = NULL;
 }
 
 static void
@@ -1104,16 +1063,6 @@ gdk_quartz_window_destroy (GdkWindow *window,
     }
 }
 
-static gboolean
-gdk_window_quartz_resize_cairo_surface (GdkWindow       *window,
-                                        cairo_surface_t *surface,
-                                        gint             width,
-                                        gint             height)
-{
-  /* Quartz surfaces cannot be resized */
-  return FALSE;
-}
-
 static void
 gdk_quartz_window_destroy_foreign (GdkWindow *window)
 {
@@ -2108,13 +2057,6 @@ gdk_window_quartz_set_static_gravities (GdkWindow *window,
   return FALSE;
 }
 
-static gboolean
-gdk_quartz_window_queue_antiexpose (GdkWindow *window,
-                                    cairo_region_t *area)
-{
-  return FALSE;
-}
-
 static void
 gdk_quartz_window_set_focus_on_map (GdkWindow *window,
                                     gboolean focus_on_map)
@@ -2946,10 +2888,8 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
   impl_class->shape_combine_region = gdk_window_quartz_shape_combine_region;
   impl_class->input_shape_combine_region = gdk_window_quartz_input_shape_combine_region;
   impl_class->set_static_gravities = gdk_window_quartz_set_static_gravities;
-  impl_class->queue_antiexpose = gdk_quartz_window_queue_antiexpose;
   impl_class->destroy = gdk_quartz_window_destroy;
   impl_class->destroy_foreign = gdk_quartz_window_destroy_foreign;
-  impl_class->resize_cairo_surface = gdk_window_quartz_resize_cairo_surface;
   impl_class->get_shape = gdk_quartz_window_get_shape;
   impl_class->get_input_shape = gdk_quartz_window_get_input_shape;
   impl_class->begin_paint_region = gdk_window_impl_quartz_begin_paint_region;

gdk/quartz/gdkwindow-quartz.h

@@ -51,7 +51,6 @@ struct _GdkWindowImplQuartz
   GdkWindowTypeHint type_hint;
 
   cairo_region_t *paint_clip_region;
-  gint begin_paint_count;
   gint in_paint_rect_count;
 
   GdkWindow *transient_for;

gdk/wayland/gdkcursor-wayland.c

@@ -68,66 +68,16 @@ struct _GdkWaylandCursorClass
 
 G_DEFINE_TYPE (GdkWaylandCursor, _gdk_wayland_cursor, GDK_TYPE_CURSOR)
 
-struct cursor_cache_key
+void
+_gdk_wayland_display_init_cursors (GdkWaylandDisplay *display)
 {
-  GdkCursorType type;
-  const char *name;
-};
-
-static void
-add_to_cache (GdkWaylandDisplay *display, GdkWaylandCursor *cursor)
-{
-  display->cursor_cache = g_slist_prepend (display->cursor_cache, cursor);
-
-  g_object_ref (cursor);
+  display->cursor_cache = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
 }
 
-static gint
-cache_compare_func (gconstpointer listelem,
-                    gconstpointer target)
-{
-  GdkWaylandCursor *cursor = (GdkWaylandCursor *) listelem;
-  struct cursor_cache_key* key = (struct cursor_cache_key *) target;
-
-  if (cursor->cursor.type != key->type)
-    return 1; /* No match */
-
-  /* Elements marked as pixmap must be named cursors
-   * (since we don't store normal pixmap cursors
-   */
-  if (key->type == GDK_CURSOR_IS_PIXMAP)
-    return strcmp (key->name, cursor->name);
-
-  return 0; /* Match */
-}
-
-static GdkWaylandCursor*
-find_in_cache (GdkWaylandDisplay *display,
-               GdkCursorType      type,
-               const char        *name)
-{
-  GSList* res;
-  struct cursor_cache_key key;
-
-  key.type = type;
-  key.name = name;
-
-  res = g_slist_find_custom (display->cursor_cache, &key, cache_compare_func);
-
-  if (res)
-    return (GdkWaylandCursor *) res->data;
-
-  return NULL;
-}
-
-/* Called by gdk_wayland_display_finalize to flush any cached cursors
- * for a dead display.
- */
 void
 _gdk_wayland_display_finalize_cursors (GdkWaylandDisplay *display)
 {
-  g_slist_foreach (display->cursor_cache, (GFunc) g_object_unref, NULL);
-  g_slist_free (display->cursor_cache);
+  g_hash_table_destroy (display->cursor_cache);
 }
 
 static gboolean
@@ -156,7 +106,14 @@ void
 _gdk_wayland_display_update_cursors (GdkWaylandDisplay      *display,
                                      struct wl_cursor_theme *theme)
 {
-  g_slist_foreach (display->cursor_cache, (GFunc) set_cursor_from_theme, theme);
+  GHashTableIter iter;
+  const char *name;
+  GdkWaylandCursor *cursor;
+
+  g_hash_table_iter_init (&iter, display->cursor_cache);
+
+  while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &cursor))
+    set_cursor_from_theme (cursor, theme);
 }
 
 static void
@@ -302,14 +259,9 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay  *display,
 
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
-  private = find_in_cache (wayland_display, GDK_CURSOR_IS_PIXMAP, name);
+  private = g_hash_table_lookup (wayland_display->cursor_cache, name);
   if (private)
-    {
-      /* Cache had it, add a ref for this user */
-      g_object_ref (private);
-
-      return (GdkCursor*) private;
-    }
+    return GDK_CURSOR (g_object_ref (private));
 
   private = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
                           "cursor-type", GDK_CURSOR_IS_PIXMAP,
@@ -325,8 +277,8 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay  *display,
   if (!set_cursor_from_theme (private, wayland_display->cursor_theme))
     return GDK_CURSOR (private);
 
-  add_to_cache (wayland_display, private);
-
+  /* Insert into cache. */
+  g_hash_table_insert (wayland_display->cursor_cache, private->name, g_object_ref (private));
   return GDK_CURSOR (private);
 }