2.14.5

svn path=/branches/gtk-2-14/; revision=21802

ChangeLog

@@ -1,3 +1,515 @@
+2008-11-24  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.14.5 ===
+
+	* NEWS: Updates
+
+2008-11-23  Hans Breuer  <hans@breuer.org>
+
+	* config.h.win32.in : don't define USE_MMX for msvc
+	* gdk-pixbuf/makefile.msc gtk/makefile.msc.in : updated
+
+2008-11-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gtk/gtkbuilder.c: (_gtk_builder_flags_from_string):
+	* gtk/gtkfilechooserdefault.c:
+	(file_list_drag_data_received_get_info_cb):
+	* gtk/gtkiconfactory.c: (icon_source_start_element):
+	* gtk/gtkprintbackend.c: (gtk_print_backend_module_load):
+	* gtk/gtkprintoperation.c: (run_pdf):
+	* gtk/gtkthemes.c: (gtk_theme_engine_load):
+	* gtk/tests/builder.c: (test_file):
+	* tests/testmerge.c: (dump_tree):
+	Missing format specifiers and some other small bits.
+	Bugzilla bug #554567.
+
+2008-11-14  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 552956 – Should check composite extension version
+
+	* gdk/x11/gdkdisplay-x11.c: Check that the version of the
+	composite extension is at least 0.4.
+	Patch by Owen Taylor
+
+2008-11-14  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 541391 – Unfocussable Treeview swallows focus
+
+	* gtk/gtktreeview.c (grab_focus_and_unset_draw_keyfocus),
+	(gtk_tree_view_focus): Honor GTK_WIDGET_CAN_FOCUS properly.
+	Patch by Christian Dywan.
+
+2008-11-05  Richard Hult  <richard@imendio.com>
+
+	Merged from trunk:
+
+	* gdk/quartz/gdkevents-quartz.c:
+	(get_keyboard_modifiers_from_ns_event), (create_key_event): Revert
+	(at least for now) the alt/cmd switching since it breaks the
+	"alt-gr" functionality of alt which makes it impossible to input
+	lots of characters.
+
+2008-11-04  Tor Lillqvist  <tml@novell.com>
+
+	Bug 557212 - Problem with which window gains focus and is visible
+
+	* gdk/win32/gdkevents-win32.c (ensure_stacking_on_activate_app):
+	Only do the restacking for the active window of the
+	application. Seems to fix the problem.
+
+	(gdk_event_translate): Only call ensure_stacking_on_activate_app()
+	when the application is being activated, not deactivated.
+
+2008-11-01  Tor Lillqvist  <tml@novell.com>
+
+	Bug 558278 - Crash when calling a callback set by
+	gdk_add_client_message_filter()
+
+	* gdk/win32/gdkevents-win32.c (apply_event_filters): Rename from
+	apply_filters() so that it is clear that this function is for
+	GdkEventFilters only.
+
+	(print_event): Print more information for GDK_CLIENT_EVENT events.
+
+	(gdk_event_translate): When handling client filters, don't use
+	apply_event_filters(). Use similar code as in the X11 backend,
+	although not exactly, as the parameter list and return value
+	semantics of gdk_event_translate() is different.
+
+2008-10-31  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 558323 – glitches when popping up combos in treeviews
+
+	gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_set_property):
+	Don't set the model property on the combo box, since that leads
+	to loops. Reported by Tristan Van Berkom
+
+2008-10-30  Christian Dywan  <christian@imendio.com>
+
+	Bug 557316 – GtkLinkButton should consider user-defined tooltip
+
+	* gtk/gtklinkbutton.c (gtk_link_button_query_tooltip_cb):
+	Only override the tooltip if not previously set
+
+2008-10-27  Richard Hult  <richard@imendio.com>
+
+	Merged from trunk:
+
+	Bug 557894 – Wrong return value for
+	gdk_pointer_grab_info_libgtk_only()
+
+	* gdk/quartz/gdkevents-quartz.c:
+	(gdk_pointer_grab_info_libgtk_only): Return TRUE when there is a
+	pointer grab. Patch by Owen Taylor.
+
+2008-10-23  Alexander Larsson  <alexl@redhat.com>
+
+	Merged from trunk:
+
+	Bug 528320 - Incorrect icons displayed for files with custom mimetype icons
+	
+        * gtk/gtkfilesystem.c:
+        (_gtk_file_info_render_icon):
+	Fall back on default file icon if there was no icon or it
+	was not found in the theme. This goes with the corresponding
+	change in glib to not add the fallback icon, but is useful
+	in other cases too.
+
+2008-10-22  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gdk/x11/gdkscreen-x11.c: Only emit size-changed if the screen
+	size actually changed.
+
+2008-10-21  Tor Lillqvist  <tml@novell.com>
+
+	Bug 557266 - Window Management Problem
+
+	Also reported in mail to gtk-list, and of course it has been well
+	known in general that window state management is messy and buggy
+	in various ways in gdk/win32.
+
+	* gdk/win32/gdkwindow-win32.c (show_window_internal): Correct
+	handling of GDK_WINDOW_STATE_ABOVE windows. It doesn't work to set
+	the WS_EX_TOPMOST extended style bit using SetWindowLong(). We
+	must call SetWindowPos() on the window using HWND_TOPMOST
+	instead. The description for WS_EX_TOPMOST in the documentation
+	for CreateWindowEx() even implies that if you read it carefully.
+
+2008-10-20  Christian Persch  <chpe@gnome.org>
+
+	Bug 557059 – crash when compositing emblems with icon
+
+	* gtk/gtkicontheme.c: (apply_emblems): Copy the pixbuf before using it
+	with gtk_pixbuf_composite, in case its pixdata is read-only (mmaped
+	from icon cache or builtins).
+
+2008-10-18  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
+	WM_WINDOWPOSCHANGING, don't dereference windowpos in the debugging
+	output without setting it first.
+
+2008-10-18  Tor Lillqvist  <tml@novell.com>
+
+	Bug 556578 - GIMP windows stay on top of other windows
+
+	* gdk/win32/gdkevents-win32.c (ensure_stacking_on_unminimize)
+	(ensure_stacking_on_window_pos_changing)
+	(ensure_stacking_on_activate_app): Ignore unmapped windows in the
+	loops where we look for the lowest "transient-type" window.
+
+	(gdk_event_translate): Don't call
+	ensure_stacking_on_window_pos_changing() or
+	ensure_stacking_on_activate_app() for unmapped windows.
+
+2008-10-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+2008-10-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.14.4 ====
+	
+	* NEWS: Updates
+
+2008-10-15  Michael Natterer  <mitch@imendio.com>
+
+	Merged from trunk:
+
+	* gdk/gdkapplaunchcontext.h (GDK_IS_APP_LAUNCH_CONTEXT): fix typo
+	in the type name so the macro becomes usable.
+
+2008-10-13  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 555779 – GtkCellRendererPixbuf crashed on failed GIcon lookup
+
+	* gtk/gtkcellrendererpixbuf
+	(gtk_cell_renderer_pixbuf_create_themed_pixbuf): Don't crash
+	if a GIcon is not present in the current theme. Patch by
+	Alex Larsson.
+
+2008-10-13  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 552318 – menubar mnemonics consumed even when
+	gtk-enable-mnemonics=false
+
+	* gtk/gtkwindow.c (gtk_window_activate_key): Don't let mnemonic
+	entries block accelerator activation when gtk-enable-mnemonics is
+	FALSE. Problem reported by Andreas Moog.
+
+2008-10-10  Simos Xenitellis  <simos@gnome.org>
+
+	Merged from trunk:
+
+	Bug 555000 – Wrong treatment on non-spacing marks dead keys in
+	GtkIMContextSimple
+
+	* gtk/gtkimcontextsimple.c: Change IS_DEAD_KEY() macro so that
+	it only checks if input is a deadkey.
+
+2008-10-09  Richard Hult  <richard@imendio.com>
+
+	Merged from trunk:
+
+	Bug 550342 – Splash screens have a caption
+
+	* gdk/quartz/gdkwindow-quartz.c: (_gdk_window_new),
+	(gdk_window_set_decorations): Patch from Marianne Gagnon to make
+	splash windows borderless.
+
+2008-10-09  Simos Xenitellis  <simos@gnome.org>
+
+	Bug 554192 – double press on the "circumflex" dead key
+	(standard french 105 keyboard) no longer produces the "^" character
+
+	* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):
+	Changed the order, put  check_compact_table() first, then
+	check_algorithmically().	
+
+2008-10-08  Christian Persch  <chpe@gnome.org>
+
+        Bug 554702 – gtkfilesystem leaks GError
+
+        * gtk/gtkfilesystem.c (_gtk_file_system_init): Free the GError.
+
+2008-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
+	Don't forget to reset reload_state when current_folder is already
+	correct. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=465992
+
+2008-10-06  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gtk/gtktooltip.c (gtk_tooltip_show_tooltip): Avoid unitialized
+	memory warnings from valgrind.
+
+2008-10-06  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gtk/gtkprintunixdialog.c (create_main_page): Show the tooltip
+	on the range entry itself, too.
+
+2008-10-04  Tor Lillqvist  <tml@novell.com>
+
+	Bug 132501 - Make utility window translate to tool window in win32
+
+	Implement the utility window type hint. Such windows are kept on
+	top of other windows of the same process. Makes GIMP's toolbox and
+	dock windows behave more like in GNOME under metacity. Apply the
+	same logic also to windows marked with the dialog window type
+	hint, and windows that are transient for some other window. I'll
+	call such windows "transient-type" below.
+
+	* gdk/win32/gdkevents-win32.c (doesnt_want_key): Drop unused
+	variables.
+
+	(ensure_stacking_on_unminimize)
+	(ensure_stacking_on_window_pos_changing)
+	(ensure_stacking_on_activate_app): New functions to implement the
+	desired stacking order. Make sure that a window that is not
+	transient-type stays below any transient-type windows of the
+	application. When activating a non-transient-type window make sure
+	it rises as high as possible while still staying below the lowest
+	transient-type window.
+
+	(gdk_event_translate): Call above functions on
+	WM_WINDOWPOSCHANGING, WM_ACTIVATEAPP and on WM_SIZE when
+	unminimizing. Improve debugging printout.
+
+	* gdk/win32/gdkwindow-win32.c (get_effective_window_decorations):
+	Handle utility windows like toolbar windows.
+
+	(gdk_window_new_internal) (update_style_bits): Give utility
+	windows the WS_EX_TOOLWINDOW extended style.
+
+	(gdk_window_set_title): If debugging "misc" or "events", make the
+	handle of top-level windows show up in their title bars. Very
+	useful when looking at debugging output.
+
+	(gdk_window_set_transient_for) (gdk_window_set_keep_above)
+	(gdk_window_set_keep_below) (gdk_window_set_modal_hint)
+	(gdk_window_set_skip_taskbar_hint)
+	(gdk_window_set_skip_pager_hint): Add and improve debugging
+	printout.
+
+	(gdk_window_set_type_hint): Print hint symbolically in GDK_NOTE().
+
+2008-10-04  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/win32/gdkmain-win32.c (_gdk_win32_window_exstyle_to_string)
+	(_gdk_win32_window_pos_bits_to_string): New debugging printout
+	functions. Decode the WS_EX_* and SWP_* bits.
+
+	* gdk/win32/gdkprivate-win32.h: Declare them. Define
+	GDK_DEBUG_MISC_OR_EVENTS for use in GDK_NOTE() to match either
+	"misc" or "events".
+
+2008-10-02  Matthias Clasen <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	530575 – GtkEntry with invisible chars has a confused cursor in
+	overwrite mode
+	Bug 371908 – Password Entry broken
+
+	* gtk/gtkentry.c (gtk_entry_draw_cursor): Use the visible text
+	in the layout when positioning the cursor, not the actual text
+	content of the entry. This makes a different when using overwrite
+	mode in an invisible entry.
+	Problem noticed by Jonathan Blandford
+
+	* gtk/gtkentry.c (gtk_entry_backspace): Make backspace behave
+	properly when invisible. 
+
+2008-10-02  Simos Xenitellis  <simos@gnome.org>
+
+        Bug 554506 – combining diacritics broken, became deadkeys
+
+        * gtk/gtkimcontextsimple.c: added check if keysym is greater
+        than 0x1000000, in this case it is not a dead key.
+
+2008-10-02  Christian Persch
+
+        Bug 554704 – gtkfilesystemmodel does too much work
+
+        * gtk/gtkfilesystemmodel.c: Replace g_slist_length()<1 check with a
+        simple NULL check.
+
+2008-10-02  Christian Persch
+
+        Bug 554701 – filechooser spams console with useless warnings
+
+        * gtk/gtkfilesystem.c.c: Don't warn if the async call was simply
+        cancelled.
+
+2008-10-02  Christian Persch
+
+        Bug 554698 – mem leak in filechooser
+
+        * gtk/gtkfilechooserdefault.c: Plug a mem leak.
+
+2008-10-02  Christian Persch
+
+        Bug 554696 – invalid free function used
+
+        * gtk/gtkfilesystemmodel.c: Use the right free func.
+
+2008-10-02  Christian Persch
+
+        Bug 554691 – mem leak in filechooser
+
+        * gtk/gtkfilesystemmodel.c: Plug a mem leak.
+
+2008-10-02  Christian Persch
+
+        Bug 554690 – mem leak in filechooser
+
+        * gtk/gtkfilechooserdefault.c: Plug a mem leak.
+
+2008-10-01  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkscalebutton.c: Don't #define _GNU_SOURCE on Windows as it
+	confuses newest mingw headers.
+
+2008-09-29  Richard Hult  <richard@imendio.com>
+
+	Merged from trunk:
+
+	Bug 554141 – uninitialized data use/free in gtkclipboard-quartz.c
+
+	* gtk/gtkclipboard-quartz.c: (gtk_clipboard_wait_for_contents):
+	Patch from Jon A. Cruz to initialize the allocated selection data.
+
+2008-09-26  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 553211 – GtkFileChooserButton unsets filter after first use
+
+	* gtk/gtkfilechooserdefault.c (show_and_select_files): Also
+	get the content-type, since it is used later on.
+	Pointed out by Davyd Madeley.
+
+2008-09-26  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 553578 - tabs are not drawn correctly
+
+	* gtk/gtknotebook.c: Track the visibility state of notebook tabs
+	between allocations so that we know to redraw the tab labels if
+	tabs are hidden and shown without changing position.
+	Reported by Marek Kašík, patch by Owen Taylor.
+
+2008-09-26  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 553133 – GtkFileChooser won't ask to mount a volume
+
+	* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Use
+	a GtkMountOperation when mounting, so that we get a password
+	dialog when required.
+
+2008-09-25  Marek Kasik  <mkasik@redhat.com>
+
+	Bug 553241 – double freed pointer in lpr_write cause firefox3 crash
+
+	* modules/printbackends/lpr/gtkprintbackendlpr.c:
+	The redundant freeing of memory was removed.
+
+	Patch by Chris Wang
+
+2008-09-25  Michael Natterer  <mitch@imendio.com>
+
+	Merged from trunk:
+
+	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
+	don't unref the file system backend, the newly added
+	unset_file_system_backend() already does this (bug #553135).
+
+2008-09-24  Tor Lillqvist  <tml@novell.com>
+
+	* gtk-zip.sh.in: Include all of share/man, lib/pkgconfig,
+	share/aclocal and share/gtk-doc instead of trying to list
+	individual files or subdirectories. We had missed gail.pc, for
+	instance.
+
+2008-09-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Bump version
+
+	* === Released 2.14.3 ===
+
+	* gtk/tests/builder.c: Fix the spinbutton test to use page_size 0.
+
+2008-09-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* NEWS: Updates
+
+2008-09-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkspinbutton.c: Warn if the adjustment has nonzero page size.
+
+	* README.in: Update to explain the situation.
+
+	* gtk/gtkadjustment.c: Revert to the old behaviour of allowing
+	values in the range [lower, upper]. Relying on the possibility
+	to set values in the [upper - page_size, upper] subrange is
+	considered deprecated, though, and will trigger a warning.
+
+	* gtk/gtkcombobox.c:
+	* gtk/gtkiconview.c:
+	* gtk/gtkrange.c:
+	* gtk/gtkscrolledwindow.c:
+	* gtk/gtktreeview.c: Add the CLAMPing back that was removed after
+	the GtkAdjustment behaviour change.
+
+2008-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	Bug 553135 – eog crash: assertion failed. Gtk error:
+	shortcuts_remove_rows: code should not be reached
+
+	* gtk/gtkfilechooserdefault.c: Disconnect from GtkFileSystem
+	signals when we are destroyed, in order to avoid nasty surprises.
+	Patch by Claudio Saavedra
+
+2008-09-22  Frederic Crozat  <fcrozat@mandriva.com>
+
+	* gtk/gtkfilesystem.c: use the correct gi18n header.
+	Fixes bug #553000.
+
+2008-09-20  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gtk/gtkfilechooserbutton.c (filter_model_visible_func): Don't
+	leak a GFile.
+
+2008-09-19  Christian Persch  <chpe@gnome.org>
+
+	Bug 552837 – mem leak in gtkimmulticontext
+
+	* gtk/gtkimmulticontext.c: (gtk_im_multicontext_get_slave): Plug mem
+	leak.
+
 2008-09-17  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version

HACKING

@@ -15,50 +15,45 @@ can be found here:
 
         http://developer.gnome.org
 
-Information about using git with GNOME can be found here:
+including information about using Subversion with GNOME:
 
-        http://live.gnome.org/Git
+        http://developer.gnome.org/tools/svn.html
 
-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.
+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.
 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 GIT to get the latest development version of
-gtk+ and glib. You can do the following to get glib and gtk+ from GIT:
+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:
 
-        $ 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+
+        $ 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+
 
-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
+To compile the SVN 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 pushing changes
-to GIT, see the `README' and `README.commits' files. In particular,
-don't, under any circumstances, push anything to GIT before
+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
 reading and understanding `README.commmits'.

INSTALL

@@ -0,0 +1,41 @@
+Prerequisites
+=============
+
+GTK+ requires the following packages:
+
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ 2.14.5 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.5.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.14.5			   # 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
+

INSTALL.in

@@ -3,11 +3,9 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, ATK and cairo libraries, available at the same
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.23.6,
-   Pango 1.20, ATK 1.29.2 and cairo 1.6.0.
-
- - gobject-introspection 0.6.7 or newer.
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ @GTK_VERSION@ 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

Makefile.am

@@ -6,7 +6,6 @@ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7
-ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST +=			\
 	HACKING			\
@@ -20,9 +19,6 @@ 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	\
@@ -119,26 +115,6 @@ 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@
 
@@ -173,28 +149,9 @@ 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
 install-data-hook:
@@ -219,7 +176,7 @@ dist-hook:
 	     && cp INSTALL README $(distdir) ; \
 	fi
 
-.PHONY: files release sanity snapshot ChangeLog
+.PHONY: files release sanity snapshot
 
 files:
 	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
@@ -243,16 +200,4 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --enable-introspection
-
-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
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds

Makefile.decl

@@ -10,7 +10,7 @@ TEST_PROGS =
 ### testing rules
 
 # Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
+XVFB = Xvfb -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 \

README

@@ -0,0 +1,405 @@
+General Information
+===================
+
+This is GTK+ version 2.14.5. 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.
+
+* 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
+  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 git repository. At the current time, any
+GTK+ is part of the GNOME Subversion 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 years, we'd like to ask
-people committing to GTK+ to follow a few rules:
+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:
 
 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 @@ people committing 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,48 +25,30 @@ people committing to GTK+ to follow a few rules:
 
 1) Ask _first_.
 
-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.
+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.
 
 Notes:
 
-* 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.
+* 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.
 
-* The expected format for git commit messages is as follows:
+* The ChangeLog entries should preferably match in date format
+  with the existing entries. You can set how emacs does this
+  by using customize mode:
 
-=== 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.
+  - M-x customize
+  - set Programming/Tools/ChangeLog/Add Log Time Format to
+    'Old Format'
 
+ 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,69 +27,6 @@ Installation
 See the file 'INSTALL'
 
 
-Release notes for 2.20
-======================
-
-* GtkStatusbar now has a message area (see gtk_status_bar_get_message_area)
-  which makes it easy to place additional widgets inside the statusbar
-  frame or to replace the label widgets. Previously, this was only possible
-  by accessing the innards of the statusbar widget directly. Applications
-  which are doing so may need some adjustments, since the addition of the
-  message area changed the internal widget hierarchy.
-
-* GtkBuilder no longer sets the "name" property of widgets to the ID
-  attribute of the <object>. Use gtk_buildable_get_name() instead of
-  gtk_widget_get_name() to obtain the ID.
-
-* GTK+ now includes introspection data, as a consequence, it gained a
-  dependency on gobject-introspection. It is possible to build without
-  introspection by passing --disable-introspection to configure.
-
-
-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.
-
-* JPEG2000 support is no longer enabled by default. It must be
-  explicitly turned on, by passing --with-libjasper to configure.
-
-* GDK has been reworked to implement 'client-side windows'. This offers
-  exciting new possibilities, such as transformed, offscreen rendering,
-  but it breaks some long-standing assumptions that applications may
-  have about GDK windows. Setting the environment variable
-  GDK_NATIVE_WINDOWS makes GDK create a native X11 window for each
-  GDK window, which might make problematic applications work better.
-
-* GTK+ calls signal (SIGPIPE, SIG_IGN) during initialization, to ignore
-  SIGPIPE signals, since these are almost never wanted in graphical
-  applications. If you do need to handle SIGPIPE for some reason, reset
-  the handler after gtk_init(), but notice that other libraries (e.g.
-  libdbus or gvfs) might do similar things.
-
-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
 ======================
 
@@ -111,15 +48,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.
 
-* 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
+* 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.
+  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
@@ -461,4 +398,8 @@ report.
 Otherwise, enter a new bug report that describes the patch, and attach
 the patch to that bug report.
 
-Patches should be in unified diff form. (The -up option to GNU diff.)
+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.win32

@@ -1,184 +1,117 @@
-The Win32 backend in GTK+ is not as stable or correct as the X11 one.
-
-For prebuilt runtime and developer packages see
-http://ftp.gnome.org/pub/gnome/binaries/win32/
-
-Building GTK+ on Win32
-======================
-
-First you obviously need developer packages for the compile-time
-dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
-zlib, libtiff at least. See
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
-
-After installing the dependencies, there are two ways to build GTK+
-for win32.
-
-1) GNU tools, ./configure && make install
------------------------------------------
-
-This requires you have mingw and MSYS.
-
-Use the configure script, and the resulting Makefiles (which use
-libtool and gcc to do the compilation). I use this myself, but it can
-be hard to setup correctly.
-
-The full script I run to build GTK+ 2.16 unpacked from a source
-distribution is as below. This is from bulding GTK+ 2.16.5. I don't
-use any script like this to build the development branch, as I don't
-distribute any binaries from development branches.
-
-# This is a shell script that calls functions and scripts from
-# tml@iki.fi's personal work envíronment. It is not expected to be
-# usable unmodified by others, and is included only for reference.
-
-MOD=gtk+
-VER=2.16.5
-REV=1
-ARCH=win32
-
-THIS=${MOD}_${VER}-${REV}_${ARCH}
-
-RUNZIP=${MOD}_${VER}-${REV}_${ARCH}.zip
-DEVZIP=${MOD}-dev_${VER}-${REV}_${ARCH}.zip
-
-HEX=`echo $THIS | md5sum | cut -d' ' -f1`
-TARGET=c:/devel/target/$HEX
-
-usedev
-usemsvs6
-
-(
-
-set -x
-
-DEPS=`latest --arch=${ARCH} glib atk cairo pango libpng zlib libtiff jpeg`
-PROXY_LIBINTL=`latest --arch=${ARCH} proxy-libintl`
-
-PKG_CONFIG_PATH=
-for D in $DEPS; do
-    PATH=/devel/dist/${ARCH}/$D/bin:$PATH
-    [ -d /devel/dist/${ARCH}/$D/lib/pkgconfig ] && PKG_CONFIG_PATH=/devel/dist/${ARCH}/$D/lib/pkgconfig:$PKG_CONFIG_PATH
-done
-
-LIBPNG=`latest --arch=${ARCH} libpng`
-ZLIB=`latest --arch=${ARCH} zlib`
-LIBTIFF=`latest --arch=${ARCH} libtiff`
-JPEG=`latest --arch=${ARCH} jpeg`
-
-patch -p0 <<'EOF'
-EOF
-
-lt_cv_deplibs_check_method='pass_all' \
-CC='gcc -mtune=pentium3 -mthreads' \
-CPPFLAGS="-I/devel/dist/${ARCH}/${LIBPNG}/include \
--I/devel/dist/${ARCH}/${ZLIB}/include \
--I/devel/dist/${ARCH}/${LIBTIFF}/include \
--I/devel/dist/${ARCH}/${JPEG}/include \
--I/devel/dist/${ARCH}/${PROXY_LIBINTL}/include" \
-LDFLAGS="-L/devel/dist/${ARCH}/${LIBPNG}/lib \
--L/devel/dist/${ARCH}/${ZLIB}/lib \
--L/devel/dist/${ARCH}/${LIBTIFF}/lib \
--L/devel/dist/${ARCH}/${JPEG}/lib \
--L/devel/dist/${ARCH}/${PROXY_LIBINTL}/lib -Wl,--exclude-libs=libintl.a \
--Wl,--enable-auto-image-base" \
-LIBS=-lintl \
-CFLAGS=-O2 \
-./configure \
---with-gdktarget=win32 \
---disable-gdiplus \
---with-included-immodules \
---without-libjasper \
---enable-debug=yes \
---enable-explicit-deps=no \
---disable-gtk-doc \
---disable-static \
---prefix=$TARGET &&
-
-libtoolcacheize &&
-rm gtk/gtk.def &&
-(PATH="$PWD/gdk-pixbuf/.libs:/devel/target/$HEX/bin:$PATH" make -j3 install || (rm .libtool-cache* && PATH="/devel/target/$HEX/bin:$PATH" make -j3 install)) &&
-
-PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >/devel/target/$HEX/etc/gtk-2.0/gdk-pixbuf.loaders &&
-
-grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
-    mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
-grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
-    mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
-
-./gtk-zip.sh &&
-
-mv /tmp/${MOD}-${VER}.zip /tmp/$RUNZIP &&
-mv /tmp/${MOD}-dev-${VER}.zip /tmp/$DEVZIP
-
-) 2>&1 | tee /devel/src/tml/packaging/$THIS.log
-
-(cd /devel && zip /tmp/$DEVZIP src/tml/packaging/$THIS.{sh,log}) &&
-manifestify /tmp/$RUNZIP /tmp/$DEVZIP
-
-You should not just copy the above blindly. There are some things in
-the script that are very specific to *my* build setup on *my* current
-machine. For instance the "latest" command, the "usedev" and
-"usemsvs6" shell functions, the /devel/dist folder. The above script
-is really just meant for reference, to give an idea. You really need
-to understand what things like PKG_CONFIG_PATH are and set them up
-properly after installing the dependencies before building GTK+.
-
-As you see above, after running configure, one can just say "make
-install", like on Unix. A post-build fix is needed, running
-gdk-pixbuf-query-loaders once more to get a correct gdk-pixbuf.loaders
-file.
-
-For a 64-bit build you need to remove the gtk/gtk.def file and let it
-be regenerated by the makefilery. This is because the 64-bit GTK dll
-has a slightly different list of exported function names. This is on
-purpose and not a bug. The API is the same at the source level, and
-the same #defines of some function names to actually have a _utf8
-suffix is used (just to keep the header simpler). But the
-corresponding non-suffixed function to maintain ABI stability are not
-needed in the 64-bit case (because there are no older EXEs around that
-would require such for ABI stability).
-
-
-2) Microsoft's tools
---------------------
-
-Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
-makefile.msc in gdk and gtk. Be prepared to manually edit various
-makefile.msc files, and the makefile snippets in build/win32.
-
-Alternative 1 also generates Microsoft import libraries (.lib), if you
-have lib.exe available. It might also work for cross-compilation from
-Unix.
-
-I use method 1 myself. Hans Breuer has been taking care of the MSVC
-makefiles. At times, we disagree a bit about various issues, and for
-instance the makefile.msc files might not produce identically named
-DLLs and import libraries as the "autoconfiscated" makefiles and
-libtool do. If this bothers you, you will have to fix the makefiles.
-
-Using GTK+ on Win32
-===================
-
-To use GTK+ on Win32, you also need either one of the above mentioned
-compilers. Other compilers might work, but don't count on it. Look for
-prebuilt developer packages (DLLs, import libraries, headers) on the
-above website.
-
-Multi-threaded use of GTK+ on Win32
-===================================
-
-Multi-threaded GTK+ programs might work on Windows in special simple
-cases, but not in general. Sorry. If you have all GTK+ and GDK calls
-in the same thread, it might work. Otherwise, probably not at
-all. Possible ways to fix this are being investigated.
-
-Wintab
-======
-
-The tablet support uses the Wintab API. The Wintab development kit is
-no longer required. The wintab.h header file is bundled with GTK+
-sources. Unfortunately it seems that only Wacom tablets come with
-support for the Wintab API nowadays.
-
---Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+The Win32 backend in GTK+ is not as stable or correct as the X11 one.
+
+For prebuilt runtime and developer packages see
+http://ftp.gnome.org/pub/gnome/binaries/win32/
+
+Building GTK+ on Win32
+======================
+
+First you obviously need developer packages for the compile-time
+dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
+zlib, libtiff at least. See
+http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+
+After installing the dependencies, there are two ways to build GTK+
+for win32.
+
+1) GNU tools, ./configure && make install
+-----------------------------------------
+
+This requires you have mingw and MSYS.
+
+Use the configure script, and the resulting Makefiles (which use
+libtool and gcc to do the compilation). I use this myself, but it can
+be hard to setup correctly.
+
+The full script I run to build GTK+ 2.10 unpacked from a source
+distribution is as below. This is from bulding GTK+ 2.10.9, slightly
+edited to make it match this 2.11 development branch. Actually I don't
+use any script like this to build the development branch, as I don't
+distribute any binaries from development branches.
+
+MOD=gtk+
+VER=2.10.9
+THIS=$MOD-$VER
+HEX=`echo $THIS | md5sum | cut -d' ' -f1`
+TARGET=c:/devel/target/$HEX
+DEPS="`/devel/src/tml/latest.sh glib atk cairo pango`"
+sed -e 's/need_relink=yes/need_relink=no # no way --tml/' <ltmain.sh >ltmain.temp && mv ltmain.temp ltmain.sh
+usedev
+usemsvs6
+MY_PKG_CONFIG_PATH=""
+for D in $DEPS; do
+    PATH=/devel/dist/$D/bin:$PATH
+    MY_PKG_CONFIG_PATH=/devel/dist/$D/lib/pkgconfig:$MY_PKG_CONFIG_PATH
+done
+PKG_CONFIG_PATH=$MY_PKG_CONFIG_PATH:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3 -mthreads' CPPFLAGS='-I/opt/gnu/include -I/opt/gnuwin32/include -I/opt/misc/include' LDFLAGS='-L/opt/gnu/lib -L/opt/gnuwin32/lib -L/opt/misc/lib -Wl,--enable-auto-image-base' LIBS=-lintl CFLAGS=-O2 ./configure --with-gdktarget=win32 --enable-debug=yes --disable-gtk-doc --disable-static --prefix=$TARGET &&
+libtoolcacheize &&
+unset MY_PKG_CONFIG_PATH &&
+PATH=/devel/target/$HEX/bin:.libs:$PATH make install &&
+(cd $TARGET/bin; strip --strip-unneeded *.dll *.exe) &&
+(cd $TARGET/lib/gtk-2.0/2.10.0/loaders; strip --strip-unneeded *.dll) &&
+(cd $TARGET/lib/gtk-2.0/2.10.0/immodules; strip --strip-unneeded *.dll) &&
+(cd $TARGET/lib/gtk-2.0/2.10.0/engines; strip --strip-unneeded *.dll) &&
+PATH=$TARGET/bin:$PATH gdk-pixbuf-query-loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
+grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
+mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
+grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
+mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
+./gtk-zip.sh &&
+(cd /devel/src/tml && zip /tmp/$MOD-dev-$VER.zip make/$THIS.make) &&
+manifestify /tmp/$MOD*-$VER.zip
+
+You should not just copy the above blindly. There are some things in
+the script that are very specific to *my* build setup on *my* current
+machine. For instance the "latest.sh" script, the "usedev" and
+"usemsvs6" shell functions, the /devel/dist folder. The above script
+is really just meant for reference, to give an idea. You really need
+to understand what things like PKG_CONFIG_PATH are and set them up
+properly after installing the dependencies before building GTK+.
+
+As you see above, after running configure, one can just say "make
+install", like on Unix. A post-build fix is needed, running
+gdk-pixbuf-query-loaders once more to get a correct gdk-pixbuf.loaders
+file.
+
+2) Microsoft's tools
+--------------------
+
+Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
+makefile.msc in gdk and gtk. Be prepared to manually edit various
+makefile.msc files, and the makefile snippets in build/win32.
+
+Alternative 1 also generates Microsoft import libraries (.lib), if you
+have lib.exe available. It might also work for cross-compilation from
+Unix.
+
+I use method 1 myself. Hans Breuer has been taking care of the MSVC
+makefiles. At times, we disagree a bit about various issues, and for
+instance the makefile.msc files might not produce identically named
+DLLs and import libraries as the "autoconfiscated" makefiles and
+libtool do. If this bothers you, you will have to fix the makefiles.
+
+Using GTK+ on Win32
+===================
+
+To use GTK+ on Win32, you also need either one of the above mentioned
+compilers. Other compilers might work, but don't count on it. Look for
+prebuilt developer packages (DLLs, import libraries, headers) on the
+above website.
+
+Multi-threaded use of GTK+ on Win32
+===================================
+
+Multi-threaded GTK+ programs might work on Windows in special simple
+cases, but not in general. Sorry. If you have all GTK+ and GDK calls
+in the same thread, it might work. Otherwise, probably not at
+all. Possible ways to fix this are being investigated.
+
+Wintab
+======
+
+The tablet support uses the Wintab API. The Wintab development kit is
+no longer required. The wintab.h header file is bundled with GTK+
+sources. Unfortunately it seems that only Wacom tablets come with
+support for the Wintab API nowadays.
+
+--Tor Lillqvist <tml@iki.fi>, <tml@novell.com>

autogen.sh

@@ -14,10 +14,7 @@ DIE=0
 
 have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-	libtool_version=`libtoolize --version |
-			 head -1 |
-			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
-			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+	libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
 	    1.4*|1.5*|2.2*)
 		have_libtool=true
