Port GtkInfoBar to RI

Conflicts:
	demos/gtk-demo/appwindow.c
	gtk/gtk.symbols
	gtk/gtkfilechooserdefault.c
	gtk/gtkhbbox.c
	gtk/gtkprintunixdialog.c
	gtk/gtkvbbox.c

HACKING

@@ -15,45 +15,50 @@ can be found here:
 
         http://developer.gnome.org
 
-including information about using Subversion with GNOME:
+Information about using git with GNOME can be found here:
 
-        http://developer.gnome.org/tools/svn.html
+        http://live.gnome.org/Git
 
-In order to get SVN gtk+ installed on your system, you need to have
-the most recent SVN versions of glib, pango, and atk installed as well.
+In order to get GIT gtk+ installed on your system, you need to have
+the most recent GIT versions of glib, pango, and atk installed as well.
 The installation process of these libraries is similar to that of gtk+, but
 needs to be fulfilled prior to installation of gtk+.
 
-If at all possible, please use SVN to get the latest development version of
-gtk+ and glib.  You can do the following to get glib and gtk+ from SVN:
+If at all possible, please use GIT to get the latest development version of
+gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
 
-        $ svn checkout http://svn.gnome.org/svn/glib/trunk glib
-        $ svn checkout http://svn.gnome.org/svn/pango/trunk pango
-        $ svn checkout http://svn.gnome.org/svn/atk/trunk atk
-        $ svn checkout http://svn.gnome.org/svn/gtk+/trunk gtk+
+        $ git clone git://git.gnome.org/glib
+        $ git clone git://git.gnome.org/pango
+        $ git clone git://git.gnome.org/atk
+        $ git clone git://git.gnome.org/gtk+
 
-To compile the SVN version of gtk+ on your system, you will need to take
+Note: if you plan to push changes to back to the master repository and
+have a gnome account, you want to use the following instead:
+
+        $ git clone ssh://<username>@git.gnome.org/git/gtk+
+
+To compile the GIT version of gtk+ on your system, you will need to take
 several steps to setup the tree for compilation.  You can do all these
 steps at once by running:
 
         gtk+$ ./autogen.sh
-   
+
 Basically this does the following for you:
 
         gtk+$ aclocal; automake; autoconf
 
 The above commands create the `configure' script.  Now you
-run the `configure' script in `gtk+/' to create all Makefiles.  
+run the `configure' script in `gtk+/' to create all Makefiles.
 More information about that in `INSTALL'.
 
-Before running `autogen.sh' or `configure', make sure you have libtool 
-in your path.  
+Before running `autogen.sh' or `configure', make sure you have libtool
+in your path.
 
 Note that autogen.sh runs configure for you.  If you wish to pass
 options like `--prefix=/usr' to `configure' you can give those options
 to `autogen.sh' and they will be passed on to `configure'.
 
-For information about submitting patches and committing changes
-to SVN, see the `README' and `README.commits' files. In particular, 
-don't, under any circumstances, commit anything to SVN before
+For information about submitting patches and pushing changes
+to GIT, see the `README' and `README.commits' files. In particular,
+don't, under any circumstances, push anything to GIT before
 reading and understanding `README.commmits'.

INSTALL

@@ -1,41 +0,0 @@
-Prerequisites
-=============
-
-GTK+ requires the following packages:
-
- - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ 2.14.2 requires at least GLib 2.17.6,
-   Pango 1.20, ATK 1.13.0 and cairo 1.6.0.
-
- - The TIFF, PNG, and JPEG image loading libraries. You most
-   likely have these installed on your system already. If not
-   these libraries are available from:
-
-    http://www.libtiff.org/
-    http://www.libpng.org/
-    http://www.ijg.org/
-
-    libtiff must be version 3.6.0 or higher.
-
-Simple install procedure
-========================
-
-  % gzip -cd gtk+-2.14.2.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.14.2			   # change to the toplevel directory
-  % ./configure				   # run the `configure' script
-  % make				   # build GTK+
-  [ Become root if necessary ]
-  % make install			   # install GTK+
-
-The Details
-===========
-
-Complete information about installing GTK+ and related libraries can be found 
-in the file:
-
- docs/reference/gtk/html/gtk-building.html
-
-Or online at:
-
- http://developer.gnome.org/doc/API/2.0/gtk/gtk-building.html
-

Makefile.am

@@ -19,6 +19,9 @@ EXTRA_DIST +=			\
 	ChangeLog.pre-2-6	\
 	ChangeLog.pre-2-8	\
 	ChangeLog.pre-2-10	\
+	ChangeLog.pre-2-12	\
+	ChangeLog.pre-2-14	\
+	ChangeLog.pre-2-16	\
 	ChangeLog.gtk-async-file-chooser	\
 	ChangeLog.gtk-printing	\
 	README.commits	\
@@ -115,6 +118,26 @@ EXTRA_DIST +=			\
 	examples/spinbutton/spinbutton.c  \
 	examples/spinbutton/Makefile  \
 	examples/find-examples.sh
+MAINTAINERCLEANFILES = \
+	$(srcdir)/INSTALL \
+	$(srcdir)/README \
+	$(srcdir)/aclocal.m4 \
+	$(srcdir)/autoscan.log \
+	$(srcdir)/compile \
+	$(srcdir)/config.guess \
+	$(srcdir)/config.h.in \
+	$(srcdir)/config.sub \
+	$(srcdir)/configure.scan \
+	$(srcdir)/depcomp \
+	$(srcdir)/install-sh \
+	$(srcdir)/ltmain.sh \
+	$(srcdir)/missing \
+	$(srcdir)/mkinstalldirs \
+	$(srcdir)/omf.make \
+	$(srcdir)/xmldocs.make \
+	$(srcdir)/gtk-doc.make \
+	$(srcdir)/ChangeLog \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 GDKTARGET=@gdktarget@
 
@@ -149,7 +172,27 @@ DISTCLEANFILES =				\
 	gail.pc					\
 	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
 	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
-	gail-uninstalled.pc
+	gail-uninstalled.pc 			\
+	config.lt
+
+distclean-local:
+	if test "$(srcdir)" = "."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	@echo Creating $@
+	@if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
 
 ## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
 DEFAULT_GDKTARGET=x11
@@ -175,7 +218,7 @@ dist-hook:
 	     && cp INSTALL README $(distdir) ; \
 	fi
 