@@ -48,24 +45,16 @@ fi
 	DIE=1
 }
 
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.11
-    ACLOCAL=aclocal-1.11
-else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
-    AUTOMAKE=automake-1.10
-    ACLOCAL=aclocal-1.10
-else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.7
     ACLOCAL=aclocal-1.7
 else
 	echo
-	echo "You must have automake 1.7.x, 1,10.x or 1.11.x installed to compile $PROJECT."
+	echo "You must have automake 1.7.x installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
 	DIE=1
 fi
-fi
-fi
 
 if test "$DIE" -eq 1; then
 	exit 1
@@ -109,7 +98,7 @@ rm -rf autom4te.cache
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
+$ACLOCAL $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
 gtkdocize || exit $?

config.h.win32.in

@@ -5,9 +5,6 @@
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
-/* Define if gio can sniff image data */
-/* #undef GDK_PIXBUF_USE_GIO_MIME */
-
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
@@ -15,7 +12,7 @@
 #define GTK_COMPILED_WITH_DEBUGGING "yes"
 
 /* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "NONE/share/locale"
+#define GTK_LOCALEDIR "c:/devel/target/HEAD/share/locale"
 
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
@@ -100,9 +97,6 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
-/* Define to 1 if libpapi available */
-/* #undef HAVE_PAPI */
-
 /* Define to 1 is libjpeg supports progressive JPEG */
 /* #undef HAVE_PROGRESSIVE_JPEG */
 
@@ -112,6 +106,9 @@
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
+/* Define to 1 if the XShape extension is available */
+/* #undef HAVE_SHAPE_EXT */
+
 /* Define to 1 if shm.h is available */
 /* #undef HAVE_SHM_H */
 
@@ -202,7 +199,7 @@
 /* Define to 1 if XFree Xinerama is available */
 /* #undef HAVE_XFREE_XINERAMA */
 
-/* Define to 1 if xinerama is available */
+/* Define to 1 is Xinerama is available */
 /* #undef HAVE_XINERAMA */
 
 /* Define to 1 if you have the `XInternAtoms' function. */
@@ -232,23 +229,12 @@
 /* Define to 1 if you have the `_NSGetEnviron' function. */
 /* #undef HAVE__NSGETENVIRON */
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */
 
 /* Define to 1 if fd_set is not available */
 #define NO_FD_SET 1
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#ifndef _MSC_VER
-/* #undef NO_MINUS_C_MINUS_O */
-#else 
-#define NO_MINUS_C_MINUS_O 1
-#endif
-
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
 
@@ -284,9 +270,7 @@
 
 /* Define to 1 if XXM is available and should be used */
 #ifndef _MSC_VER
-#  define USE_MMX 1
-#else
-#  undef USE_MMX
+#define USE_MMX 1
 #endif
 
 /* Define to 1 if no XInput should be used */

configure.in

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 # require autoconf 2.54
-AC_PREREQ(2.62)
+AC_PREREQ(2.54)
 
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
@@ -11,9 +11,9 @@ AC_PREREQ(2.62)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [20])
-m4_define([gtk_micro_version], [1])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_minor_version], [14])
+m4_define([gtk_micro_version], [5])
+m4_define([gtk_interface_age], [5])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -31,9 +31,9 @@ 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.23.6])
+m4_define([glib_required_version], [2.17.6])
 m4_define([pango_required_version], [1.20])
-m4_define([atk_required_version], [1.29.2])
+m4_define([atk_required_version], [1.13.0])
 m4_define([cairo_required_version], [1.6])
 
 
@@ -43,19 +43,12 @@ AC_INIT([gtk+], [gtk_version],
 
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
 
-AC_CONFIG_MACRO_DIR([m4])
-
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
+AM_INIT_AUTOMAKE(no-define)
 AM_CONFIG_HEADER(config.h)
 
-# Support silent build rules, requires at least automake-1.11. Enable
-# by either passing --enable-silent-rules to configure or passing V=0
-# to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
-
 #
 # For each of the libraries we build, we define the following
  
@@ -131,7 +124,6 @@ AC_CANONICAL_HOST
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
-EXE_MANIFEST_ARCHITECTURE=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
@@ -140,7 +132,6 @@ case "$host" in
     case "$host" in
     x86_64-*-*)
       LIB_EXE_MACHINE_FLAG=X64
-      EXE_MANIFEST_ARCHITECTURE=AMD64
       ;;
     esac
     ;;
@@ -151,7 +142,6 @@ esac
 AC_MSG_RESULT([$os_win32])
 
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
-AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
 case $host in
   *-*-linux*)
@@ -312,7 +302,6 @@ AM_SANITY_CHECK
 # Checks for programs.
 AC_ISC_POSIX
 AM_PROG_CC_STDC
-AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
@@ -389,19 +378,6 @@ 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
@@ -528,26 +504,6 @@ 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 
@@ -585,7 +541,6 @@ case $host in
   ;;
 esac
 
-AC_SUBST(MATH_LIB)
 #
 # see bug 162979
 #