-.PHONY: files release sanity snapshot
+.PHONY: files release sanity snapshot ChangeLog
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -200,3 +243,15 @@ snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
+
+GITIGNOREFILES = \
+	po-properties/Makefile.in.in \
+	po-properties/Makefile.in \
+	po-properties/Makefile \
+	po-properties/*.gmo \
+	po-properties/*.mo \
+	po-properties/POTFILES \
+	po-properties/stamp-it \
+	po-properties/.intltool-merge-cache
+
+-include $(top_srcdir)/git.mk

Makefile.decl

@@ -10,7 +10,7 @@ TEST_PROGS =
 ### testing rules
 
 # Xvfb based test rules
-XVFB = Xvfb -screen 0 800x600x16
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
 XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \

NEWS

@@ -1,3 +1,808 @@
+Overview of Changes from GTK+ 2.17.1 to 2.17.2
+==============================================
+
+* GtkInfoBar: A new widget to show a transient 'message area'
+  inside a content pane. The API is similar to GtkDialog and
+  supports theming for different message types (warnings,
+  errors, etc)
+
+* GtkFileChooser:
+  - Improve path bar by ellipsizing long names and preventing
+    vertical size changes
+  - Backup files are now hidden by default
+  - GTK+ remembers the file chooser sorting state now
+
+* GtkButtonBox: Implements the GtkOrientable interface now.
+
+* Printing:
+ - GTK+ supports printing an application-defined 'selection' now,
+   in addition to usual page ranges.
+
+* Changes that are relevant for theme authors:
+ - The new GtkInfoBar widget uses symbolic colors for theming
+   its background color depending on the message type. By default,
+   it uses the same background color as tooltips. This can be turned
+   off with style property.
+ - The GTK+ file chooser (as well as nautilus and other users of GIO
+   icon information) can now show different icons for xdg user dirs.
+   The icon names are folder-documents, folder-download, folder-music,
+   folder-pictures, folder-publicshare, folder-templates, folder-videos,
+   with an automatic fallback to the standard folder icon.
+
+* Bugs fixed:
+ 584021 titchy leak
+ 579590 gtk_entry_set_icon_from_stock should warn when invalid st...
+ 584125 GtkAssistant asserts if last page is GTK_ASSISTANT_PAGE_C...
+ 171416 Resume editing if name of new folder is "Type name of new...
+ 420335 Page assignment when printing 4 pages to a sheet
+ 161670 Bad behaviour from gtk_file_chooser_set_filename
+ 327152 Long names in the FileChooserDialog directory buttons sho...
+ 355851 File Dialog shows Backup Files
+ 390312 Gtk grabs keyboard on DND
+ 486839 Filechooser 'Places' items should not move up and down th...
+ 562335 Deprecate gtk_tree_view_column_get_cell_renderers and gtk...
+ 565317 Resulting image of GtkCellRendererPixbuf depends on order...
+ 565998 configure script doesn't check for cairo-xlib.pc
+ 580079 Better configure detection of Xinerama on Solaris
+ 580511 gdk_x11_atom_to_xatom_for_display translates GDK_NONE as ...
+ 580560 Backspace key does not go to the parent directory
+ 584598 GtkButtonBox silently ignores gtk_orientable_set_orientation
+ 584637 Missing conditionals for X11 shape extension in GdkWindow
+ 584805 GtkEntryCompletion selection reset when calling gtk_entry...
+ 584832 Duplicate the exec string returned by gtk_recent_info_get...
+ 585024 some gtksettings properties need extra initialisation
+ 585371 Add additional sizes to the font selector
+ 585791 use g_*gettext instead of *gettext directly
+ 562579 [Patch] Remove error dialog when directory does not exist
+ 344519 custom print ranges
+ 484922 Should remember the sort state of columns
+ 555344 consider adding a message area widget
+
+* Updated translations:
+ Danish
+ Brazilian Portuguese
+ Estonian
+ Oriya
+ Bengali India
+ Norwegian bokmål
+ Hindi
+ Spanish
+
+
+Overview of Changes from GTK+ 2.17.0 to 2.17.1
+==============================================
+
+* GtkLabel:
+ - GtkLabel can show embedded URLs, much like SexyUrlLabel
+
+* Printing:
+ - GTK+ includes a print backend that works with the PAPI
+   printing service.
+ - The file and lpr backends can print multiple pages per sheet.
+
+* Changes that are relevant for theme authors:
+ - The URL support in GtkLabel uses the link-color / visited-link-color
+   style properties
+
+* Bugs fixed:
+ 576091 GtkTooltip destroy the custom widget
+ 315462 GtkButton doesn't center its child when the child is too ...
+ 390331 "Pages per sheet" does not work for LPR printing
+ 531490 gdk_window_set_events (0) will _ADD_ events to the root w...
+ 574386 Remove deprecated call to gtk_status_icon_set_tooltip in ...
+ 576678 cups printbackend doesn't list printers on NetBSD
+ 579366 gtkbuilderparser leaks RequiresInfo objects.
+ 579884 casting problem in gmodule
+ 580511 gdk_x11_atom_to_xatom_for_display translates GDK_NONE as ...
+ 581876 Remove deprecated call to gtk_action_connect_proxy in tes...
+ 581878 Remove deprecated call to gtk_scale_button_get_orientatio...
+ 582003 Calling gdk_window_get_events() changes the event mask, b...
+ 582488 GtkNotebook behaves poorly when allocated less than reque...
+ 582950 Use number of pages to print when showing printing progress
+ 582963 Crash when printing from a thread
+ 583050 unclear disposition of function gtk_combo_box_get_active...
+ 583522 Trivial error in GtkBuilder migration documentation
+ 535557 gdk_window_set_icon_name should accept NULL to unset
+ 549859 "file" printer doesn't support n-up
+
+* Updated translations:
+ Arabic
+ British English
+ Catalan
+ Czech
+ Danish
+ Estonian
+ French
+ German
+ Greek
+ Hungarian
+ Irish
+ Italian
+ Kannada
+ Portuguese
+ Russian
+ Slovenian
+ Spanish
+ Ukrainian
+ Simplified Chinese
+
+
+Overview of Changes from GTK+ 2.16.x to 2.17.0
+==============================================
+
+* GtkBuilder:
+  - Scale marks can now be specified in builder markup
+  - GtkAssistant action widgets can be added in builder markup
+
+* Changes that are relevant for theme authors
+ - GtkEntry now has a ::invisible-char style property that allows
+   themes to set the preferred invisible character
+
+* Printing:
+ - GTK+ supports authentication of users against CUPS servers now.
+
+* Bugs fixed:
+ 578634 gtkdial example fails to compile
+ 580678 Minor improvement to GTK+ mediaLib code
+ 580511 gdk_x11_atom_to_xatom_for_display translates GDK_NONE...
+ 581110 Handlebox widget uses static variables, crashes in multi...
+ 553385 gtk-builder-convert creates untranslated combobox models
+ 580814 GtkTextLayout incorrectly assumes pango iterates in logi...
+ 579366 gtkbuilderparser leaks RequiresInfo objects
+ 579741 gailcombox should emit property-changed:accessible-name...
+ 574386 Remove deprecated call to gtk_status_icon_set_tooltip...
+ 384940 handle rejecting jobs and authentication meaningfully
+
+* Updated translations
+ Arabic
+ Brazilian Portuguese
+ British English
+ Catalan
+ Czech
+ Estonian
+ Italian
+ Kannada
+ Oriya
+ Simplified Chinese
+ Slovenian
+ Spanish
+ Ukrainian
+
+
+Overview of Changes from GTK+ 2.16.0 to 2.16.1
+==============================================
+
+* GtkBuilder:
+ - Accessible action names can now be marked as translatable.
+ - gtk-builder-convert correctly handles response ids in all dialogs.
+ - gtk-builder-convert warns about duplicate ids.
+
+* GDK:
+ - GDK no longer refuses to work on 30-bit visuals
+
+* Win32:
+ - The appearance of GTK+ menus on Vista has been improved.
+
+* Bugs fixed:
+ 575700 Crash when moving a GtkWindow
+ 574283 unused assignment and dead code in gtk_widget_set_tooltip_window
+ 538840 [Win32] GTK menu theming could be improved
+ 576254 <object> requires attribute "id"
+ 576306 gdkscreen.c: get_nearest_monitor too simple...
+ 437533 Implement draw_shape PangoRenderer method
+ 577224 crash when setting new icon after setting icon...
+ 576150 Doc bug for GtkMenuPositionFunc
+ 562863 GtkVscrollbar is hardly documented
+ 575644 Cygwin gail build patch
+ 571374 Add 30-bit visuals to the list of supported depths
+ 577650 gtkitemfactory.h fails to compile
+ 578094 ProcessIdToSessionId needs to be declared as WINAPI
+ 518642 Custom tags and translatable content
+ 532858 segv setting GBoxed subclass <property>
+ 557629 Response ID not converted for GtkFileChooserDialog
+ 577789 about dialogue doesn't linkify licence text
+ 577824 empathy_chat_window_init: GClosure is leaked
+ 577964 Page Range entry is not accessible
+ 578221 Assertion warning `GTK_IS_TEXT_LAYOUT (layout)' failed
+ 578271 PageSetup should be sent to the previewer
+ 578276 gtk-builder-convert improperly converts GtkComboBox
+ 578290 two memory leaks
+ 578354 Memory leak in gdkscreen-x11
+ 578365 GtkMountOperation does not allow passwordless mount of sf...
+ 578366 file descriptor leak
+ 573922 Using NET_WM_USER_TIME even if startup notification times...
+ 561345 Title of Print Preview window should not be previewXXXXXX...
+ 577868 about dialogue changes appearance on style-set (change th...
+ 572797 GtkCellRendererAccel display string i18n in OTHER mode
+
+* Updated translations:
+ Arabic
+ Assamese
+ Basque
+ Bulgarian
+ Crimean Tatar
+ Danish
+ Galician
+ German
+ Greek
+ Gujarati
+ Japanese
+ Kannada
+ Malayalam
+ Marathi
+ Oriya
+ Pashto
+ Russian
+ Spanish
+ Telugu
+ Turkish
+
+Overview of Changes from GTK+ 2.15.5 to 2.16.0
+==============================================
+
+* The new function gtk_style_get_property was renamed to
+  gtk_style_get_style_property to avoid binding problems.
+
+* Bugs fixed:
+ 574059 search button not available in some cases
+ 574622 GtkEntry: Should we wrap icon-press and icon-release signals?
+ 574561 gtk_style_get "shadows" g_object_get
+ 574794 Can not resize shaped windows on Windows
+ 570896 gdkevents-win32.c(2947) : error C4053: one void operand for '?:'
+ 573067 Intra-app dnd of text behavior on Windows is wrong
+ 572455 GtkEntry window layed out wrong if the widget has focus
+
+* Updated translations:
+ Assamese (as)
+ Bengali (bn_IN)
+ Czech (cs)
+ Gujarati (gu)
+ Hindi (hi)
+ Japanese (ja)
+ Kannada (kn)
+ Lithuanian (lt)
+ Malayalam (ml)
+ Polish (pl)
+ Romanian (ro)
+ Tamil (ta)
+ Telugu (te)
+
+
+Overview of Changes from GTK+ 2.15.4 to 2.15.5
+==============================================
+
+* GtkAction:
+ - Rename gtk_activatable_reset to gtk_activatable_sync_action_properties
+   to make it easier to bind
+
+* GDK:
+ - The DirectFB backend has been restored to basic function
+ - The RANDR support in the X11 backend has been made more robust
+
+* Changes that are relevant for theme authors:
+ - GtkEntry now has a ::progress-border property and use fg/bg[SELECTED]
+   for drawing progress
+
+* Bugs fixed:
+ 457086 numpad does not work when the Thai-Lao input method is used
+ 554407 directfb backend does not implement GdkWindowImpl
+ 543710 Dead keys do not work anymore with DirectFB
+ 560671 the client_message API doesn't work in DirectFB
+ 513422 Unknown meaning of translatable messages
+ 533456 Memory leak when window is destroyed
+ 572387 gdm crashes after gtk 2.15.4 upgrade
+ 565199 Ellipsize text in Places list
+ 495320 GtkRange does not use gdk_event_request_motions
+ 572904 GtkRadioAction broken in trunk
+ 573383 Setting a textview's buffer to NULL doesn't do a complete job
+ 573416 GtkMountOperation fixes for ask_password()
+ 572968 GtkIconView: image_description setter function strdups wrong...
+ 572972 GtkRecentChooserDefault: memory leak in copy_activated_cb
+ 572996 crash in Home Folder: Trying to open the sidebar
+ 573069 Gdk-CRITICAL warnings with Gtk 2.14 when dragging GtkNotebook...
+ 573113 Can't build tests due to testfilechooserbutton.c
+ 573211 Setting screen for popup windows
+ 573287 Warning on startup
+ 572273 No replacement documented for gtk_action_connect_proxy
+ 573515 po-properties/ special Makefile.in.in handling causes failure...
+ 552619 File Chooser no longer automatically enters newly created dir...
+ 573087 gdkwindow.c: {x,y}_offset used uninitialized
+ 573688 Don't steal update region in gtk_text_view_paint
+ 546285 Allow GtkEntry to draw progress
+ 569671 gdk_pixbuf_new_from_file() can't open image/x-portable-pixmap
+ 573393 Deprecated functions in gdk-Threads example code snippet
+ 571001 STATE_SHOWING missing on table items
+ 520395 event.any_data incorrect with spin buttons and combo boxes...
+ 325809 getAccessibleAtPoint for tables does not seem to take column...
+ 561631 gailbutton.c:571:idle_do_action: code should not be reached
+ 519090 Add accessibility support to GtkScaleButton
+
+* Updated translations:
+ British English (en_GB)
+ Estonian (et)
+ Hungarian (hu)
+ Japanese (ja)
+ Korean (ko)
+ Kurdish (ku)
+ Maithili (mai)
+ Dutch (nl)
+ Oriya (or)
+ Swedish (sv)
+ Traditional Chinese (zh_HK)
+ Traditional Chinese (zh_TW)
+
+
+Overview of Changes from GTK+ 2.15.3 to 2.15.4
+==============================================
+
+* GtkAction:
+ - More compatibility fixes to make PolicyKit-gnome work
+
+* GtkFileChooserButton:
+ - Don't emit file-set when the dialog is canceled. But emit it
+   when a file is received via DND
+
+* GDK
+ - Use Xrandr 1.3 for tracking monitor information, if available
+
+* Bugs fixed: 
+ 538439 tooltip may appear in upper left corner...
+ 571015 libprintbackend-cups has unlocalized strings
+ 353196 Add a file-set signal to GtkFileChooserButton
+ 571249 Icons are not drawn properly when initial widget...
+ 571196 gtk_binding_entry_add_signall deprecated without alternative
+ 508545 No way to identify terminal classes from documentation
+ 570824 TreeView is not keyboard (re)focusable after selecting a cell...
+ 568571 Asian am/pm format on cups print backend's time parsing
+ 571576 gdk_pixbuf_save_to_stream() broken
+ 571873 Compile error with gdk/win32/gdkselection-win32.c
+ 572041 Focus should change when advancing forward in GtkAssistant
+ 572040 GtkAssistant does not expose page titles
+ 570406 gailutil.def is in srcdir, but used from builddir
+
+* Updated translations:
+ Belarusian Latin (be@latin)
+ Bulgarian (bg)
+ Catalan (ca)
+ Danish (da)
+ Spanish (es)
+ Basque (eu)
+ Finnish (fi)
+ French (fr)
+ Gujarati (gu)
+ Hungarian (hu)
+ Japanese (ja)
+ Korean (ko)
+ Latvian (lv)
+ Norwegian bokmål (nb)
+ Polish (pl)
+ Brazilian Portugese (pt_BR)
+ Slovak (sk)
+ Albanian (sq)
+ Serbian (sr)
+ Swedish (sv)
+ Thai (th)
+ Vietnamese (vi)
+
+
+Overview of Changes from GTK+ 2.15.2 to 2.15.3
+==============================================
+
+* Keyboard shortcut handling has been changed, to help with a longstanding
+  complaint about the way GTK+ handles multiple layouts. GTK+ now only uses
+  keys from groups other than the current group if they are not present in
+  the current group. Feedback on this change is appreciated.
+
+* Bugs fixed:
+ 569336 change in gtkbutton klass is causing crash...
+ 569435 make maintainer-clean removes non-generated sources
+ 145058 Inputting "^^" requires four keystrokes on Win32...
+ 559408 Transparency lost when images are copied...
+ 359288 Toolbar items are not shown after hiding
+ 569918 64bit portability issue in gtkrecentchooser.c
+ 162726 Multiple Latin layouts in XKB break keyboard shortcuts
+ 569635 fontchooser should reload list of families/styles on...
+
+* Updated translations:
+ Norwegian bokmål (nb)
+ Oriya (or)
+ Brazilian Portugese (pt_BR)
+ Thai (th)
+ Traditional Chinese (zh_HK)
+ Traditional Chinese (zh_TW)
+ 
+
+Overview of Changes from GTK+ 2.15.1 to 2.15.2
+==============================================
+
+* GtkAction:
+ - Make toolitems pick up icon names from actions
+ - Draw proxies of radio actions properly
+ - Make menu proxies of recent actions work
+ - Avoid accidental activations when changing actions on proxies
+ - Make derived button classes work as proxies
+
+* Input methods:
+ - Avoid an assertion due to early use of input methods
+
+* GtkScale:
+ - Avoid a segfault in the marker drawing code
+
+* GtkImageMenuItem:
+ - Add a property to override the show-menu-images setting
+
+* Bugs fixed:
+ 566628 gdk_display_close always asserts on win32 and quartz
+ 569240 Crasher when using markers
+ 569104 Toggle menu entries showed as check menu entries...
+ 322932 Always show icons on panel menus
+
+* Updated translations:
+ Finnish (fi)
+ German (de)
+
+
+Overview of Changes from GTK+ 2.15.0 to 2.15.1
+==============================================
+
+* GtkFileChooser:
+ - Remember the file chooser's size across invocations
+ - Handle uris that are entered in the entry
+ - Improve autocompletion, in particular for uris
+
+* GtkEntry:
+ - New property "im-module" for selecting input methods per-widget
+ - New icon-related API got renamed for consistency
+ - Added properties and setters for icon tooltips
+
+* GtkTextView:
+ - New property "im-module" for selecting input methods per-widget
+ - New signal "paste-done" to allow better handling of async pasting
+
+* GtkScale:
+ - New api to add annotated marks: gtk_scale_add_mark.
+
+* GtkAction:
+ - Rework the way actions and proxies interact, to make the
+   interaction less ad hoc, more extensible, and better suited
+   for support in GUI builders like glade.
+
+   To be used as a proxy, a widget must now implement the
+`  GtkActivatable interface, and GtkActivatable implementations
+   are responsible for syncing their appearance with the action
+   and for activating the action.
+
+   All the widgets that are commonly used as proxies implement
+   GtkActivatable now.
+
+   This is a big change, and it is not unlikely to break some
+   current users of GtkAction, so feedback about problems caused
+   by this is appreciated.
+
+ - Add a "gicon" property to specify the icon with a GIcon
+
+* GDK:
+ - On X11, GDK now caches cursors to avoid cursor theming overhead
+ - New cursor type for blank cursors: GDK_BLANK_CURSOR
+
+* New deprecations:
+   gtk_scale_Button_get_orientation()
+   gtk_scale_button_set_orientation()
+   gtk_action_connect_proxy()
+   gtk_action_disconnect_proxy()
+   gtk_widget_get_action()
+   gtk_action_block_activate_from()
+   gtk_action_unblock_activate_from()
+   direct access to "gtk-action" object data
+
+* Changes that are relevant for translators:
+ - Navigation and Media stock labels have separate message contexts now
+ - The caps lock warning string has been changed
+
+* Bugs fixed:
+ 566083 Icon pixmap hardcoded during DnD
+ 566334 compile failure for gtk+ on Mac OS X
+ 565998 configure script doesn't check for cairo-xlib.pc
+ 566391 gtk_about_dialog_set_url_hook should activate...
+ 566568 gtk_tree_model_get_value docs typo
+ 566628 gdk_display_close always asserts on win32
+ 566733 Add GIcon to GtkAction, GtkToolButton
+ 567024 gtktoolbutton doesn't create right proxy menu item...
+ 523554 Copy from GIMP to Word broke
+ 567468 no check for trailing != NULL in gtk_text_layout_get..
+ 492794 Pasting external text at end of view yields wrong...
+ 164002 query scripts don't work uninstalled on windows
+ 566532 GtkScaleButton implementation of GtkOrientable
+ 450716 New API to change global IM
+ 562701 GtkEntryCompletion popup sizes its rows wrong...
+ 567944 [Win32] Sorted treeview columns can be unreadable
+ 567655 gtk_status_icon_set_tooltip_text/markup should use...
+ 567887 gtk_entry_get_storage_type() should be...
+ 568196 Please change context of Forward stock label
+ 563280 stock items & translation context
+ 568233 Wrong statement about GtkEntry's "activate" signal
+ 568263 gtk can't recognize the wrong X Selection TARGETS...
+ 565656 Add marks to scales
+ 567413 GtkComboBoxEntry doesn't emit "changed" signal...
+ 545980 GtkFileChooserEntry should handle URIs
+ 566862 pixbuf_new_from_file does not autodetect format
+ 568552 gtk_combo + gtk entry in invisible mode takes 100% cpu
+ 561801 "scheduled printing" doesn't function as expected
+ 566535 gtk_widget_get_snapshot does not work if double buff...
+ 567021 gtkimage accessors docs
+ 567761 Spellfixes in GTK+ documentation
+ 568744 Spellfixes in GtkTreeView's documentation
+ 536965 GtkPlug: crash on theme change
+ 567124 proposal to delay doing something related to immodule...
+ 568305 gdk-pixbuf mishandles BI_BITFIELDS bmps
+
+* New and updated translations:
+ Crimean Tatar (crh)
+ Spanish (es)
+ Hebrew (he)
+ Hungarian (hu)
+ Italian (it)
+ Korean (ko)
+ Lithuanian (lt)
+ Norwegian bokmål (nb)
+ Norwegian Nynorsk (nn)
+ Swedish (sv)
+ Thai (th)
+ Simplified Chinese (zh_CN)
+
+
+Overview of Changes from GTK+ 2.14.x to 2.15.0
+==============================================
+
+* GtkFileChooser
+ - Optionally shows file sizes
+ - Mounts volumes when necessary
+ - Picks better mime icons
+
+* GtkEntry
+ - Can show icons at either side of the entry, which can be made
+   clickable, drag sources, etc
+ - Can show progress information
+ - Picks the best available placeholder character for invisible entries 
+   unless it is explicitly set. See the invisible-char-set property
+ - Input methods work again in invisible entries
+ - Invisible entries can optionally display a caps-lock warning. This
+   can be turned off with the caps-lock-warning property
+
+* GtkStatusIcon
+ - Uses an extension of the tray icon spec to negotiate RGBA support.
+   This is also supported by the GNOME panel. For details, see the
+   section on "Visual and bckground pixmap handling" in the System
+   Tray Protocol Specification.
+ - Supports scroll events, middle clicks and rich tooltips
+
+* GtkLinkButton
+ - Respects user-defined tooltips 
+ - Has a default url hook
+
+* GtkBuilder
+ - Can construct menus
+ - Can associate accel groups with windows
+ - Child properties can now be translatable, e.g. GtkAssistant::page-title
+
+* GtkOrientable
+ - A new interface implemented by all widgets that have horizontal and
+   vertical variants
+
+* Printing support
+ - Print-to-file can save to non-local files
+ - Page rendering can be deferred to a thread to avoid blocking the mainloop
+
+* GDK
+ - GdkKeymap emits a state-changed signal when the caps lock state changes
+
+* Newly deprecated functions:
+  gdk_window_get_toplevels(),
+  gtk_font_selection_dialog_get_apply_button(),
+  gtk_status_icon_set_tooltip(),
+  gtk_toolbar_set_orientation()
+
+* Changes that are relevant for theme authors
+ - The GtkMenu::arrow-placement style property allow more space efficient
+   layout of scrolling menus
+ - Submenu arrows can be scaled relative to the font size, with the
+   GtkMenuItem::arrow-scaling style property
+ - Themes can set the GtkDialog::content-area-spacing style property to 
+   change the spacing between elements of the content area
+ - The GtkEntry::state-hint style property can be used to request that
+   GTK+ should pass the correct state when drawing the background of entries
+ - The GtkEntry::prelight style property can be used to suppress prelighting
+   of icons in entries on mouseover
+ 
+* Changes that are relevant for translators
+ - GTK+ has been switched to use the two-argument C_() macro
+   instead of Q_() for messages with context
+
+* Bugs fixed:
+ 434987 MS Windows style should use pango_win32_font_description_from_logfont
+ 325095 show a 'size' column
+ 552837 mem leak in gtkimmulticontext
+  83935 GtkEntry's default invisible char should be U+25CF
+ 553000 incorrect i18n header in gtkfilesystem.c
+ 552789 Show size column in the search and recently used files modes
+ 553135 eog crash: assertion failed. 
+ 382544 GtkIconView: Selection/focus should be painted around the items
+ 541391 Unfocussable Treeview swallows focus
+ 408244 add GtkDialog::content-area-spacing
+ 538782 Make GtkMenu's arrow size themable
+ 553385 gtk-builder-convert creates untranslated combobox models
+ 553241 double freed pointer in lpr_write cause firefox3 crash
+ 553917 Typo in gdkwindow-win32.c
+ 553133 GtkFileChooser won't ask to mount a volume
+ 553211 GtkFileChooserButton unsets filter after first use
+ 553578 tabs are not drawn correctly
+ 553803 eventually call XCloseDevice on XOpenDevice results
+ 552956 Should check composite extension version
+ 552959 GtkTrayIcon: _NET_SYSTEM_TRAY_VISUAL and real transparency
+ 553575 Only draw focus when navigating with the keyboard
+ 339367 Incorrect spotlocation
+ 554141 uninitialized data use/free in gtkclipboard-quartz.c
+ 371908 Password Entry broken
+ 317002 Disable input method completely in GtkEntry when it...
+ 487624 Tooltips doesn't get updated if ther's no mouse motion...
+ 107000 Add signals to GdkKeymap for monitoring caps_lock, etc
+ 530568 Entries with visibility=FALSE should warn for caps-lock on
+ 553086 hard to see current immodule
+ 541009 Get rid of separate subclasses for horizontal and vertical...
+ 344522 support non-local destination files (GtkPrint)
+ 553582 Add orientation API to GtkSeparator
+ 554506 combining diacritics broken, became deadkeys
+ 553585 Add orientation API to GtkRuler
+ 554690 mem leak in filechooser
+ 554691 mem leak in filechooser
+ 554696 invalid free function used
+ 554698 mem leak in filechooser
+ 554701 filechooser spams console with useless warnings
+ 554704 gtkfilesystemmodel does too much work
+ 530575 GtkEntry with invisible chars has a confused cursor in overwrite mode
+  96431 Can't cut and paste / DND within invisible entry
+ 132501 Make utility window translate to tool window in win32
+ 539464 gtk_cell_view_get_model is missing in GtkCellView
+ 553573 Add orientation API to GtkBox
+ 555387 Changing the sensitivity of a statusbar mistakenly requires a display
+ 436533 Allow more space efficient scroll arrows placement
+ 555270 Allow unsetting a MessageDialog's image
+ 554702 gtkfilesystem leaks GError
+ 554192 double press on the "circumflex" dead key...
+ 516425 Optionally display accelerators in popups
+ 550342 Splash screens have a caption
+ 555578 GtkTable propertiy maxima are wrong
+ 555523 gtk_scale_button_set_adjustment should accept NULL
+ 555573 gtk_font_selection_set_font_name shouldn't require a screen
+ 555676 gtk_widget_real_grab_focus assumes toplevel == window
+ 555000 Wrong treatment on non-spacing marks dead keys in GtkIMContextSimple
+ 551355 Make glib build with libtool 2.2
+ 555186 Setting gtk-toolbar-icon-size with custom icon_size
+ 555625 Updated gtk_compose_seqs_compact table
+ 555386 format not a string literal and no format arguments
+ 552318 menubar mnemonics consumed even when gtk-enable-mnemonics=false
+ 555779 GtkCellRendererPixbuf crashed on failed GIcon lookup
+ 556150 gtk 'object' property test fixing
+ 556527 The current page property is not passed to GtkPrintUnixDialog
+ 556578 GIMP windows stay on top of other windows
+ 557059 crash when compositing emblems with icon
+ 557266 Window Management Problem
+ 555920 gtkentry.c passes wrong enum to pango_layout_set_alignment
+ 528320 Incorrect icons displayed for files with custom mimetype icons
+ 557524 "va_end(args);" should be added into gtk_text_buffer_insert_with_...
+ 556835 gtkentry.c: variable is declared at middle of block
+ 556954 gtk+/gtk/gtkrecentchooserdefault.c: mismatching allocation...
+ 557315 stale clipboard target cache
+ 530454 Clarify page_nr when printing
+ 557065 gtkcellrendererpixbuf spams console over and over...
+ 557894 Wrong return value for gdk_pointer_grab_info_libgtk_only
+ 558397 gtk_widget_error_bell undefined without a screen
+ 557762 Misleading error message in GDK DirectFB
+ 557316 GtkLinkButton should consider user-defined tooltip
+ 339714 Set printer dpi on cairo ps/pdf surfaces when printing
+ 558522 scroll arrow painted insensitive even though there are pages...
+ 347230 testicontheme shortcomings
+ 558323 glitches when popping up combos in treeviews
+ 558667 gtk_font_selection_dialog_get_apply_button - deprecate
+ 412134 Add API to query style properties from the style
+ 322934 Replace menu's proxy icons with empty space hiding icons
+ 409435 GtkStatusIcon enhancements: scroll events, middle click, rich tooltips
+ 558278 Crash when calling a callback set by gdk_add_client_message_filter()
+ 558929 gtkstatusicon.c: 'event' is a member of the structure
+ 558001 gtk_icon_view_enable_model_drag_[source|dest] problem
+ 557212 Problem with which window gains focus and is visible
+ 559404 gtk_editable_insert_text counts length in bytes
+ 558586 handling of keyboard under darwin (quartz)
+ 558409 GtkLabel::use-underline doesnt work with GtkLabel::attributes
+ 553586 Add orientation API to GtkPaned
+ 560135 Print when the user double clicks a printer
+ 553765 Add orientation API to GtkRange
+ 550942 Rework of gdkeventloop-quartz.c
+ 525550 GTK+ 2.13.0 GtkCurve test fails
+ 559619 invisible-char default cannot be tested
+ 560139 GtkEntry doesn't paint with the right state
+ 560602 Wrong GtkMenuItem default value (test fails)
+ 377699 realizing gtk.Progress() causes SEGV
+ 561335 Fix typos in GtkToolItem documentation
+ 561539 Alignments miscalculate dimensions when allocated less...
+ 559947 Unchecked dependency on python>=2.4
+ 561504 testgtk should load rc file from sub folder
+ 539263 Deprecate gdk_window_get_toplevels
+ 554076 eventually release g_new-ed supported_atoms
+ 559622 GdkDevice test segfaults
+ 554453 "typeahead find" widget of GtkTreeView appears on wrong monitor...
+ 562817 GtkDialog: typo
+ 555334 connected server feature
+ 562878 password save incorrectly set in gtkmountoperation
+ 559914 eog doesn't apply paper setup
+ 562998 GtkFontButton documentation improvements
+ 557420 Some compose sequences don't work anymore (or only in specific order)
+ 546285 Allow GtkEntry to draw progress
+ 563547 Update gdkx11 atom precache table
+ 563285 test print backend does not compile
+ 559325 documentation for gdk_display_get_window_at_pointer() is wrong
+ 554274 Add default hook for GtkLinkButton
+ 546378 GtkAssistant page title is not translatable
+ 563991 gtk_file_chooser_button_new_with_backend is deprecated...
+ 563994 Input method module interface not documented
+ 564066 Crash in gtk_rc_parse_default_files
+ 563835 Typo in gtk_widget_has_screen() docs
+ 564212 gtk_icon_view_accessible_model_rows_reordered explain new_order...
+ 563751 xatom cache is prefilled too late
+ 556839 Crash when opening a link
+ 549251 GTK icon view accessible issue
+ 558306 Cannot build gdk (gtk+ 2.14.4) on Solaris 8
+ 555560 gtk_combo_box_set_active fails with no model
+ 563158 CellRendererProgress pulsing and progressing rows can not...
+ 556233 local-only causes G_IS_FILE warning
+ 562579 Remove error dialog when directory does not exist
+ 561494 FileChooser network browsing and authentication support
+ 339318 Allow page rendering to (optionally) happen in a thread
+  85292 add an icon to gtkentry
+ 564881 gtkstatusicon.c: 'event' bug again
+ 552545 leaks GpImage
+ 553374 gdk_pixdata_from_pixbuf fails for some images with use_rle set to TRUE
+ 555791 Natuilus Crashes when opening USB MP3 Player Contents
+ 561186 GdkPixbuf API type checking needs cleanup
+ 559009 gtk_radio_button_get_group documentation needs to say...
+ 523264 Update GTK+ reference documentation screenshots
+ 563876 [Regression] GTK_MODULES env var is no longer relevant
+ 554950 gail must make itself resident
+ 555953 libferret missing link against libgtk-x11
+ 554002 Orca App-Preferences dialog page tabs are "off" by one...
+ 353088 gtk_expander_get_label should return the full label text
+ 512743 Applications with lists crash in libgail
+ 564555 synaptic cannot be started...
+ 565203 icons are misplaced when horizontal gtkiconview is...
+ 549251 GTK icon view accessible issue 
+ 558694 Paned window splitter keynav broken
+ 565846 va_end(args) should be added into gtk_tree_store_new
+
+* New and updated translations:
+ Arabic (ar)
+ Asturian (ast)
+ Catalan (ca)
+ Danish (da)
+ German (de)
+ British English (en_GB)
+ Spanish (es)
+ Finnish (fi)
+ Galician (gl)
+ Hebrew (he)
+ Japanese (ja)
+ Georgian (ka)
+ Malayalam (ml)
+ Marathi (mr)
+ Portugese (pt)
+ Brazilian Portugese (pt_BR)
+ Romanian (ro)
+ Russian (ru)
+ Slovak (sk)
+ Serbian (sr, sr@latin)
+ Swedish (sv)
+ Thai (th)
+
+
 Overview of Changes from GTK+ 2.14.1 to 2.14.2
 ==============================================
 

README

@@ -1,401 +0,0 @@
-General Information
-===================
-
-This is GTK+ version 2.14.2. GTK+ is a multi-platform toolkit for
-creating graphical user interfaces. Offering a complete set of widgets,
-GTK+ is suitable for projects ranging from small one-off projects to
-complete application suites.
-
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
-developers, including those developing proprietary software, without any
-license fees or royalties.
-
-The official ftp site is:
-  ftp://ftp.gtk.org/pub/gtk
-
-The official web site is:
-  http://www.gtk.org/
-
-Information about mailing lists can be found at
-  http://www.gtk.org/mailinglists.html
-
-
-Installation
-============
-
-See the file 'INSTALL'
-
-
-Release notes for 2.14
-======================
-
-* gtkitemfactory.h is now completely deprecated.
-  As gtkactiongroup.h and gtkstock.h no longer include the gtkitemfactory.h
-  header, this might break application using gtk_item_factory_* symbols
-  without including gtkitemfactory.h - even though this behaviour has never
-  been supported in the first place.
-
-* The GtkFileSystem semi-private interface has been removed.
-  The GTK+ filechooser implementation now uses GIO directly, which has
-  rendered external filesystem implementations unnecessary. Consequently,
-  the GtkFileSystem interface is no longer available, nor the filechooser
-  will load any GtkFileSystem implementation.
-
-* GtkComboBox now renders the popdown button insensitive when
-  the model is empty. Applications which want to populate the list
-  only before displaying it can set gtk_combo_box_set_button_sensitivity
-  to GTK_SENSITIVITY_ON, so that the button is always sensitive or
-  GTK_SENSITIVITY_OFF to make it insensitive respectively.
-
-* GtkAdjustment now enforces that values are restricted to the
-  range [lower, upper - page_size]. This has always been the documented
-  behaviour, and the recommended practice is to set page_size to 0
-  when using adjustments for simple scalar values, like in a slider
-  or spin button. 
-
-* gdk-pixbuf will use GIO for mime type detection if possible. For
-  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
-  set accordingly at configure time. Otherwise, gdk-pixbuf falls
-  back to its built-in sniffing implementation.
-
-Release notes for 2.12
-======================
-
-* gtk_about_dialog_get/set_name() were deprecated in favour of
-  gtk_about_dialog_get/set_program_name(), the GtkAboutDialog now uses the
-  "program-name" property instead of the conflicting "name" property.
-
-* The gdk-pixbuf tiff loader now requires libtiff 3.6.0 or later.
-
-* Support for Windows 9x/ME has officially been removed. It hasn't worked
-  since 2.6 anyway.
-
-* The GtkTextBufferTargetInfo enumeration values have been changed from
-  G_MAXUINT-0, G_MAXUINT-1, G_MAXUINT-2, etc, to -1, -2, -3 to stay within
-  ANSI C limits.
-
-* A change in the handling of _NET_WM_USER_TIME properties on toplevel
-  windows can cause deadlock problems with window managers that are using
-  GDK for drawing decorations. In particular, metacity <= 2.18.0 is affected
-  by this. The problem has been fixed in metacity 2.18.1.
-
-* Semi-private GtkTextLayout api has changed: new GtkTextLayout method
-  invalidate_cursors(), and new functions gtk_text_layout_invalidate_cursors()
-  and gtk_text_layout_cursors_changed(), which should be used in place of
-  gtk_text_layout_invalidate() and gtk_text_layout_changed() if invalidation
-  is due to marks moved or changed selection; new GtkTextLineDisplay structure
-  member. Source compatibility is preserved; binary compatibility may break
-  only if GtkTextLineDisplay structure was created on stack or as a part
-  of another structure (in particular GnomeCanvas and its clones do not need
-  recompiling).
-
-* Another new signal has been added to GtkNotebook. The new signal
-  is called create-window, so this name can no longer be used for signals
-  in objects derived from GtkNotebook.
-
-* The gtk_notebook_set/get_group_id() functions were found to be insufficient
-  and have been deprecated in favour of gtk_notebook_set/get_group().
-
-* The move-focus signal has been moved to GtkWidget, to unify the 
-  various implementations of this signal in specific widgets. Great care 
-  has been taken to make sure that all code using this signal continues
-  to work.
-
-* An unused and hardly visible GtkFrame has been removed from the menu 
-  widget hierarchy when GtkComboBox::appears-as-list style property is 
-  set. Any RC file applying a different style to any widget below the 
-  widget path "gtk-combobox-popup-window.GtkFrame" should take into 
-  account that the frame no longer exists.
-
-* The external print preview application used by GtkPrintOperationPreview 
-  is now passed the print settings on the command line with the 
-  --print-settings parameter pointing to a temp file containing the 
-  settings. The preview application assumes ownership of the file and 
-  should delete it once it does not need it anymore. The --print-settings 
-  commandline option is understood by Evince 0.9.0 and newer. To use a 
-  different print preview application, change the gtk-print-preview-command 
-  setting in your gtkrc file, e.g. gtk-print-preview-command = "ggv %f"
-
-* GtkMenuShell is now defined as an abstract type. It was already 
-  documented as an abstract class, and there is little reason to 
-  instantiate it.
-
-* The GtkTooltips struct (this is the old tooltips API) is now considered
-  private. Code that used to access this struct, in particular the
-  tips_data_list field, will need to change. All of the old tooltips
-  API has been deprecated in favour of a new implementation and
-  API. This affects all of the gtk_tooltips_ functions, and functions 
-  which take a GtkTooltips argument, such as gtk_tool_item_set_tooltip()
-  and gtk_menu_tool_button_set_arrow_tooltip().
-  
-* The memory management of the GtkRecentManager object has been changed,
-  as using the screen didn't guarantee that the singleton instance was
-  correctly destroyed. The screen-related functions have been deprecated,
-  and should not be used anymore; the GtkRecentManager instance returned by
-  the gtk_recent_manager_get_default() function is guaranteed to be valid
-  for the entire lifetime of an application.
-
-* A number of interfaces that have been superseded by newer interfaces for 
-  a long time have finally been deprecated. This includes 
-  gtk_widget_ref/unref(), gtk_rc_style_ref/unref() and the old file selector.
-
-* The various coordinate systems in use in GtkTreeView widgets have
-  been clarified in the documentation, and in the cause of doing so, 
-  the functions gtk_tree_view_widget_to_tree_coords() and
-  gtk_tree_view_tree_to_widget_coords() have been deprecated in 
-  favour of a new family of gtk_tree_view_convert_ functions.
-
-* gtk_menu_item_remove_submenu() has been deprecated in favour of
-  gtk_menu_item_set_submenu (..., NULL).
-
-* gtk_default_draw_check() has been fixed to really decrease the
-  indicator size by one pixel to ensure an odd size instead of
-  accidentially increasing it.
-  Consequently, gtk_cell_renderer_toggle_render() could be fixed to
-  not subtract 1 from the size passed to gtk_paint_option(), which
-  was just a workaround for above off-by-two for even sizes (theme
-  engines now get the real indicator size passed).
-  The default toggle size of GtkCheckMenuItem and GtkCellRendererToggle
-  has been changed to 13 to be consistent with GtkCheckButton.
-  The only visible change with default settings is that the indicator in
-  GtkCellRendererToggle has changed its size from 11 to 13 and is now
-  consistent with menus and toggle buttons.
-
-* GTK+ has always required that gtk_init() (or a variant thereof) is
-  called before any other GTK+ function. Some applications call functions
-  like gtk_clipboard_get() to check if they need to call gtk_init(),
-  anyway. A change in GLib 2.14 has recently broken this unsupported
-  practise. It is worth pointing out that calling gtk_init() twice
-  does no harm.
-
-
-Release notes for 2.10
-======================
-
-* The hexadecimal Unicode input feature has been reworked. It no longer
-  blocks the use of the sixteen Ctrl-Shift-<hex digit> key sequences. Now
-  it only uses Ctrl-Shift-u.
-
-* A memory leak in GtkStyle handling has been fixed. This may expose bugs
-  in third-party widgets which forget to call gtk_style_attach() in their
-  realize functions.
-
-* Range widgets like GtkScrollbar now render their arrows insensitive
-  when the slider is at the end. Applications which react to arrow
-  clicks even if the slider is at the end may want to use the new
-  gtk_range_set_[upper/lower]_stepper_sensitivity() functions to
-  prevent the arrows from being rendered insensitive.
-
-* GtkObject now uses the "floating reference" support in GObject. 
-  GTK_OBJECT_IS_FLOATING() will still work, but direct checking
-  of the GTK_FLOATING flag will no longer detect the floating 
-  reference. Details about floating references can be found in the docs:
-  http://developer.gnome.org/doc/API/2.0/gobject/gobject-The-Base-Object-Type.html#floating-ref
-
-* Accelerators like (_F) are now stripped from labels when they are 
-  displayed in toolbars. If this is not wanted, the feature can be 
-  suppressed by inserting a Unicode control character, e.g ZWNJ.
-
-* The pixbuf theme engine can now customize expanders (in GtkTreeView
-  and GtkExpander) and resize grips, using the new EXPANDER and
-  RESIZE_GRIP function values.
-
-* Dialogs created by gtk_about_dialog_new() no longer hide automatically
-  when the user clicks close. It is the applications responsibility to
-  hide or destroy the dialog.
-
-* Several new signals have been added to GtkNotebook. Care has been taken
-  to choose signal names which do not collide with signals added by well-known
-  derived classes. The names which can no longer be used for signals in 
-  objects derived from GtkNotebook are page-reordered, page-removed and
-  page-added.
-
-* Due to the interface changes in the file chooser backend interface, 
-  the GTK+ ABI version has been bumped to 2.10.0. Third-party filesystem 
-  backends have to be ported to the new interface, other modules, such as 
-  theme engines, input method modules or pixbuf loaders have to be rebuilt 
-  so that they are installed in the right place for GTK+ to find them.
-
-
-Release notes for 2.8
-=====================
-
-* GTK+ 2.8 and Pango 1.10 require the cairo library.
-
-* The default theme has been renamed to "Raleigh". Existing configurations
-  specifying the "Default" theme name should still work.
-
-* The GtkTreeView::enable-search property has been changed to control
-  only typeahead search, not the C-f keybinding to start an interactive
-  search. To turn off interactive searching completely, you have to
-  set GtkTreeView::search-column to -1.
-
-* The restriction on using the same cell renderer in multiple columns
-  of a GtkTreeView is now more strictly enforced.
-
-* In GTK+ 2.8, GtkCalendar uses nl_langinfo() (if available) to determine
-  the first day of the week. Thus, it is possible to select the first day
-  of the week independently from the language, by setting LC_TIME.
-
-* In GTK+ 2.8, the gtk-update-icon-cache utility includes image data
-  in the icon caches, which will make the icon cache files larger than
-  the one produced by GTK+ 2.6. This change will reduce the memory
-  overhead of icon themes at runtime, since all GTK+ applications can
-  share the image data in memory.
-
-* In 2.8, GDK emits GdkEventGrabBroken events when a keyboard or pointer
-  grab is broken. On X11, this can happen if the same application grabs
-  again, or if the window used for the grab becomes unviewable. It happens
-  more often on Win32. Applications which use grabs should pay attention
-  to these events and do the necessary cleanups when the grab is lost.
-* The GIOChannel code for sockets on win32 has been rewritten.
-  Applications who make non-trivial use of GIOChannels on win32 should
-  be watched for possible problems.
-
-* GLib 2.8 uses atomic operations to implement reference counting, thus
-  g_object_ref/unref, g_closure_ref/sink/unref and g_iochannel_ref/unref
-  can be used without locking in multithreaded applications. Note that
-  other modifications, like concurrent setting of properties still require
-  locking.
-
-* g_convert() and related character set conversion functions have been
-  fixed to emit pending shift states and to not cache iconv descriptors
-  across multiple calls, since that is problematic for some encodings.
-  Note that these functions are not suitable for streaming conversions;
-  use g_iconv() to do streaming conversion.
-
-
-Release notes for 2.6
-=====================
-
-* GTK+ 2.6 supports clipboard persistency. To make use of this feature,
-  a clipboard manager following the specification at
-  http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
-  must be running. A sample implementation of such a clipboard manager
-  is available at 
-  http://people.imendio.com/andersca/archives/clipboard-manager-0.3.tar.gz
-  Applications can use the function gdk_display_supports_clipboard_persistence() 
-  to find out if clipboard persistence is available.
-
-* Notification on clipboard ownership changes via GdkOwnerChange events 
-  requires the XFIXES X extension. Applications can use the function
-  gdk_display_supports_selection_notification() to find out if ownerchip
-  change notification is available.
-
-* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme 
-  specification. Setting the XDG_DATA_DIRS environtment variable may be 
-  necessary if your icons aren't installed in the default location 
-  /usr/share/icons.
-
-* The icon theme code in GTK+ 2.6 can make use of mmap()able cache files
-  to avoid a lot of disk searching overhead. GTK+ includes a utility named
-  gtk-update-icon-cache to generate these cache files. For further details,
-  see the gtk-update-icon-cache man page or the GTK+ documentation.
-
-* To reduce code size and improve efficiency, GTK+, when compiled 
-  with the GNU toolchain, has separate internal and external entry 
-  points for exported functions. The internal names, which begin with 
-  IA__, may be seen when debugging a GTK+ program.
-
-* The following functions have been deprecated in GTK+ 2.6:
-  gdk_pango_context_set_colormap
-  gtk_cell_renderer_editing_canceled
-
-* The new GtkFileChooser widget emphasizes simplicity and thus does 
-  not provide a navigation entry by default when opening files. 
-  Experienced command line users will likely want to make heavy use of
-  the location dialog brought up by the Control-L key shortcut.
-
-* The GTK+ libraries use an '_' prefix to indicate private symbols that
-  must not be used by applications. On some platforms, symbols beginning 
-  with prefixes such as _gtk, _gdk, and _pango will be exported
-  from the library, on others not. In no case can applications
-  use these private symbols. In addition to that, GTK+ 2.6 makes several
-  symbols private which were not in any installed header files and
-  were never intended to be exported.
-
-* The gdk_pixbuf_xlib library included in the contrib/ directory 
-  and the framebuffer GDK backend included in the gdk/linux-fb directory
-  of GTK+ are provided on an as-is basis and have not been tested at all. 
-  No guarantees about the degree of workingness or about future
-  compatibility are provided.
-
-* On Unix, the assumption of GLib and GTK+ by default is that filenames on 
-  the filesystem are encoded in UTF-8 rather than the encoding of the locale;
-  the GTK+ developers consider that having filenames whose interpretation
-  depends on the current locale is fundamentally a bad idea.
-
-  If you have filenames encoded in the encoding of your locale, then you 
-  may want to set the G_FILENAME_ENCODING environment variable:
-  
-   G_FILENAME_ENCODING=@locale
-   export G_FILENAME_ENCODING
-
-  (Earlier versions of GLib 2.x required a different environment variable
-  setting; G_BROKEN_FILENAMES=1 to achieve the same effect; this 
-  is still supported, but G_FILENAME_ENCODING is preferred.)
-  Best integration of GTK+ 2.6 with the environment is achieved by 
-  using a UTF-8 locale.
-
-  On Windows, filenames passed to GTK+ should always be in UTF-8, as
-  in GLib 2.6. This is different than in previous versions of GTK+
-  where the system codepage was used. As in GLib, for DLL ABI
-  stability, applications built against previous versions of GTK+ will
-  use entry points providing the old semantics.
-
-  When compiling against GTK+ 2.6, applications intended to be
-  portable to Windows must take the UTF-8 file name encoding into
-  consideration, and use the gstdio wrappers to access files whose 
-  names have been constructed from strings returned from GTK+ or GLib.
-
-
-How to report bugs
-==================
-
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product gtk+.) You will need to create an
-account for yourself.
-  
-In the bug report please include:
-  
-* Information about your system. For instance:
-
-   - What operating system and version
-   - What version of X
-   - For Linux, what version of the C library
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug. 
-
-  If you can reproduce it with one of the tests or demos built with GTK+, 
-  such as demos/gtk-demo/gtk-demo, that would be most convenient. Otherwise, 
-  please include a short test program that exhibits the behavior. As a 
-  last resort, you can also provide a pointer to a larger piece of software 
-  that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out when the
-  crash occured.
-
-* Further information such as stack traces may be useful, but is not
-  necessary. If you do send a stack trace, and the error is an X error,
-  it will be more useful if the stacktrace is produced running the test
-  program with the --sync command line option.
-
-
-Patches
-=======
-
-Patches should also be submitted to bugzilla.gnome.org. If the patch
-fixes an existing bug, add the patch as an attachment to that bug
-report.
-
-Otherwise, enter a new bug report that describes the patch, and attach
-the patch to that bug report.
-
-Bug reports containing patches should include the PATCH keyword in their
-keyword fields. If the patch adds to or changes the GTK+ programming
-interface, the API keyword should also be included.
-  
-Patches should be in unified diff form. (The -u option to GNU diff.)

README.commits

@@ -1,11 +1,11 @@
-GTK+ is part of the GNOME Subversion repository. At the current time, any
+GTK+ is part of the GNOME git repository. At the current time, any
 person with write access to the GNOME repository, can make changes to
 GTK+. This is a good thing, in that it encourages many people to work
 on GTK+, and progress can be made quickly. However, GTK+ is a fairly
 large and complicated package that many other things depend on, so to
 avoid unnecessary breakage, and to take advantage of the knowledge
-about GTK+ that has been built up over the last 4 years, we'd like
-to ask people commiting to GTK+ to follow a few rules:
+about GTK+ that has been built up over the years, we'd like to ask
+people committing to GTK+ to follow a few rules:
 
 0) Ask first. If your changes are major, or could possibly break existing
    code, you should always ask. If your change is minor and you've
@@ -14,9 +14,9 @@ to ask people commiting to GTK+ to follow a few rules:
    somebody may know a better way to do things.
 
    If you are making changes to GTK+, you should be subscribed
-   to gtk-devel-list@gnome.org. (Subscription address:  
+   to gtk-devel-list@gnome.org. (Subscription address:
    gtk-devel-list-request@gnome.org.) This is a good place to ask
-   about intended changes. 
+   about intended changes.
 
    #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
    is also a good place to find GTK+ developers to discuss changes with,
@@ -25,30 +25,48 @@ to ask people commiting to GTK+ to follow a few rules:
 
 1) Ask _first_.
 
-2) There must be a ChangeLog for every commit. (If you discover that
-   you only committed half the files you meant to and need to fix that
-   up, or something, you don't need a new ChangeLog entry. But in general,
-   ChangeLog entries are mandatory.) Changes without ChangeLog entries
-   will be reverted.
-
-3) There _must_ be a ChangeLog for every commit.
+2) With git, we no longer maintain a ChangeLog file, but you are expected
+   to produce a meaningful commit message. Changes without a sufficient
+   commit message will be reverted. See below for the expected format
+   of commit messages.
 
 Notes:
 
-* If you are going to be changing many files in an experimental fashion,
-  it probably is a good idea to create a separate branch for your changes.
+* When developing larger features or complicated bug fixes, it is
+  advisable to work in a branch in your own cloned GTK+ repository.
+  You may even consider making your repository publically available
+  so that others can easily test and review your changes.
 
-* The ChangeLog entries should preferably match in date format
-  with the existing entries. You can set how emacs does this
-  by using customize mode:
+* The expected format for git commit messages is as follows:
 
-  - M-x customize
-  - set Programming/Tools/ChangeLog/Add Log Time Format to
-    'Old Format'
+=== begin example commit ===
+Short explanation of the commit
+
+Longer explanation explaining exactly what's changed, whether any
+external or private interfaces changed, what bugs were fixed (with bug
+tracker reference if applicable) and so forth. Be concise but not too brief.
+=== end example commit ===
+
+  - Always add a brief description of the commit to the _first_ line of
+    the commit and terminate by two newlines (it will work without the
+    second newline, but that is not nice for the interfaces).
+
+  - First line (the brief description) must only be one sentence and
+    should start with a capital letter unless it starts with a lowercase
+    symbol or identifier. Don't use a trailing period either. Don't exceed
+    72 characters.
+
+  - The main description (the body) is normal prose and should use normal
+    punctuation and capital letters where appropriate. Normally, for patches
+    sent to a mailing list it's copied from there.
+
+  - When committing code on behalf of others use the --author option, e.g.
+    git commit -a --author "Joe Coder <joe@coder.org>" and --signoff.
 
- Or, set the add-log-time-format to 'current-time-string in
- your .emacs file.
 
 Owen Taylor
 13 Aug 1998
 17 Apr 2001
+
+Matthias Clasen
+31 Mar 2009

README.in

@@ -27,6 +27,35 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 2.18
+======================
+
+* gtk_tooltip_set_custom now accept a NULL custom_widget to unset the
+  old custom_widget. Custom_widget does not get destroyed when the
+  tooltip goes away.
+
+
+Release notes for 2.16
+======================
+
+* Password entries now display a caps-lock warning. This can be turned off
+  with the caps-lock-warning property.
+
+* Various orientation-related functions have been deprecated in favour
+  of the new GtkOrientable interface: gtk_scale_button_get_orientation,
+  gtk_scale_button_set_orientation, gtk_toolbar_set_orientation.
+
+* The action-proxy interaction has been changed. Widgets that operate as
+  proxies have to implement the GtkActivatable interface now. GtkActivatable
+  implementation are responsible for syncing their appearance with the
+  action and for activating the action. All GTK+ widgets that are commonly
+  used as proxies implement the GtkActivatable interface.
+
+* The handling of keyboard shortcuts has been changed, to help with a
+  longstanding complaint about the way GTK+ handles multiple layouts. GTK+
+  now only uses keys from groups other than the current group if they are
+  not present in the current group.
+
 Release notes for 2.14
 ======================
 
@@ -48,11 +77,15 @@ Release notes for 2.14
   to GTK_SENSITIVITY_ON, so that the button is always sensitive or
   GTK_SENSITIVITY_OFF to make it insensitive respectively.
 
-* GtkAdjustment now enforces that values are restricted to the
-  range [lower, upper - page_size]. This has always been the documented
-  behaviour, and the recommended practice is to set page_size to 0
-  when using adjustments for simple scalar values, like in a slider
-  or spin button. 
+* In the early 2.14.x releases, GtkAdjustment was changed to enforce
+  that values are restricted to the range [lower, upper - page_size].
+  This has always been the documented behaviour, and the recommended
+  practice is to set page_size to 0 when using adjustments for simple
+  scalar values, like in a slider or spin button.
+  Due to the large number of applications that are affected by this
+  change, the behaviour has been reverted to the old behaviour in
+  2.14.3, with an explicit warning that this change will be
+  reintroduced in 2.90.
 
 * gdk-pixbuf will use GIO for mime type detection if possible. For
   this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS

autogen.sh

@@ -16,7 +16,7 @@ have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
 	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
-	    1.4*|1.5*)
+	    1.4*|1.5*|2.2*)
 		have_libtool=true
 		;;
 	esac

configure.in

@@ -11,9 +11,9 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [14])
+m4_define([gtk_minor_version], [17])
 m4_define([gtk_micro_version], [3])
-m4_define([gtk_interface_age], [3])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.17.6])
+m4_define([glib_required_version], [2.19.7])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.13.0])
 m4_define([cairo_required_version], [1.6])
@@ -378,6 +378,19 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
    pango >= pango_required_version dnl
    cairo >= cairo_required_version])
 
+## In addition to checking that cairo is present, we also need to
+## check that the correct cairo backend is there. E.g. if the GDK
+## target is win32 we need the cairo-win32 backend and so on.
+cairo_backend=$gdktarget
+
+# GDK calls the xlib backend "x11," cairo calls it "xlib." Other
+# backend names are identical.
+if test "x$cairo_backend" = "xx11"; then
+   cairo_backend=xlib
+fi
+PKG_CHECK_MODULES(CAIRO_BACKEND,
+  [cairo-$cairo_backend >= cairo_required_version])
+
 if test "$os_win32" != yes; then
     # libtool option to control which symbols are exported
     # right now, symbols starting with _ are not exported
@@ -504,6 +517,26 @@ AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
         sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
       esac])
 
+dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
+dnl po-properties/POTFILES during configure; see GNOME #573515.
+dnl
+dnl Generate list of files to be processed by xgettext which will
+dnl be included in po-properties/Makefile.
+test -d po-properties || mkdir po-properties
+if test "x$srcdir" != "x."; then
+  if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+    popropsrcprefix="$srcdir/"
+  else
+    popropsrcprefix="../$srcdir/"
+  fi
+else
+  popropsrcprefix="../"
+fi
+rm -f po-properties/POTFILES
+sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$popropsrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+< $srcdir/po-properties/POTFILES.in > po-properties/POTFILES
+dnl (End of adapted AM_GLIB_GNU_GETTEXT snippet.)
+
 AM_GLIB_DEFINE_LOCALEDIR(GTK_LOCALEDIR)
 
 dnl The DU4 header files don't provide library prototypes unless 
@@ -1163,8 +1196,11 @@ if $dynworks ; then
   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
   fi
+  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
+    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
+  fi
 else
-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
+  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
 fi
 
 # Checks to see whether we should include mediaLib
@@ -1401,9 +1437,8 @@ if test "x$gdktarget" = "xx11"; then
 
   # Check for shaped window extension
 
-  AC_CHECK_FUNC(XShapeCombineMask,
-      AC_DEFINE(HAVE_SHAPE_EXT, 1,
-                [Define to 1 if the XShape extension is available]))
+  AC_CHECK_FUNC(XShapeCombineMask, :,
+     [AC_MSG_ERROR([Shape extension not found, check your development headers])])
 
   # X SYNC check
   gtk_save_CFLAGS="$CFLAGS"
@@ -1469,54 +1504,55 @@ if test "x$gdktarget" = "xx11"; then
     gtk_save_cppflags="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $x_cflags"
   
-    case "$host" in
-      *-*-solaris*)
-          # Check for solaris
-	  AC_MSG_CHECKING(for Xinerama support on Solaris)
+    # Check for XFree
+    AC_MSG_CHECKING(for Xinerama support on XFree86)
 	  
-	  have_solaris_xinerama=false
-	  AC_CHECK_FUNC(XineramaGetInfo,
-	      [AC_CHECK_HEADER(X11/extensions/xinerama.h,
-  		  [have_solaris_xinerama=true], :,
-		  [#include <X11/Xlib.h>])])
-		
-          if $have_solaris_xinerama ; then
-            AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
-                      [Define to 1 if solaris xinerama is available])
-	    AC_DEFINE(HAVE_XINERAMA, 1,
-                      [Define to 1 if xinerama is available])
-            AC_MSG_RESULT(yes)
-          else
-            AC_MSG_RESULT(no)
-          fi
-          ;;
-      *)
-	  # Check for XFree
-          AC_MSG_CHECKING(for Xinerama support on XFree86)
-	  
-          have_xfree_xinerama=false
-          if $PKG_CONFIG --exists xinerama ; then
-             have_xfree_xinerama=true
-             X_PACKAGES="$X_PACKAGES xinerama"
-          else    
-	      AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-	          [AC_CHECK_HEADER(X11/extensions/Xinerama.h, 
-	              [GTK_ADD_LIB(x_extra_libs,Xinerama)
-		      have_xfree_xinerama=true], :,
-                      [#include <X11/Xlib.h>])])
-          fi
+    have_xfree_xinerama=false
+    if $PKG_CONFIG --exists xinerama ; then
+       have_xfree_xinerama=true
+       X_PACKAGES="$X_PACKAGES xinerama"
+    else    
+       AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+	   [AC_CHECK_HEADER(X11/extensions/Xinerama.h, 
+	   [GTK_ADD_LIB(x_extra_libs,Xinerama)
+	   have_xfree_xinerama=true], :,
+           [#include <X11/Xlib.h>])])
+    fi
 
-          if $have_xfree_xinerama ; then
-            AC_DEFINE(HAVE_XFREE_XINERAMA, 1,
-                      [Define to 1 if XFree Xinerama is available])
-	    AC_DEFINE(HAVE_XINERAMA, 1,
-                      [Define to 1 is Xinerama is available])
-            AC_MSG_RESULT(yes)
-         else
-            AC_MSG_RESULT(no)
-         fi
-         ;;
-    esac
+    if $have_xfree_xinerama ; then
+      AC_DEFINE(HAVE_XFREE_XINERAMA, 1,
+                [Define to 1 if XFree Xinerama is available])
+      AC_DEFINE(HAVE_XINERAMA, 1,
+                [Define to 1 is Xinerama is available])
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+
+      case "$host" in
+        *-*-solaris*)
+            # Check for solaris
+	    AC_MSG_CHECKING(for Xinerama support on Solaris)
+	  
+	    have_solaris_xinerama=false
+	    AC_CHECK_FUNC(XineramaGetInfo,
+	        [AC_CHECK_HEADER(X11/extensions/xinerama.h,
+  	  	    [have_solaris_xinerama=true], :,
+		    [#include <X11/Xlib.h>])])
+		
+            if $have_solaris_xinerama ; then
+              AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
+                        [Define to 1 if solaris xinerama is available])
+	      AC_DEFINE(HAVE_XINERAMA, 1,
+                        [Define to 1 if xinerama is available])
+              AC_MSG_RESULT(yes)
+            else
+              AC_MSG_RESULT(no)
+            fi
+            ;;
+        *)
+            ;;
+      esac
+    fi
   fi
   
   # set up things for XInput
@@ -1538,7 +1574,7 @@ if test "x$gdktarget" = "xx11"; then
   AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
 
   # Check for the RANDR extension
-  if $PKG_CONFIG --exists "xrandr >= 1.2" ; then
+  if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
      AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
 
      X_PACKAGES="$X_PACKAGES xrandr"
@@ -1619,21 +1655,10 @@ AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
 if test "x$gdktarget" = "xdirectfb"; then
-  DIRECTFB_REQUIRED_VERSION=0.9.24
+  DIRECTFB_REQUIRED_VERSION=1.0.0
   AC_MSG_CHECKING(for DirectFB)
 
-  if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then
-      AC_MSG_RESULT(found)
-      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
-  else
-      AC_MSG_ERROR([
-*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend 
-*** are required. The latest version of DirectFB is always available 
-*** from http://www.directfb.org/.
-  ])
-  fi
-
+  PKG_CHECK_MODULES(DIRECTFB, [directfb >= $DIRECTFB_REQUIRED_VERSION])
   AM_CONDITIONAL(USE_DIRECTFB, true)
 else
   AM_CONDITIONAL(USE_DIRECTFB, false)
@@ -1677,13 +1702,9 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
-if test "x$gdktarget" = "xx11"; then
-  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
-fi
+GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend"
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
-
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
 # into the pkg-config files
@@ -1856,6 +1877,28 @@ else
   AM_CONDITIONAL(HAVE_CUPS, false)
 fi
 
+# Checks to see if we should compile with PAPI backend for GTK+
+#
+
+AC_ARG_ENABLE(papi,
+              [AC_HELP_STRING([--disable-papi]
+                              [disable papi print backend])],,
+             [enable_papi=auto])
+
+if test "x$enable_papi" = "xauto"
+then
+  AC_MSG_CHECKING(libpapi)
+  AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no)
+  if test $have_papi = yes; then
+    AC_DEFINE([HAVE_PAPI], [], [Define to 1 if libpapi available])
+  fi
+  AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes)
+else
+  AM_CONDITIONAL(HAVE_PAPI, false)
+fi
+
+AM_CONDITIONAL(HAVE_PAPI_CUPS, test $have_papi = yes && test "x$CUPS_CONFIG" != "xno")
+
 gtk_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
 			  
@@ -1906,7 +1949,7 @@ fi
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.8])
+GTK_DOC_CHECK([1.11])
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
@@ -2084,6 +2127,7 @@ modules/printbackends/Makefile
 modules/printbackends/cups/Makefile
 modules/printbackends/lpr/Makefile
 modules/printbackends/file/Makefile
+modules/printbackends/papi/Makefile
 modules/printbackends/test/Makefile
 perf/Makefile
 contrib/Makefile

contrib/Makefile.am

@@ -4,3 +4,5 @@ SUBDIRS =
 if USE_X11
 SUBDIRS += gdk-pixbuf-xlib
 endif
+
+-include $(top_srcdir)/git.mk

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,3 +1,37 @@
+=== ChangeLog discontinued ===
+
+	With the move to git, GTK+ is switching from a ChangeLog file
+	to relying on commit messages to provide change history. Please
+	see README.commits for guidance on the expected message format.
+
+2009-03-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.16.0 ===
+
+2009-03-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.5 ===
+
+2009-02-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.4 ===
+
+2009-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.3 ===
+
+2009-01-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.2 ===
+
+2009-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.1 ===
+
+2009-01-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.0 ===
+
 2008-09-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.14.2 ===

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -38,3 +38,5 @@ pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
 
 EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in
+
+-include $(top_srcdir)/git.mk

demos/Makefile.am

@@ -82,3 +82,5 @@ EXTRA_DIST +=			\
 	gnu-keys.png
 
 DISTCLEANFILES = test-inline-pixbufs.h
+
+-include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 democodedir=$(datadir)/gtk-2.0/demo
 
-## These should be in the order you want them to appear in the 
+## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
 	appwindow.c				\
@@ -23,13 +23,16 @@ demos =						\
 	iconview.c				\
 	iconview_edit.c				\
 	images.c				\
+        links.c					\
 	list_store.c				\
 	menus.c					\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
 	printing.c				\
+	resolution_independence.c		\
 	rotated_text.c				\
+	search_entry.c				\
 	sizegroup.c				\
 	stock_browser.c				\
 	textview.c				\
@@ -95,3 +98,5 @@ IMAGEFILES=	alphatest.png		\
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h
+
+-include $(top_srcdir)/git.mk

demos/gtk-demo/appwindow.c

@@ -8,6 +8,8 @@
 #include "demo-common.h"
 
 static GtkWidget *window = NULL;
+static GtkWidget *infobar = NULL;
+static GtkWidget *messagelabel = NULL;
 
 static void
 activate_action (GtkAction *action)
@@ -16,7 +18,7 @@ activate_action (GtkAction *action)
   const gchar *typename = G_OBJECT_TYPE_NAME (action);
 
   GtkWidget *dialog;
-  
+
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
@@ -29,7 +31,7 @@ activate_action (GtkAction *action)
                     "response",
                     G_CALLBACK (gtk_widget_destroy),
                     NULL);
-  
+
   gtk_widget_show (dialog);
 }
 
@@ -41,37 +43,32 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
   gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
   gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
 
-  if (active) 
+  if (active)
     {
-      GtkWidget *dialog;
-  
-      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				       GTK_DIALOG_DESTROY_WITH_PARENT,
-				       GTK_MESSAGE_INFO,
-				       GTK_BUTTONS_CLOSE,
-				       "You activated radio action: \"%s\" of type \"%s\".\n"
-				       "Current value: %d",
-				       name, typename, value);
+      gchar *text;
 
-      /* Close dialog on user response */
-      g_signal_connect (dialog,
-			"response",
-			G_CALLBACK (gtk_widget_destroy),
-			NULL);
-      
-      gtk_widget_show (dialog);
+      text = g_strdup_printf ("You activated radio action: \"%s\" of type \"%s\".\n"
+                              "Current value: %d",
+                              name, typename, value);
+      gtk_label_set_text (GTK_LABEL (messagelabel), text);
+      gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), (GtkMessageType)value);
+      gtk_widget_show (infobar);
+      g_free (text);
     }
 }
 
-static void 
+static void
 activate_email (GtkAboutDialog *about,
 		const gchar    *link,
 		gpointer        data)
 {
-  g_print ("send mail to %s\n", link);
+  gchar *text;
+  text = g_strdup_printf ("send mail to %s", link);
+  g_print ("%s\n", text);
+  g_free (text);
 }
 
-static void 
+static void
 activate_url (GtkAboutDialog *about,
 	      const gchar    *link,
 	      gpointer        data)
@@ -132,9 +129,9 @@ about_cb (GtkAction *action,
   gtk_about_dialog_set_email_hook (activate_email, NULL, NULL);
   gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
   gtk_show_about_dialog (GTK_WINDOW (window),
-			 "name", "GTK+ Code Demos",
+			 "program-name", "GTK+ Code Demos",
 			 "version", PACKAGE_VERSION,
-			 "copyright", "(C) 1997-2005 The GTK+ Team",
+			 "copyright", "(C) 1997-2009 The GTK+ Team",
 			 "license", license,
 			 "website", "http://www.gtk.org",
 			 "comments", "Program to demonstrate GTK+ functions.",
@@ -147,12 +144,12 @@ about_cb (GtkAction *action,
   g_object_unref (transparent);
 }
 
-typedef struct 
+typedef struct
 {
   GtkAction action;
 } ToolMenuAction;
 
-typedef struct 
+typedef struct
 {
   GtkActionClass parent_class;
 } ToolMenuActionClass;
@@ -179,30 +176,30 @@ static GtkActionEntry entries[] = {
   { "HelpMenu", NULL, "_Help" },               /* name, stock id, label */
   { "New", GTK_STOCK_NEW,                      /* name, stock id */
     "_New", "<control>N",                      /* label, accelerator */
-    "Create a new file",                       /* tooltip */ 
-    G_CALLBACK (activate_action) },      
+    "Create a new file",                       /* tooltip */
+    G_CALLBACK (activate_action) },
   { "File1", NULL,                             /* name, stock id */
-    "File1", NULL,                             /* label, accelerator */     
+    "File1", NULL,                             /* label, accelerator */
     "Open first file",                         /* tooltip */
-    G_CALLBACK (activate_action) }, 
+    G_CALLBACK (activate_action) },
   { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
-    "_Save","<control>S",                      /* label, accelerator */     
+    "_Save","<control>S",                      /* label, accelerator */
     "Save current file",                       /* tooltip */
     G_CALLBACK (activate_action) },
   { "SaveAs", GTK_STOCK_SAVE,                  /* name, stock id */
-    "Save _As...", NULL,                       /* label, accelerator */     
+    "Save _As...", NULL,                       /* label, accelerator */
     "Save to a file",                          /* tooltip */
     G_CALLBACK (activate_action) },
   { "Quit", GTK_STOCK_QUIT,                    /* name, stock id */
-    "_Quit", "<control>Q",                     /* label, accelerator */     
+    "_Quit", "<control>Q",                     /* label, accelerator */
     "Quit",                                    /* tooltip */
     G_CALLBACK (activate_action) },
   { "About", NULL,                             /* name, stock id */
-    "_About", "<control>A",                    /* label, accelerator */     
-    "About",                                   /* tooltip */  
+    "_About", "<control>A",                    /* label, accelerator */
+    "About",                                   /* tooltip */
     G_CALLBACK (about_cb) },
   { "Logo", "demo-gtk-logo",                   /* name, stock id */
-     NULL, NULL,                               /* label, accelerator */     
+     NULL, NULL,                               /* label, accelerator */
     "GTK+",                                    /* tooltip */
     G_CALLBACK (activate_action) },
 };
@@ -211,9 +208,9 @@ static guint n_entries = G_N_ELEMENTS (entries);
 
 static GtkToggleActionEntry toggle_entries[] = {
   { "Bold", GTK_STOCK_BOLD,                    /* name, stock id */
-     "_Bold", "<control>B",                    /* label, accelerator */     
+     "_Bold", "<control>B",                    /* label, accelerator */
     "Bold",                                    /* tooltip */
-    G_CALLBACK (activate_action), 
+    G_CALLBACK (activate_action),
     TRUE },                                    /* is_active */
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
@@ -226,13 +223,13 @@ enum {
 
 static GtkRadioActionEntry color_entries[] = {
   { "Red", NULL,                               /* name, stock id */
-    "_Red", "<control>R",                      /* label, accelerator */     
+    "_Red", "<control>R",                      /* label, accelerator */
     "Blood", COLOR_RED },                      /* tooltip, value */
   { "Green", NULL,                             /* name, stock id */
-    "_Green", "<control>G",                    /* label, accelerator */     
+    "_Green", "<control>G",                    /* label, accelerator */
     "Grass", COLOR_GREEN },                    /* tooltip, value */
   { "Blue", NULL,                              /* name, stock id */
-    "_Blue", "<control>B",                     /* label, accelerator */     
+    "_Blue", "<control>B",                     /* label, accelerator */
     "Sky", COLOR_BLUE },                       /* tooltip, value */
 };
 static guint n_color_entries = G_N_ELEMENTS (color_entries);
@@ -245,18 +242,18 @@ enum {
 
 static GtkRadioActionEntry shape_entries[] = {
   { "Square", NULL,                            /* name, stock id */
-    "_Square", "<control>S",                   /* label, accelerator */     
+    "_Square", "<control>S",                   /* label, accelerator */
     "Square",  SHAPE_SQUARE },                 /* tooltip, value */
   { "Rectangle", NULL,                         /* name, stock id */
-    "_Rectangle", "<control>R",                /* label, accelerator */     
+    "_Rectangle", "<control>R",                /* label, accelerator */
     "Rectangle", SHAPE_RECTANGLE },            /* tooltip, value */
   { "Oval", NULL,                              /* name, stock id */
-    "_Oval", "<control>O",                     /* label, accelerator */     
-    "Egg", SHAPE_OVAL },                       /* tooltip, value */  
+    "_Oval", "<control>O",                     /* label, accelerator */
+    "Egg", SHAPE_OVAL },                       /* tooltip, value */
 };
 static guint n_shape_entries = G_N_ELEMENTS (shape_entries);
 
-static const gchar *ui_info = 
+static const gchar *ui_info =
 "<ui>"
 "  <menubar name='MenuBar'>"
 "    <menu action='FileMenu'>"
@@ -288,7 +285,7 @@ static const gchar *ui_info =
 "    <toolitem action='Open'>"
 "      <menu action='OpenMenu'>"
 "        <menuitem action='File1'/>"
-"      </menu>"  
+"      </menu>"
 "    </toolitem>"
 "    <toolitem action='Quit'/>"
 "    <separator action='Sep1'/>"
@@ -308,7 +305,7 @@ static void
 register_stock_icons (void)
 {
   static gboolean registered = FALSE;
-  
+
   if (!registered)
     {
       GdkPixbuf *pixbuf;
@@ -320,12 +317,12 @@ register_stock_icons (void)
           "_GTK!",
           0, 0, NULL }
       };
-      
+
       registered = TRUE;
 
       /* Register our stock items */
       gtk_stock_add (items, G_N_ELEMENTS (items));
-      
+
       /* Add our custom icon factory to the list of defaults */
       factory = gtk_icon_factory_new ();
       gtk_icon_factory_add_default (factory);
@@ -350,7 +347,7 @@ register_stock_icons (void)
 
           /* The gtk-logo-rgb icon has a white background, make it transparent */
           transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-          
+
           icon_set = gtk_icon_set_new_from_pixbuf (transparent);
           gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
           gtk_icon_set_unref (icon_set);
@@ -359,7 +356,7 @@ register_stock_icons (void)
         }
       else
         g_warning ("failed to load GTK logo for toolbar");
-      
+
       /* Drop our reference to the factory, GTK will hold a reference. */
       g_object_unref (factory);
     }
@@ -373,9 +370,9 @@ update_statusbar (GtkTextBuffer *buffer,
   gint row, col;
   gint count;
   GtkTextIter iter;
-  
-  gtk_statusbar_pop (statusbar, 0); /* clear any previous message, 
-				     * underflow is allowed 
+
+  gtk_statusbar_pop (statusbar, 0); /* clear any previous message,
+				     * underflow is allowed
 				     */
 
   count = gtk_text_buffer_get_char_count (buffer);
@@ -409,21 +406,21 @@ update_resize_grip (GtkWidget           *widget,
 		    GdkEventWindowState *event,
 		    GtkStatusbar        *statusbar)
 {
-  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | 
+  if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED |
 			     GDK_WINDOW_STATE_FULLSCREEN))
     {
       gboolean maximized;
 
-      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | 
+      maximized = event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED |
 					     GDK_WINDOW_STATE_FULLSCREEN);
       gtk_statusbar_set_has_resize_grip (statusbar, !maximized);
     }
 }
-		    
+
 
 GtkWidget *
 do_appwindow (GtkWidget *do_widget)
-{  
+{
   if (!window)
     {
       GtkWidget *table;
@@ -438,10 +435,10 @@ do_appwindow (GtkWidget *do_widget)
       GError *error = NULL;
 
       register_stock_icons ();
-      
+
       /* Create the toplevel window
        */
-      
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
@@ -453,15 +450,15 @@ do_appwindow (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed),
                         &window);
 
-      table = gtk_table_new (1, 4, FALSE);
-      
+      table = gtk_table_new (1, 5, FALSE);
+
       gtk_container_add (GTK_CONTAINER (window), table);
-      
+
       /* Create the menubar and toolbar
        */
-      
+
       action_group = gtk_action_group_new ("AppWindowActions");
-      open_action = g_object_new (tool_menu_action_get_type (), 
+      open_action = g_object_new (tool_menu_action_get_type (),
 				  "name", "Open",
 				  "label", "_Open",
 				  "tooltip", "Open a file",
@@ -469,30 +466,30 @@ do_appwindow (GtkWidget *do_widget)
 				  NULL);
       gtk_action_group_add_action (action_group, open_action);
       g_object_unref (open_action);
-      gtk_action_group_add_actions (action_group, 
-				    entries, n_entries, 
+      gtk_action_group_add_actions (action_group,
+				    entries, n_entries,
 				    window);
-      gtk_action_group_add_toggle_actions (action_group, 
-					   toggle_entries, n_toggle_entries, 
+      gtk_action_group_add_toggle_actions (action_group,
+					   toggle_entries, n_toggle_entries,
 					   NULL);
-      gtk_action_group_add_radio_actions (action_group, 
-					  color_entries, n_color_entries, 
+      gtk_action_group_add_radio_actions (action_group,
+					  color_entries, n_color_entries,
 					  COLOR_RED,
-					  G_CALLBACK (activate_radio_action), 
+					  G_CALLBACK (activate_radio_action),
 					  NULL);
-      gtk_action_group_add_radio_actions (action_group, 
-					  shape_entries, n_shape_entries, 
+      gtk_action_group_add_radio_actions (action_group,
+					  shape_entries, n_shape_entries,
 					  SHAPE_SQUARE,
-					  G_CALLBACK (activate_radio_action), 
+					  G_CALLBACK (activate_radio_action),
 					  NULL);
 
       merge = gtk_ui_manager_new ();
-      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge, 
+      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge,
 			      g_object_unref);
       gtk_ui_manager_insert_action_group (merge, action_group, 0);
-      gtk_window_add_accel_group (GTK_WINDOW (window), 
+      gtk_window_add_accel_group (GTK_WINDOW (window),
 				  gtk_ui_manager_get_accel_group (merge));
-      
+
       if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
 	{
 	  g_message ("building menus failed: %s", error->message);
@@ -502,7 +499,7 @@ do_appwindow (GtkWidget *do_widget)
       bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
       gtk_widget_show (bar);
       gtk_table_attach (GTK_TABLE (table),
-			bar, 
+			bar,
                         /* X direction */          /* Y direction */
                         0, 1,                      0, 1,
                         GTK_EXPAND | GTK_FILL,     0,
@@ -511,7 +508,7 @@ do_appwindow (GtkWidget *do_widget)
       bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
       gtk_widget_show (bar);
       gtk_table_attach (GTK_TABLE (table),
-			bar, 
+			bar,
                         /* X direction */       /* Y direction */
                         0, 1,                   1, 2,
                         GTK_EXPAND | GTK_FILL,  0,
@@ -520,6 +517,25 @@ do_appwindow (GtkWidget *do_widget)
       /* Create document
        */
 
+      infobar = gtk_info_bar_new ();
+      gtk_widget_set_no_show_all (infobar, TRUE);
+      messagelabel = gtk_label_new ("");
+      gtk_widget_show (messagelabel);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar))),
+                          messagelabel,
+                          TRUE, TRUE, 0);
+      gtk_info_bar_add_button (GTK_INFO_BAR (infobar),
+                               GTK_STOCK_OK, GTK_RESPONSE_OK);
+      g_signal_connect (infobar, "response",
+                        G_CALLBACK (gtk_widget_hide), NULL);
+
+      gtk_table_attach (GTK_TABLE (table),
+                        infobar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   2, 3,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);
+
       sw = gtk_scrolled_window_new (NULL, NULL);
 
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -528,20 +544,21 @@ do_appwindow (GtkWidget *do_widget)
 
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
                                            GTK_SHADOW_IN);
-      
+
       gtk_table_attach (GTK_TABLE (table),
                         sw,
                         /* X direction */       /* Y direction */
-                        0, 1,                   2, 3,
+                        0, 1,                   3, 4,
                         GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
                         0,                      0);
 
       gtk_window_set_default_size (GTK_WINDOW (window),
-                                   200, 200);
-      
+                                   GTK_SIZE_ONE_TWELFTH_EM (200),
+				   GTK_SIZE_ONE_TWELFTH_EM (200));
+
       contents = gtk_text_view_new ();
       gtk_widget_grab_focus (contents);
-      
+
       gtk_container_add (GTK_CONTAINER (sw),
                          contents);
 
@@ -551,7 +568,7 @@ do_appwindow (GtkWidget *do_widget)
       gtk_table_attach (GTK_TABLE (table),
                         statusbar,
                         /* X direction */       /* Y direction */
-                        0, 1,                   3, 4,
+                        0, 1,                   4, 5,
                         GTK_EXPAND | GTK_FILL,  0,
                         0,                      0);
 
@@ -570,12 +587,12 @@ do_appwindow (GtkWidget *do_widget)
                                statusbar,
                                0);
 
-      g_signal_connect_object (window, 
-			       "window_state_event", 
+      g_signal_connect_object (window,
+			       "window_state_event",
 			       G_CALLBACK (update_resize_grip),
 			       statusbar,
 			       0);
-      
+
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }
 
@@ -584,9 +601,11 @@ do_appwindow (GtkWidget *do_widget)
       gtk_widget_show_all (window);
     }
   else
-    {    
+    {
       gtk_widget_destroy (window);
       window = NULL;
+      infobar = NULL;
+      messagelabel = NULL;
     }
 
   return window;

demos/gtk-demo/assistant.c

@@ -58,14 +58,32 @@ on_entry_changed (GtkWidget *widget, gpointer data)
     gtk_assistant_set_page_complete (assistant, current_page, FALSE);
 }
 
+static void
+on_unit_changed (GtkWidget *assistant,
+                 gpointer user_data)
+{
+  int n;
+  GdkPixbuf *pixbuf;
+  GtkWidget *page;
+
+  /* update icons on all pages */
+  for (n = 0; n < 3; n++)
+    {
+      page = gtk_assistant_get_nth_page (GTK_ASSISTANT (assistant), n);
+      pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+      gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), page, pixbuf);
+      g_object_unref (pixbuf);
+    }
+}
+
 static void
 create_page1 (GtkWidget *assistant)
 {
   GtkWidget *box, *label, *entry;
   GdkPixbuf *pixbuf;
 
-  box = gtk_hbox_new (FALSE, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
+  box = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
+  gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (10));
 
   label = gtk_label_new ("You must fill out this entry to continue:");
   gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
@@ -91,8 +109,8 @@ create_page2 (GtkWidget *assistant)
   GtkWidget *box, *checkbutton;
   GdkPixbuf *pixbuf;
 
-  box = gtk_vbox_new (12, FALSE);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
+  box = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
+  gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (10));
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
 						 "even if you do not check this");