@@ -837,13 +792,12 @@ AC_ARG_WITH(libtiff,
             [AC_HELP_STRING([--without-libtiff],
                             [disable TIFF loader for gdk-pixbuf])])
 AC_ARG_WITH(libjasper,
-            [AC_HELP_STRING([--with-libjasper],
-                            [enable JPEG2000 loader for gdk-pixbuf])])
+            [AC_HELP_STRING([--without-libjasper],
+                            [disable JPEG2000 loader for gdk-pixbuf])])
 
 AC_ARG_ENABLE(gdiplus,
-            [AC_HELP_STRING([--enable-gdiplus],
-                            [enble GDI+ loaders for gdk-pixbuf (currently known to be broken)])],,
-	    [enable_gdiplus=no])
+            [AC_HELP_STRING([--disable-gdiplus],
+                            [disable GDI+ loaders for gdk-pixbuf])])
 
 AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ])
 
@@ -953,11 +907,11 @@ dnl Test for libpng
   fi
 
 dnl Test for libjasper
-  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
+  if test x$with_libjasper != xno && test -z "$LIBJASPER"; then
     AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg)
   fi
 
-  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
+  if test x$with_libjasper != xno && test -z "$LIBJASPER"; then
      AC_MSG_ERROR([
 *** Checks for JPEG2000 loader failed. You can build without it by passing 
 *** --without-libjasper to configure])
@@ -996,7 +950,7 @@ fi
 # because some important apps like GIMP need to read and write
 # arbitrary tEXt chunks which doesn't seem to be possible through GDI+
 
-all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif"
+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm"
 if test x$with_libjasper != xno; then
   all_loaders="$all_loaders,jasper"
 fi
@@ -1067,7 +1021,6 @@ AM_CONDITIONAL(INCLUDE_TGA, [test x"$INCLUDE_tga" = xyes])
 AM_CONDITIONAL(INCLUDE_PCX, [test x"$INCLUDE_pcx" = xyes])
 AM_CONDITIONAL(INCLUDE_ICNS, [test x"$INCLUDE_icns" = xyes])
 AM_CONDITIONAL(INCLUDE_JASPER, [test x"$INCLUDE_jasper" = xyes])
-AM_CONDITIONAL(INCLUDE_QTIF, [test x"$INCLUDE_qtif" = xyes])
 # As all GDI+ loaders are either built-in or not, arbitrarily just
 # check one of the variables here
 AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
@@ -1210,11 +1163,8 @@ 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 $LIBJASPER"
+  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
 fi
 
 # Checks to see whether we should include mediaLib
@@ -1331,6 +1281,7 @@ GDK_PIXBUF_XLIB_PACKAGES=
 GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
 GDK_PIXBUF_XLIB_EXTRA_LIBS=
 	
+X_PACKAGES=fontconfig
 GDK_EXTRA_LIBS="$GDK_WLIBS"
 GDK_EXTRA_CFLAGS=
 	
@@ -1339,8 +1290,6 @@ GTK_DEP_PACKAGES_FOR_X=
 GTK_DEP_LIBS_FOR_X=
 
 if test "x$gdktarget" = "xx11"; then
-  X_PACKAGES=fontconfig
-
   #
   # We use fontconfig very peripherally when decoding the default
   # settings.
@@ -1452,8 +1401,9 @@ if test "x$gdktarget" = "xx11"; then
 
   # Check for shaped window extension
 
-  AC_CHECK_FUNC(XShapeCombineMask, :,
-     [AC_MSG_ERROR([Shape extension not found, check your development headers])])
+  AC_CHECK_FUNC(XShapeCombineMask,
+      AC_DEFINE(HAVE_SHAPE_EXT, 1,
+                [Define to 1 if the XShape extension is available]))
 
   # X SYNC check
   gtk_save_CFLAGS="$CFLAGS"
@@ -1519,55 +1469,54 @@ if test "x$gdktarget" = "xx11"; then
     gtk_save_cppflags="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $x_cflags"
   
-    # Check for XFree
-    AC_MSG_CHECKING(for Xinerama support on XFree86)
+    case "$host" in
+      *-*-solaris*)
+          # Check for solaris
+	  AC_MSG_CHECKING(for Xinerama support on Solaris)
 	  
-    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)
-
-      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>])])
+	  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
+          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
+
+          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
   fi
   
   # set up things for XInput
@@ -1589,7 +1538,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.99" ; then
+  if $PKG_CONFIG --exists "xrandr >= 1.2" ; then
      AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
 
      X_PACKAGES="$X_PACKAGES xrandr"
@@ -1641,8 +1590,6 @@ if test "x$gdktarget" = "xx11"; then
 
   AM_CONDITIONAL(USE_X11, true)
 else
-  XPACKAGES=
-
   AM_CONDITIONAL(XINPUT_XFREE, false)
   AM_CONDITIONAL(USE_X11, false)
   AM_CONDITIONAL(HAVE_X11R6, false)
@@ -1672,10 +1619,21 @@ AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
 AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
 if test "x$gdktarget" = "xdirectfb"; then
-  DIRECTFB_REQUIRED_VERSION=1.0.0
+  DIRECTFB_REQUIRED_VERSION=0.9.24
   AC_MSG_CHECKING(for DirectFB)
 
-  PKG_CHECK_MODULES(DIRECTFB, [directfb >= $DIRECTFB_REQUIRED_VERSION])
+  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
+
   AM_CONDITIONAL(USE_DIRECTFB, true)
 else
   AM_CONDITIONAL(USE_DIRECTFB, false)
@@ -1719,15 +1677,13 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
+GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
 if test "x$gdktarget" = "xx11"; then
-  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
-else
-  GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
+  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
 fi
-
 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
@@ -1855,19 +1811,10 @@ AC_ARG_ENABLE(cups,
                               [disable cups print backend])],,
               [enable_cups=auto])
 
-if test "x$enable_cups" = "xno"; then
-  AM_CONDITIONAL(HAVE_CUPS, false)
-else
+if test "x$enable_cups" = "xauto"
+then
   AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
-  if test "x$CUPS_CONFIG" = "xno"; then
-    if test "x$enable_cups" = "xauto"; then
-      AM_CONDITIONAL(HAVE_CUPS, false)
-    else
-      AC_MSG_ERROR([
-*** cups not found.
-])
-    fi
-  else
+  if test "x$CUPS_CONFIG" != "xno"; then
     CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
     CUPS_LIBS=`$CUPS_CONFIG --libs`
 
@@ -1887,55 +1834,31 @@ else
     AC_SUBST(CUPS_LIBS)
 
     AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
-
-    AM_CONDITIONAL(HAVE_CUPS, true)
-
-    gtk_save_cflags="$CFLAGS"
-    CFLAGS="$CUPS_CFLAGS"
-    AC_TRY_COMPILE([#include <cups/http.h>],
-                   [http_t http; char *s = http.authstring;],
-                   [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [],
-                              [Define if cups http_t authstring field is accessible])],)
-    CFLAGS="$gtk_save_cflags"
-
-    AC_SUBST(HAVE_HTTP_AUTHSTRING)
-
-    gtk_save_libs="$LIBS"
-    LIBS="$CUPS_LIBS"
-    AC_CHECK_FUNCS(httpGetAuthString)
-    LIBS="$gtk_save_libs"
   fi
-fi
+  AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
 
-# Checks to see if we should compile with PAPI backend for GTK+
-#
+  gtk_save_cflags="$CFLAGS"
+  CFLAGS="$CUPS_CFLAGS"
+  AC_TRY_COMPILE([#include <cups/http.h>],
+                 [http_t http; char *s = http.authstring;],
+                 [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [],
+                            [Define if cups http_t authstring field is accessible])],)
+  CFLAGS="$gtk_save_cflags"
 
-AC_ARG_ENABLE(papi,
-              [AC_HELP_STRING([--disable-papi]
-                              [disable papi print backend])],,
-             [enable_papi=auto])
+  AC_SUBST(HAVE_HTTP_AUTHSTRING)
+
+  gtk_save_libs="$LIBS"
+  LIBS="$CUPS_LIBS"
+  AC_CHECK_FUNCS(httpGetAuthString)
+  LIBS="$gtk_save_libs"
 
-if test "x$enable_papi" = "xno"; then
-  AM_CONDITIONAL(HAVE_PAPI, false)
 else
-  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)
-  if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
-    AC_MSG_ERROR([
-*** papi not found.
-])
-  fi
+  AM_CONDITIONAL(HAVE_CUPS, false)
 fi
 
-AM_CONDITIONAL(HAVE_PAPI_CUPS, test "x$have_papi" = "xyes" -a "x$CUPS_CONFIG" != "xno")
-
 gtk_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
-
+CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
+			  
 AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
 *** Can't find cairo-pdf.h. You must build Cairo with the pdf
 *** backend enabled.]))
@@ -1944,10 +1867,6 @@ if test "$os_win32" != "yes"; then
   AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
 *** Can't find cairo-ps.h. You must build Cairo with the 
 *** postscript backend enabled.]))
-
-  AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
-*** Can't find cairo-svg.h. You must build Cairo with the
-*** svg backend enabled.]))
 fi   
 
 CPPFLAGS="$gtk_save_cppflags"
@@ -1982,17 +1901,12 @@ if test -n "$export_dynamic"; then
   GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
-##################################################
-# GObject introspection
-##################################################
-
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.11])
+GTK_DOC_CHECK([1.8])
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
@@ -2170,7 +2084,6 @@ 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,5 +4,3 @@ SUBDIRS =
 if USE_X11
 SUBDIRS += gdk-pixbuf-xlib
 endif
-
--include $(top_srcdir)/git.mk

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,36 +1,14 @@
-=== ChangeLog discontinued ===
+2008-11-24  Matthias Clasen <mclasen@redhat.com>
 
-	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.
+	* === Released 2.14.5 ===
 
-2009-03-13  Matthias Clasen  <mclasen@redhat.com>
+2008-10-16  Matthias Clasen  <mclasen@redhat.com>
 
-	* === Released 2.16.0 ===
+	* === Released 2.14.4 ====
 
-2009-03-02  Matthias Clasen  <mclasen@redhat.com>
+2008-09-23  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 ===
+	* === Released 2.14.3 ===
 
 2008-09-17  Matthias Clasen  <mclasen@redhat.com>
 

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -38,5 +38,3 @@ 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

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

@@ -154,7 +154,7 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int bpl;
 	register guint8 data;
 	guint8 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	d (printf ("1 bits/pixel\n"));
 
@@ -191,7 +191,7 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int bpl;
 	register guint8 data;
 	guint8 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 	guint32 remap[2];
 
 	d (printf ("1 bits/pixel\n"));
@@ -241,7 +241,7 @@ rgb8 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	int bpl;
 	guint32 mask;
 	register guint32 data;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 	register guint8 *s;
 	register guint8 *o;
 
@@ -282,7 +282,7 @@ rgb8a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
 	guint32 remap[256];
 	register guint8 *s;	/* read 2 pixels at once */
 	register guint32 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -336,7 +336,7 @@ rgb565lsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint8 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -407,7 +407,7 @@ rgb565msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint32 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -479,7 +479,7 @@ rgb565alsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -536,7 +536,7 @@ rgb565amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -592,7 +592,7 @@ rgb555lsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint8 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -663,7 +663,7 @@ rgb555msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	register guint32 *s;	/* read 2 pixels at once */
 #endif
 	register guint16 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -735,7 +735,7 @@ rgb555alsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -792,7 +792,7 @@ rgb555amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 #endif
 	register guint32 *o;
 
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -840,7 +840,7 @@ rgb888alsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 
 	guint8 *s;	/* for byte order swapping */
 	guint8 *o;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 
 	width = image->width;
 	height = image->height;
@@ -871,7 +871,7 @@ rgb888lsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	int width, height;
 	int bpl;
 
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 	guint8 *o, *s;
 
 	width = image->width;
@@ -901,7 +901,7 @@ rgb888amsb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colorma
 	int width, height;
 	int bpl;
 
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 #ifdef LITTLE
 	guint32 *o;
 	guint32 *s;
@@ -949,7 +949,7 @@ rgb888msb (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap
 	int width, height;
 	int bpl;
 
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 	guint8 *s;
 	guint8 *o;
 
@@ -983,7 +983,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 	int xx, yy;
 	int width, height;
 	int bpl;
-	guint8 *srow = (guint8 *)image->data, *orow = pixels;
+	guint8 *srow = image->data, *orow = pixels;
 	guint8 *o;
 	guint32 pixel;
 	Visual *v;
@@ -1134,7 +1134,7 @@ xlib_window_is_viewable (Window w)
 
 	while (w != 0) {
 		Window parent, root, *children;
-		guint nchildren;
+		int nchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
 		if (wa.map_state != IsViewable)
@@ -1223,7 +1223,7 @@ gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
 				   int dest_x, int dest_y,
 				   int width, int height)
 {
-	guint src_width, src_height;
+	int src_width, src_height;
 	XImage *image;
 	int rowstride, bpp, alpha;
 	XWindowAttributes wa;
@@ -1260,8 +1260,7 @@ gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
 	    src_height = wa.height;
 	} else {
 	    Window root;
-	    int tx, ty;
-	    guint bwidth, depth;
+	    int tx, ty, bwidth, depth;
 	    XGetGeometry (gdk_pixbuf_dpy, src, &root, &tx, &ty,
 			  &src_width, &src_height, &bwidth, &depth);
 	}

demos/Makefile.am

@@ -19,14 +19,11 @@ DEPS = 									\
 LDADDS = 								\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
-	$(MATH_LIB)
+	$(top_builddir)/gtk/$(gtktargetlib)
 
 noinst_PROGRAMS = 		\
 	testpixbuf-drawable 	\
 	testanimation 		\
-	testpixbuf-color	\
 	testpixbuf-save		\
 	testpixbuf-scale 	\
 	pixbuf-demo
@@ -55,7 +52,6 @@ test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
 testpixbuf_DEPENDENCIES = $(DEPS)
 testpixbuf_drawable_DEPENDENCIES = $(DEPS)
 testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_color_DEPENDENCIES = $(DEPS)
 testpixbuf_scale_DEPENDENCIES = $(DEPS)
 testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)
@@ -63,7 +59,6 @@ pixbuf_demo_DEPENDENCIES = $(DEPS)
 testpixbuf_LDADD = $(LDADDS)
 testpixbuf_drawable_LDADD = $(LDADDS)
 testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
 testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)
@@ -71,7 +66,6 @@ pixbuf_demo_LDADD = $(LDADDS)
 testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
 testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
@@ -88,5 +82,3 @@ 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				\
@@ -17,31 +17,23 @@ demos =						\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
-	entry_buffer.c				\
 	entry_completion.c			\
 	expander.c  				\
 	hypertext.c				\
 	iconview.c				\
 	iconview_edit.c				\
 	images.c				\
-	infobar.c				\
-	links.c					\
 	list_store.c				\
 	menus.c					\
-	offscreen_window.c			\
-	offscreen_window2.c			\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
 	printing.c				\
 	rotated_text.c				\
-	search_entry.c				\
 	sizegroup.c				\
-	spinner.c				\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
-	toolpalette.c				\
 	tree_store.c				\
 	ui_manager.c
 
@@ -62,8 +54,7 @@ DEPS = \
 LDADDS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)
+	$(top_builddir)/gtk/$(gtktargetlib)
 
 bin_PROGRAMS = gtk-demo
 
@@ -104,5 +95,3 @@ IMAGEFILES=	alphatest.png		\
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h
-
--include $(top_srcdir)/git.mk

demos/gtk-demo/appwindow.c

@@ -8,8 +8,6 @@
 #include "demo-common.h"
 
 static GtkWidget *window = NULL;
-static GtkWidget *infobar = NULL;
-static GtkWidget *messagelabel = NULL;
 
 static void
 activate_action (GtkAction *action)
@@ -18,7 +16,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,
@@ -31,7 +29,7 @@ activate_action (GtkAction *action)
                     "response",
                     G_CALLBACK (gtk_widget_destroy),
                     NULL);
-
+  
   gtk_widget_show (dialog);
 }
 
@@ -43,32 +41,37 @@ 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) 
     {
-      gchar *text;
+      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);
 
-      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);
+      /* Close dialog on user response */
+      g_signal_connect (dialog,
+			"response",
+			G_CALLBACK (gtk_widget_destroy),
+			NULL);
+      
+      gtk_widget_show (dialog);
     }
 }
 
-static void
+static void 
 activate_email (GtkAboutDialog *about,
 		const gchar    *link,
 		gpointer        data)
 {
-  gchar *text;
-  text = g_strdup_printf ("send mail to %s", link);
-  g_print ("%s\n", text);
-  g_free (text);
+  g_print ("send mail to %s\n", link);
 }
 
-static void
+static void 
 activate_url (GtkAboutDialog *about,
 	      const gchar    *link,
 	      gpointer        data)
@@ -129,9 +132,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),
-			 "program-name", "GTK+ Code Demos",
+			 "name", "GTK+ Code Demos",
 			 "version", PACKAGE_VERSION,
-			 "copyright", "(C) 1997-2009 The GTK+ Team",
+			 "copyright", "(C) 1997-2005 The GTK+ Team",
 			 "license", license,
 			 "website", "http://www.gtk.org",
 			 "comments", "Program to demonstrate GTK+ functions.",
@@ -144,12 +147,12 @@ about_cb (GtkAction *action,
   g_object_unref (transparent);
 }
 
-typedef struct
+typedef struct 
 {
   GtkAction action;
 } ToolMenuAction;
 
-typedef struct
+typedef struct 
 {
   GtkActionClass parent_class;
 } ToolMenuActionClass;
@@ -176,30 +179,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) },
 };
@@ -208,9 +211,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);
@@ -223,13 +226,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);
@@ -242,18 +245,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'>"
@@ -285,7 +288,7 @@ static const gchar *ui_info =
 "    <toolitem action='Open'>"
 "      <menu action='OpenMenu'>"
 "        <menuitem action='File1'/>"
-"      </menu>"
+"      </menu>"  
 "    </toolitem>"
 "    <toolitem action='Quit'/>"
 "    <separator action='Sep1'/>"
@@ -305,7 +308,7 @@ static void
 register_stock_icons (void)
 {
   static gboolean registered = FALSE;
-
+  
   if (!registered)
     {
       GdkPixbuf *pixbuf;
@@ -317,12 +320,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);
@@ -347,7 +350,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);
@@ -356,7 +359,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);
     }
@@ -370,9 +373,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);
@@ -406,21 +409,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;
@@ -435,10 +438,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));
@@ -450,15 +453,15 @@ do_appwindow (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed),
                         &window);
 
-      table = gtk_table_new (1, 5, FALSE);
-
+      table = gtk_table_new (1, 4, 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",
@@ -466,30 +469,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);
@@ -499,7 +502,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,
@@ -508,7 +511,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,
@@ -517,25 +520,6 @@ 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),
@@ -544,20 +528,20 @@ 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,                   3, 4,
+                        0, 1,                   2, 3,
                         GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
                         0,                      0);
 
       gtk_window_set_default_size (GTK_WINDOW (window),
                                    200, 200);
-
+      
       contents = gtk_text_view_new ();
       gtk_widget_grab_focus (contents);
-
+      
       gtk_container_add (GTK_CONTAINER (sw),
                          contents);
 
@@ -567,7 +551,7 @@ do_appwindow (GtkWidget *do_widget)
       gtk_table_attach (GTK_TABLE (table),
                         statusbar,
                         /* X direction */       /* Y direction */
-                        0, 1,                   4, 5,
+                        0, 1,                   3, 4,
                         GTK_EXPAND | GTK_FILL,  0,
                         0,                      0);
 
@@ -586,25 +570,23 @@ 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));
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }
   else
-    {
+    {    
       gtk_widget_destroy (window);
       window = NULL;
-      infobar = NULL;
-      messagelabel = NULL;
     }
 
   return window;

demos/gtk-demo/assistant.c

@@ -153,7 +153,7 @@ do_assistant (GtkWidget *do_widget)
 			G_CALLBACK (on_assistant_prepare), NULL);
     }
 