@@ -134,7 +152,7 @@ do_assistant (GtkWidget *do_widget)
     {
       assistant = gtk_assistant_new ();
 
-	 gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
+      gtk_window_set_default_size (GTK_WINDOW (assistant), -1, GTK_SIZE_ONE_TWELFTH_EM (300));
 
       gtk_window_set_screen (GTK_WINDOW (assistant),
 			     gtk_widget_get_screen (do_widget));
@@ -151,6 +169,10 @@ do_assistant (GtkWidget *do_widget)
 			G_CALLBACK (on_assistant_apply), NULL);
       g_signal_connect (G_OBJECT (assistant), "prepare",
 			G_CALLBACK (on_assistant_prepare), NULL);
+
+      /* need to reset the header pixbufs to correct size when the units change */
+      g_signal_connect (G_OBJECT (assistant), "unit-changed",
+                        G_CALLBACK (on_unit_changed), NULL);
     }
 
   if (!GTK_WIDGET_VISIBLE (assistant))

demos/gtk-demo/button_box.c

@@ -6,10 +6,10 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *
-create_bbox (gint  horizontal,
-	     char *title, 
-	     gint  spacing,
-	     gint  layout)
+create_bbox (gint    horizontal,
+	     char   *title, 
+	     GtkSize spacing,
+	     gint    layout)
 {
   GtkWidget *frame;
   GtkWidget *bbox;
@@ -22,7 +22,7 @@ create_bbox (gint  horizontal,
   else
     bbox = gtk_vbutton_box_new ();
 
-  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
+  gtk_container_set_border_width (GTK_CONTAINER (bbox), GTK_SIZE_ONE_TWELFTH_EM (5));
   gtk_container_add (GTK_CONTAINER (frame), bbox);
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
@@ -61,56 +61,56 @@ do_button_box (GtkWidget *do_widget)
 		      G_CALLBACK (gtk_widget_destroyed),
 		      &window);
     
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (10));
 
     main_vbox = gtk_vbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), main_vbox);
     
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (10));
     
     vbox = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (10));
     gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
     gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
+			create_bbox (TRUE, "Spread", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_SPREAD),
 			TRUE, TRUE, 0);
 
     gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, 5);
+			create_bbox (TRUE, "Edge", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
     
     gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-			TRUE, TRUE, 5);
+			create_bbox (TRUE, "Start", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_START),
+			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
     
     gtk_box_pack_start (GTK_BOX (vbox), 
-			create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-			TRUE, TRUE, 5);
+			create_bbox (TRUE, "End", GTK_SIZE_ONE_TWELFTH_EM (40), GTK_BUTTONBOX_END),
+			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
 
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (10));
     
     hbox = gtk_hbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (10));
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 
     gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
+			create_bbox (FALSE, "Spread", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_SPREAD),
 			TRUE, TRUE, 0);
 
     gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
-			TRUE, TRUE, 5);
+			create_bbox (FALSE, "Edge", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
 
     gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
-			TRUE, TRUE, 5);
+			create_bbox (FALSE, "Start", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_START),
+			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
 
     gtk_box_pack_start (GTK_BOX (hbox), 
-			create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
-			TRUE, TRUE, 5);
+			create_bbox (FALSE, "End", GTK_SIZE_ONE_TWELFTH_EM (30), GTK_BUTTONBOX_END),
+			TRUE, TRUE, GTK_SIZE_ONE_TWELFTH_EM (5));
   }
 
   if (!GTK_WIDGET_VISIBLE (window))

demos/gtk-demo/changedisplay.c

@@ -354,8 +354,8 @@ create_frame (ChangeDisplayInfo *info,
 
   *frame = gtk_frame_new (title);
 
-  hbox = gtk_hbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+  hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
   gtk_container_add (GTK_CONTAINER (*frame), hbox);
 
   scrollwin = gtk_scrolled_window_new (NULL, NULL);
@@ -372,7 +372,7 @@ create_frame (ChangeDisplayInfo *info,
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
   gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
 
-  *button_vbox = gtk_vbox_new (FALSE, 5);
+  *button_vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
   gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE, 0);
 
   if (!info->size_group)
@@ -611,15 +611,15 @@ do_changedisplay (GtkWidget *do_widget)
 					    "Change",         GTK_RESPONSE_OK,
 					    NULL);
 
-      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);
+      gtk_window_set_default_size (GTK_WINDOW (info->window), GTK_SIZE_ONE_TWELFTH_EM (300), GTK_SIZE_ONE_TWELFTH_EM (400));
 
       g_signal_connect (info->window, "response",
 			G_CALLBACK (response_cb), info);
       g_signal_connect (info->window, "destroy",
 			G_CALLBACK (destroy_cb), &info);
 
-      vbox = gtk_vbox_new (FALSE, 5);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
 
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (info->window)->vbox), vbox,
 			  TRUE, TRUE, 0);

demos/gtk-demo/clipboard.c

@@ -207,7 +207,7 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_vbox_new (FALSE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
 
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -215,8 +215,8 @@ do_clipboard (GtkWidget *do_widget)
 
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (4));
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
       /* Create the first entry */
@@ -232,8 +232,8 @@ do_clipboard (GtkWidget *do_widget)
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (4));
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
       /* Create the second entry */
@@ -249,8 +249,8 @@ do_clipboard (GtkWidget *do_widget)
       label = gtk_label_new ("Images can be transferred via the clipboard, too");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (4));
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
       /* Create the first image */

demos/gtk-demo/colorsel.c

@@ -87,10 +87,10 @@ do_colorsel (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
 
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       /*
@@ -108,7 +108,7 @@ do_colorsel (GtkWidget *do_widget)
 			G_CALLBACK (expose_event_callback), NULL);
 
       /* set a minimum size */
-      gtk_widget_set_size_request (da, 200, 200);
+      gtk_widget_set_size_request (da, GTK_SIZE_ONE_TWELFTH_EM (200), GTK_SIZE_ONE_TWELFTH_EM (200));
       /* set the color */
       gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
       

demos/gtk-demo/combobox.c

@@ -11,8 +11,10 @@
 
 enum 
 {
-  PIXBUF_COL,
-  TEXT_COL
+  STOCK_ID_COL,
+  TEXT_COL,
+
+  NUM_COLUMNS,
 };
 
 static gchar *
@@ -50,7 +52,6 @@ create_stock_icon_store (void)
   };
 
   GtkStockItem item;
-  GdkPixbuf *pixbuf;
   GtkWidget *cellview;
   GtkTreeIter iter;
   GtkListStore *store;
@@ -59,29 +60,25 @@ create_stock_icon_store (void)
 
   cellview = gtk_cell_view_new ();
   
-  store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+  store = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
 
   for (i = 0; i < G_N_ELEMENTS (stock_id); i++)
     {
       if (stock_id[i])
 	{
-	  pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
-					   GTK_ICON_SIZE_BUTTON, NULL);
-	  gtk_stock_lookup (stock_id[i], &item);
+          gtk_stock_lookup (stock_id[i], &item);
 	  label = strip_underscore (item.label);
 	  gtk_list_store_append (store, &iter);
 	  gtk_list_store_set (store, &iter,
-			      PIXBUF_COL, pixbuf,
+                              STOCK_ID_COL, stock_id[i],
 			      TEXT_COL, label,
 			      -1);
-	  g_object_unref (pixbuf);
 	  g_free (label);
 	}
       else
 	{
 	  gtk_list_store_append (store, &iter);
 	  gtk_list_store_set (store, &iter,
-			      PIXBUF_COL, NULL,
 			      TEXT_COL, "separator",
 			      -1);
 	}
@@ -343,9 +340,9 @@ do_combobox (GtkWidget *do_widget)
                       G_CALLBACK (gtk_widget_destroyed),
                       &window);
     
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (10));
 
-    vbox = gtk_vbox_new (FALSE, 2);
+    vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (2));
     gtk_container_add (GTK_CONTAINER (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
@@ -355,7 +352,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
     
     box = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (5));
     gtk_container_add (GTK_CONTAINER (frame), box);
     
     model = create_stock_icon_store ();
@@ -366,7 +363,7 @@ do_combobox (GtkWidget *do_widget)
     renderer = gtk_cell_renderer_pixbuf_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
     gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-				    "pixbuf", PIXBUF_COL, 
+				    "stock-id", STOCK_ID_COL, 
 				    NULL);
 
     gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
@@ -396,7 +393,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
     box = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (5));
     gtk_container_add (GTK_CONTAINER (frame), box);
     
     model = create_capital_store ();
@@ -425,7 +422,7 @@ do_combobox (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
     
     box = gtk_vbox_new (FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (box), GTK_SIZE_ONE_TWELFTH_EM (5));
     gtk_container_add (GTK_CONTAINER (frame), box);
     
     combo = gtk_combo_box_entry_new_text ();

demos/gtk-demo/demo.ui

@@ -148,8 +148,9 @@
 	 </accessibility>
     </object>
     <object class="GtkWindow" id="window1">
-        <property name="default_height">250</property>
-        <property name="default_width">440</property>
+        <!-- 100 mm = 10 cm ~= 4 inches -->
+        <property name="default_height">100 mm</property>
+        <property name="default_width">36.6667em</property>
         <property name="title">GtkBuilder demo</property>
         <child>
             <object class="GtkVBox" id="vbox1">

demos/gtk-demo/dialog.c

@@ -51,16 +51,16 @@ interactive_dialog_clicked (GtkButton *button,
                                         GTK_RESPONSE_CANCEL,
 					NULL);
 
-  hbox = gtk_hbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+  hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+  gtk_container_set_border_width (GTK_CONTAINER (hbox), GTK_SIZE_ONE_TWELFTH_EM (8));
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
 
   stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);
 
   table = gtk_table_new (2, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
+  gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
   gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
   label = gtk_label_new_with_mnemonic ("_Entry 1");
   gtk_table_attach_defaults (GTK_TABLE (table),
@@ -112,17 +112,17 @@ do_dialog (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
 
       frame = gtk_frame_new ("Dialogs");
       gtk_container_add (GTK_CONTAINER (window), frame);
 
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 
       /* Standard message dialog */
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
@@ -132,7 +132,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
 
       /* Interactive dialog*/
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       vbox2 = gtk_vbox_new (FALSE, 0);
 
@@ -143,8 +143,8 @@ do_dialog (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
 
       table = gtk_table_new (2, 2, FALSE);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 4);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+      gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
+      gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (4));
       gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
 
       label = gtk_label_new_with_mnemonic ("_Entry 1");

demos/gtk-demo/drawingarea.c

@@ -245,10 +245,10 @@ do_drawingarea (GtkWidget *do_widget)
 
       g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
 
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       /*
@@ -266,7 +266,7 @@ do_drawingarea (GtkWidget *do_widget)
 
       da = gtk_drawing_area_new ();
       /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
+      gtk_widget_set_size_request (da, GTK_SIZE_ONE_TWELFTH_EM (100), GTK_SIZE_ONE_TWELFTH_EM (100));
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 
@@ -288,7 +288,7 @@ do_drawingarea (GtkWidget *do_widget)
 
       da = gtk_drawing_area_new ();
       /* set a minimum size */
-      gtk_widget_set_size_request (da, 100, 100);
+      gtk_widget_set_size_request (da, GTK_SIZE_ONE_TWELFTH_EM (100), GTK_SIZE_ONE_TWELFTH_EM (100));
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 

demos/gtk-demo/editable_cells.c

@@ -328,11 +328,11 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
                              gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 5);
+      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (5));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
@@ -365,7 +365,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (sw), treeview);
 
       /* some buttons */
-      hbox = gtk_hbox_new (TRUE, 4);
+      hbox = gtk_hbox_new (TRUE, GTK_SIZE_ONE_TWELFTH_EM (4));
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
       button = gtk_button_new_with_label ("Add item");
@@ -378,7 +378,7 @@ do_editable_cells (GtkWidget *do_widget)
                         G_CALLBACK (remove_item), treeview);
       gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
 
-      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
+      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (320), GTK_SIZE_ONE_TWELFTH_EM (200));
     }
 
   if (!GTK_WIDGET_VISIBLE (window))

demos/gtk-demo/entry_completion.c

@@ -1,4 +1,4 @@
-/* Entry Completion
+/* Entry/Entry Completion
  *
  * GtkEntryCompletion provides a mechanism for adding support for
  * completion in GtkEntry.
@@ -58,9 +58,9 @@ do_entry_completion (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (5));
 
     label = gtk_label_new (NULL);
     gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");

demos/gtk-demo/expander.c

@@ -32,9 +32,9 @@ do_expander (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
     gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (5));
 
     label = gtk_label_new ("Expander demo. Click on the triangle for details.");
     gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

demos/gtk-demo/hypertext.c

@@ -267,7 +267,7 @@ do_hypertext (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
                              gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
-                                   450, 450);
+                                   GTK_SIZE_ONE_TWELFTH_EM (450), GTK_SIZE_ONE_TWELFTH_EM (450));
       
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/iconview.c

@@ -263,7 +263,7 @@ do_iconview (GtkWidget *do_widget)
       GError *error;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
+      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (650), GTK_SIZE_ONE_TWELFTH_EM (400));
 
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));

demos/gtk-demo/images.c

@@ -332,10 +332,10 @@ do_images (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (cleanup_callback), NULL);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
 
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

demos/gtk-demo/links.c

@@ -0,0 +1,85 @@
+/* Links
+ *
+ * GtkLabel can show hyperlinks. The default action is to call
+ * gtk_show_uri() on their URI, but it is possible to override
+ * this with a custom handler.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+response_cb (GtkWidget *dialog,
+             gint       response_id,
+             gpointer   data)
+{
+  gtk_widget_destroy (dialog);
+}
+
+static gboolean
+activate_link (GtkWidget   *label,
+               const gchar *uri,
+               gpointer     data)
+{
+  if (g_strcmp0 (uri, "keynav") == 0)
+    {
+      GtkWidget *dialog;
+      GtkWidget *parent;
+
+      parent = gtk_widget_get_toplevel (label);
+      dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent),
+                 GTK_DIALOG_DESTROY_WITH_PARENT,
+                 GTK_MESSAGE_INFO,
+                 GTK_BUTTONS_OK,
+                 "The term <i>keynav</i> is a shorthand for "
+                 "keyboard navigation and refers to the process of using "
+                 "a program (exclusively) via keyboard input.");
+
+      gtk_window_present (GTK_WINDOW (dialog));
+      g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+GtkWidget *
+do_links (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *box;
+  GtkWidget *label;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+			     gtk_widget_get_screen (do_widget));
+      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
+      g_signal_connect (window, "destroy",
+			G_CALLBACK(gtk_widget_destroyed), &window);
+      g_signal_connect (window, "delete-event",
+			G_CALLBACK (gtk_true), NULL);
+
+      label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
+                             "title=\"plain text\">text</a> may be marked up\n"
+                             "as hyperlinks, which can be clicked\n"
+                             "or activated via <a href=\"keynav\">keynav</a>");
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
+      gtk_container_add (GTK_CONTAINER (window), label);
+      gtk_widget_show (label);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/list_store.c

@@ -173,9 +173,9 @@ do_list_store (GtkWidget *do_widget)
 
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
@@ -206,7 +206,7 @@ do_list_store (GtkWidget *do_widget)
       add_columns (GTK_TREE_VIEW (treeview));
 
       /* finish & show */
-      gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
+      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (280), GTK_SIZE_ONE_TWELFTH_EM (250));
     }
 
   if (!GTK_WIDGET_VISIBLE (window))

demos/gtk-demo/main.c

@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
-#include <demos.h>
+#include "demos.h"
 
 static GtkTextBuffer *info_buffer;
 static GtkTextBuffer *source_buffer;
@@ -41,7 +41,7 @@ get_democodedir (void)
 
   if (result == NULL)
     {
-      result = g_win32_get_package_installation_directory (NULL, NULL);
+      result = g_win32_get_package_installation_directory_of_module (NULL);
       if (result == NULL)
 	result = "unknown-location";
 
@@ -764,9 +764,9 @@ create_text (GtkTextBuffer **buffer,
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view),
                                    GTK_WRAP_WORD);
       gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view),
-                                            2);
+                                            GTK_SIZE_ONE_TWELFTH_EM (2));
       gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view),
-                                            2);
+                                            GTK_SIZE_ONE_TWELFTH_EM (2));
     }
   
   return scrolled_window;
@@ -792,7 +792,7 @@ create_tree (void)
 
   gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
 			       GTK_SELECTION_BROWSE);
-  gtk_widget_set_size_request (tree_view, 200, -1);
+  gtk_widget_set_size_request (tree_view, GTK_SIZE_ONE_TWELFTH_EM (200), -1);
 
   /* this code only supports 1 level of children. If we
    * want more we probably have to use a recursing function.
@@ -946,6 +946,7 @@ main (int argc, char **argv)
     }
   /* -- End of hack -- */
   
+  gtk_enable_resolution_independence ();
   gtk_init (&argc, &argv);
 
   setup_default_icon ();
@@ -969,7 +970,7 @@ main (int argc, char **argv)
 			    gtk_label_new_with_mnemonic ("_Info"));
 
   tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
+                                    "scale", PANGO_SCALE_XX_LARGE,
                                     NULL);
    g_object_unref (info_buffer);
 
@@ -999,9 +1000,9 @@ main (int argc, char **argv)
 				    "weight", PANGO_WEIGHT_BOLD,
  				    "foreground", "DarkGoldenrod4",
                                     NULL);
-   g_object_unref (source_buffer);
+  g_object_unref (source_buffer);
   
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
+  gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (600), GTK_SIZE_ONE_TWELFTH_EM (400));
   gtk_widget_show_all (window);
   
 

demos/gtk-demo/menus.c

@@ -179,8 +179,8 @@ do_menus (GtkWidget *do_widget)
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
       
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
+      box2 = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
+      gtk_container_set_border_width (GTK_CONTAINER (box2), GTK_SIZE_ONE_TWELFTH_EM (10));
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);
 

demos/gtk-demo/panes.c

@@ -65,7 +65,7 @@ create_pane_options (GtkPaned	 *paned,
   GtkWidget *check_button;
   
   frame = gtk_frame_new (frame_label);
-  gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
+  gtk_container_set_border_width (GTK_CONTAINER (frame), GTK_SIZE_ONE_TWELFTH_EM (4));
   
   table = gtk_table_new (3, 2, TRUE);
   gtk_container_add (GTK_CONTAINER (frame), table);
@@ -138,14 +138,14 @@ do_panes (GtkWidget *do_widget)
       
       vpaned = gtk_vpaned_new ();
       gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
+      gtk_container_set_border_width (GTK_CONTAINER(vpaned), GTK_SIZE_ONE_TWELFTH_EM (5));
 
       hpaned = gtk_hpaned_new ();
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 60, 60);
+      gtk_widget_set_size_request (frame, GTK_SIZE_ONE_TWELFTH_EM (60), GTK_SIZE_ONE_TWELFTH_EM (60));
       gtk_paned_add1 (GTK_PANED (hpaned), frame);
       
       button = gtk_button_new_with_mnemonic ("_Hi there");
@@ -153,12 +153,12 @@ do_panes (GtkWidget *do_widget)
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 80, 60);
+      gtk_widget_set_size_request (frame, GTK_SIZE_ONE_TWELFTH_EM (80), GTK_SIZE_ONE_TWELFTH_EM (60));
       gtk_paned_add2 (GTK_PANED (hpaned), frame);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
-      gtk_widget_set_size_request (frame, 60, 80);
+      gtk_widget_set_size_request (frame, GTK_SIZE_ONE_TWELFTH_EM (60), GTK_SIZE_ONE_TWELFTH_EM (80));
       gtk_paned_add2 (GTK_PANED (vpaned), frame);
 
       /* Now create toggle buttons to control sizing */

demos/gtk-demo/pickers.c

@@ -18,19 +18,20 @@ do_pickers (GtkWidget *do_widget)
     gtk_window_set_screen (GTK_WINDOW (window),
                            gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Pickers");
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
    
     g_signal_connect (window, "destroy",
                       G_CALLBACK (gtk_widget_destroyed),
                       &window);
     
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (10));
 
     table = gtk_table_new (4, 2, FALSE);    
-    gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
-    gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+    gtk_table_set_col_spacing (GTK_TABLE (table), 0, GTK_SIZE_ONE_TWELFTH_EM (10));
+    gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (3));
     gtk_container_add (GTK_CONTAINER (window), table);
 
-    gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+    gtk_container_set_border_width (GTK_CONTAINER (table), GTK_SIZE_ONE_TWELFTH_EM (10));
 
     label = gtk_label_new ("Color:");
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);

demos/gtk-demo/resolution_independence.c

@@ -0,0 +1,239 @@
+/* Resolution Independence
+ *
+ * This demonstates resolution independence features available since
+ * version 2.14 of GTK+. Use the slider to change the effective DPI
+ * per monitor. Note that the changes will only affect windows from
+ * this process.
+ */
+#include <gtk/gtk.h>
+#include "config.h"
+#include "demo-common.h"
+
+static GtkWidget *window = NULL;
+static GtkWindowGroup *window_group = NULL;
+static GtkWidget *hscale;
+static GtkWidget *label;
+static GtkWidget *button;
+static gdouble button_dpi;
+
+#define INCHES_TO_MM 25.4
+
+#define MIN_DPI 24.0
+#define MAX_DPI 480.0
+#define STEP_DPI 1.0
+
+static void
+update (void)
+{
+  GdkScreen *screen;
+  gint monitor_num;
+  char *plug_name;
+  char *s;
+  gdouble dpi;
+  char *font_name;
+  GtkSettings *settings;
+  int width_mm;
+  int height_mm;
+  GdkRectangle geometry;
+
+  plug_name = NULL;
+  font_name = NULL;
+  width_mm = -1;
+  height_mm = -1;
+  geometry.x = -1;
+  geometry.y = -1;
+  geometry.width = -1;
+  geometry.height = -1;
+
+  screen = gtk_window_get_screen (GTK_WINDOW (window));
+  monitor_num = gtk_widget_get_monitor_num (window);
+  if (screen != NULL && monitor_num >= 0)
+    {
+      plug_name = gdk_screen_get_monitor_plug_name (screen, monitor_num);
+      width_mm = gdk_screen_get_monitor_width_mm (screen, monitor_num);
+      height_mm = gdk_screen_get_monitor_height_mm (screen, monitor_num);
+      gdk_screen_get_monitor_geometry (screen, monitor_num, &geometry);
+    }
+  if (screen != NULL)
+    settings = gtk_settings_get_for_screen (screen);
+  else
+    settings = gtk_settings_get_default ();
+  g_object_get (settings, "gtk-font-name", &font_name, NULL);
+
+  s = g_strdup_printf ("Monitor %d (%s) @ %dx%d+%d+%d\n"
+                       "%d mm x %d mm\n"
+		       "DPI: %.1f x %.1f\n"
+                       "Font \"%s\"\n"
+                       "1 em -> %g pixels\n"
+                       "1 mm -> %g pixels",
+                       monitor_num,
+                       plug_name != NULL ? plug_name : "unknown name",
+                       geometry.width, geometry.height, geometry.x, geometry.y,
+                       width_mm, height_mm,
+		       INCHES_TO_MM * geometry.width / width_mm,
+		       INCHES_TO_MM * geometry.height / height_mm,
+                       font_name,
+                       gtk_size_to_pixel_double (screen, monitor_num, gtk_size_em (1.0)),
+                       gtk_size_to_pixel_double (screen, monitor_num, gtk_size_mm (1.0)));
+  gtk_label_set_text (GTK_LABEL (label), s);
+  g_free (s);
+
+  button_dpi = MIN (INCHES_TO_MM * geometry.width / width_mm,
+                    INCHES_TO_MM * geometry.height / height_mm);
+  s = g_strdup_printf ("Set DPI to %.1f", button_dpi);
+  gtk_button_set_label (GTK_BUTTON (button), s);
+  g_free (s);
+
+  dpi = -1;
+  if (screen != NULL)
+    {
+      dpi = gdk_screen_get_resolution_for_monitor (screen, monitor_num);
+      gtk_range_set_value (GTK_RANGE (hscale), dpi);
+    }
+
+  g_free (plug_name);
+  g_free (font_name);
+}
+
+static void
+window_mapped (GtkWidget *widget, gpointer user_data)
+{
+  update ();
+}
+
+static void
+unit_changed (GtkWidget *widget, gpointer user_data)
+{
+  update ();
+}
+
+static void
+monitor_num_notify (GtkWindow *window, GParamSpec *psec, gpointer user_data)
+{
+  g_debug ("notify::monitor-num");
+  update ();
+}
+
+static void
+update_value (void)
+{
+  gdouble slider_value;
+
+  slider_value = gtk_range_get_value (GTK_RANGE (hscale));
+  if (slider_value >= MIN_DPI && slider_value <= MAX_DPI)
+    {
+      GdkScreen *screen;
+      gint monitor_num;
+
+      screen = gtk_window_get_screen (GTK_WINDOW (window));
+      monitor_num = gtk_widget_get_monitor_num (window);
+      if (screen != NULL && monitor_num >= 0)
+        {
+          gdk_screen_set_resolution_for_monitor (screen, monitor_num, slider_value);
+          g_signal_emit_by_name (screen, "monitors-changed");
+        }
+    }
+}
+
+static gboolean is_pressed = FALSE;
+
+static gboolean
+hscale_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+  is_pressed = TRUE;
+  return FALSE;
+}
+
+static gboolean
+hscale_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+  is_pressed = FALSE;
+  update_value ();
+  return FALSE;
+}
+
+static void
+hscale_value_changed (GtkRange *range, gpointer user_data)
+{
+  if (!is_pressed)
+    update_value ();
+}
+
+static char *
+hscale_format_value (GtkScale *scale, gdouble value, gpointer user_data)
+{
+  return g_strdup_printf ("%g DPI", value);
+}
+
+static void
+dpi_button_clicked (GtkButton *button, gpointer user_data)
+{
+  gtk_range_set_value (GTK_RANGE (hscale), button_dpi);
+}
+
+GtkWidget *
+do_resolution_independence (GtkWidget *do_widget)
+{
+  GtkWidget *vbox;
+
+  if (window != NULL)
+    goto have_window;
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
+  gtk_window_set_title (GTK_WINDOW (window), "Resolution Independence");
+  gtk_window_set_icon_name (GTK_WINDOW (window), "gtk-fullscreen");
+
+  g_signal_connect (G_OBJECT (window), "map", G_CALLBACK (window_mapped), NULL);
+  g_signal_connect (G_OBJECT (window), "notify::monitor-num", G_CALLBACK (monitor_num_notify), NULL);
+  g_signal_connect (G_OBJECT (window), "unit-changed", G_CALLBACK (unit_changed), NULL);
+
+  g_signal_connect (window, "destroy",
+                    G_CALLBACK (gtk_widget_destroyed),
+                    &window);
+
+  vbox = gtk_vbox_new (FALSE, gtk_size_em (1));
+
+  label = gtk_label_new (NULL);
+  gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+  hscale = gtk_hscale_new_with_range (MIN_DPI, MAX_DPI, STEP_DPI);
+  gtk_box_pack_start (GTK_BOX (vbox), hscale, FALSE, FALSE, 0);
+
+  g_signal_connect (G_OBJECT (hscale), "value-changed", G_CALLBACK (hscale_value_changed), NULL);
+  g_signal_connect (G_OBJECT (hscale), "button-press-event", G_CALLBACK (hscale_button_press_event), NULL);
+  g_signal_connect (G_OBJECT (hscale), "button-release-event", G_CALLBACK (hscale_button_release_event), NULL);
+  g_signal_connect (G_OBJECT (hscale), "format-value", G_CALLBACK (hscale_format_value), NULL);
+
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_container_set_border_width (GTK_CONTAINER (window), gtk_size_em (1));
+  gtk_widget_set_size_request (window, GTK_SIZE_ONE_TWELFTH_EM (500), -1);
+  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+  button = gtk_button_new ();
+  g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (dpi_button_clicked), NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  /* avoid dialogs (e.g. printing) grabbing focus from us */
+  if (window_group == NULL)
+    window_group = gtk_window_group_new ();
+  gtk_window_group_add_window (window_group, GTK_WINDOW (window));
+
+  /* make sure we're on top */
+  gtk_window_set_keep_above (GTK_WINDOW (window), TRUE);
+
+ have_window:
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    {
+      gtk_widget_show_all (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/rotated_text.c

@@ -1,101 +1,173 @@
 /* Rotated Text
  *
- * This demo shows how to use GDK and Pango to draw rotated and transformed
- * text. The use of GdkPangoRenderer in this example is a somewhat advanced
- * technique; most applications can simply use gdk_draw_layout(). We use
- * it here mostly because that allows us to work in user coordinates - that is,
- * coordinates prior to the application of the transformation matrix, rather
- * than device coordinates.
+ * This demo shows how to use PangoCairo to draw rotated and transformed
+ * text.  The right pane shows a rotated GtkLabel widget.
  *
- * As of GTK+-2.6, the ability to draw transformed and anti-aliased graphics
- * as shown in this example is only present for text. With GTK+-2.8, a new
- * graphics system called "Cairo" will be introduced that provides these
- * capabilities and many more for all types of graphics.
+ * In both cases, a custom PangoCairo shape renderer is installed to draw
+ * a red heard using cairo drawing operations instead of the Unicode heart
+ * character.
  */
-#include <math.h>
+
 #include <gtk/gtk.h>
+#include <string.h>
 
 static GtkWidget *window = NULL;
 
+#define HEART "♥"
+const char text[] = "I ♥ GTK+";
+
+static void
+fancy_shape_renderer (cairo_t        *cr,
+		      PangoAttrShape *attr,
+		      gboolean        do_path,
+		      gpointer        data)
+{
+  double x, y;
+  cairo_get_current_point (cr, &x, &y);
+  cairo_translate (cr, x, y);
+
+  cairo_scale (cr,
+	       (double) attr->ink_rect.width  / PANGO_SCALE,
+	       (double) attr->ink_rect.height / PANGO_SCALE);
+
+  switch (GPOINTER_TO_UINT (attr->data))
+    {
+    case 0x2665: /* U+2665 BLACK HEART SUIT */
+      {
+        cairo_move_to (cr, .5, .0);
+        cairo_line_to (cr, .9, -.4);
+	cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
+	cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
+	cairo_close_path (cr);
+      }
+      break;
+    }
+
+  if (!do_path) {
+    cairo_set_source_rgb (cr, 1., 0., 0.);
+    cairo_fill (cr);
+  }
+}
+
+PangoAttrList *
+create_fancy_attr_list_for_layout (PangoLayout *layout)
+{
+  PangoAttrList *attrs;
+  PangoFontMetrics *metrics;
+  int ascent;
+  PangoRectangle ink_rect, logical_rect;
+  const char *p;
+
+  /* Get font metrics and prepare fancy shape size */
+  metrics = pango_context_get_metrics (pango_layout_get_context (layout),
+				       pango_layout_get_font_description (layout),
+				       NULL);
+  ascent = pango_font_metrics_get_ascent (metrics);
+  logical_rect.x = 0;
+  logical_rect.width = ascent;
+  logical_rect.y = -ascent;
+  logical_rect.height = ascent;
+  ink_rect = logical_rect;
+  pango_font_metrics_unref (metrics);
+
+  /* Set fancy shape attributes for all hearts */
+  attrs = pango_attr_list_new ();
+  for (p = text; (p = strstr (p, HEART)); p += strlen (HEART))
+    {
+      PangoAttribute *attr;
+      
+      attr = pango_attr_shape_new_with_data (&ink_rect,
+					     &logical_rect,
+					     GUINT_TO_POINTER (g_utf8_get_char (p)),
+					     NULL, NULL);
+
+      attr->start_index = p - text;
+      attr->end_index = attr->start_index + strlen (HEART);
+
+      pango_attr_list_insert (attrs, attr);
+    }
+
+  return attrs;
+}
+
 static gboolean
 rotated_text_expose_event (GtkWidget      *widget,
 			   GdkEventExpose *event,
 			   gpointer	   data)
 {
 #define RADIUS 150
-#define N_WORDS 10
-#define FONT "Sans Bold 27"
-  
-  PangoRenderer *renderer;
-  PangoMatrix matrix = PANGO_MATRIX_INIT;
+#define N_WORDS 5
+#define FONT "Serif 18"
+
   PangoContext *context;
   PangoLayout *layout;
   PangoFontDescription *desc;
 
+  cairo_t *cr;
+  cairo_pattern_t *pattern;
+
+  PangoAttrList *attrs;
+
   int width = widget->allocation.width;
   int height = widget->allocation.height;
   double device_radius;
   int i;
 
-  /* Get the default renderer for the screen, and set it up for drawing  */
-  renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget));
-  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), widget->window);
-  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), widget->style->black_gc);
-
-  /* Set up a transformation matrix so that the user space coordinates for
-   * the centered square where we draw are [-RADIUS, RADIUS], [-RADIUS, RADIUS]
-   * We first center, then change the scale */
+  /* Create a cairo context and set up a transformation matrix so that the user
+   * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
+   * [-RADIUS, RADIUS].
+   * We first center, then change the scale. */
+  cr = gdk_cairo_create (widget->window);
   device_radius = MIN (width, height) / 2.;