-  if (!gtk_widget_get_visible (assistant))
+  if (!GTK_WIDGET_VISIBLE (assistant))
     gtk_widget_show (assistant);
   else
     {

demos/gtk-demo/builder.c

@@ -53,7 +53,7 @@ do_builder (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/button_box.c

@@ -113,7 +113,7 @@ do_button_box (GtkWidget *do_widget)
 			TRUE, TRUE, 5);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/clipboard.c

@@ -203,10 +203,6 @@ do_clipboard (GtkWidget *do_widget)
       GtkClipboard *clipboard;
 
       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), "Clipboard demo");
-
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
@@ -314,7 +310,7 @@ do_clipboard (GtkWidget *do_widget)
       gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/colorsel.c

@@ -125,7 +125,7 @@ do_colorsel (GtkWidget *do_widget)
 			G_CALLBACK (change_color_callback), NULL);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/combobox.c

@@ -440,7 +440,7 @@ do_combobox (GtkWidget *do_widget)
   
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/dialog.c

@@ -167,7 +167,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/drawingarea.c

@@ -57,7 +57,7 @@ scribble_expose_event (GtkWidget      *widget,
    */
 
   gdk_draw_drawable (widget->window,
-                     widget->style->fg_gc[gtk_widget_get_state (widget)],
+                     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
                      pixmap,
                      /* Only copy the area that was exposed. */
                      event->area.x, event->area.y,
@@ -318,7 +318,7 @@ do_drawingarea (GtkWidget *do_widget)
 
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/editable_cells.c

@@ -381,7 +381,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/entry_buffer.c

@@ -1,65 +0,0 @@
-/* Entry/Entry Buffer
- *
- * GtkEntryBuffer provides the text content in a GtkEntry.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_entry_buffer (GtkWidget *do_widget)
-{
-  GtkWidget *vbox;
-  GtkWidget *label;
-  GtkWidget *entry;
-  GtkEntryBuffer *buffer;
-
-  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkEntryBuffer",
-					  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 (gtk_widget_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), "Entries share a buffer. Typing in one is reflected in the other.");
-    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-    /* Create a buffer */
-    buffer = gtk_entry_buffer_new (NULL, 0);
-
-    /* Create our first entry */
-    entry = gtk_entry_new_with_buffer (buffer);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-    /* Create the second entry */
-    entry = gtk_entry_new_with_buffer (buffer);
-    gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-    g_object_unref (buffer);
-  }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-

demos/gtk-demo/entry_completion.c

@@ -1,4 +1,4 @@
-/* Entry/Entry Completion
+/* Entry Completion
  *
  * GtkEntryCompletion provides a mechanism for adding support for
  * completion in GtkEntry.
@@ -86,7 +86,7 @@ do_entry_completion (GtkWidget *do_widget)
     gtk_entry_completion_set_text_column (completion, 0);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/expander.c

@@ -47,7 +47,7 @@ do_expander (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (expander), label);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/hypertext.c

@@ -300,7 +300,7 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_show_all (sw);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/iconview.c

@@ -358,7 +358,7 @@ do_iconview (GtkWidget *do_widget)
 	}
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/iconview_edit.c

@@ -146,7 +146,7 @@ do_iconview_edit (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), icon_view);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/images.c

@@ -450,7 +450,7 @@ do_images (GtkWidget *do_widget)
                         vbox);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/infobar.c

@@ -1,104 +0,0 @@
-/* Info bar
- *
- * Info bar widgets are used to report important messages to the user.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-on_bar_response (GtkInfoBar *info_bar,
-                 gint        response_id,
-                 gpointer    user_data)
-{
-  GtkWidget *dialog;
-
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-				   GTK_MESSAGE_INFO,
-				   GTK_BUTTONS_OK,
-				   "You clicked a button on an info bar");
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            "Your response has id %d", response_id);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
-}
-
-GtkWidget *
-do_infobar (GtkWidget *do_widget)
-{
-  GtkWidget *frame;
-  GtkWidget *bar;
-  GtkWidget *vbox;
-  GtkWidget *vbox2;
-  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_window_set_title (GTK_WINDOW (window), "Info Bars");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      vbox = gtk_vbox_new (FALSE, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new_with_buttons (GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
-      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0);
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
-      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE, 0);
-
-      frame = gtk_frame_new ("Info bars");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 8);
-
-      vbox2 = gtk_vbox_new (FALSE, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-      gtk_container_add (GTK_CONTAINER (frame), vbox2);
-
-      /* Standard message dialog */
-      label = gtk_label_new ("An example of different info bars");
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/links.c

@@ -1,84 +0,0 @@
-/* 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;
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_links (GtkWidget *do_widget)
-{
-  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_window_set_title (GTK_WINDOW (window), "Links");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-      g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
-
-      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_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/list_store.c

@@ -10,8 +10,6 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *window = NULL;
-static GtkTreeModel *model = NULL;
-static guint timeout = 0;
 
 typedef struct
 {
@@ -28,8 +26,6 @@ enum
   COLUMN_NUMBER,
   COLUMN_SEVERITY,
   COLUMN_DESCRIPTION,
-  COLUMN_PULSE,
-  COLUMN_ACTIVE,
   NUM_COLUMNS
 };
 
@@ -51,33 +47,6 @@ static Bug data[] =
   { FALSE, 1,     "Normal",     "First bug :=)" },
 };
 
-static gboolean
-spinner_timeout (gpointer data)
-{
-  GtkTreeIter iter;
-  guint pulse;
-
-  if (model == NULL)
-    return FALSE;
-
-  gtk_tree_model_get_iter_first (model, &iter);
-  gtk_tree_model_get (model, &iter,
-                      COLUMN_PULSE, &pulse,
-                      -1);
-  if (pulse == G_MAXUINT)
-    pulse = 0;
-  else
-    pulse++;
-
-  gtk_list_store_set (GTK_LIST_STORE (model),
-                      &iter,
-                      COLUMN_PULSE, pulse,
-                      COLUMN_ACTIVE, TRUE,
-                      -1);
-
-  return TRUE;
-}
-
 static GtkTreeModel *
 create_model (void)
 {
@@ -87,25 +56,21 @@ create_model (void)
 
   /* create list store */
   store = gtk_list_store_new (NUM_COLUMNS,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_UINT,
-                              G_TYPE_STRING,
-                              G_TYPE_STRING,
-                              G_TYPE_UINT,
-                              G_TYPE_BOOLEAN);
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_UINT,
+			      G_TYPE_STRING,
+			      G_TYPE_STRING);
 
   /* add data to the list store */
   for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-                          COLUMN_FIXED, data[i].fixed,
-                          COLUMN_NUMBER, data[i].number,
-                          COLUMN_SEVERITY, data[i].severity,
-                          COLUMN_DESCRIPTION, data[i].description,
-                          COLUMN_PULSE, 0,
-                          COLUMN_ACTIVE, FALSE,
-                          -1);
+			  COLUMN_FIXED, data[i].fixed,
+			  COLUMN_NUMBER, data[i].number,
+			  COLUMN_SEVERITY, data[i].severity,
+			  COLUMN_DESCRIPTION, data[i].description,
+			  -1);
     }
 
   return GTK_TREE_MODEL (store);
@@ -113,8 +78,8 @@ create_model (void)
 
 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-               gchar                 *path_str,
-               gpointer               data)
+	       gchar                 *path_str,
+	       gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *)data;
   GtkTreeIter  iter;
@@ -145,75 +110,48 @@ add_columns (GtkTreeView *treeview)
   /* column for fixed toggles */
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled",
-                    G_CALLBACK (fixed_toggled), model);
+		    G_CALLBACK (fixed_toggled), model);
 
   column = gtk_tree_view_column_new_with_attributes ("Fixed?",
-                                                     renderer,
-                                                     "active", COLUMN_FIXED,
-                                                     NULL);
+						     renderer,
+						     "active", COLUMN_FIXED,
+						     NULL);
 
   /* set this column to a fixed sizing (of 50 pixels) */
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for bug numbers */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Bug number",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_NUMBER,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_NUMBER,
+						     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_NUMBER);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for severities */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Severity",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_SEVERITY,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_SEVERITY,
+						     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_SEVERITY);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for description */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Description",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_DESCRIPTION,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_DESCRIPTION,
+						     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_DESCRIPTION);
   gtk_tree_view_append_column (treeview, column);
-
-  /* column for spinner */
-  renderer = gtk_cell_renderer_spinner_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Spinning",
-                                                     renderer,
-                                                     "pulse",
-                                                     COLUMN_PULSE,
-                                                     "active",
-                                                     COLUMN_ACTIVE,
-                                                     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
-  gtk_tree_view_append_column (treeview, column);
-}
-
-static gboolean
-window_closed (GtkWidget *widget,
-               GdkEvent  *event,
-               gpointer   user_data)
-{
-  model = NULL;
-  window = NULL;
-  if (timeout != 0)
-    {
-      g_source_remove (timeout);
-      timeout = 0;
-    }
-  return FALSE;
 }
 
 GtkWidget *
@@ -224,16 +162,17 @@ do_list_store (GtkWidget *do_widget)
       GtkWidget *vbox;
       GtkWidget *label;
       GtkWidget *sw;
+      GtkTreeModel *model;
       GtkWidget *treeview;
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
 
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       vbox = gtk_vbox_new (FALSE, 8);
@@ -244,10 +183,10 @@ do_list_store (GtkWidget *do_widget)
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+					   GTK_SHADOW_ETCHED_IN);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
+				      GTK_POLICY_NEVER,
+				      GTK_POLICY_AUTOMATIC);
       gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
 
       /* create tree model */
@@ -257,7 +196,7 @@ do_list_store (GtkWidget *do_widget)
       treeview = gtk_tree_view_new_with_model (model);
       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
-                                       COLUMN_DESCRIPTION);
+				       COLUMN_DESCRIPTION);
 
       g_object_unref (model);
 
@@ -268,27 +207,14 @@ do_list_store (GtkWidget *do_widget)
 
       /* finish & show */
       gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
-      g_signal_connect (window, "delete-event",
-                        G_CALLBACK (window_closed), NULL);
     }
 
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-      if (timeout == 0) {
-        /* FIXME this should use the animation-duration instead */
-        timeout = g_timeout_add (80, spinner_timeout, NULL);
-      }
-    }
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
   else
     {
       gtk_widget_destroy (window);
       window = NULL;
-      if (timeout != 0)
-        {
-          g_source_remove (timeout);
-          timeout = 0;
-        }
     }
 
   return 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_of_module (NULL);
+      result = g_win32_get_package_installation_directory (NULL, NULL);
       if (result == NULL)
 	result = "unknown-location";
 

demos/gtk-demo/menus.c

@@ -2,10 +2,10 @@
  *
  * There are several widgets involved in displaying menus. The
  * GtkMenuBar widget is a menu bar, which normally appears horizontally
- * at the top of an application, but can also be layed out vertically.
- * The GtkMenu widget is the actual menu that pops up. Both GtkMenuBar
- * and GtkMenu are subclasses of GtkMenuShell; a GtkMenuShell contains
- * menu items (GtkMenuItem). Each menu item contains text and/or images
+ * at the top of an application, but can also be layed out vertically. 
+ * The GtkMenu widget is the actual menu that pops up. Both GtkMenuBar 
+ * and GtkMenu are subclasses of GtkMenuShell; a GtkMenuShell contains 
+ * menu items (GtkMenuItem). Each menu item contains text and/or images 
  * and can be selected by the user.
  *
  * There are several kinds of menu item, including plain GtkMenuItem,
@@ -22,6 +22,7 @@
  * GtkUIManager provides a higher-level interface for creating menu bars
  * and menus; while you can construct menus manually, most people don't
  * do that. There's a separate demo for GtkUIManager.
+ * 
  */
 
 #include <gtk/gtk.h>
@@ -117,35 +118,37 @@ change_orientation (GtkWidget *button,
     }
 }
 
-static GtkWidget *window = NULL;
-
 GtkWidget *
 do_menus (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
   GtkWidget *box;
   GtkWidget *box1;
   GtkWidget *box2;
   GtkWidget *button;
-
+  
   if (!window)
     {
       GtkWidget *menubar;
       GtkWidget *menu;
       GtkWidget *menuitem;
       GtkAccelGroup *accel_group;
-
+      
       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), "Menus");
       g_signal_connect (window, "destroy",
 			G_CALLBACK(gtk_widget_destroyed), &window);
-
+      g_signal_connect (window, "delete-event",
+			G_CALLBACK (gtk_true), NULL);
+      
       accel_group = gtk_accel_group_new ();
       gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
 
+      gtk_window_set_title (GTK_WINDOW (window), "menus");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
+      
+            
       box = gtk_hbox_new (FALSE, 0);
       gtk_container_add (GTK_CONTAINER (window), box);
       gtk_widget_show (box);
@@ -153,18 +156,18 @@ do_menus (GtkWidget *do_widget)
       box1 = gtk_vbox_new (FALSE, 0);
       gtk_container_add (GTK_CONTAINER (box), box1);
       gtk_widget_show (box1);
-
+      
       menubar = gtk_menu_bar_new ();
       gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
       gtk_widget_show (menubar);
-
+      
       menu = create_menu (2, TRUE);
-
+      
       menuitem = gtk_menu_item_new_with_label ("test\nline2");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
-
+      
       menuitem = gtk_menu_item_new_with_label ("foo");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
@@ -175,7 +178,7 @@ do_menus (GtkWidget *do_widget)
       gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
       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);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