-  pango_matrix_translate (&matrix,
-			  device_radius + (width - 2 * device_radius) / 2,
-			  device_radius + (height - 2 * device_radius) / 2);
-  pango_matrix_scale (&matrix, device_radius / RADIUS, device_radius / RADIUS);
+  cairo_translate (cr,
+		   device_radius + (width - 2 * device_radius) / 2,
+		   device_radius + (height - 2 * device_radius) / 2);
+  cairo_scale (cr, device_radius / RADIUS, device_radius / RADIUS);
 
-  /* Create a PangoLayout, set the font and text */
+  /* Create and a subtle gradient source and use it. */
+  pattern = cairo_pattern_create_linear (-RADIUS, -RADIUS, RADIUS, RADIUS);
+  cairo_pattern_add_color_stop_rgb (pattern, 0., .5, .0, .0);
+  cairo_pattern_add_color_stop_rgb (pattern, 1., .0, .0, .5);
+  cairo_set_source (cr, pattern);
+
+  /* Create a PangoContext and set up our shape renderer */
   context = gtk_widget_create_pango_context (widget);
+  pango_cairo_context_set_shape_renderer (context,
+					  fancy_shape_renderer,
+					  NULL, NULL);
+
+  /* Create a PangoLayout, set the text, font, and attributes */
   layout = pango_layout_new (context);
-  pango_layout_set_text (layout, "Text", -1);
+  pango_layout_set_text (layout, text, -1);
   desc = pango_font_description_from_string (FONT);
   pango_layout_set_font_description (layout, desc);
-  pango_font_description_free (desc);
+
+  attrs = create_fancy_attr_list_for_layout (layout);
+  pango_layout_set_attributes (layout, attrs);
+  pango_attr_list_unref (attrs);
 
   /* Draw the layout N_WORDS times in a circle */
   for (i = 0; i < N_WORDS; i++)
     {
-      GdkColor color;
-      PangoMatrix rotated_matrix = matrix;
       int width, height;
-      double angle = (360. * i) / N_WORDS;
 
-      /* Gradient from red at angle == 60 to blue at angle == 300 */
-      color.red   = 65535 * (1 + cos ((angle - 60) * G_PI / 180.)) / 2;
-      color.green = 0;
-      color.blue  = 65535  - color.red;
-    
-      gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-					     PANGO_RENDER_PART_FOREGROUND, &color);
-                                             
-      pango_matrix_rotate (&rotated_matrix, angle);
-
-      pango_context_set_matrix (context, &rotated_matrix);
-    
       /* Inform Pango to re-layout the text with the new transformation matrix */
-      pango_layout_context_changed (layout);
+      pango_cairo_update_layout (cr, layout);
     
-      pango_layout_get_size (layout, &width, &height);
-      pango_renderer_draw_layout (renderer, layout,
-				  - width / 2, - RADIUS * PANGO_SCALE);
+      pango_layout_get_pixel_size (layout, &width, &height);
+      cairo_move_to (cr, - width / 2, - RADIUS * .9);
+      pango_cairo_show_layout (cr, layout);
+
+      /* Rotate for the next turn */
+      cairo_rotate (cr, G_PI*2 / N_WORDS);
     }
 
-  /* Clean up default renderer, since it is shared */
-  gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
-					 PANGO_RENDER_PART_FOREGROUND, NULL);
-  gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), NULL);
-  gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), NULL);
-
   /* free the objects we created */
+  pango_font_description_free (desc);
   g_object_unref (layout);
   g_object_unref (context);
+  cairo_pattern_destroy (pattern);
+  cairo_destroy (cr);
   
   return FALSE;
 }
@@ -103,21 +175,31 @@ rotated_text_expose_event (GtkWidget      *widget,
 GtkWidget *
 do_rotated_text (GtkWidget *do_widget)
 {
-  GtkWidget *drawing_area;
-  
   if (!window)
     {
+      GtkWidget *box;
+      GtkWidget *drawing_area;
+      GtkWidget *label;
+      PangoLayout *layout;
+      PangoAttrList *attrs;
+
       const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
-
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   gtk_size_em ((4 * RADIUS)), gtk_size_em ((4 * RADIUS)));
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
+      box = gtk_hbox_new (TRUE, 0);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      /* Add a drawing area */
+
       drawing_area = gtk_drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), drawing_area);
+      gtk_container_add (GTK_CONTAINER (box), drawing_area);
 
       /* This overrides the background color from the theme */
       gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
@@ -125,7 +207,20 @@ do_rotated_text (GtkWidget *do_widget)
       g_signal_connect (drawing_area, "expose-event",
 			G_CALLBACK (rotated_text_expose_event), NULL);
 
-      gtk_window_set_default_size (GTK_WINDOW (window), 2 * RADIUS, 2 * RADIUS);
+      /* And a label */
+      label = gtk_label_new (text);
+      gtk_container_add (GTK_CONTAINER (box), label);
+
+      gtk_label_set_angle (label, 45);
+
+      /* Set up fancy stuff on the label */
+      layout = gtk_label_get_layout (label);
+      pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),
+					      fancy_shape_renderer,
+					      NULL, NULL);
+      attrs = create_fancy_attr_list_for_layout (layout);
+      gtk_label_set_attributes (label, attrs);
+      pango_attr_list_unref (attrs);
     }
 
   if (!GTK_WIDGET_VISIBLE (window))

demos/gtk-demo/search_entry.c

@@ -0,0 +1,283 @@
+/* Entry/Search Entry 
+ *
+ * GtkEntry allows to display icons and progress information. 
+ * This demo shows how to use these features in a search entry.
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+static GtkWidget *menu = NULL;
+static GtkWidget *notebook = NULL;
+
+static guint search_progress_id = 0;
+static guint finish_search_id = 0;
+
+static void
+show_find_button (void)
+{
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
+}
+
+static void
+show_cancel_button (void)
+{
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 1);
+}
+
+static gboolean
+search_progress (gpointer data)
+{
+  gtk_entry_progress_pulse (GTK_ENTRY (data));
+
+  return TRUE;
+}
+
+static void
+search_progress_done (GtkEntry *entry)
+{
+  gtk_entry_set_progress_fraction (entry, 0.0);
+}
+
+static gboolean
+finish_search (GtkButton *button)
+{
+  show_find_button ();
+  g_source_remove (search_progress_id);
+  search_progress_id = 0;
+  
+  return FALSE;
+}
+
+static gboolean
+start_search_feedback (gpointer data)
+{
+  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, 
+                                           (GSourceFunc)search_progress, data,
+                                           (GDestroyNotify)search_progress_done);
+  return FALSE;
+}
+
+static void
+start_search (GtkButton *button, 
+              GtkEntry  *entry)
+{
+  show_cancel_button ();
+  search_progress_id = g_timeout_add_seconds (1, (GSourceFunc)start_search_feedback, entry);
+  finish_search_id = g_timeout_add_seconds (15, (GSourceFunc)finish_search, button);
+}
+
+
+static void
+stop_search (GtkButton *button,
+             gpointer   data)
+{
+  g_source_remove (finish_search_id);
+  finish_search (button);
+}
+
+static void
+icon_press_cb (GtkEntry       *entry, 
+               gint            position,
+               GdkEventButton *event,
+               gpointer        data)
+{
+  if (position == GTK_ENTRY_ICON_PRIMARY)
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
+                    event->button, event->time);
+  else 
+    gtk_entry_set_text (entry, "");
+}
+
+static void
+text_changed_cb (GtkEntry   *entry,
+                 GParamSpec *pspec,
+                 GtkWidget  *button)
+{
+  gboolean has_text;
+
+  has_text = gtk_entry_get_text_length (entry) > 0;
+  gtk_entry_set_icon_sensitive (entry, 
+                                GTK_ENTRY_ICON_SECONDARY,
+                                has_text);
+  gtk_widget_set_sensitive (button, has_text);
+}
+
+static void
+activate_cb (GtkEntry  *entry,
+             GtkButton *button)
+{
+  if (search_progress_id != 0)
+    return;
+
+  start_search (button, entry);
+
+}
+
+static void
+search_by_name (GtkWidget *item, 
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_FIND);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by name\n"
+                                   "Click here to change the search type");
+} 
+                
+static void
+search_by_description (GtkWidget *item, 
+                       GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_EDIT);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by description\n"
+                                   "Click here to change the search type");
+} 
+                
+static void
+search_by_file (GtkWidget *item, 
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_OPEN);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by file name\n"
+                                   "Click here to change the search type");
+} 
+
+static void
+search_entry_destroyed (GtkWidget  *widget)
+{
+  if (finish_search_id != 0)
+    g_source_remove (finish_search_id);
+
+  if (search_progress_id != 0)
+    g_source_remove (search_progress_id);
+
+  window = NULL;
+}
+
+                
+GtkWidget *
+do_search_entry (GtkWidget *do_widget)
+{
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *label;
+  GtkWidget *entry;
+  GtkWidget *item;
+  GtkWidget *image;
+  GtkWidget *find_button;
+  GtkWidget *cancel_button;
+  
+  if (!window)
+    {
+      window = gtk_dialog_new_with_buttons ("Search Entry",
+                                            GTK_WINDOW (do_widget),
+ 					    0,
+					    GTK_STOCK_CLOSE,
+					    GTK_RESPONSE_NONE,
+					    NULL);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+      g_signal_connect (window, "response",
+                        G_CALLBACK (gtk_widget_destroy), NULL);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (search_entry_destroyed), &window);
+
+      vbox = gtk_vbox_new (FALSE, 5);
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      hbox = gtk_hbox_new (FALSE, 10);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+      gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
+
+      /* Create our entry */
+      entry = gtk_entry_new ();
+      gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+
+      /* Create the find and cancel buttons */
+      notebook = gtk_notebook_new ();
+      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
+      gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE, 0);
+
+      find_button = gtk_button_new_with_label ("Find");
+      g_signal_connect (find_button, "clicked", 
+                        G_CALLBACK (start_search), entry);
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
+      gtk_widget_show (find_button);
+
+      cancel_button = gtk_button_new_with_label ("Cancel");
+      g_signal_connect (cancel_button, "clicked", 
+                        G_CALLBACK (stop_search), NULL);
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
+      gtk_widget_show (cancel_button);
+
+      /* Set up the search icon */
+      search_by_name (NULL, GTK_ENTRY (entry));
+      
+      /* Set up the clear icon */
+      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), 
+                                     GTK_ENTRY_ICON_SECONDARY, 
+                                     GTK_STOCK_CLEAR);
+      text_changed_cb (GTK_ENTRY (entry), NULL, find_button);
+
+      g_signal_connect (entry, "icon-press", 
+                        G_CALLBACK (icon_press_cb), NULL);
+      g_signal_connect (entry, "notify::text", 
+                        G_CALLBACK (text_changed_cb), find_button);
+      g_signal_connect (entry, "activate", 
+                        G_CALLBACK (activate_cb), NULL);
+
+      /* Create the menu */
+      menu = gtk_menu_new ();
+      gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);
+
+      item = gtk_image_menu_item_new_with_label ("Search by name");
+      image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      g_signal_connect (item, "activate", G_CALLBACK (search_by_name), entry);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+      item = gtk_image_menu_item_new_with_label ("Search by description");
+      image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      g_signal_connect (item, "activate", G_CALLBACK (search_by_description), entry);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+      item = gtk_image_menu_item_new_with_label ("Search by file name");
+      image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      g_signal_connect (item, "activate", G_CALLBACK (search_by_file), entry);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+      gtk_widget_show_all (menu);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (menu);
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+
+

demos/gtk-demo/sizegroup.c

@@ -115,9 +115,9 @@ do_sizegroup (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (5));
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (5));
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
       
@@ -127,9 +127,9 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
 
       table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
+      gtk_container_set_border_width (GTK_CONTAINER (table), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (10));
       gtk_container_add (GTK_CONTAINER (frame), table);
 
       add_row (GTK_TABLE (table), 0, size_group, "_Foreground", color_options);
@@ -141,9 +141,9 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
       table = gtk_table_new (2, 2, FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
+      gtk_container_set_border_width (GTK_CONTAINER (table), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_table_set_row_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (5));
+      gtk_table_set_col_spacings (GTK_TABLE (table), GTK_SIZE_ONE_TWELFTH_EM (10));
       gtk_container_add (GTK_CONTAINER (frame), table);
 
       add_row (GTK_TABLE (table), 0, size_group, "_Dashing", dash_options);

demos/gtk-demo/stock_browser.c

@@ -420,12 +420,12 @@ do_stock_browser (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Stock Icons and Items");
-      gtk_window_set_default_size (GTK_WINDOW (window), -1, 500);
+      gtk_window_set_default_size (GTK_WINDOW (window), -1, GTK_SIZE_ONE_TWELFTH_EM (500));
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+      gtk_container_set_border_width (GTK_CONTAINER (window), GTK_SIZE_ONE_TWELFTH_EM (8));
 
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_hbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_container_add (GTK_CONTAINER (window), hbox);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -494,8 +494,8 @@ do_stock_browser (GtkWidget *do_widget)
       frame = gtk_frame_new ("Selected Item");
       gtk_container_add (GTK_CONTAINER (align), frame);
 
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (4));
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 
       display = g_new (StockItemDisplay, 1);

demos/gtk-demo/textscroll.c

@@ -182,9 +182,9 @@ do_textscroll (GtkWidget *do_widget)
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
+      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (600), GTK_SIZE_ONE_TWELFTH_EM (400));
       
-      hbox = gtk_hbox_new (TRUE, 6);
+      hbox = gtk_hbox_new (TRUE, GTK_SIZE_ONE_TWELFTH_EM (6));
       gtk_container_add (GTK_CONTAINER (window), hbox);
 
       create_text_view (hbox, TRUE);

demos/gtk-demo/textview.c

@@ -114,7 +114,7 @@ create_tags (GtkTextBuffer *buffer)
 			      "justification", GTK_JUSTIFY_RIGHT, NULL);
 
   gtk_text_buffer_create_tag (buffer, "wide_margins",
-			      "left_margin", 50, "right_margin", 50,
+			      "left_margin", GTK_SIZE_ONE_TWELFTH_EM (50), "right_margin", GTK_SIZE_ONE_TWELFTH_EM (50),
 			      NULL);
   
   gtk_text_buffer_create_tag (buffer, "strikethrough",
@@ -139,9 +139,9 @@ create_tags (GtkTextBuffer *buffer)
   gtk_text_buffer_create_tag (buffer, "rtl_quote",
 			      "wrap_mode", GTK_WRAP_WORD,
 			      "direction", GTK_TEXT_DIR_RTL,
-			      "indent", 30,
-			      "left_margin", 20,
-			      "right_margin", 20,
+			      "indent", GTK_SIZE_ONE_TWELFTH_EM (30),
+			      "left_margin", GTK_SIZE_ONE_TWELFTH_EM (20),
+			      "right_margin", GTK_SIZE_ONE_TWELFTH_EM (20),
 			      NULL);
 }
 
@@ -173,7 +173,10 @@ insert_text (GtkTextBuffer *buffer)
       exit (1);
     }
 
-  scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
+  scaled = gdk_pixbuf_scale_simple (pixbuf,
+                                    gtk_size_to_pixel (NULL, 0, GTK_SIZE_ONE_TWELFTH_EM (32)),
+                                    gtk_size_to_pixel (NULL, 0, GTK_SIZE_ONE_TWELFTH_EM (32)),
+                                    GDK_INTERP_BILINEAR);
   g_object_unref (pixbuf);
   pixbuf = scaled;
   
@@ -409,7 +412,7 @@ attach_widgets (GtkTextView *text_view)
         {
           widget = gtk_hscale_new (NULL);
           gtk_range_set_range (GTK_RANGE (widget), 0, 100);
-          gtk_widget_set_size_request (widget, 70, -1);
+          gtk_widget_set_size_request (widget, GTK_SIZE_ONE_TWELFTH_EM (70), -1);
         }
       else if (i == 3)
         {
@@ -454,7 +457,7 @@ do_textview (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
-				   450, 450);
+				   GTK_SIZE_ONE_TWELFTH_EM (450), GTK_SIZE_ONE_TWELFTH_EM (450));
       
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
@@ -463,7 +466,7 @@ do_textview (GtkWidget *do_widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
       vpaned = gtk_vpaned_new ();
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
+      gtk_container_set_border_width (GTK_CONTAINER(vpaned), GTK_SIZE_ONE_TWELFTH_EM (5));
       gtk_container_add (GTK_CONTAINER (window), vpaned);
 
       /* For convenience, we just use the autocreated buffer from
@@ -534,7 +537,7 @@ recursive_attach_view (int                 depth,
   gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
 
   align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-  gtk_container_set_border_width (GTK_CONTAINER (align), 1);
+  gtk_container_set_border_width (GTK_CONTAINER (align), GTK_SIZE_ONE_TWELFTH_EM (1));
   
   gtk_container_add (GTK_CONTAINER (event_box), align);
   gtk_container_add (GTK_CONTAINER (align), child_view);
@@ -590,7 +593,7 @@ easter_egg_callback (GtkWidget *button,
   window_ptr = &window;
   g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
 
-  gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
+  gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (300), GTK_SIZE_ONE_TWELFTH_EM (400));
   
   gtk_widget_show_all (window);
 }

demos/gtk-demo/tree_store.c

@@ -291,7 +291,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* havoc column */
@@ -313,7 +313,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* tim column */
@@ -336,7 +336,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* owen column */
@@ -358,7 +358,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 
   /* dave column */
@@ -380,7 +380,7 @@ add_columns (GtkTreeView *treeview)
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
 				   GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
+  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), GTK_SIZE_ONE_TWELFTH_EM (50));
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 }
 
@@ -402,8 +402,8 @@ do_tree_store (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
+      vbox = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (8));
+      gtk_container_set_border_width (GTK_CONTAINER (vbox), GTK_SIZE_ONE_TWELFTH_EM (8));
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
@@ -435,7 +435,7 @@ do_tree_store (GtkWidget *do_widget)
       /* expand all rows after the treeview widget has been realized */
       g_signal_connect (treeview, "realize",
 			G_CALLBACK (gtk_tree_view_expand_all), NULL);
-      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
+      gtk_window_set_default_size (GTK_WINDOW (window), GTK_SIZE_ONE_TWELFTH_EM (50), GTK_SIZE_ONE_TWELFTH_EM (400));
     }
 
   if (!GTK_WIDGET_VISIBLE (window))

demos/gtk-demo/ui_manager.c

@@ -204,7 +204,7 @@ do_ui_manager (GtkWidget *do_widget)
 			  FALSE, FALSE, 0);
 
       label = gtk_label_new ("Type\n<alt>\nto start");
-      gtk_widget_set_size_request (label, 200, 200);
+      gtk_widget_set_size_request (label, GTK_SIZE_ONE_TWELFTH_EM (200), GTK_SIZE_ONE_TWELFTH_EM (200));
       gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
       gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
 
@@ -213,8 +213,8 @@ do_ui_manager (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
 
-      box2 = gtk_vbox_new (FALSE, 10);
-      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
+      box2 = gtk_vbox_new (FALSE, GTK_SIZE_ONE_TWELFTH_EM (10));
+      gtk_container_set_border_width (GTK_CONTAINER (box2), GTK_SIZE_ONE_TWELFTH_EM (10));
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 
       button = gtk_button_new_with_label ("close");

demos/testgtk/main.c

@@ -189,6 +189,7 @@ load_file (const gchar *filename)
 
   gtk_text_buffer_get_bounds (source_buffer, &start, &end);
   gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
+  fclose (file);
 }
 
 gboolean

docs/Makefile.am

@@ -19,3 +19,5 @@ EXTRA_DIST += \
 	generation.txt			\
 	gtkdocs_fix			\
 	RELEASE-HOWTO
+
+-include $(top_srcdir)/git.mk

docs/RELEASE-HOWTO

@@ -9,17 +9,19 @@ dependencies:
 Without those packages make distcheck will *not* pass.
 
 
- 0) Blow away your gtk+ directory, check a new version out
+ 0) Go back to a pristine working directory. With git, this works:
 
- 1) autogen and build it, make sure to enable docs by specifying 
+    git clean -f -x
+
+ 1) autogen and build it, make sure to enable docs by specifying
     --enable-gtk-doc --enable-man
 
- 2) Update NEWS based on the various ChangeLog files; follow the format
+ 2) Update NEWS based on the content of git log; follow the format
     of prior entries. This includes finding noteworthy new features,
     collecting summaries for all the fixed bugs that are referenced
-    and collecting all updated translations. 
-    Also collect the names of all contributors that are mentioned. 
-    We don't discriminate between bug reporters, patch writers, 
+    and collecting all updated translations.
+    Also collect the names of all contributors that are mentioned.
+    We don't discriminate between bug reporters, patch writers,
     committers, etc. Anybody who is mentioned in ChangeLog gets
     credits, but only real names, not email addresses or nicknames.
 
@@ -29,14 +31,14 @@ Without those packages make distcheck will *not* pass.
     with configure.in.
 
  4) Verify that the version in configure.in has been bumped after the last
-    release. (Note that this is critical, a slip-up here will cause the 
+    release. (Note that this is critical, a slip-up here will cause the
     soname to change).
 
  5) Make sure that make check is happy (If you don't do it here, make distcheck
-    will also catch it, but it is kind of disheartening to see make distcheck 
-    fail due to an extraneous symbol after watching it build the docs for an 
-    hour...). 
-    Typical problems to expect here (depending on whether this is a devel 
+    will also catch it, but it is kind of disheartening to see make distcheck
+    fail due to an extraneous symbol after watching it build the docs for an
+    hour...).
+    Typical problems to expect here (depending on whether this is a devel
     snapshot or a stable release):
     * forgotten source files
     * new symbols missing from .symbols files
@@ -48,57 +50,58 @@ Without those packages make distcheck will *not* pass.
 
  6) If this is a devel release, make sure that the docs for new symbols
     are in good shape. Look at the -unused.txt files and add stuff found
-    there to the corresponding -sections.txt file. Look at the 
+    there to the corresponding -sections.txt file. Look at the
     -undocumented.txt files and see if there is anything in there that
     should be documented. If it is, this may be due to typos in the doc
-    comments in the source. Make sure that all new symbols have proper 
-    Since: tags, and that there is an index in the main -docs.sgml for 
-    the next stable version. 
+    comments in the source. Make sure that all new symbols have proper
+    Since: tags, and that there is an index in the main -docs.sgml for
+    the next stable version.
 
- 7) Add === Released 2.x.y === at the top of all ChangeLog files
+ 7) make distcheck
 
- 8) make distcheck
+ 8) Fix broken stuff found by 7), repeat
 
- 9) Fix broken stuff found by 8), repeat
+ 9) Commit all changes: git commit -a. You will have a bunch of po file
+    changes, NEWS and maybe some doc changes too
 
-10) svn commit; you'll have a bunch of po file changes, ChangeLog updates,
-     and maybe some doc changes too
- 
-11) If 10) fails because someone else committed inbetween, curse, svn up,
-    fix conflicts and go to 8)
-
-12) Now you've got the tarball. Check that the tarball size looks
+10) Now you've got the tarball. Check that the tarball size looks
     reasonable compared to previous releases. If the size goes down
     a lot, likely the docs went missing for some reason. Or the translations.
     If the size goes up by a lot, something else may be wrong.
 
-13) Tag the release. The command for doing that looks like
+11) Tag the release. The git command for doing that looks like
 
-      svn cp svn+ssh://matthiasc@svn.gnome.org/svn/gtk+/branches/gtk-2-12 \
-             svn+ssh://matthiasc@svn.gnome.org/svn/gtk+/tags/GTK_2_12_10
+    git tag -m "GTK+ 2.12.10" 2.12.10
 
-14) Bump the version number in configure.in and commit this change 
-    with a ChangeLog entry
+12) Push the tagged commit upstream. The git command for doing that is
 
-15) Upload the tarball to master.gnome.org and run install-module to transfer
+    git push origin refs/tags/2.12.10
+
+13) Bump the version number in configure.in and commit and push this change
+
+14) Upload the tarball to master.gnome.org and run install-module to transfer
     it to download.gnome.org. If you don't have an account on master.gnome.org,
     find someone who can do it for you. The command for this looks like
-  
+
       scp gtk+-2.12.10.tar.gz matthiasc@master.gnome.org:
       ssh matthiasc@master.gnome.org
       install-module gtk+-2.12.10.tar.gz
 
-16) Get the bz2 tarball and the .md5sum files back from master.gnome.org 
-    You can probably also create it locally, but I've experienced md5 
-    mismatches when doing so
+15) Get the .bz2 tarball and the .md5sum files back from master.gnome.org
+    You can probably also create it locally, but I've experienced md5
+    mismatches when doing so.
+
+16) Upload the .gz and .bz2 tarballs and checksums to ftp.gtk.org and put
+    them in the right directory below /ftp/pub. Pay attention to correct
+    ownership, and don't forget to update the LATEST file in the directory.
 
 17) Go to the gnome-announce list archives, find the last announce message,
-    create a new message in the same form, replacing version numbers, 
-    commentary at the top about "what this release is about" and the 
-    Summary of changes.
+    create a new message in the same form, replacing version numbers,
+    commentary at the top about "what this release is about" and the
+    summary of changes.
 
 18) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
     gtk-devel-list. Set reply-to to gnome-hackers.
 
-19) Add a link to the release announcement to www.gtk.org which lives 
+19) Add a link to the release announcement to www.gtk.org which lives
     in the gtk-web cvs module.

docs/faq/Makefile.am

@@ -38,3 +38,5 @@ dist-hook:
 endif
 
 .PHONY: html
+
+-include $(top_srcdir)/git.mk

docs/faq/gtk-faq.sgml

@@ -824,8 +824,8 @@ However, bindings for many other languages are available.</para>
 <para>So, after you have installed GTK+ there are a couple of
 things that can ease you into developing applications with
 it. There is the GTK+ Tutorial <ulink
-url="http://www.gtk.org/tutorial/">
-http://www.gtk.org/tutorial/</ulink>, which is undergoing
+url="http://library.gnome.org/devel/gtk-tutorial/stable/">
+http://library.gnome.org/devel/gtk-tutorial/stable/</ulink>, which is undergoing
 development. This will introduce you to writing applications
 using C.</para>
 

docs/reference/ChangeLog