@@ -191,12 +194,12 @@ do_menus (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      gtk_widget_set_can_default (button, TRUE);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/offscreen_window.c

@@ -1,579 +0,0 @@
-/* Offscreen windows/Rotated button
- *
- * Offscreen windows can be used to transform parts of a widget
- * hierarchy. Note that the rotated button is fully functional.
- */
-#include <math.h>
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_ROTATED_BIN              (gtk_rotated_bin_get_type ())
-#define GTK_ROTATED_BIN(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ROTATED_BIN, GtkRotatedBin))
-#define GTK_ROTATED_BIN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ROTATED_BIN, GtkRotatedBinClass))
-#define GTK_IS_ROTATED_BIN(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ROTATED_BIN))
-#define GTK_IS_ROTATED_BIN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ROTATED_BIN))
-#define GTK_ROTATED_BIN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ROTATED_BIN, GtkRotatedBinClass))
-
-typedef struct _GtkRotatedBin   GtkRotatedBin;
-typedef struct _GtkRotatedBinClass  GtkRotatedBinClass;
-
-struct _GtkRotatedBin
-{
-  GtkContainer container;
-
-  GtkWidget *child;
-  GdkWindow *offscreen_window;
-  gdouble angle;
-};
-
-struct _GtkRotatedBinClass
-{
-  GtkContainerClass parent_class;
-};
-
-GType      gtk_rotated_bin_get_type  (void) G_GNUC_CONST;
-GtkWidget* gtk_rotated_bin_new       (void);
-void       gtk_rotated_bin_set_angle (GtkRotatedBin *bin,
-                                      gdouble        angle);
-
-/*** implementation ***/
-
-static void     gtk_rotated_bin_realize       (GtkWidget       *widget);
-static void     gtk_rotated_bin_unrealize     (GtkWidget       *widget);
-static void     gtk_rotated_bin_size_request  (GtkWidget       *widget,
-                                               GtkRequisition  *requisition);
-static void     gtk_rotated_bin_size_allocate (GtkWidget       *widget,
-                                               GtkAllocation   *allocation);
-static gboolean gtk_rotated_bin_damage        (GtkWidget       *widget,
-                                               GdkEventExpose  *event);
-static gboolean gtk_rotated_bin_expose        (GtkWidget       *widget,
-                                               GdkEventExpose  *offscreen);
-
-static void     gtk_rotated_bin_add           (GtkContainer    *container,
-                                               GtkWidget       *child);
-static void     gtk_rotated_bin_remove        (GtkContainer    *container,
-                                               GtkWidget       *widget);
-static void     gtk_rotated_bin_forall        (GtkContainer    *container,
-                                               gboolean         include_internals,
-                                               GtkCallback      callback,
-                                               gpointer         callback_data);
-static GType    gtk_rotated_bin_child_type    (GtkContainer    *container);
-
-G_DEFINE_TYPE (GtkRotatedBin, gtk_rotated_bin, GTK_TYPE_CONTAINER);
-
-static void
-to_child (GtkRotatedBin *bin,
-          double         widget_x,
-          double         widget_y,
-          double        *x_out,
-          double        *y_out)
-{
-  GtkAllocation child_area;
-  double x, y, xr, yr;
-  double c, s;
-  double w, h;
-
-  s = sin (bin->angle);
-  c = cos (bin->angle);
-  child_area = bin->child->allocation;
-
-  w = c * child_area.width + s * child_area.height;
-  h = s * child_area.width + c * child_area.height;
-
-  x = widget_x;
-  y = widget_y;
-
-  x -= (w - child_area.width) / 2;
-  y -= (h - child_area.height) / 2;
-
-  x -= child_area.width / 2;
-  y -= child_area.height / 2;
-
-  xr = x * c + y * s;
-  yr = y * c - x * s;
-  x = xr;
-  y = yr;
-
-  x += child_area.width / 2;
-  y += child_area.height / 2;
-
-  *x_out = x;
-  *y_out = y;
-}
-
-static void
-to_parent (GtkRotatedBin *bin,
-           double         offscreen_x,
-           double         offscreen_y,
-           double        *x_out,
-           double        *y_out)
-{
-  GtkAllocation child_area;
-  double x, y, xr, yr;
-  double c, s;
-  double w, h;
-
-  s = sin (bin->angle);
-  c = cos (bin->angle);
-  child_area = bin->child->allocation;
-
-  w = c * child_area.width + s * child_area.height;
-  h = s * child_area.width + c * child_area.height;
-
-  x = offscreen_x;
-  y = offscreen_y;
-
-  x -= child_area.width / 2;
-  y -= child_area.height / 2;
-
-  xr = x * c - y * s;
-  yr = x * s + y * c;
-  x = xr;
-  y = yr;
-
-  x += child_area.width / 2;
-  y += child_area.height / 2;
-
-  x -= (w - child_area.width) / 2;
-  y -= (h - child_area.height) / 2;
-
-  *x_out = x;
-  *y_out = y;
-}
-
-static void
-gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-
-  widget_class->realize = gtk_rotated_bin_realize;
-  widget_class->unrealize = gtk_rotated_bin_unrealize;
-  widget_class->size_request = gtk_rotated_bin_size_request;
-  widget_class->size_allocate = gtk_rotated_bin_size_allocate;
-  widget_class->expose_event = gtk_rotated_bin_expose;
-
-  g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
-                                   GTK_TYPE_ROTATED_BIN,
-                                   g_cclosure_new (G_CALLBACK (gtk_rotated_bin_damage),
-                                                   NULL, NULL));
-
-  container_class->add = gtk_rotated_bin_add;
-  container_class->remove = gtk_rotated_bin_remove;
-  container_class->forall = gtk_rotated_bin_forall;
-  container_class->child_type = gtk_rotated_bin_child_type;
-}
-
-static void
-gtk_rotated_bin_init (GtkRotatedBin *bin)
-{
-  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
-}
-
-GtkWidget *
-gtk_rotated_bin_new (void)
-{
-  return g_object_new (GTK_TYPE_ROTATED_BIN, NULL);
-}
-
-static GdkWindow *
-pick_offscreen_child (GdkWindow     *offscreen_window,
-                      double         widget_x,
-                      double         widget_y,
-                      GtkRotatedBin *bin)
-{
- GtkAllocation child_area;
- double x, y;
-
- if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      to_child (bin, widget_x, widget_y, &x, &y);
-
-      child_area = bin->child->allocation;
-
-      if (x >= 0 && x < child_area.width &&
-          y >= 0 && y < child_area.height)
-        return bin->offscreen_window;
-    }
-
-  return NULL;
-}
-
-static void
-offscreen_window_to_parent (GdkWindow     *offscreen_window,
-                            double         offscreen_x,
-                            double         offscreen_y,
-                            double        *parent_x,
-                            double        *parent_y,
-                            GtkRotatedBin *bin)
-{
-  to_parent (bin, offscreen_x, offscreen_y, parent_x, parent_y);
-}
-
-static void
-offscreen_window_from_parent (GdkWindow     *window,
-                              double         parent_x,
-                              double         parent_y,
-                              double        *offscreen_x,
-                              double        *offscreen_y,
-                              GtkRotatedBin *bin)
-{
-  to_child (bin, parent_x, parent_y, offscreen_x, offscreen_y);
-}
-
-static void
-gtk_rotated_bin_realize (GtkWidget *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  gint border_width;
-  GtkRequisition child_requisition;
-
-  gtk_widget_set_realized (widget, TRUE);
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = widget->allocation.y + border_width;
-  attributes.width = widget->allocation.width - 2 * border_width;
-  attributes.height = widget->allocation.height - 2 * border_width;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask = gtk_widget_get_events (widget)
-                        | GDK_EXPOSURE_MASK
-                        | GDK_POINTER_MOTION_MASK
-                        | GDK_BUTTON_PRESS_MASK
-                        | GDK_BUTTON_RELEASE_MASK
-                        | GDK_SCROLL_MASK
-                        | GDK_ENTER_NOTIFY_MASK
-                        | GDK_LEAVE_NOTIFY_MASK;
-
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.wclass = GDK_INPUT_OUTPUT;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                   &attributes, attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-  g_signal_connect (widget->window, "pick-embedded-child",
-                    G_CALLBACK (pick_offscreen_child), bin);
-
-  attributes.window_type = GDK_WINDOW_OFFSCREEN;
-
-  child_requisition.width = child_requisition.height = 0;
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      attributes.width = bin->child->allocation.width;
-      attributes.height = bin->child->allocation.height;
-    }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
-                                          &attributes, attributes_mask);
-  gdk_window_set_user_data (bin->offscreen_window, widget);
-  if (bin->child)
-    gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
-  g_signal_connect (bin->offscreen_window, "to-embedder",
-                    G_CALLBACK (offscreen_window_to_parent), bin);
-  g_signal_connect (bin->offscreen_window, "from-embedder",
-                    G_CALLBACK (offscreen_window_from_parent), bin);
-
-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
-  gdk_window_show (bin->offscreen_window);
-}
-
-static void
-gtk_rotated_bin_unrealize (GtkWidget *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-
-  gdk_window_set_user_data (bin->offscreen_window, NULL);
-  gdk_window_destroy (bin->offscreen_window);
-  bin->offscreen_window = NULL;
-
-  GTK_WIDGET_CLASS (gtk_rotated_bin_parent_class)->unrealize (widget);
-}
-
-static GType
-gtk_rotated_bin_child_type (GtkContainer *container)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-
-  if (bin->child)
-    return G_TYPE_NONE;
-
-  return GTK_TYPE_WIDGET;
-}
-
-static void
-gtk_rotated_bin_add (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-
-  if (!bin->child)
-    {
-      gtk_widget_set_parent_window (widget, bin->offscreen_window);
-      gtk_widget_set_parent (widget, GTK_WIDGET (bin));
-      bin->child = widget;
-    }
-  else
-    g_warning ("GtkRotatedBin cannot have more than one child\n");
-}
-
-static void
-gtk_rotated_bin_remove (GtkContainer *container,
-                        GtkWidget    *widget)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-  gboolean was_visible;
-
-  was_visible = gtk_widget_get_visible (widget);
-
-  if (bin->child == widget)
-    {
-      gtk_widget_unparent (widget);
-
-      bin->child = NULL;
-
-      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-    }
-}
-
-static void
-gtk_rotated_bin_forall (GtkContainer *container,
-                        gboolean      include_internals,
-                        GtkCallback   callback,
-                        gpointer      callback_data)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
-
-  g_return_if_fail (callback != NULL);
-
-  if (bin->child)
-    (*callback) (bin->child, callback_data);
-}
-
-void
-gtk_rotated_bin_set_angle (GtkRotatedBin *bin,
-                           gdouble        angle)
-{
-  g_return_if_fail (GTK_IS_ROTATED_BIN (bin));
-
-  bin->angle = angle;
-  gtk_widget_queue_resize (GTK_WIDGET (bin));
-
-  gdk_window_geometry_changed (bin->offscreen_window);
-}
-
-static void
-gtk_rotated_bin_size_request (GtkWidget      *widget,
-                              GtkRequisition *requisition)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  GtkRequisition child_requisition;
-  double s, c;
-  double w, h;
-
-  child_requisition.width = 0;
-  child_requisition.height = 0;
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_size_request (bin->child, &child_requisition);
-
-  s = sin (bin->angle);
-  c = cos (bin->angle);
-  w = c * child_requisition.width + s * child_requisition.height;
-  h = s * child_requisition.width + c * child_requisition.height;
-
-  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + w;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + h;
-}
-
-static void
-gtk_rotated_bin_size_allocate (GtkWidget     *widget,
-                               GtkAllocation *allocation)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  gint border_width;
-  gint w, h;
-  gdouble s, c;
-
-  widget->allocation = *allocation;
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  w = allocation->width - border_width * 2;
-  h = allocation->height - border_width * 2;
-
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (widget->window,
-                            allocation->x + border_width,
-                            allocation->y + border_width,
-                            w, h);
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      GtkRequisition child_requisition;
-      GtkAllocation child_allocation;
-
-      s = sin (bin->angle);
-      c = cos (bin->angle);
-
-      gtk_widget_get_child_requisition (bin->child, &child_requisition);
-      child_allocation.x = 0;
-      child_allocation.y = 0;
-      child_allocation.height = child_requisition.height;
-      if (c == 0.0)
-        child_allocation.width = h / s;
-      else if (s == 0.0)
-        child_allocation.width = w / c;
-      else
-        child_allocation.width = MIN ((w - s * child_allocation.height) / c,
-                                      (h - c * child_allocation.height) / s);
-
-      if (gtk_widget_get_realized (widget))
-        gdk_window_move_resize (bin->offscreen_window,
-                                child_allocation.x,
-                                child_allocation.y,
-                                child_allocation.width,
-                                child_allocation.height);
-
-      child_allocation.x = child_allocation.y = 0;
-      gtk_widget_size_allocate (bin->child, &child_allocation);
-    }
-}
-
-static gboolean
-gtk_rotated_bin_damage (GtkWidget      *widget,
-                        GdkEventExpose *event)
-{
-  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
-
-  return TRUE;
-}
-
-static gboolean
-gtk_rotated_bin_expose (GtkWidget      *widget,
-                        GdkEventExpose *event)
-{
-  GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  gint width, height;
-  gdouble s, c;
-  gdouble w, h;
-
-  if (gtk_widget_is_drawable (widget))
-    {
-      if (event->window == widget->window)
-        {
-          GdkPixmap *pixmap;
-          GtkAllocation child_area;
-          cairo_t *cr;
-
-          if (bin->child && gtk_widget_get_visible (bin->child))
-            {
-              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              child_area = bin->child->allocation;
-
-              cr = gdk_cairo_create (widget->window);
-
-              /* transform */
-              s = sin (bin->angle);
-              c = cos (bin->angle);
-              w = c * child_area.width + s * child_area.height;
-              h = s * child_area.width + c * child_area.height;
-
-              cairo_translate (cr, (w - child_area.width) / 2, (h - child_area.height) / 2);
-              cairo_translate (cr, child_area.width / 2, child_area.height / 2);
-              cairo_rotate (cr, bin->angle);
-              cairo_translate (cr, -child_area.width / 2, -child_area.height / 2);
-
-              /* clip */
-              gdk_drawable_get_size (pixmap, &width, &height);
-              cairo_rectangle (cr, 0, 0, width, height);
-              cairo_clip (cr);
-              /* paint */
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, 0);
-              cairo_paint (cr);
-
-              cairo_destroy (cr);
-            }
-        }
-      else if (event->window == bin->offscreen_window)
-        {
-          gtk_paint_flat_box (widget->style, event->window,
-                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                              &event->area, widget, "blah",
-                              0, 0, -1, -1);
-
-          if (bin->child)
-            gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                            bin->child,
-                                            event);
-        }
-    }
-
-  return FALSE;
-}
-
-/*** ***/
-
-static void
-scale_changed (GtkRange      *range,
-               GtkRotatedBin *bin)
-{
-  gtk_rotated_bin_set_angle (bin, gtk_range_get_value (range));
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_offscreen_window (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *bin, *vbox, *scale, *button;
-      GdkColor black;
-
-      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 widget");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gdk_color_parse ("black", &black);
-      gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-      vbox = gtk_vbox_new (0, FALSE);
-      scale = gtk_hscale_new_with_range (0, G_PI/2, 0.01);
-      gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
-
-      button = gtk_button_new_with_label ("A Button");
-      bin = gtk_rotated_bin_new ();
-
-      g_signal_connect (scale, "value-changed", G_CALLBACK (scale_changed), bin);
-
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-      gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE, 0);
-      gtk_container_add (GTK_CONTAINER (bin), button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-

demos/gtk-demo/offscreen_window2.c

@@ -1,500 +0,0 @@
-/* Offscreen windows/Effects
- *
- * Offscreen windows can be used to render elements multiple times to achieve
- * various effects.
- */
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_MIRROR_BIN              (gtk_mirror_bin_get_type ())
-#define GTK_MIRROR_BIN(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MIRROR_BIN, GtkMirrorBin))
-#define GTK_MIRROR_BIN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MIRROR_BIN, GtkMirrorBinClass))
-#define GTK_IS_MIRROR_BIN(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MIRROR_BIN))
-#define GTK_IS_MIRROR_BIN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MIRROR_BIN))
-#define GTK_MIRROR_BIN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MIRROR_BIN, GtkMirrorBinClass))
-
-typedef struct _GtkMirrorBin   GtkMirrorBin;
-typedef struct _GtkMirrorBinClass  GtkMirrorBinClass;
-
-struct _GtkMirrorBin
-{
-  GtkContainer container;
-
-  GtkWidget *child;
-  GdkWindow *offscreen_window;
-};
-
-struct _GtkMirrorBinClass
-{
-  GtkContainerClass parent_class;
-};
-
-GType      gtk_mirror_bin_get_type  (void) G_GNUC_CONST;
-GtkWidget* gtk_mirror_bin_new       (void);
-
-/*** implementation ***/
-
-static void     gtk_mirror_bin_realize       (GtkWidget       *widget);
-static void     gtk_mirror_bin_unrealize     (GtkWidget       *widget);
-static void     gtk_mirror_bin_size_request  (GtkWidget       *widget,
-                                               GtkRequisition  *requisition);
-static void     gtk_mirror_bin_size_allocate (GtkWidget       *widget,
-                                               GtkAllocation   *allocation);
-static gboolean gtk_mirror_bin_damage        (GtkWidget       *widget,
-                                               GdkEventExpose  *event);
-static gboolean gtk_mirror_bin_expose        (GtkWidget       *widget,
-                                               GdkEventExpose  *offscreen);
-
-static void     gtk_mirror_bin_add           (GtkContainer    *container,
-                                               GtkWidget       *child);
-static void     gtk_mirror_bin_remove        (GtkContainer    *container,
-                                               GtkWidget       *widget);
-static void     gtk_mirror_bin_forall        (GtkContainer    *container,
-                                               gboolean         include_internals,
-                                               GtkCallback      callback,
-                                               gpointer         callback_data);
-static GType    gtk_mirror_bin_child_type    (GtkContainer    *container);
-
-G_DEFINE_TYPE (GtkMirrorBin, gtk_mirror_bin, GTK_TYPE_CONTAINER);
-
-static void
-to_child (GtkMirrorBin *bin,
-          double         widget_x,
-          double         widget_y,
-          double        *x_out,
-          double        *y_out)
-{
-  *x_out = widget_x;
-  *y_out = widget_y;
-}
-
-static void
-to_parent (GtkMirrorBin *bin,
-           double         offscreen_x,
-           double         offscreen_y,
-           double        *x_out,
-           double        *y_out)
-{
-  *x_out = offscreen_x;
-  *y_out = offscreen_y;
-}
-
-static void
-gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-
-  widget_class->realize = gtk_mirror_bin_realize;
-  widget_class->unrealize = gtk_mirror_bin_unrealize;
-  widget_class->size_request = gtk_mirror_bin_size_request;
-  widget_class->size_allocate = gtk_mirror_bin_size_allocate;
-  widget_class->expose_event = gtk_mirror_bin_expose;
-
-  g_signal_override_class_closure (g_signal_lookup ("damage-event", GTK_TYPE_WIDGET),
-                                   GTK_TYPE_MIRROR_BIN,
-                                   g_cclosure_new (G_CALLBACK (gtk_mirror_bin_damage),
-                                                   NULL, NULL));
-
-  container_class->add = gtk_mirror_bin_add;
-  container_class->remove = gtk_mirror_bin_remove;
-  container_class->forall = gtk_mirror_bin_forall;
-  container_class->child_type = gtk_mirror_bin_child_type;
-}
-
-static void
-gtk_mirror_bin_init (GtkMirrorBin *bin)
-{
-  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
-}
-
-GtkWidget *
-gtk_mirror_bin_new (void)
-{
-  return g_object_new (GTK_TYPE_MIRROR_BIN, NULL);
-}
-
-static GdkWindow *
-pick_offscreen_child (GdkWindow     *offscreen_window,
-                      double         widget_x,
-                      double         widget_y,
-                      GtkMirrorBin *bin)
-{
- GtkAllocation child_area;
- double x, y;
-
- if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      to_child (bin, widget_x, widget_y, &x, &y);
-
-      child_area = bin->child->allocation;
-
-      if (x >= 0 && x < child_area.width &&
-          y >= 0 && y < child_area.height)
-        return bin->offscreen_window;
-    }
-
-  return NULL;
-}
-
-static void
-offscreen_window_to_parent (GdkWindow     *offscreen_window,
-                            double         offscreen_x,
-                            double         offscreen_y,
-                            double        *parent_x,
-                            double        *parent_y,
-                            GtkMirrorBin *bin)
-{
-  to_parent (bin, offscreen_x, offscreen_y, parent_x, parent_y);
-}
-
-static void
-offscreen_window_from_parent (GdkWindow     *window,
-                              double         parent_x,
-                              double         parent_y,
-                              double        *offscreen_x,
-                              double        *offscreen_y,
-                              GtkMirrorBin *bin)
-{
-  to_child (bin, parent_x, parent_y, offscreen_x, offscreen_y);
-}
-
-static void
-gtk_mirror_bin_realize (GtkWidget *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  gint border_width;
-  GtkRequisition child_requisition;
-
-  gtk_widget_set_realized (widget, TRUE);
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = widget->allocation.y + border_width;
-  attributes.width = widget->allocation.width - 2 * border_width;
-  attributes.height = widget->allocation.height - 2 * border_width;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask = gtk_widget_get_events (widget)
-                        | GDK_EXPOSURE_MASK
-                        | GDK_POINTER_MOTION_MASK
-                        | GDK_BUTTON_PRESS_MASK
-                        | GDK_BUTTON_RELEASE_MASK
-                        | GDK_SCROLL_MASK
-                        | GDK_ENTER_NOTIFY_MASK
-                        | GDK_LEAVE_NOTIFY_MASK;
-
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.wclass = GDK_INPUT_OUTPUT;
-
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                   &attributes, attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-  g_signal_connect (widget->window, "pick-embedded-child",
-                    G_CALLBACK (pick_offscreen_child), bin);
-
-  attributes.window_type = GDK_WINDOW_OFFSCREEN;
-
-  child_requisition.width = child_requisition.height = 0;
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      attributes.width = bin->child->allocation.width;
-      attributes.height = bin->child->allocation.height;
-    }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
-                                          &attributes, attributes_mask);
-  gdk_window_set_user_data (bin->offscreen_window, widget);
-  if (bin->child)
-    gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
-  g_signal_connect (bin->offscreen_window, "to-embedder",
-                    G_CALLBACK (offscreen_window_to_parent), bin);
-  g_signal_connect (bin->offscreen_window, "from-embedder",
-                    G_CALLBACK (offscreen_window_from_parent), bin);
-
-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
-  gdk_window_show (bin->offscreen_window);
-}
-
-static void
-gtk_mirror_bin_unrealize (GtkWidget *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-
-  gdk_window_set_user_data (bin->offscreen_window, NULL);
-  gdk_window_destroy (bin->offscreen_window);
-  bin->offscreen_window = NULL;
-
-  GTK_WIDGET_CLASS (gtk_mirror_bin_parent_class)->unrealize (widget);
-}
-
-static GType
-gtk_mirror_bin_child_type (GtkContainer *container)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-
-  if (bin->child)
-    return G_TYPE_NONE;
-
-  return GTK_TYPE_WIDGET;
-}
-
-static void
-gtk_mirror_bin_add (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-
-  if (!bin->child)
-    {
-      gtk_widget_set_parent_window (widget, bin->offscreen_window);
-      gtk_widget_set_parent (widget, GTK_WIDGET (bin));
-      bin->child = widget;
-    }
-  else
-    g_warning ("GtkMirrorBin cannot have more than one child\n");
-}
-
-static void
-gtk_mirror_bin_remove (GtkContainer *container,
-                        GtkWidget    *widget)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-  gboolean was_visible;
-
-  was_visible = gtk_widget_get_visible (widget);
-
-  if (bin->child == widget)
-    {
-      gtk_widget_unparent (widget);
-
-      bin->child = NULL;
-
-      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-    }
-}
-
-static void
-gtk_mirror_bin_forall (GtkContainer *container,
-                        gboolean      include_internals,
-                        GtkCallback   callback,
-                        gpointer      callback_data)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
-
-  g_return_if_fail (callback != NULL);
-
-  if (bin->child)
-    (*callback) (bin->child, callback_data);
-}
-
-static void
-gtk_mirror_bin_size_request (GtkWidget      *widget,
-                              GtkRequisition *requisition)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  GtkRequisition child_requisition;
-
-  child_requisition.width = 0;
-  child_requisition.height = 0;
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    gtk_widget_size_request (bin->child, &child_requisition);
-
-  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.width + 10;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.height * 2 + 10;
-}
-
-static void
-gtk_mirror_bin_size_allocate (GtkWidget     *widget,
-                               GtkAllocation *allocation)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  gint border_width;
-  gint w, h;
-  widget->allocation = *allocation;
-
-  border_width = GTK_CONTAINER (widget)->border_width;
-
-  w = allocation->width - border_width * 2;
-  h = allocation->height - border_width * 2;
-
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (widget->window,
-                            allocation->x + border_width,
-                            allocation->y + border_width,
-                            w, h);
-
-  if (bin->child && gtk_widget_get_visible (bin->child))
-    {
-      GtkRequisition child_requisition;
-      GtkAllocation child_allocation;
-
-      gtk_widget_get_child_requisition (bin->child, &child_requisition);
-      child_allocation.x = 0;
-      child_allocation.y = 0;
-      child_allocation.height = child_requisition.height;
-      child_allocation.width = child_requisition.width;
-
-      if (gtk_widget_get_realized (widget))
-        gdk_window_move_resize (bin->offscreen_window,
-                                allocation->x + border_width,
-                                allocation->y + border_width,
-                                child_allocation.width, child_allocation.height);
-      gtk_widget_size_allocate (bin->child, &child_allocation);
-    }
-}
-
-static gboolean
-gtk_mirror_bin_damage (GtkWidget      *widget,
-                        GdkEventExpose *event)
-{
-  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
-
-  return TRUE;
-}
-
-static gboolean
-gtk_mirror_bin_expose (GtkWidget      *widget,
-                        GdkEventExpose *event)
-{
-  GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  gint width, height;
-
-  if (gtk_widget_is_drawable (widget))
-    {
-      if (event->window == widget->window)
-        {
-          GdkPixmap *pixmap;
-          cairo_t *cr;
-          cairo_matrix_t matrix;
-          cairo_pattern_t *mask;
-
-          if (bin->child && gtk_widget_get_visible (bin->child))
-            {
-              pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              gdk_drawable_get_size (pixmap, &width, &height);
-
-              cr = gdk_cairo_create (widget->window);
-
-              cairo_save (cr);
-
-              cairo_rectangle (cr, 0, 0, width, height);
-              cairo_clip (cr);
-
-              /* paint the offscreen child */
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, 0);
-              cairo_paint (cr);
-
-              cairo_restore (cr);
-
-              cairo_matrix_init (&matrix, 1.0, 0.0, 0.3, 1.0, 0.0, 0.0);
-              cairo_matrix_scale (&matrix, 1.0, -1.0);
-              cairo_matrix_translate (&matrix, -10, - 3 * height - 10);
-              cairo_transform (cr, &matrix);
-
-              cairo_rectangle (cr, 0, height, width, height);
-              cairo_clip (cr);
-
-              gdk_cairo_set_source_pixmap (cr, pixmap, 0, height);
-
-              /* create linear gradient as mask-pattern to fade out the source */
-              mask = cairo_pattern_create_linear (0.0, height, 0.0, 2*height);
-              cairo_pattern_add_color_stop_rgba (mask, 0.0,  0.0, 0.0, 0.0, 0.0);
-              cairo_pattern_add_color_stop_rgba (mask, 0.25, 0.0, 0.0, 0.0, 0.01);
-              cairo_pattern_add_color_stop_rgba (mask, 0.5,  0.0, 0.0, 0.0, 0.25);
-              cairo_pattern_add_color_stop_rgba (mask, 0.75, 0.0, 0.0, 0.0, 0.5);
-              cairo_pattern_add_color_stop_rgba (mask, 1.0,  0.0, 0.0, 0.0, 1.0);
-
-              /* paint the reflection */
-              cairo_mask (cr, mask);
-
-              cairo_pattern_destroy (mask);
-              cairo_destroy (cr);
-            }
-        }
-      else if (event->window == bin->offscreen_window)
-        {
-          gtk_paint_flat_box (widget->style, event->window,
-                              GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-                              &event->area, widget, "blah",
-                              0, 0, -1, -1);
-
-          if (bin->child)
-            gtk_container_propagate_expose (GTK_CONTAINER (widget),
-                                            bin->child,
-                                            event);
-        }
-    }
-
-  return FALSE;
-}
-
-/*** ***/
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_offscreen_window2 (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *bin, *vbox;
-      GtkWidget *hbox, *entry, *applybutton, *backbutton;
-      GtkSizeGroup *group;
-
-      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), "Effects");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-      vbox = gtk_vbox_new (0, FALSE);
-
-      bin = gtk_mirror_bin_new ();
-
-      group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
-
-      hbox = gtk_hbox_new (FALSE, 6);
-      backbutton = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (backbutton),
-                         gtk_image_new_from_stock (GTK_STOCK_GO_BACK, 4));
-      gtk_size_group_add_widget (group, backbutton);
-      entry = gtk_entry_new ();
-      gtk_size_group_add_widget (group, entry);
-      applybutton = gtk_button_new ();
-      gtk_size_group_add_widget (group, applybutton);
-      gtk_container_add (GTK_CONTAINER (applybutton),
-                         gtk_image_new_from_stock (GTK_STOCK_APPLY, 4));
-
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-      gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE, 0);
-      gtk_container_add (GTK_CONTAINER (bin), hbox);
-      gtk_box_pack_start (GTK_BOX (hbox), backbutton, FALSE, FALSE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE, 0);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-

demos/gtk-demo/panes.c

@@ -180,7 +180,7 @@ do_panes (GtkWidget *do_widget)
       gtk_widget_show_all (vbox);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/pickers.c

@@ -59,7 +59,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/pixbufs.c

@@ -260,7 +260,7 @@ do_pixbufs (GtkWidget *do_widget)
         }
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/printing.c

@@ -13,19 +13,19 @@
 #define HEADER_HEIGHT (10*72/25.4)
 #define HEADER_GAP (3*72/25.4)
 
-typedef struct
+typedef struct 
 {
   gchar *filename;
   gdouble font_size;
 
-  gint lines_per_page;
+  gint lines_per_page;  
   gchar **lines;
   gint num_lines;
   gint num_pages;
 } PrintData;
 
 static void
-begin_print (GtkPrintOperation *operation,
+begin_print (GtkPrintOperation *operation, 
 	     GtkPrintContext   *context,
 	     gpointer           user_data)
 {
@@ -35,9 +35,9 @@ begin_print (GtkPrintOperation *operation,
   double height;
 
   height = gtk_print_context_get_height (context) - HEADER_HEIGHT - HEADER_GAP;
-
+  
   data->lines_per_page = floor (height / data->font_size);
-
+  
   g_file_get_contents (data->filename, &contents, NULL, NULL);
 
   data->lines = g_strsplit (contents, "\n", 0);
@@ -46,7 +46,7 @@ begin_print (GtkPrintOperation *operation,
   i = 0;
   while (data->lines[i] != NULL)
     i++;
-
+  
   data->num_lines = i;
   data->num_pages = (data->num_lines - 1) / data->lines_per_page + 1;
 
@@ -72,10 +72,10 @@ draw_page (GtkPrintOperation *operation,
   width = gtk_print_context_get_width (context);
 
   cairo_rectangle (cr, 0, 0, width, HEADER_HEIGHT);
-
+  
   cairo_set_source_rgb (cr, 0.8, 0.8, 0.8);
   cairo_fill_preserve (cr);
-
+  
   cairo_set_source_rgb (cr, 0, 0, 0);
   cairo_set_line_width (cr, 1);
   cairo_stroke (cr);
@@ -107,19 +107,19 @@ draw_page (GtkPrintOperation *operation,
   pango_layout_get_pixel_size (layout, &text_width, &text_height);
   cairo_move_to (cr, width - text_width - 4, (HEADER_HEIGHT - text_height) / 2);
   pango_cairo_show_layout (cr, layout);
-
+  
   g_object_unref (layout);
-
+  
   layout = gtk_print_context_create_pango_layout (context);
-
+  
   desc = pango_font_description_from_string ("monospace");
   pango_font_description_set_size (desc, data->font_size * PANGO_SCALE);
   pango_layout_set_font_description (layout, desc);
   pango_font_description_free (desc);
-
+  
   cairo_move_to (cr, 0, HEADER_HEIGHT + HEADER_GAP);
   line = page_nr * data->lines_per_page;
-  for (i = 0; i < data->lines_per_page && line < data->num_lines; i++)
+  for (i = 0; i < data->lines_per_page && line < data->num_lines; i++) 
     {
       pango_layout_set_text (layout, data->lines[line], -1);
       pango_cairo_show_layout (cr, layout);
@@ -131,7 +131,7 @@ draw_page (GtkPrintOperation *operation,
 }
 
 static void
-end_print (GtkPrintOperation *operation,
+end_print (GtkPrintOperation *operation, 
 	   GtkPrintContext   *context,
 	   gpointer           user_data)
 {
@@ -147,10 +147,7 @@ GtkWidget *
 do_printing (GtkWidget *do_widget)
 {
   GtkPrintOperation *operation;
-  GtkPrintSettings *settings;
   PrintData *data;
-  gchar *uri, *ext;
-  const gchar *dir;
   GError *error = NULL;
 
   operation = gtk_print_operation_new ();
@@ -158,55 +155,37 @@ do_printing (GtkWidget *do_widget)
   data->filename = demo_find_file ("printing.c", NULL);
   data->font_size = 12.0;
 
-  g_signal_connect (G_OBJECT (operation), "begin-print",
+  g_signal_connect (G_OBJECT (operation), "begin-print", 
 		    G_CALLBACK (begin_print), data);
-  g_signal_connect (G_OBJECT (operation), "draw-page",
+  g_signal_connect (G_OBJECT (operation), "draw-page", 
 		    G_CALLBACK (draw_page), data);
-  g_signal_connect (G_OBJECT (operation), "end-print",
+  g_signal_connect (G_OBJECT (operation), "end-print", 
 		    G_CALLBACK (end_print), data);
 
   gtk_print_operation_set_use_full_page (operation, FALSE);
   gtk_print_operation_set_unit (operation, GTK_UNIT_POINTS);
-  gtk_print_operation_set_embed_page_setup (operation, TRUE);
-
-  settings = gtk_print_settings_new ();
-  dir = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-  if (dir == NULL)
-    dir = g_get_home_dir ();
-  if (g_strcmp0 (gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT), "ps") == 0)
-    ext = ".ps";
-  else if (g_strcmp0 (gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT), "svg") == 0)
-    ext = ".svg";
-  else
-    ext = ".pdf";
-
-  uri = g_strconcat ("file://", dir, "/", "gtk-demo", ext, NULL);
-  gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
-  gtk_print_operation_set_print_settings (operation, settings);
 
   gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);
 
   g_object_unref (operation);
-  g_object_unref (settings);
-  g_free (uri);
 
   if (error)
     {
       GtkWidget *dialog;
-
+      
       dialog = gtk_message_dialog_new (GTK_WINDOW (do_widget),
 				       GTK_DIALOG_DESTROY_WITH_PARENT,
 				       GTK_MESSAGE_ERROR,
 				       GTK_BUTTONS_CLOSE,
 				       "%s", error->message);
       g_error_free (error);
-
+      
       g_signal_connect (dialog, "response",
 			G_CALLBACK (gtk_widget_destroy), NULL);
-
-      gtk_widget_show (dialog);
+      
+      gtk_widget_show (dialog);      
     }
-
+  
 
   return NULL;
 }

demos/gtk-demo/rotated_text.c

@@ -1,173 +1,101 @@
 /* Rotated Text
  *
- * This demo shows how to use PangoCairo to draw rotated and transformed
- * text.  The right pane shows a rotated GtkLabel widget.
+ * 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.
  *
- * 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.
+ * 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.
  */
-
+#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 5
-#define FONT "Serif 18"
-
+#define N_WORDS 10
+#define FONT "Sans Bold 27"
+  
+  PangoRenderer *renderer;
+  PangoMatrix matrix = PANGO_MATRIX_INIT;
   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;
 
-  /* 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);
+  /* 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 */
   device_radius = MIN (width, height) / 2.;
-  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);
+  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);
 
-  /* 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 */
+  /* Create a PangoLayout, set the font and text */
   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);
-
-  attrs = create_fancy_attr_list_for_layout (layout);
-  pango_layout_set_attributes (layout, attrs);
-  pango_attr_list_unref (attrs);
+  pango_font_description_free (desc);
 
   /* 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;
 
-      /* Inform Pango to re-layout the text with the new transformation matrix */
-      pango_cairo_update_layout (cr, layout);
+      /* 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;
     
-      pango_layout_get_pixel_size (layout, &width, &height);
-      cairo_move_to (cr, - width / 2, - RADIUS * .9);
-      pango_cairo_show_layout (cr, layout);
+      gdk_pango_renderer_set_override_color (GDK_PANGO_RENDERER (renderer),
+					     PANGO_RENDER_PART_FOREGROUND, &color);
+                                             
+      pango_matrix_rotate (&rotated_matrix, angle);
 
-      /* Rotate for the next turn */
-      cairo_rotate (cr, G_PI*2 / N_WORDS);
+      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_layout_get_size (layout, &width, &height);
+      pango_renderer_draw_layout (renderer, layout,
+				  - width / 2, - RADIUS * PANGO_SCALE);
     }
 
+  /* 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;
 }
@@ -175,30 +103,21 @@ 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), 4 * RADIUS, 2 * 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 (box), drawing_area);
+      gtk_container_add (GTK_CONTAINER (window), drawing_area);
 
       /* This overrides the background color from the theme */
       gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &white);
@@ -206,24 +125,10 @@ do_rotated_text (GtkWidget *do_widget)
       g_signal_connect (drawing_area, "expose-event",
 			G_CALLBACK (rotated_text_expose_event), NULL);
 
-      /* And a label */
-
-      label = gtk_label_new (text);
-      gtk_container_add (GTK_CONTAINER (box), label);
-
-      gtk_label_set_angle (GTK_LABEL (label), 45);
-
-      /* Set up fancy stuff on the label */
-      layout = gtk_label_get_layout (GTK_LABEL (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 (GTK_LABEL (label), attrs);
-      pango_attr_list_unref (attrs);
+      gtk_window_set_default_size (GTK_WINDOW (window), 2 * RADIUS, 2 * RADIUS);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/search_entry.c

@@ -1,335 +0,0 @@
-/* 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
-clear_entry (GtkEntry *entry)
-{
-  gtk_entry_set_text (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");
-}
-
-GtkWidget *
-create_search_menu (GtkWidget *entry)
-{
-  GtkWidget *menu;
-  GtkWidget *item;
-  GtkWidget *image;
-
-  menu = gtk_menu_new ();
-
-  item = gtk_image_menu_item_new_with_mnemonic ("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);
-  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-  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_mnemonic ("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);
-  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-  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_mnemonic ("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);
-  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-  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);
-
-  return menu;
-}
-
-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
-    clear_entry (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_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;
-}
-
-static void
-entry_populate_popup (GtkEntry *entry,
-                      GtkMenu  *menu,
-                      gpointer user_data)
-{
-  GtkWidget *item;
-  GtkWidget *search_menu;
-  gboolean has_text;
-
-  has_text = gtk_entry_get_text_length (entry) > 0;
-
-  item = gtk_separator_menu_item_new ();
-  gtk_widget_show (item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  item = gtk_menu_item_new_with_mnemonic ("C_lear");
-  gtk_widget_show (item);
-  g_signal_connect_swapped (item, "activate",
-                            G_CALLBACK (clear_entry), entry);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_set_sensitive (item, has_text);
-
-  search_menu = create_search_menu (GTK_WIDGET (entry));
-  item = gtk_menu_item_new_with_label ("Search by");
-  gtk_widget_show (item);
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), search_menu);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-}
-
-GtkWidget *
-do_search_entry (GtkWidget *do_widget)
-{
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *label;
-  GtkWidget *entry;
-  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 = create_search_menu (entry);
-      gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);
-
-      /* add accessible alternatives for icon functionality */
-      g_signal_connect (entry, "populate-popup",
-                        G_CALLBACK (entry_populate_popup), NULL);
-    }
-
-  if (!gtk_widget_get_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

@@ -158,7 +158,7 @@ do_sizegroup (GtkWidget *do_widget)
 			G_CALLBACK (toggle_grouping), size_group);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/spinner.c

@@ -1,94 +0,0 @@
-/* Spinner
- *
- * GtkSpinner allows to show that background activity is on-going.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *spinner_sensitive = NULL;
-static GtkWidget *spinner_unsensitive = NULL;
-
-static void
-on_play_clicked (GtkButton *button, gpointer user_data)
-{
-  gtk_spinner_start (GTK_SPINNER (spinner_sensitive));
-  gtk_spinner_start (GTK_SPINNER (spinner_unsensitive));
-}
-
-static void
-on_stop_clicked (GtkButton *button, gpointer user_data)
-{
-  gtk_spinner_stop (GTK_SPINNER (spinner_sensitive));
-  gtk_spinner_stop (GTK_SPINNER (spinner_unsensitive));
-}
-
-GtkWidget *
-do_spinner (GtkWidget *do_widget)
-{
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *button;
-  GtkWidget *spinner;
-
-  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkSpinner",
-                                          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 (gtk_widget_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);
-
-    /* Sensitive */
-    hbox = gtk_hbox_new (FALSE, 5);
-    spinner = gtk_spinner_new ();
-    gtk_container_add (GTK_CONTAINER (hbox), spinner);
-    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
-    gtk_container_add (GTK_CONTAINER (vbox), hbox);
-    spinner_sensitive = spinner;
-
-    /* Disabled */
-    hbox = gtk_hbox_new (FALSE, 5);
-    spinner = gtk_spinner_new ();
-    gtk_container_add (GTK_CONTAINER (hbox), spinner);
-    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
-    gtk_container_add (GTK_CONTAINER (vbox), hbox);
-    spinner_unsensitive = spinner;
-    gtk_widget_set_sensitive (hbox, FALSE);
-
-    button = gtk_button_new_from_stock (GTK_STOCK_MEDIA_PLAY);
-    g_signal_connect (G_OBJECT (button), "clicked",
-                      G_CALLBACK (on_play_clicked), spinner);
-    gtk_container_add (GTK_CONTAINER (vbox), button);
-
-    button = gtk_button_new_from_stock (GTK_STOCK_MEDIA_STOP);
-    g_signal_connect (G_OBJECT (button), "clicked",
-                      G_CALLBACK (on_stop_clicked), spinner);
-    gtk_container_add (GTK_CONTAINER (vbox), button);
-
-    /* Start by default to test for:
-     * https://bugzilla.gnome.org/show_bug.cgi?id=598496 */
-    on_play_clicked (NULL, NULL);
-  }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-

demos/gtk-demo/stock_browser.c

@@ -532,7 +532,7 @@ do_stock_browser (GtkWidget *do_widget)
 			NULL);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/textscroll.c

@@ -191,7 +191,7 @@ do_textscroll (GtkWidget *do_widget)
       create_text_view (hbox, FALSE);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/textview.c

@@ -500,7 +500,7 @@ do_textview (GtkWidget *do_widget)
       gtk_widget_show_all (vpaned);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/toolpalette.c

@@ -1,795 +0,0 @@
-/* Tool Palette
- *
- * A tool palette widget shows groups of toolbar items as a grid of icons
- * or a list of names.
- */
-
-#include <string.h>
-#include <gtk/gtk.h>
-#include "config.h"
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-
-static void load_stock_items (GtkToolPalette *palette);
-static void load_toggle_items (GtkToolPalette *palette);
-static void load_special_items (GtkToolPalette *palette);
-
-typedef struct _CanvasItem CanvasItem;
-
-struct _CanvasItem
-{
-  GdkPixbuf *pixbuf;
-  gdouble x, y;
-};
-
-static CanvasItem *drop_item = NULL;
-static GList *canvas_items = NULL;
-
-/********************************/
-/* ====== Canvas drawing ====== */
-/********************************/
-
-static CanvasItem*
-canvas_item_new (GtkWidget     *widget,
-                 GtkToolButton *button,
-                 gdouble        x,
-                 gdouble        y)
-{
-  CanvasItem *item = NULL;
-  const gchar *stock_id;
-  GdkPixbuf *pixbuf;
-
-  stock_id = gtk_tool_button_get_stock_id (button);
-  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
-
-  if (pixbuf)
-    {
-      item = g_slice_new0 (CanvasItem);
-      item->pixbuf = pixbuf;
-      item->x = x;
-      item->y = y;
-    }
-
-  return item;
-}
-
-static void
-canvas_item_free (CanvasItem *item)
-{
-  g_object_unref (item->pixbuf);
-  g_slice_free (CanvasItem, item);
-}
-
-static void
-canvas_item_draw (const CanvasItem *item,
-                  cairo_t          *cr,
-                  gboolean          preview)
-{
-  gdouble cx = gdk_pixbuf_get_width (item->pixbuf);
-  gdouble cy = gdk_pixbuf_get_height (item->pixbuf);
-
-  gdk_cairo_set_source_pixbuf (cr,
-                               item->pixbuf,
-                               item->x - cx * 0.5,
-                               item->y - cy * 0.5);
-
-  if (preview)
-    cairo_paint_with_alpha (cr, 0.6);
-  else
-    cairo_paint (cr);
-}
-
-static gboolean
-canvas_expose_event (GtkWidget      *widget,
-                     GdkEventExpose *event)
-{
-  cairo_t *cr;
-  GList *iter;
-
-  cr = gdk_cairo_create (widget->window);
-  gdk_cairo_region (cr, event->region);
-  cairo_clip (cr);
-
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_rectangle (cr, 0, 0, widget->allocation.width, widget->allocation.height);
-  cairo_fill (cr);
-
-  for (iter = canvas_items; iter; iter = iter->next)
-    canvas_item_draw (iter->data, cr, FALSE);
-
-  if (drop_item)
-    canvas_item_draw (drop_item, cr, TRUE);
-
-  cairo_destroy (cr);
-
-  return TRUE;
-}
-
-/*****************************/
-/* ====== Palette DnD ====== */
-/*****************************/
-
-static void
-palette_drop_item (GtkToolItem      *drag_item,
-                   GtkToolItemGroup *drop_group,
-                   gint              x,
-                   gint              y)
-{
-  GtkWidget *drag_group = gtk_widget_get_parent (GTK_WIDGET (drag_item));
-  GtkToolItem *drop_item = gtk_tool_item_group_get_drop_item (drop_group, x, y);
-  gint drop_position = -1;
-
-  if (drop_item)
-    drop_position = gtk_tool_item_group_get_item_position (GTK_TOOL_ITEM_GROUP (drop_group), drop_item);
-
-  if (GTK_TOOL_ITEM_GROUP (drag_group) != drop_group)
-    {
-      gboolean homogeneous, expand, fill, new_row;
-
-      g_object_ref (drag_item);
-      gtk_container_child_get (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item),
-                               "homogeneous", &homogeneous,
-                               "expand", &expand,
-                               "fill", &fill,
-                               "new-row", &new_row,
-                               NULL);
-      gtk_container_remove (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item));
-      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (drop_group),
-                                  drag_item, drop_position);
-      gtk_container_child_set (GTK_CONTAINER (drop_group), GTK_WIDGET (drag_item),
-                               "homogeneous", homogeneous,
-                               "expand", expand,
-                               "fill", fill,
-                               "new-row", new_row,
-                               NULL);
-      g_object_unref (drag_item);
-    }
-  else
-    gtk_tool_item_group_set_item_position (GTK_TOOL_ITEM_GROUP (drop_group),
-                                           drag_item, drop_position);
-}
-
-static void
-palette_drop_group (GtkToolPalette   *palette,
-                    GtkToolItemGroup *drag_group,
-                    GtkToolItemGroup *drop_group)
-{
-  gint drop_position = -1;
-
-  if (drop_group)
-    drop_position = gtk_tool_palette_get_group_position (palette, drop_group);
-
-  gtk_tool_palette_set_group_position (palette, drag_group, drop_position);
-}
-
-static void
-palette_drag_data_received (GtkWidget        *widget,
-                            GdkDragContext   *context,
-                            gint              x,
-                            gint              y,
-                            GtkSelectionData *selection,
-                            guint             info,
-                            guint             time,
-                            gpointer          data)
-{
-  GtkToolItemGroup *drop_group = NULL;
-  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
-  GtkWidget        *drag_item = NULL;
-
-  while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
-    drag_palette = gtk_widget_get_parent (drag_palette);
-
-  if (drag_palette)
-    {
-      drag_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (drag_palette),
-                                                  selection);
-      drop_group = gtk_tool_palette_get_drop_group (GTK_TOOL_PALETTE (widget),
-                                                    x, y);
-    }
-
-  if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
-    palette_drop_group (GTK_TOOL_PALETTE (drag_palette),
-                        GTK_TOOL_ITEM_GROUP (drag_item),
-                        drop_group);
-  else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
-    palette_drop_item (GTK_TOOL_ITEM (drag_item),
-                       drop_group,
-                       x - GTK_WIDGET (drop_group)->allocation.x,
-                       y - GTK_WIDGET (drop_group)->allocation.y);
-}
-
-/********************************/
-/* ====== Passive Canvas ====== */
-/********************************/
-
-static void
-passive_canvas_drag_data_received (GtkWidget        *widget,
-                                   GdkDragContext   *context,
-                                   gint              x,
-                                   gint              y,
-                                   GtkSelectionData *selection,
-                                   guint             info,
-                                   guint             time,
-                                   gpointer          data)
-{
-  /* find the tool button, which is the source of this DnD operation */
-
-  GtkWidget *palette = gtk_drag_get_source_widget (context);
-  CanvasItem *canvas_item = NULL;
-  GtkWidget *tool_item = NULL;
-
-  while (palette && !GTK_IS_TOOL_PALETTE (palette))
-    palette = gtk_widget_get_parent (palette);
-
-  if (palette)
-    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
-                                                selection);
-
-  g_assert (NULL == drop_item);
-
-  /* append a new canvas item when a tool button was found */
-
-  if (GTK_IS_TOOL_ITEM (tool_item))
-    canvas_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
-
-  if (canvas_item)
-    {
-      canvas_items = g_list_append (canvas_items, canvas_item);
-      gtk_widget_queue_draw (widget);
-    }
-}
-
-/************************************/
-/* ====== Interactive Canvas ====== */
-/************************************/
-
-static gboolean
-interactive_canvas_drag_motion (GtkWidget      *widget,
-                                GdkDragContext *context,
-                                gint            x,
-                                gint            y,
-                                guint           time,
-                                gpointer        data)
-{
-  if (drop_item)
-    {
-      /* already have a drop indicator - just update position */
-
-      drop_item->x = x;
-      drop_item->y = y;
-
-      gtk_widget_queue_draw (widget);
-      gdk_drag_status (context, GDK_ACTION_COPY, time);
-    }
-  else
-    {
-      /* request DnD data for creating a drop indicator */
-
-      GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
-
-      if (!target)
-        return FALSE;
-
-      gtk_drag_get_data (widget, context, target, time);
-    }
-
-  return TRUE;
-}
-
-static void
-interactive_canvas_drag_data_received (GtkWidget        *widget,
-                                       GdkDragContext   *context,
-                                       gint              x,
-                                       gint              y,
-                                       GtkSelectionData *selection,
-                                       guint             info,
-                                       guint             time,
-                                       gpointer          data)
-
-{
-  /* find the tool button which is the source of this DnD operation */
-
-  GtkWidget *palette = gtk_drag_get_source_widget (context);
-  GtkWidget *tool_item = NULL;
-
-  while (palette && !GTK_IS_TOOL_PALETTE (palette))
-    palette = gtk_widget_get_parent (palette);
-
-  if (palette)
-    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
-                                                selection);
-
-  /* create a drop indicator when a tool button was found */
-
-  g_assert (NULL == drop_item);
-
-  if (GTK_IS_TOOL_ITEM (tool_item))
-    {
-      drop_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
-      gdk_drag_status (context, GDK_ACTION_COPY, time);
-      gtk_widget_queue_draw (widget);
-    }
-}
-
-static gboolean
-interactive_canvas_drag_drop (GtkWidget      *widget,
-                              GdkDragContext *context,
-                              gint            x,
-                              gint            y,
-                              guint           time,
-                              gpointer        data)
-{
-  if (drop_item)
-    {
-      /* turn the drop indicator into a real canvas item */
-
-      drop_item->x = x;
-      drop_item->y = y;
-
-      canvas_items = g_list_append (canvas_items, drop_item);
-      drop_item = NULL;
-
-      /* signal the item was accepted and redraw */
-
-      gtk_drag_finish (context, TRUE, FALSE, time);
-      gtk_widget_queue_draw (widget);
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-interactive_canvas_real_drag_leave (gpointer data)
-{
-  if (drop_item)
-    {
-      GtkWidget *widget = GTK_WIDGET (data);
-
-      canvas_item_free (drop_item);
-      drop_item = NULL;
-
-      gtk_widget_queue_draw (widget);
-    }
-
-  return FALSE;
-}
-
-static void
-interactive_canvas_drag_leave (GtkWidget      *widget,
-                               GdkDragContext *context,
-                               guint           time,
-                               gpointer        data)
-{
-  /* defer cleanup until a potential "drag-drop" signal was received */
-  g_idle_add (interactive_canvas_real_drag_leave, widget);
-}
-
-static void
-on_combo_orientation_changed (GtkComboBox *combo_box,
-                              gpointer     user_data)
-{
-  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
-  GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW (GTK_WIDGET (palette)->parent);
-  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
-  GtkTreeIter iter;
-  gint val = 0;
-
-  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
-    return;
-
-  gtk_tree_model_get (model, &iter, 1, &val, -1);
-
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (palette), val);
-
-  if (val == GTK_ORIENTATION_HORIZONTAL)
-    gtk_scrolled_window_set_policy (sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-  else
-    gtk_scrolled_window_set_policy (sw, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-}
-
-static void
-on_combo_style_changed (GtkComboBox *combo_box,
-                        gpointer     user_data)
-{
-  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
-  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
-  GtkTreeIter iter;
-  gint val = 0;
-
-  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
-    return;
-
-  gtk_tree_model_get (model, &iter, 1, &val, -1);
-
-  if (val == -1)
-    gtk_tool_palette_unset_style (palette);
-  else
-    gtk_tool_palette_set_style (palette, val);
-}
-
-GtkWidget *
-do_toolpalette (GtkWidget *do_widget)
-{
-  GtkWidget *box = NULL;
-  GtkWidget *hbox = NULL;
-  GtkWidget *combo_orientation = NULL;
-  GtkListStore *orientation_model = NULL;
-  GtkWidget *combo_style = NULL;
-  GtkListStore *style_model = NULL;
-  GtkCellRenderer *cell_renderer = NULL;
-  GtkTreeIter iter;
-  GtkWidget *palette = NULL;
-  GtkWidget *palette_scroller = NULL;
-  GtkWidget *notebook = NULL;
-  GtkWidget *contents = NULL;
-  GtkWidget *contents_scroller = NULL;
-
-  if (!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), "Tool Palette");
-      gtk_window_set_default_size (GTK_WINDOW (window), 200, 600);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      /* Add widgets to control the ToolPalette appearance: */
-      box = gtk_vbox_new (FALSE, 6);
-      gtk_container_add (GTK_CONTAINER (window), box);
-
-      /* Orientation combo box: */
-      orientation_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-      gtk_list_store_append (orientation_model, &iter);
-      gtk_list_store_set (orientation_model, &iter,
-                          0, "Horizontal",
-                          1, GTK_ORIENTATION_HORIZONTAL,
-                          -1);
-      gtk_list_store_append (orientation_model, &iter);
-      gtk_list_store_set (orientation_model, &iter,
-                          0, "Vertical",
-                          1, GTK_ORIENTATION_VERTICAL,
-                          -1);
-
-      combo_orientation =
-        gtk_combo_box_new_with_model (GTK_TREE_MODEL (orientation_model));
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_orientation),
-                                  cell_renderer,
-                                  TRUE);
-      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_orientation),
-                                      cell_renderer,
-                                      "text", 0,
-                                      NULL);
-      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE, 0);
-
-      /* Style combo box: */
-      style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Text",
-                          1, GTK_TOOLBAR_TEXT,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Both",
-                          1, GTK_TOOLBAR_BOTH,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Both: Horizontal",
-                          1, GTK_TOOLBAR_BOTH_HORIZ,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Icons",
-                          1, GTK_TOOLBAR_ICONS,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Default",
-                          1, -1,  /* A custom meaning for this demo. */
-                          -1);
-      combo_style = gtk_combo_box_new_with_model (GTK_TREE_MODEL (style_model));
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_style),
-                                  cell_renderer,
-                                  TRUE);
-      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_style),
-                                      cell_renderer,
-                                      "text", 0,
-                                      NULL);
-      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE, 0);
-
-      /* Add hbox */
-      hbox = gtk_hbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0);
-
-      /* Add and fill the ToolPalette: */
-      palette = gtk_tool_palette_new ();
-
-      load_stock_items (GTK_TOOL_PALETTE (palette));
-      load_toggle_items (GTK_TOOL_PALETTE (palette));
-      load_special_items (GTK_TOOL_PALETTE (palette));
-
-      palette_scroller = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_set_border_width (GTK_CONTAINER (palette_scroller), 6);
-
-      gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
-      gtk_container_add (GTK_CONTAINER (hbox), palette_scroller);
-
-      gtk_widget_show_all (box);
-
-      /* Connect signals: */
-      g_signal_connect (combo_orientation, "changed",
-                        G_CALLBACK (on_combo_orientation_changed), palette);
-      g_signal_connect (combo_style, "changed",
-                        G_CALLBACK (on_combo_style_changed), palette);
-
-      /* Keep the widgets in sync: */
-      on_combo_orientation_changed (GTK_COMBO_BOX (combo_orientation), palette);
-
-      /* ===== notebook ===== */
-
-      notebook = gtk_notebook_new ();
-      gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
-      gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE, 0);
-
-      /* ===== DnD for tool items ===== */
-
-      g_signal_connect (palette, "drag-data-received",
-                        G_CALLBACK (palette_drag_data_received), NULL);
-
-      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
-                                      palette,
-                                      GTK_DEST_DEFAULT_ALL,
-                                      GTK_TOOL_PALETTE_DRAG_ITEMS |
-                                      GTK_TOOL_PALETTE_DRAG_GROUPS,
-                                      GDK_ACTION_MOVE);
-
-      /* ===== passive DnD dest ===== */
-
-      contents = gtk_drawing_area_new ();
-      gtk_widget_set_app_paintable (contents, TRUE);
-
-      g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
-                        "signal::drag-data-received", passive_canvas_drag_data_received, NULL,
-                        NULL);
-
-      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
-                                      contents,
-                                      GTK_DEST_DEFAULT_ALL,
-                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
-                                      GDK_ACTION_COPY);
-
-      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
-      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
-                                             contents);
-      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
-
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                                contents_scroller,
-                                gtk_label_new ("Passive DnD Mode"));
-
-      /* ===== interactive DnD dest ===== */
-
-      contents = gtk_drawing_area_new ();
-      gtk_widget_set_app_paintable (contents, TRUE);
-
-      g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
-                        "signal::drag-motion", interactive_canvas_drag_motion, NULL,
-                        "signal::drag-data-received", interactive_canvas_drag_data_received, NULL,
-                        "signal::drag-leave", interactive_canvas_drag_leave, NULL,
-                        "signal::drag-drop", interactive_canvas_drag_drop, NULL,
-                        NULL);
-
-      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
-                                      contents,
-                                      GTK_DEST_DEFAULT_HIGHLIGHT,
-                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
-                                      GDK_ACTION_COPY);
-
-      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
-      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
-                                             contents);
-      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
-
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), contents_scroller,
-                                gtk_label_new ("Interactive DnD Mode"));
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
-
-static void
-load_stock_items (GtkToolPalette *palette)
-{
-  GtkWidget *group_af = gtk_tool_item_group_new ("Stock Icons (A-F)");
-  GtkWidget *group_gn = gtk_tool_item_group_new ("Stock Icons (G-N)");
-  GtkWidget *group_or = gtk_tool_item_group_new ("Stock Icons (O-R)");
-  GtkWidget *group_sz = gtk_tool_item_group_new ("Stock Icons (S-Z)");
-  GtkWidget *group = NULL;
-
-  GtkToolItem *item;
-  GSList *stock_ids;
-  GSList *iter;
-
-  stock_ids = gtk_stock_list_ids ();
-  stock_ids = g_slist_sort (stock_ids, (GCompareFunc) strcmp);
-
-  gtk_container_add (GTK_CONTAINER (palette), group_af);
-  gtk_container_add (GTK_CONTAINER (palette), group_gn);
-  gtk_container_add (GTK_CONTAINER (palette), group_or);
-  gtk_container_add (GTK_CONTAINER (palette), group_sz);
-
-  for (iter = stock_ids; iter; iter = g_slist_next (iter))
-    {
-      GtkStockItem stock_item;
-      gchar *id = iter->data;
-
-      switch (id[4])
-        {
-          case 'a':
-            group = group_af;
-            break;
-
-          case 'g':
-            group = group_gn;
-            break;
-
-          case 'o':
-            group = group_or;
-            break;
-
-          case 's':
-            group = group_sz;
-            break;
-        }
-
-      item = gtk_tool_button_new_from_stock (id);
-      gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item), id);
-      gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE);
-      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-
-      if (!gtk_stock_lookup (id, &stock_item) || !stock_item.label)
-        gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), id);
-
-      g_free (id);
-    }
-
-  g_slist_free (stock_ids);
-}
-
-static void
-load_toggle_items (GtkToolPalette *palette)
-{
-  GSList *toggle_group = NULL;
-  GtkToolItem *item;
-  GtkWidget *group;
-  char *label;
-  int i;
-
-  group = gtk_tool_item_group_new ("Radio Item");
-  gtk_container_add (GTK_CONTAINER (palette), group);
-
-  for (i = 1; i <= 10; ++i)
-    {
-      label = g_strdup_printf ("#%d", i);
-      item = gtk_radio_tool_button_new (toggle_group);
-      gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), label);
-      g_free (label);
-
-      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-      toggle_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item));
-    }
-}
-
-static GtkToolItem *
-create_entry_item (const char *text)
-{
-  GtkToolItem *item;
-  GtkWidget *entry;
-
-  entry = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (entry), text);
-  gtk_entry_set_width_chars (GTK_ENTRY (entry), 5);
-
-  item = gtk_tool_item_new ();
-  gtk_container_add (GTK_CONTAINER (item), entry);
-
-  return item;
-}
-
-static void
-load_special_items (GtkToolPalette *palette)
-{
-  GtkToolItem *item;
-  GtkWidget *group;
-  GtkWidget *label_button;
-
-  group = gtk_tool_item_group_new (NULL);
-  label_button = gtk_button_new_with_label ("Advanced Features");
-  gtk_widget_show (label_button);
-  gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (group),
-                                        label_button);
-  gtk_container_add (GTK_CONTAINER (palette), group);
-
-  item = create_entry_item ("homogeneous=FALSE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, NULL);
-
-  item = create_entry_item ("homogeneous=FALSE, expand=TRUE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
-                           NULL);
-
-  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, fill=FALSE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
-                           "fill", FALSE, NULL);
-
-  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, new-row=TRUE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
-                           "new-row", TRUE, NULL);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
-  gtk_tool_item_set_tooltip_text (item, "Show on vertical palettes only");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_tool_item_set_visible_horizontal (item, FALSE);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
-  gtk_tool_item_set_tooltip_text (item, "Show on horizontal palettes only");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_tool_item_set_visible_vertical (item, FALSE);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
-  gtk_tool_item_set_tooltip_text (item, "Do not show at all");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_widget_set_no_show_all (GTK_WIDGET (item), TRUE);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN);
-  gtk_tool_item_set_tooltip_text (item, "Expanded this item");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE,
-                           "expand", TRUE,
-                           NULL);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_HELP);
-  gtk_tool_item_set_tooltip_text (item, "A regular item");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-}