@@ -1,3 +1,429 @@
+=== ChangeLog discontinued ===
+
+	With the move to git, GTK+ is switching from a ChangeLog file
+	to relying on commit messages to provide change history. Please
+	see README.commits for guidance on the expected message format.
+
+2009-03-25   Paul Bolle <pebolle@tiscali.nl>
+
+	Bug 562863 - GtkVscrollbar is hardly documented
+
+	* gtk/tmpl/gtkvscrollbar.sgml:
+	* gtk/tmpl/gtkhscrollbar.sgml: Minor tweaks.
+
+2009-03-24  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 576150 – Doc bug for GtkMenuPositionFunc
+
+	* gtk/tmpl/gtkmenu.sgml: Remove a misleading sentence.
+	Pointed out by Owen Taylor.
+
+2009-03-23  Claudio Saavedra  <csaavedra@igalia.com>
+
+	* gdk-pixbuf/tmpl/animation.sgml: Fix typos and document the
+	GdkPixbufSimpleAnim structure.
+
+2009-03-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.16.0 ===
+
+2009-03-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Rename gtk_style_get_property to
+	gtk_style_get_style_property
+
+2009-03-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.5 ===
+
+2009-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 573393 – Deprecated functions in gdk-Threads example code snippet
+
+	* gdk/tmpl/threads.sgml: Don't use deprecated GTK+ api.
+	Spotted by Andre Klapper
+
+2009-03-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/images/messagedialog.png: Fix this image
+
+	* gtk/images/aboutdialog.png: New image
+	* gtk/Makefile.am: Add it here.
+	* gtk/visual_index.xml: And here.
+
+2009-02-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_window_get_default_icon_name
+
+2009-02-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.4 ===
+
+2009-02-06  Stefan Kost  <ensonic@users.sf.net>
+
+	* gdk-pixbuf/gdk-pixbuf.sgml:
+	* gdk/gdk-docs.sgml:
+	* gtk/gtk-docs.sgml:
+	* libgail-util/gail-libgail-util-docs.sgml:
+	  Add online urls for library.gnome.org. This allows other docs to do
+          gtkdoc-rebase --online --html-dir=html
+          before publishing docs and have working xrefs.
+          Whitespece cleanup for gdk/gdk-docs.sgml.
+
+2009-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.3 ===
+
+2009-01-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.2 ===
+
+2009-01-26  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new image menu item api
+
+2009-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.1 ===
+
+2009-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add GtkActivatableIface, too
+
+2009-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new GtkActivatable API
+
+	* gtk/gtk-docs.sgml: Include GtkActivatable section
+
+	* gtk.types: Add gtk_activatable_get_type
+
+2009-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Additions
+
+2009-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/tmpl/properties.sgml: Typo fix
+
+2009-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new GtkAction api
+ 
+2009-01-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new scale api
+
+2009-01-19  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gdk/tmpl/cursors.sgml: Document GDK_BLANK_CURSOR.
+
+2009-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new api
+
+2009-01-13  Christian Dywan  <christian@imendio.com>
+
+	Bug 567569 – Typo in GtkFileChooser example in GTK+ documentation
+
+	* gtk/tmpl/gtkfilechooser.sgml: s/gobject_unref/g_object_unref.
+        Patch by Priyank Gosalia.
+
+2009-01-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_CAPS_LOCK_WARNING
+	* gtk/Makefile.am: And copy the icon
+
+2009-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 566045 – GtkViewport is lacking a description
+
+	* gtk/tmpl/gtkviewport.sgml: Add some descriptive text, shamelessly
+	copied from gtkscrolledwindow.sgml. Requested by Andrew Cowie.
+
+2009-01-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.0 ===
+
+2008-12-31  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/migrating-GtkEntry-icons.sgml: Add a section about
+	signals.
+
+	* gtk/tmpl/gtkentry.sgml: Update to new signal names
+
+2008-12-30  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkorientable.sgml:
+	* gtk/tmpl/gtkvscrollbar.sgml:
+	* gtk/tmpl/gtkhsv.sgml: Add short/long description.
+
+2008-12-30  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkwidget.sgml:
+	* gtk/tmpl/gtkprintoperation.sgml: Additions
+
+	* gtk/tmpl/gtkprintunixdialog.sgml: Document the preview
+	capability.
+
+2008-12-29  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktreeview.sgml: Document GtkTreeViewGridLines
+
+2008-12-29  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprintsettings.sgml: Document NumberUpLayout
+	* gtk/images/layout-*.png: n-up page layout images
+	* gtk/Makefile.am: Glue
+
+2008-12-29  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkenums.sgml:
+	* gtk/tmpl/gtkmain.sgml:
+	* gtk/tmpl/gtktypeutils.sgml: Additions
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+	
+	* gtk/tmpl/gtkprintunixdialog.sgml: Document capabilities	
+	* gtk/tmpl/gtkstyle.sgml: Document GtkBorder
+	* gtk/tmpl/gtkmenubar.sgml: Document GtkPackDirection
+	* gtk/tmpl/gtkenums.sgml: Document GtkArrowPlacement
+	* gtk/tmpl/gtkbuilder.sgml: Document GtkBuilderError
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Remove duplicate vscrollbar section.
+	Merge accident ?
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktreesortable.sgml: Small addition
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Move GtkFixedChild, GtkTableChild and
+	GtkTableRowCol to Private
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkfontseldlg.sgml: Merge docs inline.
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/building.sgml: It's <envar>, not <envvar>
+
+	* gtk/gtk-sections.txt: Remove duplicates, pick up misc new api
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkscrolledwindow.sgml:
+	* gtk/tmpl/gtkscale.sgml: Merge docs inline.
+
+2008-12-28  Matthias Clasen <mclasen@redhat.com>
+
+	* docs/reference/gtk/gtk-sections.txt: Remove overridden INCLUDE
+
+	* gtk/tmpl/gtkfontsel.sgml:
+	* gtk/tmpl/gtkeditable.sgml: Merge docs inline.
+
+2008-12-27  Matthias Clasen <mclasen@redhat.com>
+	
+	* gtk/tmpl/gtkmessagedialog.sgml:
+	* gtk/tmpl/gtkmenushell.sgml:
+	* gtk/tmpl/gtklinkbutton.sgml: 
+	* gtk/tmpl/gtkimage.sgml: Additions
+
+	* gtk/gtk-sections.txt:
+	* gtk/gtk-docs.sgml: Add GtkHSV
+	* gtk/Makefile.am: Don't ignore gtkhsv.h
+
+2008-12-27  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Remove nonexisting api
+	* gtk/migrating-GtkEntry-icons.sgml: Formatting fixes
+
+2008-12-27  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/Makefile.am: Add migrating-GtkEntry-icons.sgml to
+	content_files and expand_content_files.
+
+2008-12-27  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/migrating-GtkLinkButton.sgml: Mention default hook
+	* gtk/migrating-GtkEntry-icons.sgml: Migration chapter 
+	SexyIconEntry -> GtkEntry
+
+2008-12-27  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add GtkEntryIconPosition
+
+	* gtk/tmpl/gtkentry.sgml: Add note about a11y concerns.
+
+2008-12-26  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkentry.sgml: Mention new functionality
+
+	* gtk/gtk-sections.txt: Add new api
+
+2008-12-26  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/migrating-GtkBuilder.xml: Update
+
+2008-12-26  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/drawing-model.sgml: Turn into a refentry to fit better in 
+	the overall formatting.
+
+2008-12-25  Matthias Clasen <mclasen@redhat.com>
+
+	* gdk/gdk-docs.sgml: Add a "Since 2.16" index
+
+2008-12-10  Matthias Clasen <mclasen@redhat.com>
+
+        Bug 563876 – [Regression] GTK_MODULES env var is no longer relevant
+
+        * gtk/running.sgml: Improve GTK_MODULES docs.
+
+2008-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkcontainer.sgml: Document translatable child
+	properties in GtkBuilder
+
+2008-11-29  Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>
+
+	* docs/reference/gtk/images/accel-label.png:
+	* docs/reference/gtk/images/assistant.png:
+	* docs/reference/gtk/images/button.png:
+	* docs/reference/gtk/images/check-button.png:
+	* docs/reference/gtk/images/color-button.png:
+	* docs/reference/gtk/images/colorsel.png:
+	* docs/reference/gtk/images/combo-box-entry.png:
+	* docs/reference/gtk/images/combo-box.png:
+	* docs/reference/gtk/images/entry.png:
+	* docs/reference/gtk/images/file-button.png:
+	* docs/reference/gtk/images/filechooser.png:
+	* docs/reference/gtk/images/font-button.png:
+	* docs/reference/gtk/images/fontsel.png:
+	* docs/reference/gtk/images/frame.png:
+	* docs/reference/gtk/images/icon-view.png:
+	* docs/reference/gtk/images/image.png:
+	* docs/reference/gtk/images/label.png
+	* docs/reference/gtk/images/link-button.png:
+	* docs/reference/gtk/images/list-and-tree.png:
+	* docs/reference/gtk/images/menubar.png:
+	* docs/reference/gtk/images/messagedialog.png:
+	* docs/reference/gtk/images/multiline-text.png:
+	* docs/reference/gtk/images/notebook.png:
+	* docs/reference/gtk/images/pagesetupdialog.png:
+	* docs/reference/gtk/images/panes.png:
+	* docs/reference/gtk/images/printdialog.png:
+	* docs/reference/gtk/images/progressbar.png:
+	* docs/reference/gtk/images/radio-group.png:
+	* docs/reference/gtk/images/recentchooserdialog.png:
+	* docs/reference/gtk/images/scales.png:
+	* docs/reference/gtk/images/scrolledwindow.png:
+	* docs/reference/gtk/images/separator.png:
+	* docs/reference/gtk/images/spinbutton.png:
+	* docs/reference/gtk/images/statusbar.png:
+	* docs/reference/gtk/images/toggle-button.png:
+	* docs/reference/gtk/images/toolbar.png:
+	* docs/reference/gtk/images/volumebutton.png:
+	* docs/reference/gtk/images/window.png: 
+	update all screenshots to have a consistent look. 
+	Closes the bug 523264.
+
+2008-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktooltips.sgml:
+	* gtk/tmpl/gtkoptionmenu.sgml:
+	* gtk/tmpl/gtkcombo.sgml:
+	* gtk/tmpl/gtkwindow.sgml:
+	* gtk/tmpl/gtkwidget.sgml:
+	* gtk/tmpl/gtktogglebutton.sgml:
+	* gtk/tmpl/gtkstyle.sgml:
+	* gtk/tmpl/gtkspinbutton.sgml:
+	* gtk/tmpl/gtkrc.sgml:
+	* gtk/tmpl/gtknotebook.sgml:
+	* gtk/tmpl/gtklabel.sgml:
+	* gtk/tmpl/gtkdrawingarea.sgml:
+	* gtk/tmpl/gtkcheckmenuitem.sgml:
+	* gtk/tmpl/gtkcalendar.sgml: 
+	* gtk/tmpl/gtkbbox.sgml: Improve deprecation annotations.
+
+2008-11-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/Makefile.am:
+	* gdk/Makefile.am:
+	* gdk-pixbuf/Makefile.am: Use a new gtk-doc feature to generate
+	much nicer indices.
+
+	* gtk/drawing-model.xml: Fix document structure
+
+2008-11-25  Christian Dywan  <christian@imendio.com>
+
+	Bug 559009 – gtk_radio_button_get_group documentation needs
+        to say whether to free the returned GSList
+
+	* gtk/tmpl/gtkradiobutton.sgml: Clarify radio_button_get_group docs
+
+2008-11-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new statusicon api.
+
+2008-11-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add new GtkStyle functions.
+
+2008-10-29  Federico Mena Quintero  <federico@novell.com>
+
+	* gtk/drawing-model.xml: New chapter for "The GTK+ Drawing Model".
+
+	* gtk/Makefile.am (content_files): Add drawing-model.xml.
+	(HTML_IMAGES): Add a the images for that new chapter.
+
+	* gtk/tmpl/gtkwidget.sgml: Link to the drawing model docs from the
+	descriptions of GTK_APP_PAINTABLE and GTK_DOUBLE_BUFFERED.
+
+	* gtk/glossary.xml: Link to the drawing model docs on no-window
+	widgets.
+
+2008-10-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt:
+	* gtk/gtk-docs.sgml:
+	* gtk/gtk.types: Add GtkOrientable
+
+2008-10-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk.types: Add gtk_mount_operation_get_type
+
+2008-10-09  Michael Natterer  <mitch@imendio.com>
+
+	Bug 516425 – Optionally display accelerators in popups
+
+	* gtk/tmpl/gtkuimanager.sgml: document the enhanced XML syntax and
+	the new enum value for popups with accelerators.
+
+2008-10-07  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtk-sections.txt: add gtk_box_new.
+
+2008-10-02  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtk-sections.txt: add gtk_ruler_new.
+
+2008-09-30  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtk-sections.txt: add gtk_separator_new.
+
+2008-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Add gtk_im_multi_context_get_context_id.
+	
+2008-09-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/gdk-sections.txt: Add gdk_keymap_get_caps_locks_state.
+
 2008-09-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.14.2 ===

docs/reference/Makefile.am

@@ -3,3 +3,6 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gdk-pixbuf gdk gtk libgail-util
 
+GITIGNOREFILES = */*.1
+
+-include $(top_srcdir)/git.mk

docs/reference/gdk-pixbuf/Makefile.am

@@ -47,7 +47,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
+MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml --name-space=gdk_pixbuf
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
@@ -79,19 +79,21 @@ EXTRA_DIST += version.xml.in \
 
 ########################################################################
 
-man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
-
 if ENABLE_MAN
 
+man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
+
 %.1 : %.xml 
 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-endif
-
 BUILT_EXTRA_DIST = $(man_MANS)
 
+endif
+
 dist-hook-local: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)';				\
 	for f in $$files; do					\
 	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
 	  cp $$d/$$f $(distdir) || exit 1; done
+
+-include $(top_srcdir)/git.mk

docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1

@@ -1,118 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GDK-PIXBUF-CSOURCE" 1 "" "" ""
-.SH NAME
-gdk-pixbuf-csource \- C code generation utility for GdkPixbuf images
-.SH "SYNOPSIS"
-.ad l
-.hy 0
-.HP 19
-\fBgdk\-pixbuf\-csource\fR [options] [image]
-.ad
-.hy
-.ad l
-.hy 0
-.HP 19
-\fBgdk\-pixbuf\-csource\fR [options] \-\-build\-list [[name]\ [image]...]
-.ad
-.hy
-
-.SH "DESCRIPTION"
-
-.PP
- \fBgdk\-pixbuf\-csource\fR is a small utility that generates C code containing images, useful for compiling images directly into programs\&.
-
-.SH "INVOCATION"
-
-.PP
- \fBgdk\-pixbuf\-csource\fR either takes as input one image file name to generate code for, or, using the \fB\-\-build\-list\fR option, a list of (\fIname\fR, \fIimage\fR) pairs to generate code for a list of images into named variables\&.
-
-.SS "Options"
-
-.TP
-\fB\-\-stream\fR
-Generate pixbuf data stream (a single string containing a serialized GdkPixdata structure in network byte order)\&.
-
-.TP
-\fB\-\-struct\fR
-Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk\-pixdata\&.h\fR)\&.
-
-.TP
-\fB\-\-macros\fR
-Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and *_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image\&.
-
-.TP
-\fB\-\-rle\fR
-Enables run\-length encoding for the generated pixel data (default)\&.
-
-.TP
-\fB\-\-raw\fR
-Disables run\-length encoding for the generated pixel data\&.
-
-.TP
-\fB\-\-extern\fR
-Generate extern symbols\&.
-
-.TP
-\fB\-\-static\fR
-Generate static symbols (default)\&.
-
-.TP
-\fB\-\-decoder\fR
-Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition to decode run\-length encoded image data\&.
-
-.TP
-\fB\-\-name=identifier\fR
-Specifies the identifier name (prefix) for the generated variables or macros (useful only if \fB\-\-build\-list\fR was not specified)\&.
-
-.TP
-\fB\-\-build\-list\fR
-Enables (\fIname\fR, \fIimage\fR) pair parsing mode\&.
-
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Print brief help and exit\&.
-
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Print version and exit\&.
-
-.TP
-\fB\-\-g\-fatal\-warnings\fR
-Make warnings fatal (causes the program to abort)\&.
-
-.SH "SEE ALSO"
-
-.PP
-The GdkPixbuf documentation, shipped with the Gtk+ distribution, available from www\&.gtk\&.org: \fIhttp://www.gtk.org\fR\&.
-
-.SH "BUGS"
-
-.PP
-The runlength encoder gets out of sync with the pixel boundaries, since it includes the rowstride padding in the encoded stream\&. Furthermore, it generates pixbufs with suboptimal rowstride in some cases\&.
-
-.SH "AUTHOR"
-
-.PP
- \fBgdk\-pixbuf\-csource\fR was written by Tim Janik <timj@gtk\&.org>\&.
-
-.PP
-This manual page was provided by Tim Janik <timj@gtk\&.org>\&.
-

docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.1

@@ -1,49 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GDK-PIXBUF-QUERY" 1 "" "" ""
-.SH NAME
-gdk-pixbuf-query-loaders \- GdkPixbuf loader registration utility
-.SH "SYNOPSIS"
-
-.nf
-\fBgdk-pixbuf-query-loaders\fR [module...]
-.fi
-
-.SH "DESCRIPTION"
-
-.PP
- \fBgdk-pixbuf-query-loaders\fR collects information about loadable modules for gdk-pixbuf and writes it to \fIstdout\fR\&.
-
-.PP
-If called without arguments, it looks for modules in the gdk-pixbuf loader directory\&.
-
-.PP
-If called with arguments, it looks for the specified modules\&. The arguments may be absolute or relative paths\&.
-
-.SH "ENVIRONMENT"
-
-.PP
-The environment variable \fBGDK_PIXBUF_MODULEDIR\fR can be used to specify a different loader directory\&. The default gdk-pixbuf loader directory is \fI\fIlibdir\fR/gtk-2\&.0/\fIversion\fR/loaders\fR\&.
-
-.SH "BUGS"
-
-.PP
-None known yet\&.
-

docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt

@@ -136,6 +136,8 @@ gdk_pixbuf_animation_iter_get_pixbuf
 GdkPixbufSimpleAnim
 gdk_pixbuf_simple_anim_new
 gdk_pixbuf_simple_anim_add_frame
+gdk_pixbuf_simple_anim_set_loop
+gdk_pixbuf_simple_anim_get_loop
 
 <SUBSECTION Standard>
 GDK_PIXBUF_ANIMATION

docs/reference/gdk-pixbuf/gdk-pixbuf.sgml

@@ -9,8 +9,12 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>The &gdk-pixbuf; Library</title>
-    <releaseinfo>Version &version;</releaseinfo>
+    <title>GDK-PixBuf Reference Manual</title>
+    <releaseinfo>
+      Version &version;
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" url="http://library.gnome.org/devel/gdk-pixbuf/unstable/">http://library.gnome.org/devel/gdk-pixbuf/unstable/</ulink>.
+    </releaseinfo>
     <authorgroup>
       <author>
 	<firstname>Federico</firstname>
@@ -123,16 +127,15 @@
   <index id="api-index-2-4" role="2.4">
     <title>Index of new symbols in 2.4</title>
     <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
   <index id="api-index-2-6" role="2.6">
     <title>Index of new symbols in 2.6</title>
     <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
   <index id="api-index-2-8" role="2.8">
     <title>Index of new symbols in 2.8</title>
     <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
   </index>
-  <!-- -->
   <index id="api-index-2-10" role="2.10">
     <title>Index of new symbols in 2.10</title>
     <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
@@ -140,12 +143,11 @@
   <index id="api-index-2-12" role="2.12">
     <title>Index of new symbols in 2.12</title>
     <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
-  </index>  
-  <!-- -->
+  </index>
   <index id="api-index-2-14" role="2.14">
     <title>Index of new symbols in 2.14</title>
     <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
 
    <xi:include href="porting-from-imlib.sgml" />
 

docs/reference/gdk-pixbuf/tmpl/animation.sgml

@@ -25,13 +25,13 @@ Animated images.
 
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
 <para>
-And opaque struct representing an animation.
+An opaque struct representing an animation.
 </para>
 
 
 <!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
 <para>
-And opaque struct representing an iterator which points to a
+An opaque struct representing an iterator which points to a
 certain position in an animation.
 </para>
 
@@ -148,7 +148,7 @@ certain position in an animation.
 
 <!-- ##### STRUCT GdkPixbufSimpleAnim ##### -->
 <para>
-An
+An opaque struct representing a simple animation.
 </para>
 
 
@@ -172,3 +172,21 @@ An
 @pixbuf: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_simple_anim_set_loop ##### -->
+<para>
+
+</para>
+
+@animation: 
+@loop: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_simple_anim_get_loop ##### -->
+<para>
+
+</para>
+
+@animation: 
+@Returns: 
+
+

docs/reference/gdk/Makefile.am

@@ -52,7 +52,7 @@ GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\
@@ -152,3 +152,5 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 EXTRA_DIST += version.xml.in
+
+-include $(top_srcdir)/git.mk

docs/reference/gdk/gdk-docs.sgml

@@ -7,7 +7,11 @@
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GDK Reference Manual</title>
-    <releaseinfo>for GDK &version;</releaseinfo>
+    <releaseinfo>
+      for GDK &version;
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" url="http://library.gnome.org/devel/gdk/unstable/">http://library.gnome.org/devel/gdk/unstable/</ulink>.
+    </releaseinfo>
   </bookinfo>
 
   <reference id="reference">
@@ -75,25 +79,29 @@
   <index id="api-index-2-4" role="2.4">
     <title>Index of new symbols in 2.4</title>
     <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
   <index id="api-index-2-6" role="2.6">
     <title>Index of new symbols in 2.6</title>
     <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
   <index id="api-index-2-8" role="2.8">
     <title>Index of new symbols in 2.8</title>
     <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
   <index id="api-index-2-10" role="2.10">
     <title>Index of new symbols in 2.10</title>
     <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
   <index id="api-index-2-12" role="2.12">
     <title>Index of new symbols in 2.12</title>
     <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
   <index id="api-index-2-14" role="2.14">
     <title>Index of new symbols in 2.14</title>
     <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-16" role="2.16">
+    <title>Index of new symbols in 2.16</title>
+    <xi:include href="xml/api-index-2.16.xml"><xi:fallback /></xi:include>
   </index>  
 </book>

docs/reference/gdk/gdk-sections.txt

@@ -225,8 +225,12 @@ gdk_screen_broadcast_client_message
 gdk_screen_get_setting
 gdk_screen_get_font_options
 gdk_screen_set_font_options
+gdk_screen_get_font_options_for_monitor
+gdk_screen_set_font_options_for_monitor
 gdk_screen_get_resolution
 gdk_screen_set_resolution
+gdk_screen_get_resolution_for_monitor
+gdk_screen_set_resolution_for_monitor
 gdk_screen_get_active_window
 gdk_screen_get_window_stack
 <SUBSECTION Spawning>
@@ -874,6 +878,7 @@ gdk_pango_renderer_set_stipple
 gdk_pango_renderer_set_override_color
 gdk_pango_context_get
 gdk_pango_context_get_for_screen
+gdk_pango_context_get_for_screen_for_monitor
 gdk_pango_context_set_colormap
 GdkPangoAttrEmbossed
 GdkPangoAttrEmbossColor
@@ -992,6 +997,7 @@ gdk_keymap_get_entries_for_keyval
 gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
+gdk_keymap_get_caps_lock_state
 
 <SUBSECTION>
 gdk_keyval_name

docs/reference/gdk/tmpl/cursors.sgml

@@ -121,8 +121,9 @@ The standard cursors available.
 @GDK_WATCH: <inlinegraphic format="PNG" fileref="watch.png"></inlinegraphic>
 @GDK_XTERM: <inlinegraphic format="PNG" fileref="xterm.png"></inlinegraphic>
 @GDK_LAST_CURSOR: last cursor type
+@GDK_BLANK_CURSOR: Blank cursor. Since 2.16
 @GDK_CURSOR_IS_PIXMAP: type of cursors constructed with 
-gdk_cursor_new_from_pixmap() or gdk_cursor_new_from_pixbuf()
+  gdk_cursor_new_from_pixmap() or gdk_cursor_new_from_pixbuf()
 
 <!-- ##### FUNCTION gdk_cursor_new ##### -->
 <para>

docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml

@@ -2,7 +2,7 @@
 Application launching
 
 <!-- ##### SECTION Short_Description ##### -->
-startup notification for applications
+Startup notification for applications
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -38,7 +38,7 @@ g_object_unref (context);
 
 <!-- ##### TYPEDEF GdkAppLaunchContext ##### -->
 <para>
-
+An opaque structure representing an application launch context.
 </para>
 
 

docs/reference/gdk/tmpl/gdktesting.sgml

@@ -2,7 +2,7 @@
 Testing
 
 <!-- ##### SECTION Short_Description ##### -->
-test utilities
+Test utilities
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>

docs/reference/gdk/tmpl/keys.sgml

@@ -11,7 +11,7 @@ They appear in the <structfield>keyval</structfield> field of the
 #GdkEventKey structure, which is passed to signal handlers for the
 "key-press-event" and "key-release-event" signals.
 The complete list of key values can be found in the <filename>&lt;gdk/gdkkeysyms.h&gt;</filename>
-header file. <filename>&lt;gdk/gdkkeysyms.h&gt;</filename> is not included in <filename>&lt;gtk/gtk.h&gt;</filename>, 
+header file. <filename>&lt;gdk/gdkkeysyms.h&gt;</filename> is not included in <filename>&lt;gdk/gdk.h&gt;</filename>, 
 it must be included independently, because the file is quite large.
 </para>
 <para>
@@ -108,6 +108,13 @@ in the keymap and see what keyval it corresponds to.
 
 @keymap: the object which received the signal.
 
+<!-- ##### SIGNAL GdkKeymap::state-changed ##### -->
+<para>
+
+</para>
+
+@gdkkeymap: the object which received the signal.
+
 <!-- ##### STRUCT GdkKeymapKey ##### -->
 <para>
 A <structname>GdkKeymapKey</structname> is a hardware key that can 
@@ -213,6 +220,15 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_keymap_get_caps_lock_state ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_keyval_name ##### -->
 <para>
 Converts a key value into a symbolic name.

docs/reference/gdk/tmpl/properties.sgml

@@ -305,7 +305,7 @@ is provided.
 @data: location to store a pointer to the data. The retrieved
        data should be freed with g_free() when you are finished
        using it.
-@Returns: %TRUE if data was sucessfully received and stored
+@Returns: %TRUE if data was successfully received and stored
           in @data, otherwise %FALSE.
 
 

docs/reference/gdk/tmpl/threads.sgml

@@ -212,8 +212,7 @@ int main (int argc, char *argv[])
   /* create a window */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (destroy), NULL);
+  g_signal_connect (window, "destroy", G_CALLBACK (destroy), NULL);
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 

docs/reference/gtk/Makefile.am

@@ -41,11 +41,9 @@ IGNORE_HFILES=				\
 	gtkfilesystemmodel.h		\
 	gtkfilesystemunix.h		\
 	gtkfilesystemwin32.h		\
-	gtkhsv.h			\
 	gtkiconcache.h			\
         gtkiconcachevalidator.h         \
 	gtkiconthemeparser.h		\
-	gtkimmodule.h			\
 	gtkintl.h			\
 	gtkkeyhash.h			\
 	gtkmarshal.h			\
@@ -117,7 +115,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gtk
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
@@ -128,18 +126,21 @@ content_files =					\
 	changes-2.0.sgml			\
 	compiling.sgml				\
 	directfb.sgml				\
+	drawing-model.xml			\
 	glossary.xml				\
 	migrating-checklist.sgml		\
+	migrating-GtkAboutDialog.sgml		\
 	migrating-GtkAction.sgml		\
+	migrating-GtkAssistant.sgml		\
+	migrating-GtkBuilder.sgml		\
+	migrating-GtkColorButton.sgml		\
 	migrating-GtkComboBox.sgml		\
+	migrating-GtkEntry-icons.sgml		\
 	migrating-GtkFileChooser.sgml		\
 	migrating-GtkIconView.sgml		\
-	migrating-GtkAboutDialog.sgml		\
-	migrating-GtkColorButton.sgml		\
-	migrating-GtkAssistant.sgml		\
-	migrating-GtkRecentChooser.sgml 	\
+	migrating-GtkLabel-links.sgml		\
 	migrating-GtkLinkButton.sgml		\
-	migrating-GtkBuilder.sgml		\
+	migrating-GtkRecentChooser.sgml 	\
         migrating-GtkTooltip.sgml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
@@ -155,10 +156,12 @@ content_files =					\
 	visual_index.xml
 
 expand_content_files = 				\
+	drawing-model.xml			\
 	glossary.xml				\
 	migrating-checklist.sgml		\
 	migrating-GtkAction.sgml		\
 	migrating-GtkComboBox.sgml		\
+	migrating-GtkEntry-icons.sgml		\
 	migrating-GtkFileChooser.sgml		\
 	migrating-GtkIconView.sgml		\
 	migrating-GtkAboutDialog.sgml		\
@@ -179,6 +182,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-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/gtk-cdrom.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-clear.png			\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-close.png			\
@@ -292,6 +296,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/24/gtk-fullscreen.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-leave-fullscreen.png	\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-info.png			\
+	$(srcdir)/images/aboutdialog.png				\
 	$(srcdir)/images/accel-label.png				\
 	$(srcdir)/images/assistant.png					\
 	$(srcdir)/images/button.png					\
@@ -301,6 +306,8 @@ HTML_IMAGES = \
 	$(srcdir)/images/combo-box.png					\
 	$(srcdir)/images/combo-box-entry.png				\
 	$(srcdir)/images/entry.png					\
+	$(srcdir)/images/figure-hierarchical-drawing.png		\
+	$(srcdir)/images/figure-windowed-label.png			\
 	$(srcdir)/images/file-button.png				\
 	$(srcdir)/images/filechooser.png				\
 	$(srcdir)/images/font-button.png				\
@@ -330,7 +337,18 @@ HTML_IMAGES = \
 	$(srcdir)/images/toolbar.png					\
 	$(srcdir)/images/tree-view-coordinates.png			\
 	$(srcdir)/images/volumebutton.png				\
-	$(srcdir)/images/window.png
+	$(srcdir)/images/window.png					\
+	$(srcdir)/images/layout-btlr.png				\
+	$(srcdir)/images/layout-btrl.png				\
+	$(srcdir)/images/layout-lrbt.png				\
+	$(srcdir)/images/layout-lrtb.png				\
+	$(srcdir)/images/layout-rlbt.png				\
+	$(srcdir)/images/layout-rltb.png				\
+	$(srcdir)/images/layout-tblr.png				\
+	$(srcdir)/images/layout-tbrl.png				\
+	$(srcdir)/images/gtk-ri-file-chooser-size-6.png			\
+	$(srcdir)/images/gtk-ri-file-chooser-size-12.png		\
+	$(srcdir)/images/gtk-ri-file-chooser-size-24.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html \
@@ -347,19 +365,21 @@ EXTRA_DIST += version.xml.in
 
 ########################################################################
 
-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
-
 if ENABLE_MAN
 
+man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
+
 %.1 : %.xml 
 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-endif
-
 BUILT_EXTRA_DIST = $(man_MANS)
 
+endif
+
 dist-hook-local: $(BUILT_EXTRA_DIST)
 	files='$(BUILT_EXTRA_DIST)';				\
 	for f in $$files; do					\
 	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
 	  cp $$d/$$f $(distdir) || exit 1; done
+
+-include $(top_srcdir)/git.mk

docs/reference/gtk/building.sgml

@@ -262,7 +262,7 @@ How to compile GTK+ itself
           for mime types that are used by GIO and, indirectly, by GTK+. 
           gdk-pixbuf will use GIO for mime type detection if possible. For this 
           to work, shared-mime-info needs to be installed and 
-          <envvar>XDG_DATA_DIRS</envvar> set accordingly at configure time. 
+          <envar>XDG_DATA_DIRS</envar> set accordingly at configure time. 
           Otherwise, gdk-pixbuf falls back to its built-in mime type detection.
         </para>
       </listitem>

docs/reference/gtk/drawing-model.xml

@@ -0,0 +1,586 @@
+<?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="chap-drawing-model">
+<refmeta>
+<refentrytitle>The GTK+ Drawing Model</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>GTK Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>The GTK+ Drawing Model</refname>
+<refpurpose>
+    The GTK+ drawing model in detail
+</refpurpose>
+</refnamediv>
+
+
+  <refsect1 id="drawing-overview">
+    <title>Overview of the drawing model</title>
+
+    <para>
+      This chapter describes the GTK+ drawing model in detail.  If you
+      are interested in the procedure which GTK+ follows to draw its
+      widgets and windows, you should read this chapter; this will be
+      useful to know if you decide to implement your own widgets.  This
+      chapter will also clarify the reasons behind the ways certain
+      things are done in GTK+; for example, why you cannot change the
+      background color of all widgets with the same method.
+    </para>
+
+    <para>
+      Programs that run in a windowing system generally create
+      rectangular regions in the screen called
+      <firstterm>windows</firstterm>.  Traditional windowing systems
+      do not automatically save the graphical content of windows, and
+      instead ask client programs to repaint those windows whenever it
+      is needed.  For example, if a window that is stacked below other
+      windows gets raised to the top, then a client program has to
+      repaint the area that was previously obscured.  When the
+      windowing system asks a client program to redraw part of a
+      window, it sends an <firstterm>exposure event</firstterm> to the
+      program for that window.
+    </para>
+
+    <para>
+      Here, "windows" means "rectangular regions with automatic
+      clipping", instead of "toplevel application windows".  Most
+      windowing systems support nested windows, where the contents of
+      child windows get clipped by the boundaries of their parents.
+      Although GTK+ and GDK in particular may run on a windowing
+      system with no such notion of nested windows, GDK presents the
+      illusion of being under such a system.  A toplevel window may
+      contain many subwindows and sub-subwindows, for example, one for
+      the menu bar, one for the document area, one for each scrollbar,
+      and one for the status bar.  In addition, controls that receive
+      user input, such as clickable buttons, are likely to have their
+      own subwindows as well.
+    </para>
+
+    <para>
+      Generally, the drawing cycle begins when GTK+ receives an
+      exposure event from the underlying windowing system:  if the
+      user drags a window over another one, the windowing system will
+      tell the underlying window that it needs to repaint itself.  The
+      drawing cycle can also be initiated when a widget itself decides
+      that it needs to update its display.  For example, when the user
+      types a character in a <link
+      linkend="GtkEntry"><classname>GtkEntry</classname></link>
+      widget, the entry asks GTK+ to queue a redraw operation for
+      itself.
+    </para>
+
+    <para>
+      The following sections describe how GTK+ decides which widgets
+      need to be repainted, and how widgets work internally in terms
+      of the resources they use from the windowing system.
+    </para>
+
+    <refsect2 id="window-no-window-widgets">
+      <title>Window and no-window widgets</title>
+
+      <para>
+	A <link linkend="GdkWindow"><classname>GdkWindow</classname></link>
+	represents a window from the underlying windowing system on which GTK+
+	is running.  For example, on X11 it corresponds to a
+	<type>Window</type>; on Win32, it corresponds to a <type>HANDLE</type>.
+	The windowing system generates events for these windows.  The GDK
+	interface to the windowing system translates such native events into
+	<link linkend="GdkEvent"><structname>GdkEvent</structname></link>
+	structures and sends them on to the GTK layer.  In turn, the GTK layer
+	finds the widget that corresponds to a particular
+	<classname>GdkWindow</classname> and emits the corresponding event
+	signals on that widget.
+      </para>
+
+      <para>
+	When the program needs to redraw a region of a
+	<classname>GdkWindow</classname>, GDK generates an event of
+	type <link
+	linkend="GDK_EVENT_EXPOSE"><constant>GDK_EVENT_EXPOSE</constant></link>
+	for that window.  The GTK+ widget layer in turn finds the
+	widget that corresponds to that window, and emits the <link
+	linkend="GtkWidget-expose-event">expose-event signal</link>
+	for that widget.
+      </para>
+
+      <para>
+	In principle, each widget could have a
+	<classname>GdkWindow</classname> of its own.  With such a
+	scheme, the drawing cycle would be trivial:  when GDK notifies
+	the GTK layer about an exposure event for a
+	<classname>GdkWindow</classname>, the GTK layer would simply
+	emit the <link linkend="GtkWidget-expose-event">expose-event
+	signal</link> for that widget.  The widget's expose event
+	handler would subsequently repaint the widget.  No further
+	work would be necessary; the windowing system would generate
+	exposure events for each window that needs it, and then each
+	corresponding widget would draw itself in turn.
+      </para>
+
+      <para>
+	However, in practice it is convenient to have widgets which do
+	not have a <classname>GdkWindow</classname> of their own, but
+	rather share the one from their parent widget.  Such widgets
+	have the <constant>GTK_NO_WINDOW</constant> <link
+	linkend="GtkWidgetFlags">widget flag</link> turned on; this
+	can be tested easily with the <link
+	linkend="GTK-WIDGET-NO-WINDOW-CAPS"><function>GTK_WIDGET_NO_WINDOW()</function></link>
+	macro.  As such, these are called <firstterm>no-window
+	widgets</firstterm>.
+      </para>
+
+      <para>
+	No-window widgets are useful for various reasons:
+      </para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    Some widgets may want the parent's background to show through, even
+	    when they draw on parts of it.  For example, consider a theme that
+	    uses textured backgrounds, such as gradients or repeating
+	    patterns.  If each widget had its own window, and in turn its own
+	    gradient background, labels would look bad because there would be a
+	    visible break with respect to their surroundings.  <xref
+	      linkend="figure-windowed-label"/> shows this undesirable effect.
+	  </para>
+
+	  <figure id="figure-windowed-label">
+	    <title>Windowed label vs. no-window label</title>
+
+	    <graphic fileref="figure-windowed-label.png" format="png"/>
+	  </figure>
+	</listitem>
+
+	<listitem>
+	  <para>
+	    Reducing the number of windows creates less traffic between GTK+ and
+	    the underlying windowing system, especially when getting events.
+	  </para>
+	</listitem>
+      </itemizedlist>
+
+      <para>
+	On the other hand, widgets that would benefit from having a "hard"
+	clipping region may find it more convenient to create their own
+	windows.  Also, widgets which want to receive events resulting from
+	user interaction may find it convenient to use windows of their own as
+	well.  Widgets may have more than one window if they want to
+	define different regions for capturing events.
+      </para>
+    </refsect2>
+
+    <refsect2 id="hierarchical-drawing">
+      <title>Hierarchical drawing</title>
+
+      <para>
+	When the GTK layer receives an exposure event from GDK, it
+	finds the widget that corresponds to the window which received
+	the event.  By definition, this corresponds to a widget that
+	has the <constant>GTK_NO_WINDOW</constant> flag turned
+	<emphasis>off</emphasis> (otherwise, the widget wouldn't own
+	the window!).  First this widget paints its background, and
+	then, if it is a container widget, it tells each of its
+	<constant>GTK_NO_WINDOW</constant> children to paint
+	themselves.  This process is applied recursively for all the
+	<constant>GTK_NO_WINDOW</constant> descendants of the original
+	widget.
+      </para>
+
+      <para>
+	Note that this process does not get propagated to widgets
+	which have windows of their own, that is, to widgets which
+	have the <constant>GTK_NO_WINDOW</constant> flag turned off.
+	If such widgets require redrawing, then the windowing system
+	will already have sent exposure events to their corresponding
+	windows.  As such, there is no need to
+	<firstterm>propagate</firstterm> the exposure to them on the
+	GTK+ side.
+      </para>
+
+      <para>
+	<xref
+	linkend="figure-hierarchical-drawing"/> shows how a simple toplevel window would
+	paint itself when it contains only <constant>GTK_NO_WINDOW</constant> descendants:
+
+	<orderedlist>
+	  <listitem>
+	    <para>
+	      The outermost, thick rectangle is a toplevel <link
+		linkend="GtkWindow"><classname>GtkWindow</classname></link>,
+	      which is not a <constant>GTK_NO_WINDOW</constant> widget &mdash;
+	      as such, it does receive its exposure event as it comes from GDK.
+	      First the <classname>GtkWindow</classname> would paint its own
+	      background.  Then, it would ask its only child to paint itself,
+	      numbered 2.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The dotted rectangle represents a <link
+		linkend="GtkVBox"><classname>GtkVBox</classname></link>, which
+	      has been made the sole child of the
+	      <classname>GtkWindow</classname>.  Boxes are just layout
+	      containers that do not paint anything by themselves, so this
+	      <classname>GtkVBox</classname> would draw nothing, but rather ask
+	      its children to draw themselves.  The children are numbered 3 and
+	      6.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The thin rectangle is a <link
+		linkend="GtkFrame"><classname>GtkFrame</classname></link>,
+	      which has two children:  a label for the frame, numbered 4, and
+	      another label inside, numbered 5.  First the frame would draw its
+	      own beveled box, then ask the frame label and its internal child to
+	      draw themselves.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The frame label has no children, so it just draws its text:  "Frame&nbsp;Label".
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The internal label has no children, so it just draws its text:  "This
+	      is some text inside the frame!".
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The dotted rectangle represents a <link
+		linkend="GtkHBox"><classname>GtkHBox</classname></link>.  Again,
+	      this does not draw anything by itself, but rather asks its children
+	      to draw themselves.  The children are numbered 7 and 9.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      The thin rectangle is a <link
+		linkend="GtkButton"><classname>GtkButton</classname></link> with
+	      a single child, numbered 8.  First the button would draw its
+	      beveled box, and then it would ask its child to draw itself.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      This is a text label which has no children, so it just draws its
+	      own text:  "Cancel".
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Similar to number 7, this is a button with a single child, numbered
+	      10.  First the button would draw its beveled box, and then it would
+	      ask its child to draw itself.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Similar to number 8, this is a text label which has no children,
+	      so it just draws its own text:  "OK".
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+
+      <figure id="figure-hierarchical-drawing">
+	<title>Hierarchical drawing order</title>
+
+	<graphic fileref="figure-hierarchical-drawing.png" format="png"/>
+      </figure>
+
+      <para>
+	To avoid the flickering that would result from each widget drawing
+	itself in turn, GTK+ uses a double-buffering mechanism.  The following
+	sections describe this mechanism in detail.
+      </para>
+    </refsect2>
+
+    <refsect2 id="notes-on-drawing-no-window-widgets">
+      <title>Notes on drawing no-window widgets</title>
+
+      <para>
+	Remember that the coordinates in a <link
+	linkend="GdkEventExpose">GdkEventExpose</link> are relative to
+	the <classname>GdkWindow</classname> that received the event,
+	<emphasis>not</emphasis> to the widget whose expose-event
+	handler is being called.  If your widget owns the window, then
+	these coordinates are probably what you expect.  However, if
+	you have a <constant>GTK_NO_WINDOW</constant> widget that
+	shares its parent's window, then the event's coordinates will
+	be offset by your widget's allocation:  remember that the
+	allocation is always relative to the parent
+	<emphasis>window</emphasis> of the widget, not to the parent
+	<emphasis>widget</emphasis> itself.
+      </para>
+
+      <para>
+	For example, if you have a no-window widget whose allocation
+	is {&nbsp;x=5,&nbsp;y=6,
+	<replaceable>width</replaceable>,&nbsp;<replaceable>height</replaceable>&nbsp;},
+	then your drawing origin should be at (5,&nbsp;6), not at
+	(0,&nbsp;0).
+      </para>
+    </refsect2>
+
+    <refsect2 id="include-inferiors">
+      <title>Drawing over child windows</title>
+
+      <para>
+	When you draw on a <classname>GdkWindow</classname>, your
+	drawing gets clipped by any child windows that it may
+	intersect.  Sometimes you need to draw over your child windows
+	as well; for example, when drawing a drag-handle to resize
+	something.  In this case, turn on the <link
+	linkend="GDK-INCLUDE-INFERIORS:CAPS">GDK_INCLUDE_INFERIORS</link>
+	subwindow mode for the <link
+	linkend="gdk-Graphics-Contexts">GdkGC</link> which you use for
+	drawing.
+      </para>
+    </refsect2>
+  </refsect1>
+
+  <refsect1 id="double-buffering">
+    <title>Double buffering</title>
+
+    <para>
+      When the GTK layer receives an exposure event from GDK, it first finds
+      the <literal>!<constant>GTK_NO_WINDOW</constant></literal> widget that
+      corresponds to the event's window.  Then, it emits the <link
+	linkend="GtkWidget-expose-event">expose-event signal</link> for that
+      widget.  As described above, that widget will first draw its background,
+      and then ask each of its <constant>GTK_NO_WINDOW</constant> children to
+      draw themselves.
+    </para>
+
+    <para>
+      If each of the drawing calls made by each subwidget's
+      <literal>expose-event</literal> handler were sent directly to the
+      windowing system, flicker could result.  This is because areas may get
+      redrawn repeatedly:  the background, then decorative frames, then text
+      labels, etc.  To avoid flicker, GTK+ employs a <firstterm>double
+	buffering</firstterm> system at the GDK level.  Widgets normally don't
+      know that they are drawing to an off-screen buffer; they just issue their
+      normal drawing commands, and the buffer gets sent to the windowing system
+      when all drawing operations are done.
+    </para>
+
+    <!-- FIXME: figure with a timeline of non-double-buffered and
+         double-buffered paints:
+
+         onscreen:
+         [garbage]
+         [background]
+         [button-frame]
+         [icon]
+         [label]
+
+
+         onscreen:             offscreen:
+         [garbage]
+                               [background]
+                               [button-frame]
+                               [icon]
+                               [label]
+         [final result]
+    -->
+
+    <para>
+      Two basic functions in GDK form the core of the double-buffering
+      mechanism:  <link
+      linkend="gdk_window_begin_paint_region"><function>gdk_window_begin_paint_region()</function></link>
+      and <link
+      linkend="gdk_window_end_paint"><function>gdk_window_end_paint()</function></link>.
+      The first function tells a <classname>GdkWindow</classname> to
+      create a temporary off-screen buffer for drawing.  All
+      subsequent drawing operations to this window get automatically
+      redirected to that buffer.  The second function actually paints
+      the buffer onto the on-screen window, and frees the buffer.
+    </para>
+
+    <refsect2 id="automatic-double-buffering">
+      <title>Automatic double buffering</title>
+
+      <para>
+	It would be inconvenient for all widgets to call
+	<function>gdk_window_begin_paint_region()</function> and
+	<function>gdk_window_end_paint()</function> at the beginning
+	and end of their expose-event handlers.
+      </para>
+
+      <para>
+	To make this easier, most GTK+ widgets have the
+	<constant>GTK_DOUBLE_BUFFERED</constant> <link
+	linkend="GtkWidgetFlags">widget flag</link> turned on by
+	default.  When GTK+ encounters such a widget, it automatically
+	calls <function>gdk_window_begin_paint_region()</function>
+	before emitting the expose-event signal for the widget, and
+	then it calls <function>gdk_window_end_paint()</function>
+	after the signal has been emitted.  This is convenient for
+	most widgets, as they do not need to worry about creating
+	their own temporary drawing buffers or about calling those
+	functions.
+      </para>
+
+      <para>
+	However, some widgets may prefer to disable this kind of
+	automatic double buffering and do things on their own.  To do
+	this, turn off the <constant>GTK_DOUBLE_BUFFERED</constant>
+	flag in your widget's constructor.
+      </para>
+
+      <example id="disabling-double-buffering">
+	<title>Disabling automatic double buffering</title>
+
+	<programlisting>
+static void
+my_widget_init (MyWidget *widget)
+{
+  ...
+
+  GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
+
+  ...
+}
+	</programlisting>
+      </example>
+
+      <para>
+	When is it convenient to disable double buffering?  Generally,
+	this is the case only if your widget gets drawn in such a way
+	that the different drawing operations do not overlap each
+	other.  For example, this may be the case for a simple image
+	viewer:  it can just draw the image in a single operation.
+	This would <emphasis>not</emphasis> be the case with a word
+	processor, since it will need to draw and over-draw the page's
+	background, then the background for highlighted text, and then
+	the text itself.
+      </para>
+
+      <para>
+	Even if you turn off the
+	<constant>GTK_DOUBLE_BUFFERED</constant> flag on a widget, you
+	can still call
+	<function>gdk_window_begin_paint_region()</function> and
+	<function>gdk_window_end_paint()</function> by hand to use
+	temporary drawing buffers.
+      </para>
+    </refsect2>
+  </refsect1>
+
+  <refsect1 id="app-paintable-widgets">
+    <title>App-paintable widgets</title>
+
+    <para>
+      Generally, applications use the pre-defined widgets in GTK+ and
+      they do not draw extra things on top of them (the exception
+      being <classname>GtkDrawingArea</classname>).  However,
+      applications may sometimes find it convenient to draw directly
+      on certain widgets like toplevel windows or event boxes.  When
+      this is the case, GTK+ needs to be told not to overwrite your
+      drawing afterwards, when the window gets to drawing its default
+      contents.
+    </para>
+
+    <para>
+      <classname>GtkWindow</classname> and
+      <classname>GtkEventBox</classname> are the only two widgets
+      which will draw their default contents unless you turn on the
+      <constant>GTK_APP_PAINTABLE</constant> <link
+      linkend="GtkWidgetFlags">widget flag</link>.  If you turn on
+      this flag, then they will not draw their contents and let you do
+      it instead.
+    </para>
+
+    <para>
+      The expose-event handler for <classname>GtkWindow</classname> is
+      implemented effectively like this:
+    </para>
+
+    <programlisting>
+static gint
+gtk_window_expose (GtkWidget      *widget,
+		   GdkEventExpose *event)
+{
+  if (!GTK_WIDGET_APP_PAINTABLE (widget))
+    gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL, 
+                        GTK_SHADOW_NONE, event->area, widget, "base", 0, 0, -1, -1);
+
+  if (GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event)
+    return GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event (widget, event);
+
+  return FALSE;
+}
+    </programlisting>
+
+    <para>
+      The expose-event handler for <classname>GtkEventBox</classname>
+      is implemented in a similar fashion.
+    </para>
+
+    <para>
+      Since the <link linkend="GtkWidget-expose-event">expose-event
+	signal</link> runs user-connected handlers
+      <emphasis>before</emphasis> the widget's default handler, what
+      happens is this:
+    </para>
+
+    <orderedlist>
+      <listitem>
+	<para>
+	  Your own expose-event handler gets run.  It paints something
+	  on the window or the event box.
+	</para>
+      </listitem>
+
+      <listitem>
+	<para>
+	  The widget's default expose-event handler gets run.  If
+	  <constant>GTK_APP_PAINTABLE</constant> is turned off (this
+	  is the default), <emphasis>your drawing will be
+	  overwritten</emphasis>.  If that flag is turned on, the
+	  widget will not draw its default contents and preserve your
+	  drawing instead.
+	</para>
+      </listitem>
+
+      <listitem>
+	<para>
+	  The expose-event handler for the parent class gets run.
+	  Since both <classname>GtkWindow</classname> and
+	  <classname>GtkEventBox</classname> are descendants of
+	  <classname>GtkContainer</classname>, their no-window
+	  children will be asked to draw themselves recursively, as
+	  described in <xref linkend="hierarchical-drawing"/>.
+	</para>
+      </listitem>
+    </orderedlist>
+
+    <formalpara>
+      <title>Summary of app-paintable widgets</title>
+
+      <para>
+	Turn on the <constant>GTK_APP_PAINTABLE</constant> flag if you
+	intend to draw your own content directly on a
+	<classname>GtkWindow</classname> and
+	<classname>GtkEventBox</classname>.  You seldom need to draw
+	on top of other widgets, and
+	<classname>GtkDrawingArea</classname> ignores this flag, as it
+	<emphasis>is</emphasis> intended to be drawn on.
+      </para>
+    </formalpara>
+  </refsect1>
+</refentry>
+
+<!--
+Local variables:
+mode: xml
+sgml-parent-document: ("gtk-docs.sgml" "book" "part" "refentry")
+End:
+-->

docs/reference/gtk/glossary.xml

@@ -197,7 +197,9 @@
 	draw its contents, but rather shares its <glossterm
 	linkend="parent">parent's</glossterm>.  Such a widget has the
 	%GTK_NO_WINDOW <link linkend="GtkWidgetFlags">flag</link> set, and 
-        can be tested with the GTK_WIDGET_NO_WINDOW() macro.
+        can be tested with the GTK_WIDGET_NO_WINDOW() macro.  See
+	<xref linkend="window-no-window-widgets"/> for a detailed
+	description of this flag.
       </para>
     </glossdef>
   </glossentry>

docs/reference/gtk/gtk-builder-convert.1

@@ -1,43 +0,0 @@
-.\"     Title: gtk-builder-convert
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\"      Date: 07/10/2007
-.\"    Manual: 
-.\"    Source: 
-.\"
-.TH "GTK\-BUILDER\-CONVERT" "1" "07/10/2007" "" ""
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-gtk\-builder\-convert \- Glade file conversion utility
-.SH "SYNOPSIS"
-.HP 20
-\fBgtk\-builder\-convert\fR [\-\-skip\-windows] [\-\-root\ \fIname\fR] {input} {output}
-.SH "DESCRIPTION"
-.PP
-\fBgtk\-builder\-convert\fR
-converts glade files into XML files which can be loaded with #GtkBuilder.
-.PP
-It expects the name of a glade file as the first argument, and writes its output the file specified as the second argument.
-.SH "OPTIONS"
-.PP
-\-\-skip\-windows, \-w
-.RS 4
-Convert everything but GtkWindow subclasses.
-.RE
-.PP
-\-\-root, \-r
-.RS 4
-Convert only the widget named
-\fIname\fR
-and its children.
-.RE
-.SH "BUGS"
-.PP
-Toolbars are not handled.
-.PP
-Support for accessibility is not yet implemented.
-.PP
-The script requires a python interpreter to run.

docs/reference/gtk/gtk-docs.sgml

@@ -8,7 +8,11 @@
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GTK+ Reference Manual</title>
-    <releaseinfo>for GTK+ &version;</releaseinfo>
+    <releaseinfo>
+      for GTK+ &version;
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" url="http://library.gnome.org/devel/gtk/unstable/">http://library.gnome.org/devel/gtk/unstable/</ulink>.
+    </releaseinfo>
   </bookinfo>
 
   <part id="gtk">
@@ -96,6 +100,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="directfb.sgml" />
     <xi:include href="resources.sgml" />
     <xi:include href="xml/question_index.sgml" />
+    <xi:include href="drawing-model.xml" />
   </part>
 
 
@@ -121,6 +126,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="xml/gtktypeutils.xml" />
     <xi:include href="xml/gtktesting.xml" />
     <xi:include href="xml/filesystem.xml" />
+    <xi:include href="xml/gtksize.xml" />
   </part>
 
   <part id="gtkobjects">
@@ -154,6 +160,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtklabel.xml" />
       <xi:include href="xml/gtkprogressbar.xml" />
       <xi:include href="xml/gtkstatusbar.xml" />
+      <xi:include href="xml/gtkinfobar.xml" />
       <xi:include href="xml/gtkstatusicon.xml" />
     </chapter>
 
@@ -246,13 +253,15 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtktoggleaction.xml" />
       <xi:include href="xml/gtkradioaction.xml" />
       <xi:include href="xml/gtkrecentaction.xml" />
+      <xi:include href="xml/gtkactivatable.xml" />
     </chapter>
 
     <chapter id="SelectorWidgets">
       <title>Selectors (File/Font/Color/Input Devices)</title>
       <xi:include href="xml/gtkcolorbutton.xml" />
-      <xi:include href="xml/gtkcolorsel.xml" />
       <xi:include href="xml/gtkcolorseldlg.xml" />
+      <xi:include href="xml/gtkcolorsel.xml" />
+      <xi:include href="xml/gtkhsv.xml" />
       <xi:include href="xml/gtkfilechooser.xml" />
       <xi:include href="xml/gtkfilechooserbutton.xml" />
       <xi:include href="xml/gtkfilechooserdialog.xml" />
@@ -279,6 +288,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtknotebook.xml" />
       <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
+      <xi:include href="xml/gtkorientable.xml" />
     </chapter>
 
     <chapter id="Ornaments">
@@ -423,6 +433,8 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <xi:include href="xml/migrating-GtkLinkButton.sgml" />
     <xi:include href="xml/migrating-GtkBuilder.sgml" />
     <xi:include href="xml/migrating-GtkTooltip.sgml" />
+    <xi:include href="xml/migrating-GtkEntry-icons.sgml" />
+    <xi:include href="xml/migrating-GtkLabel-links.sgml" />
   </part>
 
   <part>
@@ -470,4 +482,12 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <title>Index of new symbols in 2.14</title>
     <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-16" role="2.16">
+    <title>Index of new symbols in 2.16</title>
+    <xi:include href="xml/api-index-2.16.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-18" role="2.18">
+    <title>Index of new symbols in 2.18</title>
+    <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
+  </index>
 </book>

docs/reference/gtk/gtk-query-immodules-2.0.1

@@ -1,49 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "GTK-QUERY-IMMODUL" 1 "" "" ""
-.SH NAME
-gtk-query-immodules-2.0 \- Input method module registration utility
-.SH "SYNOPSIS"
-
-.nf
-\fBgtk-query-immodules-2.0\fR [module...]
-.fi
-
-.SH "DESCRIPTION"
-
-.PP
- \fBgtk-query-immodules-2.0\fR collects information about loadable input method modules for GTK+ and writes it to \fIstdout\fR\&.
-
-.PP
-If called without arguments, it looks for modules in the GTK+ input method module path\&.
-
-.PP
-If called with arguments, it looks for the specified modules\&. The arguments may be absolute or relative paths\&.
-
-.SH "ENVIRONMENT"
-
-.PP
-The environment variable \fBGTK_PATH\fR can be used to prepend directories to the input method module path\&.
-
-.SH "BUGS"
-
-.PP
-None known yet\&.
-

docs/reference/gtk/gtk-sections.txt

@@ -188,12 +188,33 @@ gtk_action_disconnect_proxy
 gtk_action_get_proxies
 gtk_action_connect_accelerator
 gtk_action_disconnect_accelerator
+gtk_action_block_activate
+gtk_action_unblock_activate
 gtk_action_block_activate_from
 gtk_action_unblock_activate_from
 gtk_action_get_accel_path
 gtk_action_set_accel_path
 gtk_action_get_accel_closure
 gtk_action_set_accel_group
+gtk_action_set_label
+gtk_action_get_label
+gtk_action_set_short_label
+gtk_action_get_short_label
+gtk_action_set_tooltip
+gtk_action_get_tooltip
+gtk_action_set_stock_id
+gtk_action_get_stock_id
+gtk_action_set_gicon
+gtk_action_get_gicon
+gtk_action_set_icon_name
+gtk_action_get_icon_name
+gtk_action_set_visible_horizontal
+gtk_action_get_visible_horizontal
+gtk_action_set_visible_vertical
+gtk_action_get_visible_vertical
+gtk_action_set_is_important
+gtk_action_get_is_important
+
 <SUBSECTION Standard>
 GTK_TYPE_ACTION
 GTK_ACTION
@@ -207,6 +228,27 @@ gtk_action_get_type
 GtkActionPrivate
 </SECTION>
 
+<SECTION>
+<FILE>gtkactivatable</FILE>
+<TITLE>GtkActivatable</TITLE>
+GtkActivatable
+GtkActivatableIface
+gtk_activatable_do_set_related_action
+gtk_activatable_get_related_action
+gtk_activatable_get_use_action_appearance
+gtk_activatable_sync_action_properties
+gtk_activatable_set_related_action
+gtk_activatable_set_use_action_appearance
+<SUBSECTION Standard>
+GTK_ACTIVATABLE
+GTK_ACTIVATABLE_CLASS
+GTK_ACTIVATABLE_GET_IFACE
+GTK_IS_ACTIVATABLE
+GTK_TYPE_ACTIVATABLE
+<SUBSECTION Private>
+gtk_activatable_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkactiongroup</FILE>
 <TITLE>GtkActionGroup</TITLE>
@@ -286,6 +328,7 @@ GtkAlignment
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_get_padding
+gtk_alignment_get_padding_unit
 gtk_alignment_set_padding
 <SUBSECTION Standard>
 GTK_ALIGNMENT
@@ -429,9 +472,11 @@ gtk_box_pack_end_defaults
 gtk_box_get_homogeneous
 gtk_box_set_homogeneous
 gtk_box_get_spacing
+gtk_box_get_spacing_unit
 gtk_box_set_spacing
 gtk_box_reorder_child
 gtk_box_query_child_packing
+gtk_box_query_child_packing_unit
 gtk_box_set_child_packing
 <SUBSECTION Standard>
 GTK_BOX
@@ -444,21 +489,6 @@ GTK_BOX_GET_CLASS
 gtk_box_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkvscrollbar</FILE>
-<TITLE>GtkVScrollbar</TITLE>
-GtkVScrollbar
-gtk_vscrollbar_new
-<SUBSECTION Standard>
-GTK_VSCROLLBAR
-GTK_IS_VSCROLLBAR
-GTK_TYPE_VSCROLLBAR
-gtk_vscrollbar_get_type
-GTK_VSCROLLBAR_CLASS
-GTK_IS_VSCROLLBAR_CLASS
-GTK_VSCROLLBAR_GET_CLASS
-</SECTION>
-
 <SECTION>
 <FILE>gtkbuildable</FILE>
 GtkBuildable
@@ -793,6 +823,29 @@ gtk_color_button_get_type
 GtkColorButtonPrivate
 </SECTION>
 