demos/gtk-demo/tree_store.c

@@ -438,7 +438,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/ui_manager.c

@@ -221,7 +221,7 @@ do_ui_manager (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK (gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      gtk_widget_set_can_default (button, TRUE);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
       gtk_widget_grab_default (button);
 
       gtk_widget_show_all (window);

demos/testgtk/main.c

@@ -189,7 +189,6 @@ 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

demos/testpixbuf-color.c

@@ -1,161 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-#include "config.h"
-#include <stdio.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#define ICC_PROFILE             "/usr/share/color/icc/bluish.icc"
-#define ICC_PROFILE_SIZE        3966
-
-static gboolean
-save_image_png (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
-{
-	gchar *contents = NULL;
-	gchar *contents_encode = NULL;
-	gsize length;
-	gboolean ret;
-	gint len;
-
-	/* get icc file */
-	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
-	if (!ret)
-		goto out;
-	contents_encode = g_base64_encode ((const guchar *) contents, length);
-	ret = gdk_pixbuf_save (pixbuf, filename, "png", error,
-			       "tEXt::Software", "Hello my name is dave",
-			       "icc-profile", contents_encode,
-			       NULL);
-	len = strlen (contents_encode);
-	g_debug ("ICC profile was %i bytes", len);
-out:
-	g_free (contents);
-	g_free (contents_encode);
-	return ret;
-}
-
-static gboolean
-save_image_tiff (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
-{
-	gchar *contents = NULL;
-	gchar *contents_encode = NULL;
-	gsize length;
-	gboolean ret;
-	gint len;
-
-	/* get icc file */
-	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
-	if (!ret)
-		goto out;
-	contents_encode = g_base64_encode ((const guchar *) contents, length);
-	ret = gdk_pixbuf_save (pixbuf, filename, "tiff", error,
-			       "icc-profile", contents_encode,
-			       NULL);
-	len = strlen (contents_encode);
-	g_debug ("ICC profile was %i bytes", len);
-out:
-	g_free (contents);
-	g_free (contents_encode);
-	return ret;
-}
-
-static gboolean
-save_image_verify (const gchar *filename, GError **error)
-{
-	gboolean ret = FALSE;
-	GdkPixbuf *pixbuf = NULL;
-	const gchar *option;
-	gchar *icc_profile = NULL;
-	gsize len = 0;
-
-	/* load */
-	pixbuf = gdk_pixbuf_new_from_file (filename, error);
-	if (pixbuf == NULL)
-		goto out;
-
-	/* check values */
-	option = gdk_pixbuf_get_option (pixbuf, "icc-profile");
-	if (option == NULL) {
-		*error = g_error_new (1, 0, "no profile set");
-		goto out;
-	}
-
-	/* decode base64 */
-	icc_profile = (gchar *) g_base64_decode (option, &len);
-	if (len != ICC_PROFILE_SIZE) {
-		*error = g_error_new (1, 0,
-		                      "profile length invalid, got %" G_GSIZE_FORMAT,
-		                      len);
-		g_file_set_contents ("error.icc", icc_profile, len, NULL);
-		goto out;
-	}
-
-	/* success */
-	ret = TRUE;
-out:
-	if (pixbuf != NULL)
-		g_object_unref (pixbuf);
-	g_free (icc_profile);
-	return ret;
-}
-
-int
-main (int argc, char **argv)
-{
-	GdkWindow *root;
-	GdkPixbuf *pixbuf;
-	gboolean ret;
-	gint retval = 1;
-	GError *error = NULL;
-
-	gtk_init (&argc, &argv);
-
-	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
-	root = gdk_get_default_root_window ();
-	pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-					       0, 0, 0, 0, 150, 160);
-
-	/* PASS */
-	g_debug ("try to save PNG with a profile");
-	ret = save_image_png ("icc-profile.png", pixbuf, &error);
-	if (!ret) {
-		g_warning ("FAILED: did not save image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* PASS */
-	g_debug ("try to save TIFF with a profile");
-	ret = save_image_tiff ("icc-profile.tiff", pixbuf, &error);
-	if (!ret) {
-		g_warning ("FAILED: did not save image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* PASS */
-	g_debug ("try to load PNG and get color attributes");
-	ret = save_image_verify ("icc-profile.png", &error);
-	if (!ret) {
-		g_warning ("FAILED: did not load image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* PASS */
-	g_debug ("try to load TIFF and get color attributes");
-	ret = save_image_verify ("icc-profile.tiff", &error);
-	if (!ret) {
-		g_warning ("FAILED: did not load image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* success */
-	retval = 0;
-	g_debug ("ALL OKAY!");
-out:
-	return retval;
-}

demos/testpixbuf-save.c

@@ -72,7 +72,7 @@ save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
 {
         GdkPixbufLoader *loader = data;
 
-        return gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err);
+        return gdk_pixbuf_loader_write (loader, buf, count, err);
 }
 
 static GdkPixbuf *
@@ -82,7 +82,7 @@ buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
         GdkPixbuf *pixbuf;
 
         loader = gdk_pixbuf_loader_new ();
-        if (gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err) &&
+        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
             gdk_pixbuf_loader_close (loader, err)) {
                 pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
                 g_object_unref (loader);

docs/Makefile.am

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

docs/RELEASE-HOWTO

@@ -7,22 +7,19 @@ dependencies:
 * gtk-doc
 * docbook-utils
 Without those packages make distcheck will *not* pass.
-Make sure that gtk-doc is the latest released version.
 
 
- 0) Go back to a pristine working directory. With git, this works:
+ 0) Blow away your gtk+ directory, check a new version out
 
-    git clean -f -x
-
- 1) autogen and build it, make sure to enable docs by specifying
+ 1) autogen and build it, make sure to enable docs by specifying 
     --enable-gtk-doc --enable-man
 
- 2) Update NEWS based on the content of git log; follow the format
+ 2) Update NEWS based on the various ChangeLog files; 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.
 
@@ -32,14 +29,14 @@ Make sure that gtk-doc is the latest released version.
     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
@@ -51,58 +48,57 @@ Make sure that gtk-doc is the latest released version.
 
  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) make distcheck
+ 7) Add === Released 2.x.y === at the top of all ChangeLog files
 
- 8) Fix broken stuff found by 7), repeat
+ 8) make distcheck
 