+<SECTION>
+<FILE>gtkhsv</FILE>
+<TITLE>GtkHSV</TITLE>
+GtkHSV
+gtk_hsv_new
+gtk_hsv_set_color
+gtk_hsv_get_color
+gtk_hsv_set_metrics
+gtk_hsv_get_metrics
+gtk_hsv_is_adjusting
+gtk_hsv_to_rgb
+gtk_rgb_to_hsv
+<SUBSECTION Standard>
+GTK_TYPE_HSV
+GTK_HSV
+GTK_HSV_CLASS
+GTK_IS_HSV
+GTK_IS_HSV_CLASS
+GTK_HSV_GET_CLASS
+<SUBSECTION Private>
+gtk_hsv_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkcolorsel</FILE>
 <TITLE>GtkColorSelection</TITLE>
@@ -983,6 +1036,7 @@ gtk_container_unset_focus_chain
 gtk_container_class_find_child_property
 gtk_container_class_install_child_property
 gtk_container_class_list_child_properties
+gtk_container_get_border_width_unit
 <SUBSECTION Standard>
 GTK_CONTAINER
 GTK_IS_CONTAINER
@@ -1228,6 +1282,7 @@ gtk_entry_get_text_length
 gtk_entry_select_region
 gtk_entry_set_visibility
 gtk_entry_set_invisible_char
+gtk_entry_unset_invisible_char
 gtk_entry_set_editable
 gtk_entry_set_max_length
 gtk_entry_get_activates_default
@@ -1253,6 +1308,33 @@ gtk_entry_set_completion
 gtk_entry_get_completion
 gtk_entry_set_cursor_hadjustment
 gtk_entry_get_cursor_hadjustment
+gtk_entry_set_progress_fraction
+gtk_entry_get_progress_fraction
+gtk_entry_set_progress_pulse_step
+gtk_entry_get_progress_pulse_step
+gtk_entry_progress_pulse
+GtkEntryIconPosition
+gtk_entry_set_icon_from_pixbuf
+gtk_entry_set_icon_from_stock
+gtk_entry_set_icon_from_icon_name
+gtk_entry_set_icon_from_gicon
+gtk_entry_get_icon_storage_type
+gtk_entry_get_icon_pixbuf
+gtk_entry_get_icon_stock 
+gtk_entry_get_icon_name
+gtk_entry_get_icon_gicon
+gtk_entry_set_icon_activatable
+gtk_entry_get_icon_activatable
+gtk_entry_set_icon_sensitive
+gtk_entry_get_icon_sensitive
+gtk_entry_get_icon_at_pos
+gtk_entry_set_icon_tooltip_text
+gtk_entry_get_icon_tooltip_text
+gtk_entry_set_icon_tooltip_markup
+gtk_entry_get_icon_tooltip_markup
+gtk_entry_set_icon_drag_source
+gtk_entry_get_current_icon_drag_source
+
 <SUBSECTION Standard>
 GTK_ENTRY
 GTK_IS_ENTRY
@@ -1336,6 +1418,7 @@ gtk_expander_set_expanded
 gtk_expander_get_expanded
 gtk_expander_set_spacing
 gtk_expander_get_spacing
+gtk_expander_get_spacing_unit
 gtk_expander_set_label
 gtk_expander_get_label
 gtk_expander_set_use_underline
@@ -1542,7 +1625,6 @@ gtk_file_selection_get_type
 <FILE>gtkfixed</FILE>
 <TITLE>GtkFixed</TITLE>
 GtkFixed
-GtkFixedChild
 gtk_fixed_new
 gtk_fixed_put
 gtk_fixed_move
@@ -1556,6 +1638,7 @@ GTK_FIXED_CLASS
 GTK_IS_FIXED_CLASS
 GTK_FIXED_GET_CLASS
 <SUBSECTION Private>
+GtkFixedChild
 gtk_fixed_get_type
 </SECTION>
 
@@ -1853,14 +1936,19 @@ gtk_icon_view_set_columns
 gtk_icon_view_get_columns
 gtk_icon_view_set_item_width
 gtk_icon_view_get_item_width
+gtk_icon_view_get_item_width_unit
 gtk_icon_view_set_spacing
 gtk_icon_view_get_spacing
+gtk_icon_view_get_spacing_unit
 gtk_icon_view_set_row_spacing
 gtk_icon_view_get_row_spacing
+gtk_icon_view_get_row_spacing_unit
 gtk_icon_view_set_column_spacing
 gtk_icon_view_get_column_spacing
+gtk_icon_view_get_column_spacing_unit
 gtk_icon_view_set_margin
 gtk_icon_view_get_margin
+gtk_icon_view_get_margin_unit
 gtk_icon_view_select_path
 gtk_icon_view_unselect_path
 gtk_icon_view_path_is_selected
@@ -1938,6 +2026,7 @@ gtk_image_set
 gtk_image_get
 gtk_image_set_pixel_size
 gtk_image_get_pixel_size
+gtk_image_get_pixel_size_unit
 <SUBSECTION Standard>
 GTK_IMAGE
 GTK_IS_IMAGE
@@ -1954,6 +2043,7 @@ GtkImagePixmapData
 GtkImageStockData
 GtkImageAnimationData
 GtkImageIconNameData
+GtkImageGIconData
 </SECTION>
 
 <SECTION>
@@ -1966,6 +2056,11 @@ gtk_image_menu_item_new
 gtk_image_menu_item_new_from_stock
 gtk_image_menu_item_new_with_label
 gtk_image_menu_item_new_with_mnemonic
+gtk_image_menu_item_get_use_stock
+gtk_image_menu_item_set_use_stock
+gtk_image_menu_item_get_always_show_image
+gtk_image_menu_item_set_always_show_image
+gtk_image_menu_item_set_accel_group
 <SUBSECTION Standard>
 GtkImageMenuItemClass
 GTK_IMAGE_MENU_ITEM
@@ -1982,6 +2077,8 @@ gtk_image_menu_item_get_type
 <FILE>gtkimcontext</FILE>
 <TITLE>GtkIMContext</TITLE>
 GtkIMContext
+GtkIMContextClass
+GtkIMContextInfo
 gtk_im_context_set_client_window
 gtk_im_context_get_preedit_string
 gtk_im_context_filter_keypress
@@ -2028,6 +2125,8 @@ gtk_im_context_simple_get_type
 GtkIMMulticontext
 gtk_im_multicontext_new
 gtk_im_multicontext_append_menuitems
+gtk_im_multicontext_get_context_id
+gtk_im_multicontext_set_context_id
 <SUBSECTION Standard>
 GTK_IM_MULTICONTEXT
 GTK_IS_IM_MULTICONTEXT
@@ -2186,6 +2285,7 @@ gtk_label_set_use_markup
 gtk_label_set_use_underline
 gtk_label_set_single_line_mode
 gtk_label_set_angle
+gtk_label_get_current_uri
 <SUBSECTION Standard>
 GTK_LABEL
 GTK_IS_LABEL
@@ -2387,11 +2487,15 @@ gtk_menu_item_new_with_label
 gtk_menu_item_new_with_mnemonic
 gtk_menu_item_set_right_justified
 gtk_menu_item_get_right_justified
+gtk_menu_item_get_label
+gtk_menu_item_set_label
+gtk_menu_item_get_use_underline
+gtk_menu_item_set_use_underline
 gtk_menu_item_set_submenu
 gtk_menu_item_get_submenu
+gtk_menu_item_remove_submenu
 gtk_menu_item_set_accel_path  
 gtk_menu_item_get_accel_path  
-gtk_menu_item_remove_submenu
 gtk_menu_item_select
 gtk_menu_item_deselect
 gtk_menu_item_activate
@@ -2495,6 +2599,37 @@ GTK_MESSAGE_DIALOG_GET_CLASS
 gtk_message_dialog_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkinfobar</FILE>
+<TITLE>GtkInfoBar</TITLE>
+GtkInfoBar
+gtk_info_bar_new
+gtk_info_bar_new_with_buttons
+gtk_info_bar_set_contents
+gtk_info_bar_add_action_widget
+gtk_info_bar_add_button
+gtk_info_bar_add_buttons
+gtk_info_bar_set_response_sensitive
+gtk_info_bar_set_default_response
+gtk_info_bar_response
+gtk_info_bar_set_message_type
+gtk_info_bar_get_message_type
+gtk_info_bar_get_action_area
+gtk_info_bar_get_content_area
+
+<SUBSECTION Standard>
+GTK_TYPE_INFO_BAR
+GTK_INFO_BAR
+GTK_INFO_BAR_CLASS
+GTK_IS_INFO_BAR
+GTK_IS_INFO_BAR_CLASS
+GTK_INFO_BAR_GET_CLASS
+
+<SUBSECTION Private>
+gtk_info_bar_get_type
+GtkMessageAreaPrivate
+</SECTION>
+
 <SECTION>
 <FILE>gtkmisc</FILE>
 <TITLE>GtkMisc</TITLE>
@@ -2503,6 +2638,7 @@ gtk_misc_set_alignment
 gtk_misc_set_padding
 gtk_misc_get_alignment
 gtk_misc_get_padding
+gtk_misc_get_padding_unit
 <SUBSECTION Standard>
 GTK_MISC
 GTK_IS_MISC
@@ -2657,6 +2793,7 @@ gtk_option_menu_get_type
 <FILE>gtkpaned</FILE>
 <TITLE>GtkPaned</TITLE>
 GtkPaned
+gtk_paned_new
 gtk_paned_add1
 gtk_paned_add2
 gtk_paned_gutter_size
@@ -3149,6 +3286,7 @@ gtk_recent_action_get_type
 <TITLE>GtkRuler</TITLE>
 GtkRuler
 GtkRulerMetric
+gtk_ruler_new
 gtk_ruler_set_metric
 gtk_ruler_set_range
 gtk_ruler_get_metric
@@ -3160,7 +3298,6 @@ GTK_TYPE_RULER
 GTK_RULER_CLASS
 GTK_IS_RULER_CLASS
 GTK_RULER_GET_CLASS
-
 <SUBSECTION Private>
 gtk_ruler_get_type
 gtk_ruler_draw_ticks
@@ -3171,6 +3308,8 @@ gtk_ruler_draw_pos
 <FILE>gtkscale</FILE>
 <TITLE>GtkScale</TITLE>
 GtkScale
+gtk_scale_new
+gtk_scale_new_with_range
 gtk_scale_set_digits
 gtk_scale_set_draw_value
 gtk_scale_set_value_pos
@@ -3179,6 +3318,8 @@ gtk_scale_get_draw_value
 gtk_scale_get_value_pos
 gtk_scale_get_layout
 gtk_scale_get_layout_offsets
+gtk_scale_add_mark
+gtk_scale_clear_marks
 <SUBSECTION Standard>
 GTK_SCALE
 GTK_IS_SCALE
@@ -3213,6 +3354,7 @@ GTK_SCALE_BUTTON_CLASS
 GTK_IS_SCALE_BUTTON_CLASS
 GTK_SCALE_BUTTON_GET_CLASS
 <SUBSECTION Private>
+GtkScaleButtonPrivate
 gtk_scale_button_get_type
 </SECTION>
 
@@ -3220,6 +3362,7 @@ gtk_scale_button_get_type
 <FILE>gtkscrollbar</FILE>
 <TITLE>GtkScrollbar</TITLE>
 GtkScrollbar
+gtk_scrollbar_new
 <SUBSECTION Standard>
 GTK_SCROLLBAR
 GTK_IS_SCROLLBAR
@@ -3265,6 +3408,7 @@ gtk_scrolled_window_get_type
 <FILE>gtkseparator</FILE>
 <TITLE>GtkSeparator</TITLE>
 GtkSeparator
+gtk_separator_new
 <SUBSECTION Standard>
 GTK_SEPARATOR
 GTK_IS_SEPARATOR
@@ -3457,6 +3601,12 @@ gtk_status_icon_get_size
 gtk_status_icon_set_screen
 gtk_status_icon_get_screen
 gtk_status_icon_set_tooltip
+gtk_status_icon_set_tooltip_text
+gtk_status_icon_get_tooltip_text
+gtk_status_icon_set_tooltip_markup
+gtk_status_icon_get_tooltip_markup
+gtk_status_icon_set_has_tooltip
+gtk_status_icon_get_has_tooltip
 gtk_status_icon_set_visible
 gtk_status_icon_get_visible
 gtk_status_icon_set_blinking
@@ -3482,8 +3632,6 @@ gtk_status_icon_get_type
 <FILE>gtktable</FILE>
 <TITLE>GtkTable</TITLE>
 GtkTable
-GtkTableChild
-GtkTableRowCol
 gtk_table_new
 gtk_table_resize
 gtk_table_attach
@@ -3494,10 +3642,14 @@ gtk_table_set_row_spacings
 gtk_table_set_col_spacings
 gtk_table_set_homogeneous
 gtk_table_get_default_row_spacing
+gtk_table_get_default_row_spacing_unit
 gtk_table_get_homogeneous
 gtk_table_get_row_spacing
+gtk_table_get_row_spacing_unit
 gtk_table_get_col_spacing
+gtk_table_get_col_spacing_unit
 gtk_table_get_default_col_spacing
+gtk_table_get_default_col_spacing_unit
 <SUBSECTION Standard>
 GTK_TABLE
 GTK_IS_TABLE
@@ -3506,6 +3658,8 @@ GTK_TABLE_CLASS
 GTK_IS_TABLE_CLASS
 GTK_TABLE_GET_CLASS
 <SUBSECTION Private>
+GtkTableChild
+GtkTableRowCol
 gtk_table_get_type
 </SECTION>
 
@@ -3549,16 +3703,9 @@ GTK_TEXT_INDEX
 GTK_TEXT
 GTK_IS_TEXT
 GTK_TYPE_TEXT
-gtk_text_get_type
 GTK_TEXT_CLASS
 GTK_IS_TEXT_CLASS
 GTK_TEXT_GET_CLASS
-<SUBSECTION Standard>
-GTK_TEXT
-GTK_IS_TEXT
-GTK_TYPE_TEXT
-GTK_TEXT_CLASS
-GTK_IS_TEXT_CLASS
 <SUBSECTION Private>
 gtk_text_get_type
 </SECTION>
@@ -3647,20 +3794,6 @@ gtk_text_buffer_unregister_deserialize_format
 gtk_text_buffer_unregister_serialize_format
 
 <SUBSECTION Standard>
-gtk_text_buffer_deserialize
-gtk_text_buffer_deserialize_get_can_create_tags
-gtk_text_buffer_deserialize_set_can_create_tags
-gtk_text_buffer_get_copy_target_list
-gtk_text_buffer_get_deserialize_formats
-gtk_text_buffer_get_paste_target_list
-gtk_text_buffer_get_serialize_formats
-gtk_text_buffer_register_deserialize_format
-gtk_text_buffer_register_deserialize_tagset
-gtk_text_buffer_register_serialize_format
-gtk_text_buffer_register_serialize_tagset
-gtk_text_buffer_serialize
-gtk_text_buffer_unregister_deserialize_format
-gtk_text_buffer_unregister_serialize_format
 GTK_TEXT_BUFFER
 GTK_IS_TEXT_BUFFER
 GTK_TYPE_TEXT_BUFFER
@@ -3896,18 +4029,24 @@ gtk_text_view_set_overwrite
 gtk_text_view_get_overwrite
 gtk_text_view_set_pixels_above_lines
 gtk_text_view_get_pixels_above_lines
+gtk_text_view_get_pixels_above_lines_unit
 gtk_text_view_set_pixels_below_lines
 gtk_text_view_get_pixels_below_lines
+gtk_text_view_get_pixels_below_lines_unit
 gtk_text_view_set_pixels_inside_wrap
 gtk_text_view_get_pixels_inside_wrap
+gtk_text_view_get_pixels_inside_wrap_unit
 gtk_text_view_set_justification
 gtk_text_view_get_justification
 gtk_text_view_set_left_margin
 gtk_text_view_get_left_margin
+gtk_text_view_get_left_margin_unit
 gtk_text_view_set_right_margin
 gtk_text_view_get_right_margin
+gtk_text_view_get_right_margin_unit
 gtk_text_view_set_indent
 gtk_text_view_get_indent
+gtk_text_view_get_indent_unit
 gtk_text_view_set_tabs
 gtk_text_view_get_tabs
 gtk_text_view_set_accepts_tab
@@ -4632,6 +4771,7 @@ gtk_tree_view_column_set_cell_data_func
 gtk_tree_view_column_clear_attributes
 gtk_tree_view_column_set_spacing
 gtk_tree_view_column_get_spacing
+gtk_tree_view_column_get_spacing_unit
 gtk_tree_view_column_set_visible
 gtk_tree_view_column_get_visible
 gtk_tree_view_column_set_resizable
@@ -4640,11 +4780,14 @@ gtk_tree_view_column_set_sizing
 gtk_tree_view_column_get_sizing
 gtk_tree_view_column_get_width
 gtk_tree_view_column_get_fixed_width
+gtk_tree_view_column_get_fixed_width_unit
 gtk_tree_view_column_set_fixed_width
 gtk_tree_view_column_set_min_width
 gtk_tree_view_column_get_min_width
+gtk_tree_view_column_get_min_width_unit
 gtk_tree_view_column_set_max_width
 gtk_tree_view_column_get_max_width
+gtk_tree_view_column_get_max_width_unit
 gtk_tree_view_column_clicked
 gtk_tree_view_column_set_title
 gtk_tree_view_column_get_title
@@ -4693,6 +4836,7 @@ GtkTreeViewMappingFunc
 GtkTreeViewSearchEqualFunc
 gtk_tree_view_new
 gtk_tree_view_get_level_indentation
+gtk_tree_view_get_level_indentation_unit
 gtk_tree_view_get_show_expanders
 gtk_tree_view_set_level_indentation
 gtk_tree_view_set_show_expanders
@@ -4816,6 +4960,7 @@ gtk_cell_view_new_with_text
 gtk_cell_view_new_with_markup
 gtk_cell_view_new_with_pixbuf
 gtk_cell_view_set_model
+gtk_cell_view_get_model
 gtk_cell_view_set_displayed_row
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_size_of_row
@@ -4866,13 +5011,17 @@ GtkCellRendererMode
 GtkCellRenderer
 GtkCellRendererClass
 gtk_cell_renderer_get_size
+gtk_cell_renderer_get_size_unit
 gtk_cell_renderer_render
 gtk_cell_renderer_activate
 gtk_cell_renderer_start_editing
 gtk_cell_renderer_editing_canceled
 gtk_cell_renderer_stop_editing
 gtk_cell_renderer_get_fixed_size
+gtk_cell_renderer_get_fixed_size_unit
 gtk_cell_renderer_set_fixed_size
+gtk_cell_renderer_get_tree_view_column
+gtk_cell_renderer_get_tree_view
 
 <SUBSECTION Standard>
 GTK_CELL_RENDERER
@@ -5407,7 +5556,15 @@ gtk_widget_set_has_tooltip
 gtk_widget_trigger_tooltip_query
 gtk_widget_get_snapshot
 gtk_widget_get_window
-gtk_widget_get_allocation
+gtk_widget_get_monitor_num
+gtk_widget_get_size_request_unit
+gtk_widget_size_to_pixel
+gtk_widget_size_to_pixel_double
+gtk_widget_style_get_property_unit
+gtk_widget_style_get_unit_valist
+gtk_widget_style_get_unit
+gtk_widget_get_unit_valist
+gtk_widget_get_unit
 <SUBSECTION>
 gtk_requisition_copy
 gtk_requisition_free
@@ -5481,7 +5638,6 @@ gtk_window_set_deletable
 gtk_window_set_frame_dimensions
 gtk_window_set_has_frame
 gtk_window_set_mnemonic_modifier
-gtk_window_set_role
 gtk_window_set_type_hint
 gtk_window_set_skip_taskbar_hint
 gtk_window_set_skip_pager_hint
@@ -5493,7 +5649,9 @@ gtk_window_set_role
 gtk_window_get_decorated
 gtk_window_get_deletable
 gtk_window_get_default_icon_list
+gtk_window_get_default_icon_name
 gtk_window_get_default_size
+gtk_window_get_default_size_unit
 gtk_window_get_destroy_with_parent
 gtk_window_get_frame_dimensions
 gtk_window_get_has_frame
@@ -5529,6 +5687,7 @@ gtk_window_set_icon_name
 gtk_window_set_auto_startup_notification
 gtk_window_get_opacity
 gtk_window_set_opacity
+gtk_window_get_monitor_num
 <SUBSECTION Standard>
 GTK_WINDOW
 GTK_IS_WINDOW
@@ -5694,6 +5853,12 @@ gtk_style_lookup_icon_set
 gtk_style_render_icon
 gtk_style_get_font
 gtk_style_set_font
+gtk_style_get_style_property
+gtk_style_get_valist
+gtk_style_get
+gtk_style_get_style_property_unit
+gtk_style_get_unit_valist
+gtk_style_get_unit
 gtk_draw_hline
 gtk_draw_vline
 gtk_draw_shadow
@@ -5760,6 +5925,7 @@ GTK_TYPE_BORDER
 <SUBSECTION Private>
 gtk_style_get_type
 gtk_border_get_type
+GtkThemeEngine
 </SECTION>
 
 <SECTION>
@@ -5847,6 +6013,7 @@ gtk_selection_data_targets_include_image
 gtk_selection_data_targets_include_text
 gtk_selection_data_targets_include_uri
 gtk_selection_data_targets_include_rich_text
+gtk_selection_data_get_selection
 gtk_selection_data_get_data
 gtk_selection_data_get_length
 gtk_selection_data_get_data_type
@@ -5865,7 +6032,6 @@ gtk_selection_data_free
 GTK_TYPE_SELECTION_DATA
 GTK_TYPE_TARGET_LIST
 <SUBSECTION Private>
-gtk_selection_data_copy
 gtk_selection_data_get_type
 gtk_target_list_get_type
 </SECTION>
@@ -6126,6 +6292,7 @@ gtk_binding_set_add_path
 <TITLE>Standard Enumerations</TITLE>
 GtkAccelFlags
 GtkAnchorType
+GtkArrowPlacement
 GtkArrowType
 GtkAttachOptions
 GtkButtonBoxStyle
@@ -6188,6 +6355,7 @@ GTK_STOCK_ADD
 GTK_STOCK_APPLY
 GTK_STOCK_BOLD
 GTK_STOCK_CANCEL
+GTK_STOCK_CAPS_LOCK_WARNING
 GTK_STOCK_CDROM
 GTK_STOCK_CLEAR
 GTK_STOCK_CLOSE
@@ -6367,7 +6535,10 @@ gtk_icon_set_ref
 gtk_icon_set_render_icon
 gtk_icon_set_unref
 gtk_icon_size_lookup
+gtk_icon_size_lookup_unit
 gtk_icon_size_lookup_for_settings
+gtk_icon_size_lookup_for_settings_for_monitor
+gtk_icon_size_lookup_for_settings_unit
 gtk_icon_size_register
 gtk_icon_size_register_alias
 gtk_icon_size_from_name
@@ -6436,9 +6607,15 @@ gtk_print_operation_set_track_print_status
 gtk_print_operation_set_custom_tab_label
 gtk_print_operation_run
 gtk_print_operation_cancel
+gtk_print_operation_draw_page_finish
+gtk_print_operation_set_defer_drawing
 gtk_print_operation_get_status
 gtk_print_operation_get_status_string
 gtk_print_operation_is_finished
+gtk_print_operation_set_support_selection
+gtk_print_operation_get_support_selection
+gtk_print_operation_set_has_selection
+gtk_print_operation_get_has_selection
 gtk_print_run_page_setup_dialog
 GtkPageSetupDoneFunc
 gtk_print_run_page_setup_dialog_async
@@ -6483,8 +6660,13 @@ gtk_print_unix_dialog_set_settings
 gtk_print_unix_dialog_get_settings
 gtk_print_unix_dialog_get_selected_printer
 gtk_print_unix_dialog_add_custom_tab
+gtk_print_unix_dialog_set_support_selection
+gtk_print_unix_dialog_get_support_selection
+gtk_print_unix_dialog_set_has_selection
+gtk_print_unix_dialog_get_has_selection
 GtkPrintCapabilities
 gtk_print_unix_dialog_set_manual_capabilities
+gtk_print_unix_dialog_get_manual_capabilities
 
 <SUBSECTION Standard>
 GTK_TYPE_PRINT_UNIX_DIALOG
@@ -6605,12 +6787,21 @@ gtk_print_settings_set_n_copies
 GTK_PRINT_SETTINGS_NUMBER_UP
 gtk_print_settings_get_number_up
 gtk_print_settings_set_number_up
+GtkNumberUpLayout
 GTK_PRINT_SETTINGS_NUMBER_UP_LAYOUT
 gtk_print_settings_get_number_up_layout
 gtk_print_settings_set_number_up_layout
 GTK_PRINT_SETTINGS_RESOLUTION
 gtk_print_settings_get_resolution
 gtk_print_settings_set_resolution
+gtk_print_settings_set_resolution_xy
+GTK_PRINT_SETTINGS_RESOLUTION_X
+gtk_print_settings_get_resolution_x
+GTK_PRINT_SETTINGS_RESOLUTION_Y
+gtk_print_settings_get_resolution_y
+GTK_PRINT_SETTINGS_PRINTER_LPI
+gtk_print_settings_get_printer_lpi
+gtk_print_settings_set_printer_lpi
 GTK_PRINT_SETTINGS_SCALE
 gtk_print_settings_get_scale
 gtk_print_settings_set_scale
@@ -6873,3 +7064,51 @@ GTK_TYPE_MOUNT_OPERATION
 gtk_mount_operation_get_type
 GtkMountOperationPrivate
 </SECTION>
+
+<SECTION>
+<FILE>gtkorientable</FILE>
+<TITLE>Orientable</TITLE>
+GtkOrientable
+gtk_orientable_get_orientation
+gtk_orientable_set_orientation
+
+<SUBSECTION Standard>
+GtkOrientableIface
+GTK_IS_ORIENTABLE
+GTK_IS_ORIENTABLE_CLASS
+GTK_ORIENTABLE
+GTK_ORIENTABLE_CLASS
+GTK_ORIENTABLE_GET_IFACE
+GTK_TYPE_ORIENTABLE
+
+<SUBSECTION Private>
+gtk_orientable_get_type
+</SECTION>
+
+<SECTION>
+<TITLE>Units</TITLE>
+<FILE>gtksize</FILE>
+GtkSize
+GtkUSize
+GtkSizeUnit
+gtk_size_em
+gtk_size_mm
+gtk_size_get_em
+gtk_size_get_mm
+GTK_SIZE_ONE_TWELFTH_EM
+GTK_SIZE_MAXPIXEL
+GTK_SIZE_MINPIXEL
+gtk_size_get_unit
+gtk_size_to_pixel
+gtk_size_to_pixel_double
+gtk_size_to_string
+gtk_param_spec_size
+gtk_value_set_size
+gtk_value_get_size
+gtk_value_size_skip_conversion
+gtk_param_spec_usize
+gtk_value_set_usize
+gtk_value_get_usize
+gtk_value_usize_skip_conversion
+gtk_enable_resolution_independence
+</SECTION>

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

@@ -1,51 +0,0 @@
-.\" ** You probably do not want to edit this file directly **
-.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
-.\" Instead of manually editing it, you probably should edit the DocBook XML
-.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GTK\-UPDATE\-ICON\-CACH" "1" "11/07/2005" "" ""
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-gtk\-update\-icon\-cache \- Icon theme caching utility
-.SH "SYNOPSIS"
-.HP 22
-\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-ignore\-theme\-index] [\-\-index\-only] [\-\-source\ [name]] [\-\-quiet] {iconpath}
-.SH "DESCRIPTION"
-.PP
-\fBgtk\-update\-icon\-cache\fR
-creates mmap()able cache files for icon themes.
-.PP
-It expects to be given the path to a icon theme directory containing an
-\fIindex.theme\fR, e.g.
-\fI/usr/share/icons/hicolor\fR, and writes a
-\fIicon\-theme.cache\fR
-containing cached information about the icons in the directory tree below the given directory.
-.PP
-GTK+ can use the cache files created by
-\fBgtk\-update\-icon\-cache\fR
-to avoid a lot of system call and disk seek overhead when the application starts. Since the format of the cache files allows them to be mmap()ed shared between multiple applications, the overall memory consumption is reduced as well.
-.SH "OPTIONS"
-.TP
-\-\-force, \-f
-Overwrite an existing cache file even if it appears to be uptodate.
-.TP
-\-\-ignore\-theme\-index, \-t
-Don't check for the existence of 'index.theme' in the icon theme directory. Without this option,
-\fBgtk\-update\-icon\-cache\fR
-refuses to create an icon cache in a directory which does not appear to be the toplevel directory of an icon theme.
-.TP
-\-\-index\-only, \-i
-Don't include image data in the cache.
-.TP
-\-\-source, \-c
-Output a C header file declaring a constant
-\fIname\fR
-with the contents of the icon cache.
-.TP
-\-\-quiet, \-q
-Turn off verbose output.
-.SH "BUGS"
-.PP
-None known yet.

docs/reference/gtk/gtk.types

@@ -8,6 +8,7 @@ gtk_accel_map_get_type
 gtk_accessible_get_type
 gtk_action_get_type
 gtk_action_group_get_type
+gtk_activatable_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
 gtk_arrow_get_type
@@ -71,6 +72,7 @@ gtk_hruler_get_type
 gtk_hscale_get_type
 gtk_hscrollbar_get_type
 gtk_hseparator_get_type
+gtk_hsv_get_type
 gtk_icon_factory_get_type
 gtk_icon_theme_get_type
 gtk_icon_view_get_type
@@ -79,6 +81,7 @@ gtk_image_menu_item_get_type
 gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
+gtk_info_bar_get_type
 gtk_input_dialog_get_type
 gtk_invisible_get_type
 gtk_item_factory_get_type
@@ -96,10 +99,12 @@ gtk_menu_shell_get_type
 gtk_menu_tool_button_get_type
 gtk_message_dialog_get_type
 gtk_misc_get_type
+gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_object_get_type
 gtk_old_editable_get_type
 gtk_option_menu_get_type
+gtk_orientable_get_type
 gtk_page_setup_get_type
 gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type

docs/reference/gtk/images/README

@@ -1,6 +1,6 @@
-This directory contains a collection of images of various widgets.  They
-are created via the shooter command in gtk+/docs/tools/, and are
-updated semi-regularly.  The images are used in both the headers of
+This directory contains a collection of images of various widgets.
+They are created via the shooter command in gtk+/docs/tools/, and are
+updated semi-regularly. The images are used in both the headers of
 individual widgets as well as the visual index of widgets.
 
-
+There are a number of other images in this directory as well.