- 9) Commit all changes: git commit -a. You will have a bunch of po file
-    changes, NEWS and maybe some doc changes too
+ 9) Fix broken stuff found by 8), repeat
 
-10) Now you've got the tarball. Check that the tarball size looks
+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
     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.
 
-11) Tag the release. The git command for doing that looks like
+13) Tag the release. The command for doing that looks like
 
-    git tag -m "GTK+ 2.12.10" 2.12.10
+      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
 
-12) Push the tagged commit upstream. The git command for doing that is
+14) Bump the version number in configure.in and commit this change 
+    with a ChangeLog entry
 
-    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
+15) 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
 
-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.
+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
 
 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 desktop-devel-list.
+    gtk-devel-list. Set reply-to to gnome-hackers.
 
-19) Add a link to the release announcement to www.gtk.org which lives
-    in the gtk-web git module.
+19) Add a link to the release announcement to www.gtk.org which lives 
+    in the gtk-web cvs module.

docs/developers.txt

@@ -48,6 +48,15 @@ Events that are assured to have a valid GdkEvent.any.window field are
 GDK_EXPOSE		GtkWidget::expose_event
 
 
+gtk_widget_ref() vs. gtk_object_ref()
+-------------------------------------
+
+The widget referencing functions gtk_widget_ref() and gtk_widget_unref()
+are currently just wrappers about the corresponding referencing functions
+for objects. Still you should use the widget referencing functions if you
+are sure the referenced object is of type GTK_WIDGET_TYPE.
+
+
 Writing Gdk functions
 ---------------------
 

docs/dnd_internals.txt

@@ -62,6 +62,8 @@ used by anything other than the DND code in GTK+.
 /* Drag and Drop */
 
 GdkDragContext * gdk_drag_context_new        (void);
+void             gdk_drag_context_ref        (GdkDragContext *context);
+void             gdk_drag_context_unref      (GdkDragContext *context);
 
 These create and refcount GdkDragContexts in a
 straightforward manner.

docs/faq/Makefile.am

@@ -38,5 +38,3 @@ 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://library.gnome.org/devel/gtk-tutorial/stable/">
-http://library.gnome.org/devel/gtk-tutorial/stable/</ulink>, which is undergoing
+url="http://www.gtk.org/tutorial/">
+http://www.gtk.org/tutorial/</ulink>, which is undergoing
 development. This will introduce you to writing applications
 using C.</para>
 
@@ -2108,10 +2108,10 @@ not.</para>
 snippet:</para>
 
 <programlisting role="C">
-     g_object_ref(widget);
+     gtk_widget_ref(widget);
      gtk_container_remove(GTK_CONTAINER(old_parent), widget);
      gtk_container_add(GTK_CONTAINER(new_parent), widget);
-     g_object_unref(widget);
+     gtk_widget_unref(widget);
 </programlisting>
 
 </sect1>
@@ -2307,8 +2307,8 @@ used, as in:</para>
                NULL, gtk_widget_get_colormap(top),
                &amp;pixmap_mask, NULL, pixfile);
   pixw = gtk_pixmap_new (pixmap, pixmap_mask);
-  g_object_unref (pixmap);
-  g_object_unref (pixmap_mask);
+  gdk_pixmap_unref (pixmap);
+  gdk_pixmap_unref (pixmap_mask);
 </programlisting>
 
 </sect1>

docs/refcounting.txt

@@ -250,12 +250,12 @@ Example code sequences that require reference wraps:
    /* gtk_container_remove() will unparent the child and therefore
     * cause its reference count to be decremented by one.
     */
-   g_object_ref (widget);
+   gtk_widget_ref (widget);
    gtk_container_remove (container, widget);
    /* without the reference count, the widget would have been destroyed here.
    */
    gtk_container_add (container, widget);
-   g_object_unref (widget);
+   gtk_widget_unref (widget);
 
 
   /* all items in item_list need to be referenced
@@ -267,7 +267,7 @@ Example code sequences that require reference wraps:
    slist = NULL;
    for (list = item_list; list; list = list->next)
    {
-     g_object_ref (GTK_WIDGET (list->data));
+     gtk_widget_ref (GTK_WIDGET (list->data));
      slist = g_slist_prepend (slist, list->data);
    }
    gtk_list_remove_items (list, item_list);
@@ -280,7 +280,7 @@ Example code sequences that require reference wraps:
      
      tmp = slist;
      slist = slist->next;
-     g_object_unref (GTK_WIDGET (tmp->data));
+     gtk_widget_unref (GTK_WIDGET (tmp->data));
      g_slist_free_1 (tmp);
    }
    

docs/reference/ChangeLog

@@ -1,428 +1,14 @@
-=== ChangeLog discontinued ===
+2008-11-24  Matthias Clasen <mclasen@redhat.com>
 
-	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.
+	* === Released 2.14.5 ===
 
-2009-03-25   Paul Bolle <pebolle@tiscali.nl>
+2008-10-16  Matthias Clasen  <mclasen@redhat.com>
 
-	Bug 562863 - GtkVscrollbar is hardly documented
+	* === Released 2.14.4 ====
 
-	* gtk/tmpl/gtkvscrollbar.sgml:
-	* gtk/tmpl/gtkhscrollbar.sgml: Minor tweaks.
+2008-09-23  Matthias Clasen  <mclasen@redhat.com>
 
-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.
+	* === Released 2.14.3 ===
 
 2008-09-17  Matthias Clasen  <mclasen@redhat.com>
 

docs/reference/Makefile.am

@@ -3,6 +3,3 @@ 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 --name-space=gdk_pixbuf
+MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
@@ -79,21 +79,19 @@ EXTRA_DIST += version.xml.in \
 
 ########################################################################
 
-if ENABLE_MAN
-
 man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
 
+if ENABLE_MAN
+
 %.1 : %.xml 
 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-BUILT_EXTRA_DIST = $(man_MANS)
-
 endif
 
+BUILT_EXTRA_DIST = $(man_MANS)
+
 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

@@ -0,0 +1,118 @@
+.\"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

@@ -0,0 +1,49 @@
+.\"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,8 +136,6 @@ 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,12 +9,8 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <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>
+    <title>The &gdk-pixbuf; Library</title>
+    <releaseinfo>Version &version;</releaseinfo>
     <authorgroup>
       <author>
 	<firstname>Federico</firstname>
@@ -127,15 +123,16 @@
   <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>
@@ -143,11 +140,12 @@
   <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" />
 
@@ -186,7 +184,4 @@
       </address>
     </para>
   </appendix>
-
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-
 </book>

docs/reference/gdk-pixbuf/gdk-pixbuf.types

@@ -4,5 +4,3 @@ gdk_pixbuf_get_type
 gdk_pixbuf_loader_get_type
 gdk_pixbuf_animation_get_type
 gdk_pixbuf_animation_iter_get_type
-gdk_pixbuf_simple_anim_get_type
-

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

@@ -23,18 +23,15 @@ Animated images.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
 <para>
-An opaque struct representing an animation.
+And opaque struct representing an animation.
 </para>
 
 
 <!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
 <para>
-An opaque struct representing an iterator which points to a
+And opaque struct representing an iterator which points to a
 certain position in an animation.
 </para>
 
@@ -151,15 +148,10 @@ certain position in an animation.
 
 <!-- ##### STRUCT GdkPixbufSimpleAnim ##### -->
 <para>
-An opaque struct representing a simple animation.
+An
 </para>
 
 
-<!-- ##### ARG GdkPixbufSimpleAnim:loop ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION gdk_pixbuf_simple_anim_new ##### -->
 <para>
 
@@ -180,21 +172,3 @@ An opaque struct representing a simple animation.
 @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-pixbuf/tmpl/creating.sgml

@@ -46,9 +46,6 @@ Creating a pixbuf from image data that is already in memory.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_new ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/file-loading.sgml

@@ -28,9 +28,6 @@ Loading a pixbuf from a file.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/file-saving.sgml

@@ -21,9 +21,6 @@ to a socket or store it in a database.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
 <para>
 

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

@@ -72,9 +72,6 @@ Application-driven progressive image loading.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### STRUCT GdkPixbufLoader ##### -->
 <para>
 The <structname>GdkPixbufLoader</structname> struct contains only private
@@ -117,7 +114,6 @@ fields.
 
 </para>
 
-@void: 
 @Returns: 
 
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml

@@ -26,9 +26,6 @@ Getting parts of an X drawable's image data into a pixbuf.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_xlib_get_from_drawable ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml

@@ -23,9 +23,6 @@ Initializing the &gdk-pixbuf; Xlib library.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml

@@ -24,9 +24,6 @@ Rendering a pixbuf to an X drawable.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml

@@ -20,9 +20,6 @@ Rendering RGB buffers to X drawables.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### STRUCT XlibRgbCmap ##### -->
   <para>
     FIXME: Describe this.
@@ -201,7 +198,6 @@ displays.
 
 </para>
 
-@void: 
 @Returns: 
 
 
@@ -234,7 +230,6 @@ displays.
 
 </para>
 
-@void: 
 @Returns: 
 
 
@@ -243,7 +238,6 @@ displays.
 
 </para>
 
-@void: 
 @Returns: 
 
 
@@ -252,7 +246,6 @@ displays.
 
 </para>
 
-@void: 
 @Returns: 
 
 
@@ -261,7 +254,6 @@ displays.
 
 </para>
 
-@void: 
 @Returns: 
 
 
@@ -270,7 +262,6 @@ displays.
 
 </para>
 
-@void: 
 @Returns: 
 
 
@@ -279,7 +270,6 @@ displays.
 
 </para>
 
-@void: 
 @Returns: <!--
 Local variables:
 mode: sgml

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

@@ -93,9 +93,6 @@ put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blu
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### ENUM GdkPixbufError ##### -->
 <para>
 An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;

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

@@ -19,9 +19,6 @@ you're linking against.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### VARIABLE gdk_pixbuf_version ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; library as a string.

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

@@ -22,9 +22,6 @@ into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### STRUCT GdkPixdata ##### -->
   <para>
 

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

@@ -68,9 +68,6 @@ They are not covered by the same stability guarantees as the regular
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
 <para>
 
@@ -87,7 +84,6 @@ They are not covered by the same stability guarantees as the regular
 
 </para>
 
-@void: 
 @Returns: 
 
 

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

@@ -48,9 +48,6 @@ Functions for reference counting and memory management on pixbufs.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
   <para>
 

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

@@ -81,9 +81,6 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### ENUM GdkInterpType ##### -->
   <para>
     This enumeration describes the different interpolation modes that

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

@@ -20,9 +20,6 @@ Utility and miscellaneous convenience functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
 <para>
 

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 --name-space=gdk
+MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\
@@ -152,5 +152,3 @@ 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,11 +7,7 @@
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GDK Reference Manual</title>
-    <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>
+    <releaseinfo>for GDK &version;</releaseinfo>
   </bookinfo>
 
   <reference id="reference">
@@ -79,40 +75,25 @@
   <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>
-  <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>
-  <index id="api-index-2-20" role="2.20">
-    <title>Index of new symbols in 2.20</title>
-    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
-  </index>
-
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-
+  </index>  
 </book>

docs/reference/gdk/gdk-sections.txt

@@ -215,7 +215,6 @@ gdk_screen_list_visuals
 gdk_screen_get_toplevel_windows
 gdk_screen_make_display_name
 gdk_screen_get_n_monitors
-gdk_screen_get_primary_monitor
 gdk_screen_get_monitor_geometry
 gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
@@ -641,7 +640,6 @@ gdk_window_at_pointer
 gdk_window_show
 gdk_window_show_unraised
 gdk_window_hide
-gdk_window_is_destroyed
 gdk_window_is_visible
 gdk_window_is_viewable
 gdk_window_get_state
@@ -663,8 +661,6 @@ gdk_window_resize
 gdk_window_move_resize
 gdk_window_scroll
 gdk_window_move_region
-gdk_window_flush
-gdk_window_ensure_native
 gdk_window_reparent
 gdk_window_clear
 gdk_window_clear_area
@@ -672,7 +668,6 @@ gdk_window_clear_area_e
 gdk_window_copy_area
 gdk_window_raise
 gdk_window_lower
-gdk_window_restack
 gdk_window_focus
 gdk_window_register_dnd
 gdk_window_begin_resize_drag
@@ -724,7 +719,6 @@ gdk_window_set_background
 gdk_window_set_back_pixmap
 GDK_PARENT_RELATIVE
 gdk_window_set_cursor
-gdk_window_get_cursor
 gdk_window_set_colormap
 gdk_window_get_user_data
 gdk_window_get_geometry
@@ -745,7 +739,6 @@ gdk_window_get_colormap
 gdk_window_get_type
 gdk_window_get_origin
 gdk_window_get_deskrelative_origin
-gdk_window_get_root_coords
 gdk_window_get_pointer
 GdkModifierType
 gdk_window_get_parent
@@ -774,10 +767,6 @@ GdkPointerHooks
 gdk_set_pointer_hooks
 
 <SUBSECTION>
-gdk_offscreen_window_get_pixmap
-gdk_offscreen_window_set_embedder
-gdk_offscreen_window_get_embedder
-gdk_window_geometry_changed
 gdk_window_redirect_to_drawable
 gdk_window_remove_redirection
 
@@ -916,7 +905,6 @@ gdk_cairo_set_source_pixbuf
 gdk_cairo_set_source_pixmap
 gdk_cairo_rectangle
 gdk_cairo_region
-gdk_cairo_reset_clip
 </SECTION>
 
 <SECTION>
@@ -943,7 +931,6 @@ gdk_region_get_clipbox
 gdk_region_get_rectangles
 gdk_region_empty
 gdk_region_equal
-gdk_region_rect_equal
 gdk_region_point_in
 gdk_region_rect_in
 GdkOverlapType
@@ -1005,9 +992,6 @@ 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
-gdk_keymap_add_virtual_modifiers
-gdk_keymap_map_virtual_modifiers
 
 <SUBSECTION>
 gdk_keyval_name

docs/reference/gdk/tmpl/cairo_interaction.sgml

@@ -27,9 +27,6 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_cairo_create ##### -->
 <para>
 
@@ -88,12 +85,3 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 @region: 
 
 
-<!-- ##### FUNCTION gdk_cairo_reset_clip ##### -->
-<para>
-
-</para>
-
-@cr: 
-@drawable: 
-
-

docs/reference/gdk/tmpl/colors.sgml

@@ -46,9 +46,6 @@ gdk_color_change() will probably become aliases.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -105,7 +102,6 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
-@void: 
 @Returns: 
 
 
@@ -113,7 +109,6 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
-@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/cursors.sgml

@@ -31,9 +31,6 @@ gdk_window_set_cursor() or by setting the cursor member of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.
@@ -124,9 +121,8 @@ 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/dnd.sgml

@@ -25,9 +25,6 @@ the GTK+ documentation for more information.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### SECTION Image ##### -->
-
-
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -57,7 +54,6 @@ the GTK+ documentation for more information.
 <para>
 </para>
 
-@void: 
 @Returns: