2.10.8

svn path=/branches/gtk-2-10/; revision=17167

.cvsignore

@@ -23,11 +23,13 @@ gtk+-unix-print-2.0.pc
 gtk+-linux-fb-2.0.pc
 gtk+-nanox-2.0.pc
 gtk+-x11-2.0.pc
+gtk+-quartz-2.0.pc
 gdk-2.0.pc
 gdk-2.0-uninstalled.pc
 gdk-linux-fb-2.0.pc
 gdk-nanox-2.0.pc
 gdk-x11-2.0.pc
+gdk-quartz-2.0.pc
 gdk-pixbuf-2.0.pc
 gdk-pixbuf-2.0-uninstalled.pc
 gtk-zip.sh

INSTALL

@@ -3,9 +3,9 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, and Atk libraries, available at the same location as GTK+
-   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
-   Pango-1.2 is recommended.)
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ 2.10.8 requires at least GLib 2.12, 
+   Pango 1.13, ATK 1.9 and cairo 1.2.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not
@@ -18,12 +18,12 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.9.2.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.9.2			   # change to the toplevel directory
+  % gzip -cd gtk+-2.10.8.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.10.8			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
-  % make				   # build GTK
+  % make				   # build GTK+
   [ Become root if necessary ]
-  % make install			   # install GTK
+  % make install			   # install GTK+
 
 The Details
 ===========

INSTALL.in

@@ -3,9 +3,9 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, and Atk libraries, available at the same location as GTK+
-   (Either Pango-1.0 or Pango-1.2 can be used with GTK+-2.2; 
-   Pango-1.2 is recommended.)
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.12, 
+   Pango 1.13, ATK 1.9 and cairo 1.2.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not
@@ -21,9 +21,9 @@ Simple install procedure
   % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
   % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
-  % make				   # build GTK
+  % make				   # build GTK+
   [ Become root if necessary ]
-  % make install			   # install GTK
+  % make install			   # install GTK+
 
 The Details
 ===========

NEWS

@@ -1,3 +1,626 @@
+Overview of Changes from GTK+ 2.10.7 to 2.10.8
+==============================================
+
+* Bugs fixed:
+ 393102 _gtk_modules_init assumes display is not opened instead o...
+ 395326	Gedit crashed no open text documents
+ 394855	impossible to build the directfb version
+ 396161	GtkUIManager crashing on unknown action in ui-file
+ 334168	Single '~' in location entry doesn't go to $HOME
+ 363147	GTKFileChoser Does not Show Desktop and Home after Uncol...
+ 390746	Custom tab title not set correctly on Microsoft Windows
+ 393813	Segfault in gtk_text_view_set_border_window_size()
+ 395316	File leak in gtk-demo
+ 395830	Wrong named icon lookup when requested size matches two s...
+ 396074	libgtk should link against Xfixes
+ 396160	Memory leak in gtkselection
+ 396175	wrong GtkWarning: Input method gtk-im-context-simple shou...
+ 396470	Missing slider redraw in GtkRange if activate-slider is set
+ 153828	Filechooser does not remember state
+ 357303	Gnome Main Menu Recent Documents extended by long file na...
+ 394000	Documentation error for GdkPixdata
+ 392504	The crosshair mouse cursor look a bit funny
+ 393255	GtkNotebook: Menu label centered instead of left aligned
+ 395045	gtk_radio_button_focus: Harmless compiler warning
+
+* Updated translations (bg,lt,sl)
+
+
+Overview of Changes from GTK+ 2.10.6 to 2.10.7
+==============================================
+
+* GtkNotebook 
+ - Tab reordering is a less intrusive
+ - Rendering fixes on win32
+
+* GtkTreeView
+  - Column resizing works correctly in right-to-left languages
+  - Many scrolling bugs have been fixed
+
+* GtkTextView:
+  - Improved scrolling during DND.
+
+* GtkRecentManager is more robust against bad URIs
+
+* Print support:
+ - The cups backend works with 'BrowseShortNames Off' 
+   in the cups configuration
+ - Multi-valued options are properly passed to cups
+ - Fix build with cups 1.3
+ - A few IPP compliance issues have been fixed
+ - Make the lpr backend work on BSD
+
+* Input methods:
+ - GtkEntryCompletion works with input methods
+ - The Thai input method has been replace by a functional
+   Thai and Lao input method based on libthai
+
+* Accessibility support:
+ - GtkMessageDialog sets accessible name role explicitly
+
+* Theme support:
+ - The semantics of the gtk-color-scheme setting has been
+   slightly changed. Values from rc files are still merged
+   together, but the X setting just overrides the prior table.
+
+* GdkPixbuf:
+ - gdk_pixbuf_loader_write() now closes the loader when 
+   returning FALSE, as documented
+ - The BMP loader supports more BMP variants, including 
+   transparency and 10-bit channels.
+
+* Bugs fixed:
+ 122688 modal dialog popup + drag in progress = mouse freeze
+ 315732	gnome-session crash on login
+ 335622	Click Description field causes Evolution to crash.
+ 357050	Crash replacing \n\n with \n or undoing after paste
+ 359537	printing custom page
+ 373466	crash in Text Editor:
+ 388041	crash in Open Folder: nada
+ 390873	crash in Text Editor: I had just opened it up ...
+ 367529	gtk_combo_box_set_model(combo, NULL) generates warning wh...
+ 381499	xdgmime requires getc_unlocked, darwin 6 lacks
+ 349119	GtkUIManager crashes on wrong action names in an XML file
+ 363437	gnome-panel crash to gtkrecentmanager code
+ 366782	GtkTreeView "expand_all" can crash if a node's children a...
+ 374378	Crash as GTK tries to blink cursor in defocused spinbutto...
+ 381236	apps crash when using a mouse cursor theme as icon theme
+ 320465 gtk_window_parse_geometry is almost completely broken
+ 355350 Page Setup, Range and Copy information ignored
+ 387170 Fairly large leak in gtk+
+ 390159 printing with BSD lpr does not work properly
+  64998 GtkEntry - gtk_entry_set_text emits "changed" twice
+  92387 unfriendly drag-n-drop in textview - scrolls too fast
+ 172188	io-bmp.c should sanity check the size given by the OffBit...
+ 304482	GtkComboBoxEntry editable entry should be centered vertic...
+ 315440	Problem with gtkpaned inside gtknotebook(mouse wheel over...
+ 317064	GtkTextBuffer signals documentation
+ 317080	Incorrect gtk.immodules might make GTK+ lose its translation
+ 330683	Changing selection by up/down does not move to top/bottom.
+ 335473	gtk_file_chooser_button_new_with_dialog() is too strict
+ 337261	about dialogue initial focus
+ 339752	Please use LOCALE_IFIRSTDAYOFWEEK for GtkCalendar on Windows
+ 339756	LANG and LC_* environment variables should affect the C r...
+ 349638	Cannot Compose (multi_key) polish l (or L) with stroke, "ł"
+ 350342	Alt+Left/Right reorders tabs if not swallowed by Gecko
+ 351678	Notebooks not with PositionType.Top drawn incorrectly
+ 351679	Notebooks drawn with extra line below tab in MS-Windows t...
+ 352276	Location of G_GNUC_INTERNAL breaks Solaris build
+ 352435 GtkProgressBar text rendering errors
+ 352738	gtk_tree_view_column_set_sort_indicator() fails to show a...
+ 352795	configure.in: Bug in "checking Whether to write dependenc...
+ 353438	Add tiny extra docs to gdk_beep
+ 353709	GtkEntry shift-click inside selected text can behave funny
+ 354495	Compose key doesn't work on location entry
+ 357578	No grid lines are drawn
+ 357974	Crashes (failed assertatin)
+ 359231	validate_visible_area() sometimes passes mismatches (tree...
+ 359542	scale capability for Unix print dialog box can not be set...
+ 359581	GtkCellView clobbers parent's GdkWindow on style-set
+ 360350	leak in gtk_radio_button_focus
+ 362439	gtkicontheme::pixbuf_supports_svg leaks GList
+ 362614	gtk_widget_show does not check for NULL arg
+ 363191	gtk_tree_view_set_cursor() does not make row fully visible
+ 364514	gtk leaks GDI objects on the win32 classic look and feel
+ 364866	CUPS http_t type is becoming opaque
+ 364868	GDI resource leak in GtkStatusIcon on win32
+ 365031	gedit crashes with .recently-used.xbel file
+ 365047	GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT is never used in Gt...
+ 365388	gdk-pixbuf/Makefile.am: pixbufloader_pcx.def is not distr...
+ 366548	Clicking removed Focus frame
+ 370395	leak in gtk_rc_parse_icon_source
+ 374420	symbolic colors not reset correctly
+ 376094	Add gtk-doc on GtkCellRendererText::edited
+ 376535	crashes in gtk_drag_source_info_destroy()
+ 377349	gtk_status_icon_position_menu is not implemented for Win32
+ 378852	Fixes for notebook tab detaching
+ 379503	possible crash in gtk_default_draw_flat_box
+ 379803	Bad g_return_if_fail in gdkinput-xfree.c
+ 380421	Enabling extension events stops GDK_2BUTTON_PRESS
+ 382314	gtkpagesetup leaks when setting new paper size
+ 382369	some builtin papers have wrong display names
+ 383373	child properties getter returns not-NULL array, but no sp...
+ 383407	gtk_entry_set_text does not check for completion->priv->c...
+ 383435	expose improvements to GtkNotebook
+ 384168	gdk x11 backend doesn't build on Darwin
+ 386694	set_active_iter is called on rows with children
+ 388123	_gtk_file_chooser_embed_set_delegate() docs typo.
+ 389183	Typo in API docs (s/expansive/expensive)
+ 389194	mem leaks in gtkpagesetupunixdialog
+ 390468	Unbreak GtkNotebook keybindings
+ 390872	Scroll timeout isn't removed when widget destroyed
+ 391229	gtkprintoperation-win32.c: windows.h with WIN32_LEAN_AND_...
+ 172584	32 bpp windows bitmap files with 10-11-10 RGB masks are d...
+ 323146	gtk_button_grab_notify clears button->in_button (shouldn't)
+ 340135	page switching with keynav 'stuck'
+ 341158	Gdk-pixbuf programs need glib, but are not linked with it
+ 343330	gdk_pixbuf_new has redundant size checks
+ 343956	drawing problem in gtkassistant
+ 345094	gtk_notebook_insert_page can return wrong position
+ 353962	Tabs are all the same height
+ 360112	Wrong documentation for gtk_file_chooser_set_select_multiple
+ 365364	gtksettings doesn't list printpreview settings
+ 371756	GtkTreeView cursor not easily moved when set to GTK_SELEC...
+ 378462	En Dash Compose Keystrokes Yield an Em Dash Character
+ 389581	The interactive search window disappears during typing
+ 358864	Shows "xterm" cursor when insensitive
+ 385672	calendars draw arrows pointing to the right sligthly misp...
+ 391523	IPP glitches in GtkPrint
+ 391725	gtkicontheme::load_themes attempts to open dir after ENOENT
+  58389 Add some method of cancellation to GtkRange?
+  81031 immodules for Thai
+ 152620	Small icon (hIconSm member)
+ 159764	handles of GtkHandleBox are always drawn vertically
+ 348108	Refleaks in gtk-demo
+ 392227	GtkEntry::recompute_idle_func operates on widget->window=...
+ 164494	Create folder text entry widget creates the folder when i...
+ 332604	GtkLabel cannot have an alignment and be ellipsized in 2....
+ 362406	Breakage from process_all_updates() in gtkwindow.c
+ 392191	GtkFileChooser outputs assertions when create folder butt...
+ 392315	gdk_drawable_get_size() call in unrealized GtkEntry
+ 392457	GtkAssistant sometimes forgets to reset current_page whil...
+ 392532	valgrindify use of XSendEvent
+ 332266	gdk_draw_layout fails for coordinates >= 2^21
+ 346616 Selected item not visible in the popup in list mode
+ 392646	Fix cross-compilation
+ 393124	misdrawing of tabs
+ 393166	background box of the "bin_window" not placed correctly
+
+* Updated translations (ar,as,bn_IN,ca,en_CA,en_GB,
+    es,et,fi,fr,gu,he,hi,hy,hu,ka,mk,ml,mr,nb,nl,
+    or,pl,pt,si,sq,sv,ta,th)
+
+
+Overview of Changes from GTK+ 2.10.5 to 2.10.6
+==============================================
+
+* Bugs fixed:
+ 358931 2.10.5 build issue due to a typo
+ 357280 Compile crashes 
+ 359053 Reduce relocations
+ 359052 gtk_print_settings_get_duplex() return wrong 
+        value for one of vertical setting
+ 
+
+Overview of Changes from GTK+ 2.10.4 to 2.10.5
+==============================================
+
+* Bugs fixed:
+ 358405 gtk_file_chooser_button_new
+ 353736 crash in Document Viewer: I had just viewed the pr...
+ 354849 Unable to build gtk+ under Solaris 9
+ 357280 Compile crashes
+ 357454 leak in _gtk_menu_is_empty()
+ 357566 [x11] Invalid unref for input windows
+ 357791 gtk_tree_selection_get_selected_rows does not always fill model
+ 358351 expander with multi-line label doesn't properly respond to mouse
+
+* Updated translations (dz,et,gl,ka)
+
+
+Overview of Changes from GTK+ 2.10.3 to 2.10.4
+==============================================
+
+* GtkFileChooser works better with remote bookmarks
+
+* Windows theme engine improvements
+
+* Bugs fixed:
+ 116626 Use keyboard map contents to detect RTL groups
+ 353772 Add doc blurb for GtkWidget::parent-set
+ 353803 GtkEntry unneccesarily resets im context at commit
+ 353914 Leak of to_reset list from _gtk_settings_reset_rc_values
+ 354043 Renew the typeahead search timeout when using scrollwheel
+ 354687 PLT-reduction stuff not quite working
+ 354887 GtkFileChooserButton displays unnecessary authentication 
+        dialogs
+ 355308 gtk_tree_view_set_grid_lines notifies wrong property
+ 355732 Combobox leaks treeview in list mode
+ 355134 Type in string
+ 355961 Typo in documentation for GtkPrintContext
+ 340201 Enhancement of Wimp theme engine.
+ 357132 Setting an RGBA colormap using gtk_widget_set_colormap() 
+        on any widget at application start (before other widgets 
+        are used) causes the running app to revert to the stock 
+        icon theme
+
+* Updated translations (bg,bn,bn_IN,de,dz,el,
+  en_GB,et,fi,gu,hi,id,ka,lt,lv,mk,nb,nl,nn,or,
+  ru,sl,sv,ta,th)
+
+
+Overview of Changes from GTK+ 2.10.2 to 2.10.3
+==============================================
+
+* GtkFileChooser:
+ - Fix several Win32-specific problems
+ - Add automated tests for GtkFileSystem
+ - Make overwrite confirmation work again
+
+* Printing support:
+ - Fix confusion between names and values in combo boxes
+ - Poll for printer list updates in the cups backend
+
+* Add an automatic scrolling example to gtk-demo
+
+* Bugs fixed:
+ 354004 Use of g_warning("%s", NULL) after failing to 
+        open a display
+ 346751 symbolic colors can't be use in properties
+ 352264 gtk_status_icon_set_from_pixbuf leaks the old 
+        pixbuf
+ 352391 small link button leak
+ 353449 A break is missing in 
+        gtk_recent_chooser_menu_set_current_uri
+ 329604 do not scroll on copy to clipboard
+ 354035 Typo in the GtkWidget::drag-drop doc blurb
+
+* Translation updates (ang,bn_IN,ca,de,dz,el,eu,fi,
+  fr,hi,hu,it,ja,lt,ml,mr,nn,or,pl,pt_BR,ro,ru,sl,
+  sr,sr@Latn,sv,ta,th,tr,vi,zh_CN,zh_HK,zh_TW)
+
+
+Overview of Changes from GTK+ 2.10.1 to 2.10.2
+==============================================
+
+* Many fixes and improvements for the OS X backends
+
+* Revert to using gtk modules with global binding,
+  since the local binding that was introduced in 
+  2.10 breaks the accessibility support of current 
+  OpenOffice.org releases.
+
+* GtkRecenManager 
+ - Poll for changes to the XBEL file
+ - Fix initial bad placement of recent files menu
+ - Show nonexisting resources by default, and do 
+   not mark them as insensitive
+ - Allow adding a filter to GtkRecentChooserMenu
+
+* GtkFileChooser
+ - Improve the fallbacks for icons
+ - Make  / and ~ activate the location entry again
+
+* Bugs fixed:
+ 348828	Segmentation Fault in gtk_combo_box_menu_setup 
+        when removing combobox child
+ 349552	problem with parsing (enum) style properties
+ 351581	API Documentation issues with 2.15 release
+ 348652	reorder() from ComboBoxEntry produces Gtk+ assert 
+        error
+ 349128	Fix docs about GtkTreeModel::row-deleted
+ 350605	Crash caused by the recent menu
+ 348096	GtkStyle leaks GtkRcContext
+ 348145	Background images not working with Quartz backend
+ 329752	Problem with has_selection notification when 
+        deleting the selection
+ 347856	gtk_recent_chooser_add_filter not implemented 
+        for GtkRecentChooserMenu
+ 348245	Disabling pdf printing doesn't hide option
+ 348278	textview doesn't update on hinting setting change
+ 348289	Filechooser is blocked by higher priority idle
+ 348478	entry completions needs to reset the IM context 
+        before emitting action-activate signal
+ 348538	Remove old email addreses from the tutorial
+ 348626	drag-to-child should not work
+ 348634	IconView does not update background
+ 348706	don't allow dnd onto arrows
+ 348740	configure script does not honour PKG_CONFIG variable
+ 348787	Segfault in gtk_font_button_update_font_info()
+ 348824	test attached calendar-sane-timer patch in head
+ 348971	gtk_status_icon_get_geometry returns bogus data
+ 349382	valgrind uninitialized memory warnings setting 
+        partly uninitialized X properties
+ 349570	notebook arrow PRELIGHT drawing doesn't work
+ 349834	Memleak from gtk_tree_view_set_enable_tree_lines
+ 349858	Leak of ShmPixmapInfo from get_shm_pixmap_for_image
+ 349859	gtk_paint_tab doesn't work when widget is now 
+        option menu
+ 349997	Indirect leak from XkbGetMap
+ 350039	GtkFileChooserEntry leaks sources
+ 350050	GdkGC leak from GtkRuler
+ 350139	Should use evince preview mode
+ 350258	Memory leak in gtk_entry_drag_data_received()
+ 350329	The CUPS printer backend in GTK+-2.10.1 fails 
+        with CUPS 1.1.
+ 350517	reset_style_idle() interferes with application 
+        idles
+ 350860	Balloon messages sent to tray do not have the 
+        correct window in XEvent
+ 350938	TreeViewColumn rendering off when "spacing" 
+        property set
+ 351112	gtk_notebook_set_current_page fails when the 
+        notebook has not yet been shown
+ 351519	Directfb backend fails to build
+ 165714	GtkEntryCompletion doesn't complete on paste
+ 168737	Different button sizes in About dialogs
+ 345666	The icons of file, directory and device at 
+        GtkFileChooser
+ 349429	spin button does not use correct value for 
+        inner_border
+ 349501	fix in the documentation of function 
+        gtk_list_store_insert_with_values()
+ 350072	stdout output from colorselection
+ 351759	Wrong range value in documentation of 
+        gtk_color_selection_set_current_alpha
+ 349277	Wrong message for problems with serializing 
+        texts
+ 346800	Rework sort/filter models to use indices to 
+        parents instead of pointers
+ 349120	Small error in doc
+ 350911 gdk_pixbuf_new_from_file_at_scale() should 
+        skip when there's enough image data 
+ 348728	GtkTable Row and Column Spacing
+ 351241	swapped argument description
+ 350023	"Running GTK+ Applications" chapter does not 
+        document new GTK_DEBUG possibilities
+ 351812 file print backend filename encoding issue
+
+* New and updated translations (bg,bn_IN,de,dz,el,es,
+  et,eu,fi,gu,hu,ko,ku,ja,lt,mk,ml,nb,ne,nl,or,pl,po,
+  sv,th,tr,tt,uk,zh_HK,zh_TW)
+
+
+Overview of Changes from GTK+ 2.10.0 to 2.10.1
+==============================================
+
+* Drop Pango requirement 1.12.0
+
+* Many fixes and improvements for the OS X 
+  and directfb backends
+
+* The printing framework now supports a subset
+  of the Cups 1.2 custom PPD option spec
+
+* Bug fixes:
+ 348134 box gaps on left and right can be drawn wrong
+ 348014	crash on Epiphany Web Browser
+ 348063	_gtk_icon_cache_get_icon crashes when no 
+        cache available
+ 348096	GtkStyle leaks GtkRcContext
+ 157439	The "adding to panel" is buggy when switching 
+        to an rtl environment
+ 346751	symbolic colors can't be use in properties
+ 347976	Context menus appear in strange locations
+ 348001	xid / fid X11 font id's are used intermixed
+ 348049	Tabs "magically" re-order
+ 348094	Adjustment leak from gtkiconview
+ 348115 improve notebook visuals when dragging
+ 348120	gtkentrycompletion leaks action_view
+ 348227	gtkimcontextsimple doesn't terminate a string 
+        with null
+ 348424	mem leak in GtkPrintSettings
+ 348089	Missing chaining up in gtk_recent_chooser_menu_finalize
+ 348090	Reference leak in gtk_text_layout_set_contexts
+ 348095	gtk_menu_stop_scrolling does work even if we 
+        were not scrolling...
+ 142582	Add animation xsetting
+ 346427	xbm loader returns false, fails to set error
+ 346733	GList of visuals is always empty and causes 
+        crashes in gdk_rgb_choose_visual()
+ 347048	crash on using GtkAssistant
+ 164884	GtkTreeView row drag is sometimes started 
+        spuriously
+ 302127	GtkTreeView gets angry when items deleted 
+        from a test_expand_row handler
+ 346092 gtk_tooltip_set_delay documentation wrong
+ 346428	Be robust against broken loaders failing to 
+        set error on failure
+ 346467	gtkwindow state assignments bug
+ 346598	modeline takes too much memory
+ 346603	Context menus only work once
+ 346639	treeview memleak
+ 346668	symbolic colors are broken when specifying 
+        engine
+ 346713 quartz backend is missing functions that 
+        pygtk needs
+ 346721	XBM reading in quartz backend is broken
+ 346836	Tabs jump around when opening menus
+ 347018 missing GDK_QUARTZ_ALLOC/RELEASE_POOL calls
+ 347277	gtk_drag_get_ipc_widget() and window groups
+ 347315	SYNC extension check failing
+ 347902	GtkRange doesn't reliably update stepper 
+        sensitivity
+ 335012 gtkcellrenderertext - gtkeditable: bad 
+        interaction when ypad is set to hi value
+ 337910	gdk_pango_layout_get_clip_region is inefficient
+ 346605	Modifier-key events are not sent
+ 346970	gtkfilechooserbutton leaks an empty list
+ 347032	documentation of gtk_print_context_get_height() 
+        has typo
+ 347037	GObject info missing for GtkRecentManager and 
+        GtkRecentChooser* in gtk-doc API reference
+ 347041 documentation of gtk_paper_size_is_equal() 
+        has a typo
+ 347043	Reference leaks in GtkFileChooserButton
+ 347066	gimp 2.3.9/2.2.12 GTK+ assertion fails on 
+        open file dialog
+ 347211 documentation of gtk_print_job_send() has a 
+        typo
+ 347710	new GtkCellRendererSpin misses a lot of API 
+        documentation
+ 347711	slight glitches in GtkAssistant API documentation
+ 347065	Fix in-line doc typos
+ 311399	relative to the window string can be better 
+
+* Updated translations (bg,bn_IN,cs,de,dz,es,et,
+  eu,fi,fr,gu,he,ko,or,th)
+
+Overview of Changes from GTK+ 2.9.4 to 2.10.0
+=============================================
+
+* Printing:
+  - A PREVIEW capability has been added to allow hiding the
+    preview button
+
+* Bug fixes:
+ 321393	Incorrect size request after changing the font
+ 327164	(GtkRBNode *)node becomes NULL inside GtkTreeView
+ 344074	Feature request: get printer list, and get default print
+ 344876	refcount leak when using ComboBox.set_cell_data_func
+ 345644	gtk+-2.9.4 requires CUPS-1.2.x
+ 345663	gtkaction(group)?.c: using functions without prototype declaration
+ 346079	gtk receives all sorts of events from the X server
+ 343841	Misguided iter assertion in gtk_list_store_insert_with_values()
+ 346113 unix print dialogue always has preview button
+ 346237 Possible leak in gtkprintunixdialog.c
+ 346027 cancelling printer enumeration
+ 346312 gtk 2.9.4 tarball lacks the files gtkwin32embedwidget.h 
+        and gtkprint-win32.h
+ 346341 Memory leak in gtk_tree_model_sort_finalize: User data not freed
+
+* Updated translations (cs,cy,dz,es,gu,hi,ko,mk,nb,nl,ru,th,ur)
+
+Overview of Changes from GTK+ 2.9.3 to 2.9.4
+============================================
+
+* GtkPrintOperation:
+ - UI improvements in the print dialog
+ - Make printing work without a display connection
+ - Replace "Print to PDF" by "Print to file" that
+   can generate PDF or PostScript
+ - Add a function to the low-level API to 
+   enumerate all printers
+
+* GtkNotebook tab DND has been improved
+
+* GtkProgressbar supports text in activity mode 
+
+* GtkLabel allows to set the wrap mode
+
+* GtkStatusIcon supports transparency
+
+* Bugs fixed:
+ 344850 Dragging a GtkTreeViewColumn segfaults when 
+        using certain GtkTreeViewColumnDropFunc
+ 342458 Stock menu items without icons are broken in 
+        recent GTK+ releases.
+ 335873 notebook DND + popup windows
+ 337882 gtk_progress_bar_set_text() does nothing in 
+        activity mode
+ 339456 unix print dialogue help button bug
+ 339702 Make sure printing works without a display
+ 341571 tabs too easily reordered
+ 344074 New Feature: get printer list, and get default print
+ 344743 gtk_targets_include_text() should initialize atoms
+ 344838 Allow func to be NULL in 
+        gtk_tree_view_set_search_position_func
+ 344891 GtkPrintOperationPreview signal defs correction
+ 345008 Need updated cairo req
+ 345093 print preview temp file issues
+ 345107 Memory leak in gtk_entry_completion_finalize: 
+        User data not freed
+ 345194 gdk_window_set_functions() docs need to be updated
+ 345456 grid-lines property is wrongly registered and 
+        get/set.
+ 314278 strings in gtk-update-icon-cache are not marked 
+        for translation
+ 344707 size group with widgets in hidden container
+ 344897 Entry completion model NULL handling should be 
+        documented
+ 345038 gtk_print_job_set_status' status
+ 345106 dialog button box spacings
+ 345176 GtkIconView doc about drag and drop
+ 345275 doc imporovements for gtk_window_move
+ 345320 Two very similiar strings should be made equal
+ 345321 Add meaning of "shortcut" as translator comment
+ 320034 transparency gtkstatusicon
+ 339592 Add print-to-postscript
+ 344867 custom paper file could use keyfile
+
+* Updated translations (cs,de,es,fr,gl,gu,hi,ko,ta,th)
+
+Overview of Changes from GTK+ 2.9.2 to 2.9.3
+============================================  
+
+* GtkPrintOperation: 
+ - Introduce an allow-async property 
+ - Introduce a GtkPrintOperationAction enumeration
+ - Rename pdf_target to export_filename
+ - Allow to hide "Print to PDF" in the low-level API
+
+* GtkNotebook:
+ - Add a destroy notify to 
+   gtk_notebook_set_window_creation_hook.
+
+* GtkTreeView:
+ - Support grid lines
+
+* GtkRange:
+ - Add a number of new stle properties which allow more
+   fexible stepper theming
+
+* Bugs fixed:
+ 153212 Have the Paste kbd shortcut jump to the location in 
+        the buffer
+ 337491 _gdk_win32_drawable_release_dc: DeleteDC() called on 
+        a GetDC() handle
+ 339739 gtk/gtkprintoperation-win32.c: 3 compile error
+ 342339 GtkRange::stepper-spacing style property not 
+        implemented correctly
+ 343945 Buttons of a GtkAssistant are not accessible
+ 344148 Wrong reqs for ATK
+ 344209 gtk_notebook_set_window_creation_hook() has no destroy 
+        func.
+ 344232 GtkEntry's "Delete" context menu item is sensitive on a 
+        non-editable GtkEntry
+ 344244 Window resizing not working when keeping the aspect 
+        fixed
+ 344288 gtk_print_operation_preview_is_selected must return 
+        a value
+ 344386 gdk-2.0-uninstalled.pc.in and gdkconfig.h
+ 344496 CRLF converting via Clipboard
+ 344504 GtkPrintCapabilities not in gtktypebuiltins.h
+ 344505 Wrong signal registration for create_custom_widget
+ 344512 cvs build issue
+ 344513 pdf print module's print_stream not calling destroy 
+        notify
+ 344518 NULL unref in page setup dialogue
+ 344543 gtk_progress_bar_pulse calls gtk_progress_bar_paint 
+        directly
+ 344560 gtk_print_settings_[sg]et_scale shouldn't be in percent
+ 344607 memory leaks in gtkrecentchooserdefault.c and 
+        gtkrecentchoosermenu.c
+ 344624 Memory leak in gtk_tree_model_filter_finalize: User 
+        data not freed
+ 337603 Possible off-by-one in 
+        gdk_pango_layout_line_get_clip_region
+ 344239 Wrong filename for gtk-find stock item.
+ 344528 comma at end of GtkPrintOperationAction enum causes 
+        mozilla compilation error
+ 344290 horizontal-padding not take into account when placing 
+        submenus
+ 344558 document print dialogue response codes
+ 339592 Add print-to-postscript
+ 342249 Allow to draw upper and lower sides of GtkRange's 
+        trough differently
+ 344530 gtk_recent_chooser_widget_new_for_manager and 
+        gtk_recent_chooser_menu_new_for_manager should 
+        allow NULL manager arg
+
+* Updated translations (es,fi,gu,ko,th,wa)
+
+
 Overview of Changes from GTK+ 2.9.1 to 2.9.2
 ============================================
 
@@ -152,6 +775,12 @@ Overview of Changes from GTK+ 2.9.0 to 2.9.1
  340951 faq: How do I internationalize a GTK+ program? doesn't 
         mention glib-I18N
  341855 Little typo in the Tree and List Widget Overview
+ 153212 Have the Paste kbd shortcut jump to the location 
+        in the buffer
+ 335729 Invisible rows and 
+        gtk_tree_model_filter_convert_child_*_to_*
+ 106406 GtkTreeView Grid Lines?
+ 339592 Add print-to-postscript
 
 * Updated translations (de,es,gl,gu,nl)
 

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.9.2. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.10.8. 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.
@@ -20,11 +20,13 @@ The official web site is:
 Information about mailing lists can be found at
   http://www.gtk.org/mailinglists.html
 
+
 Installation
 ============
 
 See the file 'INSTALL'
 
+
 Release notes for 2.10
 ======================
 
@@ -48,15 +50,15 @@ Release notes for 2.10
   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
 
-* Suffixes 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.
+* 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
+* 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.
 
@@ -66,8 +68,63 @@ Release notes for 2.10
   objects derived from GtkNotebook are page-reordered, page-removed and
   page-added.
 
-Release notes
-=============
+* 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
@@ -149,6 +206,7 @@ Release notes
   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
 ==================
 
@@ -182,6 +240,7 @@ In the bug report please include:
   it will be more useful if the stacktrace is produced running the test
   program with the --sync command line option.
 
+
 Patches
 =======
 

README.in

@@ -20,11 +20,13 @@ The official web site is:
 Information about mailing lists can be found at
   http://www.gtk.org/mailinglists.html
 
+
 Installation
 ============
 
 See the file 'INSTALL'
 
+
 Release notes for 2.10
 ======================
 
@@ -48,15 +50,15 @@ Release notes for 2.10
   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
 
-* Suffixes 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.
+* 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
+* 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.
 
@@ -66,8 +68,63 @@ Release notes for 2.10
   objects derived from GtkNotebook are page-reordered, page-removed and
   page-added.
 
-Release notes
-=============
+* 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
@@ -149,6 +206,7 @@ Release notes
   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
 ==================
 
@@ -182,6 +240,7 @@ In the bug report please include:
   it will be more useful if the stacktrace is produced running the test
   program with the --sync command line option.
 
+
 Patches
 =======
 

acconfig.h

@@ -68,6 +68,8 @@
 
 #undef GETTEXT_PACKAGE
 
+#undef HAVE_CUPS_API_1_2
+
 /* #undef PACKAGE */
 /* #undef VERSION */
 

configure.in

@@ -11,11 +11,11 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [9])
-m4_define([gtk_micro_version], [2])
+m4_define([gtk_minor_version], [10])
+m4_define([gtk_micro_version], [8])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_interface_age], [8])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
@@ -31,10 +31,10 @@ 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.11.0])
-m4_define([pango_required_version], [1.13.0])
-m4_define([atk_required_version], [1.0.1])
-m4_define([cairo_required_version], [1.1.6])
+m4_define([glib_required_version], [2.12.0])
+m4_define([pango_required_version], [1.12.0])
+m4_define([atk_required_version], [1.9.0])
+m4_define([cairo_required_version], [1.2.0])
 
 
 AC_INIT([gtk+], [gtk_version],
@@ -370,7 +370,8 @@ AC_ARG_ENABLE(explicit-deps,
 AC_MSG_CHECKING([Whether to write dependencies into .pc files])
 case $enable_explicit_deps in
   auto)
-    deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh`
+    export SED
+    deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
       enable_explicit_deps=yes  
     else
@@ -402,7 +403,7 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-AC_CHECK_FUNCS(lstat mkstemp flockfile)
+AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
 
 # _NL_TIME_FIRST_WEEKDAY is an enum and not a define
 AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
@@ -469,7 +470,7 @@ fi
 # sure that both po/ and po-properties/ have .po files that correspond
 # to your language.  If you only add one to po/, the build will break
 # in po-properties/.
-ALL_LINGUAS="af am ar az az_IR be bg bn br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy ia id is it ja ka ko ku li lt lv mi mk ml mn mr ms nb ne nl nn nso or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt uk uz uz@Latn vi wa xh yi zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am ang ar as az az_IR be bg bn bn_IN br bs ca cs cy da de dz el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu hy ia id is it ja ka ko ku li lt lv mi mk ml mn mr ms nb ne nl nn nso or pa pl pt pt_BR ro ru rw si sk sl sq sr sr@Latn sr@ije sv ta te th tk tr tt uk ur uz uz@Latn vi wa xh yi zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
@@ -728,6 +729,10 @@ fi
 AC_MSG_RESULT($gtk_uxtheme_h)
 
 
+# Checks for gdkspawn
+AC_CHECK_HEADERS(crt_externs.h)
+AC_CHECK_FUNCS(_NSGetEnviron)
+
 ##################################################
 # Checks for gdk-pixbuf
 ##################################################
@@ -1032,7 +1037,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
 
 if test $cross_compiling = yes; then
   AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
-  if test x$GDK_PIXBUF_CSOURCE = xno; then
+  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+  if test x$GTK_UPDATE_ICON_CACHE = xno; then
     REBUILD_PNGS=#
   fi
 fi
@@ -1042,7 +1048,7 @@ if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
      AC_MSG_ERROR([
 *** gtkbuiltincache.h is not in the tree, and cannot be built
 *** because you don't have libpng, or (when cross-compiling) you 
-*** don't have a prebuilt gdk-pixbuf-csource on the host system.])
+*** don't have a prebuilt gtk-update-icon-cache on the build system.])
 fi
 
 AC_SUBST(REBUILD_PNGS)
@@ -1092,8 +1098,8 @@ if test "x$gdktarget" = "xx11"; then
   if $PKG_CONFIG --exists x11 xext xrender; then
     have_base_x_pc=true
     X_PACKAGES="$X_PACKAGES x11 xext xrender"
-    x_libs="`pkg-config --libs x11 xext xrender`"
-    X_CFLAGS="`pkg-config --cflags x11 xext xrender`"
+    x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
+    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
     
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
@@ -1192,12 +1198,16 @@ if test "x$gdktarget" = "xx11"; then
       AC_DEFINE(HAVE_SHAPE_EXT))
 
   # X SYNC check
+  gtk_save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $x_cflags"
   
   AC_CHECK_FUNC(XSyncQueryExtension,
       [AC_CHECK_HEADER(X11/extensions/sync.h,
 	  AC_DEFINE(HAVE_XSYNC, 1, Have the SYNC extension library),
 	  :, [#include <X11/Xlib.h>])])
 
+  CFLAGS="$gtk_save_CFLAGS"
+
   # Xshm checks
 
   if test "x$enable_shm" = "xyes"; then
@@ -1339,6 +1349,7 @@ if test "x$gdktarget" = "xx11"; then
     AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
     
     X_PACKAGES="$X_PACKAGES xfixes"
+    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
   fi
 
   if $have_base_x_pc ; then
@@ -1406,17 +1417,18 @@ else
 fi
 
 if test "x$gdktarget" = "xdirectfb"; then
-  DIRECTFB_REQUIRED_VERSION=0.9.21
+  DIRECTFB_REQUIRED_VERSION=0.9.24
   AC_MSG_CHECKING(for DirectFB)
 
-  if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
+  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 directfb` $GDK_EXTRA_CFLAGS"
-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs directfb` $GDK_EXTRA_LIBS"
+      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 is required. The latest
-*** version of DirectFB is always available from http://www.directfb.org/.
+*** 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
 
@@ -1544,6 +1556,17 @@ 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`
 
+  CUPS_API_VERSION=`cups-config --api-version`
+  CUPS_API_MAJOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $1}'`
+  CUPS_API_MINOR=`echo -n $CUPS_API_VERSION | awk -F. '{print $2}'`
+
+  if test $CUPS_API_MAJOR -gt 1 -o \
+          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
+    AC_DEFINE(HAVE_CUPS_API_1_2)
+  fi
+
+  AC_SUBST(CUPS_API_MAJOR)
+  AC_SUBST(CUPS_API_MINOR)
   AC_SUBST(CUPS_CFLAGS)
   AC_SUBST(CUPS_LIBS)
 fi
@@ -1578,6 +1601,7 @@ CPPFLAGS="$gtk_save_cppflags"
 #
 # We are using gmodule-no-export now, but I'm leaving the stripping
 # code in place for now, since pango and atk still require gmodule.
+export SED
 export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
 if test -n "$export_dynamic"; then
   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
@@ -1754,7 +1778,7 @@ modules/engines/ms-windows/Theme/gtk-2.0/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile
 modules/printbackends/lpr/Makefile
-modules/printbackends/pdf/Makefile
+modules/printbackends/file/Makefile
 perf/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,3 +1,47 @@
+2007-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.8 ===
+
+2007-01-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.7 ===
+
+2006-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.6 ===
+
+2006-10-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.5 ===
+
+2006-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.4 ===
+
+2006-09-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.3 ===
+
+2006-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.2 ===
+
+2006-07-23  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.1 ===
+
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.0 ===
+
+2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.9.4 ===
+
+2006-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.3 ===
+
 2006-06-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.9.2 ===

demos/gtk-demo/Makefile.am

@@ -31,6 +31,7 @@ demos =						\
 	sizegroup.c				\
 	stock_browser.c				\
 	textview.c				\
+	textscroll.c				\
 	tree_store.c				\
 	ui_manager.c
 

demos/gtk-demo/appwindow.c

@@ -467,6 +467,7 @@ do_appwindow (GtkWidget *do_widget)
 				  "stock-id", GTK_STOCK_OPEN,
 				  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, 
 				    window);

demos/gtk-demo/changedisplay.c

@@ -300,6 +300,8 @@ display_changed_cb (GtkTreeSelection  *selection,
   GtkTreeModel *model;
   GtkTreeIter iter;
 
+  if (info->current_display)
+    g_object_unref (info->current_display);
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     gtk_tree_model_get (model, &iter,
 			DISPLAY_COLUMN_DISPLAY, &info->current_display,
@@ -320,6 +322,8 @@ screen_changed_cb (GtkTreeSelection  *selection,
   GtkTreeModel *model;
   GtkTreeIter iter;
 
+  if (info->current_screen)
+    g_object_unref (info->current_screen);
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     gtk_tree_model_get (model, &iter,
 			SCREEN_COLUMN_SCREEN, &info->current_screen,
@@ -562,6 +566,14 @@ destroy_info (ChangeDisplayInfo *info)
   g_slist_free (tmp_list);
 
   g_object_unref (info->size_group);
+  g_object_unref (info->display_model);
+  g_object_unref (info->screen_model);
+
+  if (info->current_display)
+    g_object_unref (info->current_display);
+  if (info->current_screen)
+    g_object_unref (info->current_screen);
+
   g_free (info);
 }
 

demos/gtk-demo/combobox.c

@@ -74,6 +74,7 @@ create_stock_icon_store (void)
 			      PIXBUF_COL, pixbuf,
 			      TEXT_COL, label,
 			      -1);
+	  g_object_unref (pixbuf);
 	  g_free (label);
 	}
       else

demos/gtk-demo/drawingarea.c

@@ -218,6 +218,16 @@ checkerboard_expose (GtkWidget	    *da,
   return TRUE;
 }
 
+static void
+close_window (void)
+{
+  window = NULL;
+
+  if (pixmap)
+    g_object_unref (pixmap);
+  pixmap = NULL;
+}
+
 GtkWidget *
 do_drawingarea (GtkWidget *do_widget)
 {
@@ -233,7 +243,7 @@ do_drawingarea (GtkWidget *do_widget)
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
 
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
@@ -309,14 +319,9 @@ do_drawingarea (GtkWidget *do_widget)
     }
 
   if (!GTK_WIDGET_VISIBLE (window))
-    {
       gtk_widget_show_all (window);
-    }
   else
-    {
       gtk_widget_destroy (window);
-      window = NULL;
-    }
 
   return window;
 }

demos/gtk-demo/editable_cells.c

@@ -121,7 +121,10 @@ create_numbers_model (void)
   /* add numbers */
   for (i = 0; i < N_NUMBERS; i++)
     {
-      char str[2] = { '0' + i, '\0' };
+      char str[2];
+
+      str[0] = '0' + i;
+      str[1] = '\0';
 
       gtk_list_store_append (model, &iter);
 

demos/gtk-demo/iconview.c

@@ -243,6 +243,18 @@ home_clicked (GtkToolItem *item,
 			    TRUE);
 }
 
+static void close_window(void)
+{
+  gtk_widget_destroy (window);
+  window = NULL;
+
+  g_object_unref (file_pixbuf);
+  file_pixbuf = NULL;
+
+  g_object_unref (folder_pixbuf);
+  folder_pixbuf = NULL;
+}
+
 GtkWidget *
 do_iconview (GtkWidget *do_widget)
 {
@@ -258,7 +270,7 @@ do_iconview (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
 
       g_signal_connect (window, "destroy",
-			G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (close_window), NULL);
 
       error = NULL;
       if (!load_pixbufs (&error))

demos/gtk-demo/main.c

@@ -19,7 +19,7 @@ enum {
   TITLE_COLUMN,
   FILENAME_COLUMN,
   FUNC_COLUMN,
-  ITALIC_COLUMN,
+  STYLE_COLUMN,
   NUM_COLUMNS
 };
 
@@ -94,15 +94,15 @@ window_closed_cb (GtkWidget *window, gpointer data)
 {
   CallbackData *cbdata = data;
   GtkTreeIter iter;
-  gboolean italic;
+  PangoStyle style;
 
   gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
   gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-		      ITALIC_COLUMN, &italic,
+		      STYLE_COLUMN, &style,
 		      -1);
-  if (italic)
+  if (style == PANGO_STYLE_ITALIC)
     gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-			ITALIC_COLUMN, !italic,
+			STYLE_COLUMN, PANGO_STYLE_NORMAL,
 			-1);
 
   gtk_tree_path_free (cbdata->path);
@@ -575,6 +575,8 @@ load_file (const gchar *filename)
 	}
     }
 
+  fclose (file);
+  
   fontify ();
 
   g_string_free (buffer, TRUE);
@@ -586,7 +588,7 @@ row_activated_cb (GtkTreeView       *tree_view,
 		  GtkTreeViewColumn *column)
 {
   GtkTreeIter iter;
-  gboolean italic;
+  PangoStyle style;
   GDoDemoFunc func;
   GtkWidget *window;
   GtkTreeModel *model;
@@ -597,14 +599,14 @@ row_activated_cb (GtkTreeView       *tree_view,
   gtk_tree_model_get (GTK_TREE_MODEL (model),
 		      &iter,
 		      FUNC_COLUMN, &func,
-		      ITALIC_COLUMN, &italic,
+		      STYLE_COLUMN, &style,
 		      -1);
 
   if (func)
     {
       gtk_tree_store_set (GTK_TREE_STORE (model),
 			  &iter,
-			  ITALIC_COLUMN, !italic,
+			  STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
 			  -1);
       window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
       
@@ -700,7 +702,7 @@ create_tree (void)
 
   Demo *d = testgtk_demos;
 
-  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
+  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
   tree_view = gtk_tree_view_new ();
   gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
@@ -723,7 +725,7 @@ create_tree (void)
 			  TITLE_COLUMN, d->title,
 			  FILENAME_COLUMN, d->filename,
 			  FUNC_COLUMN, d->func,
-			  ITALIC_COLUMN, FALSE,
+			  STYLE_COLUMN, PANGO_STYLE_NORMAL,
 			  -1);
 
       d++;
@@ -742,7 +744,7 @@ create_tree (void)
 			      TITLE_COLUMN, children->title,
 			      FILENAME_COLUMN, children->filename,
 			      FUNC_COLUMN, children->func,
-			      ITALIC_COLUMN, FALSE,
+			      STYLE_COLUMN, PANGO_STYLE_NORMAL,
 			      -1);
 	  
 	  children++;
@@ -751,14 +753,10 @@ create_tree (void)
 
   cell = gtk_cell_renderer_text_new ();
 
-  g_object_set (cell,
-                "style", PANGO_STYLE_ITALIC,
-                NULL);
-  
   column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
 						     cell,
 						     "text", TITLE_COLUMN,
-						     "style_set", ITALIC_COLUMN,
+						     "style", STYLE_COLUMN,
 						     NULL);
   
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
@@ -786,6 +784,8 @@ create_tree (void)
 
   gtk_widget_grab_focus (tree_view);
 
+   g_object_unref (model);
+
   return box;
 }
 
@@ -869,7 +869,7 @@ main (int argc, char **argv)
   
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
-  g_signal_connect (window, "destroy",
+  g_signal_connect_after (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);
 
   hbox = gtk_hbox_new (FALSE, 0);
@@ -885,13 +885,15 @@ main (int argc, char **argv)
 			    create_text (&info_buffer, FALSE),
 			    gtk_label_new_with_mnemonic ("_Info"));
 
+  tag = gtk_text_buffer_create_tag (info_buffer, "title",
+                                    "font", "Sans 18",
+                                    NULL);
+   g_object_unref (info_buffer);
+
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new_with_mnemonic ("_Source"));
 
-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
-                                    NULL);
 
   tag = gtk_text_buffer_create_tag (source_buffer, "comment",
 				    "foreground", "DodgerBlue",
@@ -914,6 +916,7 @@ main (int argc, char **argv)
 				    "weight", PANGO_WEIGHT_BOLD,
  				    "foreground", "DarkGoldenrod4",
                                     NULL);
+   g_object_unref (source_buffer);
   
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);

demos/gtk-demo/printing.c

@@ -156,7 +156,7 @@ do_printing (GtkWidget *do_widget)
   g_signal_connect (G_OBJECT (operation), "end-print", 
 		    G_CALLBACK (end_print), data);
 
-  gtk_print_operation_run (operation, GTK_WINDOW (do_widget), &error);
+  gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);
 
   g_object_unref (operation);
 

demos/gtk-demo/textscroll.c

@@ -0,0 +1,200 @@
+/* Text Widget/Automatic scrolling
+ *
+ * This example demonstrates how to use the gravity of 
+ * GtkTextMarks to keep a text view scrolled to the bottom
+ * while appending text.
+ */
+
+#include <gtk/gtk.h>
+#include "demo-common.h"
+
+/* Scroll to the end of the buffer.
+ */
+static gboolean
+scroll_to_end (GtkTextView *textview)
+{
+  GtkTextBuffer *buffer;
+  GtkTextIter iter;
+  GtkTextMark *mark;
+  char *spaces;
+  static int count;
+
+  buffer = gtk_text_view_get_buffer (textview);
+  
+  /* Get "end" mark. It's located at the end of buffer because 
+   * of right gravity
+   */
+  mark = gtk_text_buffer_get_mark (buffer, "end");
+  gtk_text_buffer_get_iter_at_mark (buffer, &iter, mark);
+
+  /* and insert some text at its position, the iter will be 
+   * revalidated after insertion to point to the end of inserted text
+   */
+  spaces = g_strnfill (count++, ' ');
+  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
+  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
+  gtk_text_buffer_insert (buffer, &iter,
+                          "Scroll to end scroll to end scroll "
+                          "to end scroll to end ",
+                          -1);
+  g_free (spaces);
+
+  /* Now scroll the end mark onscreen.
+   */
+  gtk_text_view_scroll_mark_onscreen (textview, mark);
+
+  /* Emulate typewriter behavior, shift to the left if we 
+   * are far enough to the right.
+   */
+  if (count > 150)
+    count = 0;
+
+  return TRUE;
+}
+
+/* Scroll to the bottom of the buffer.
+ */
+static gboolean
+scroll_to_bottom (GtkTextView *textview)
+{
+  GtkTextBuffer *buffer;
+  GtkTextIter iter;
+  GtkTextMark *mark;
+  char *spaces;
+  static int count;
+
+  buffer = gtk_text_view_get_buffer (textview);
+  
+  /* Get end iterator */
+  gtk_text_buffer_get_end_iter (buffer, &iter);
+
+  /* and insert some text at it, the iter will be revalidated
+   * after insertion to point to the end of inserted text
+   */
+  spaces = g_strnfill (count++, ' ');
+  gtk_text_buffer_insert (buffer, &iter, "\n", -1);
+  gtk_text_buffer_insert (buffer, &iter, spaces, -1);
+  gtk_text_buffer_insert (buffer, &iter,
+                          "Scroll to bottom scroll to bottom scroll "
+                          "to bottom scroll to bottom",
+                          -1);
+  g_free (spaces);
+
+  /* Move the iterator to the beginning of line, so we don't scroll 
+   * in horizontal direction 
+   */
+  gtk_text_iter_set_line_offset (&iter, 0);
+  
+  /* and place the mark at iter. the mark will stay there after we
+   * insert some text at the end because it has right gravity.
+   */
+  mark = gtk_text_buffer_get_mark (buffer, "scroll");
+  gtk_text_buffer_move_mark (buffer, mark, &iter);
+  
+  /* Scroll the mark onscreen.
+   */
+  gtk_text_view_scroll_mark_onscreen (textview, mark);
+
+  /* Shift text back if we got enough to the right.
+   */
+  if (count > 40)
+    count = 0;
+
+  return TRUE;
+}
+
+static guint
+setup_scroll (GtkTextView *textview,
+              gboolean     to_end)
+{
+  GtkTextBuffer *buffer;
+  GtkTextIter iter;
+
+  buffer = gtk_text_view_get_buffer (textview);
+  gtk_text_buffer_get_end_iter (buffer, &iter);
+
+  if (to_end)
+  {
+    /* If we want to scroll to the end, including horizontal scrolling,
+     * then we just create a mark with right gravity at the end of the 
+     * buffer. It will stay at the end unless explicitely moved with 
+     * gtk_text_buffer_move_mark.
+     */
+    gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
+    
+    /* Add scrolling timeout. */
+    return g_timeout_add (50, (GSourceFunc) scroll_to_end, textview);
+  }
+  else
+  {
+    /* If we want to scroll to the bottom, but not scroll horizontally, 
+     * then an end mark won't do the job. Just create a mark so we can 
+     * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
+     * explicitely when needed. Use left gravity so the mark stays where 
+     * we put it after inserting new text.
+     */
+    gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);
+    
+    /* Add scrolling timeout. */
+    return g_timeout_add (100, (GSourceFunc) scroll_to_bottom, textview);
+  }
+}
+
+static void
+remove_timeout (GtkWidget *window,
+                gpointer   timeout)
+{
+  g_source_remove (GPOINTER_TO_UINT (timeout));
+}
+
+static void
+create_text_view (GtkWidget *hbox,
+                  gboolean   to_end)
+{
+  GtkWidget *swindow;
+  GtkWidget *textview;
+  guint timeout;
+
+  swindow = gtk_scrolled_window_new (NULL, NULL);
+  gtk_box_pack_start_defaults (GTK_BOX (hbox), swindow);
+  textview = gtk_text_view_new ();
+  gtk_container_add (GTK_CONTAINER (swindow), textview);
+
+  timeout = setup_scroll (GTK_TEXT_VIEW (textview), to_end);
+
+  /* Remove the timeout in destroy handler, so we don't try to
+   * scroll destroyed widget. 
+   */
+  g_signal_connect (textview, "destroy",
+                    G_CALLBACK (remove_timeout),
+                    GUINT_TO_POINTER (timeout));
+}
+
+GtkWidget *
+do_textscroll (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *hbox;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      g_signal_connect (window, "destroy",
+			G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
+      
+      hbox = gtk_hbox_new (TRUE, 6);
+      gtk_container_add (GTK_CONTAINER (window), hbox);
+
+      create_text_view (hbox, TRUE);
+      create_text_view (hbox, FALSE);
+    }
+
+  if (!GTK_WIDGET_VISIBLE (window))
+      gtk_widget_show_all (window);
+  else
+      gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/ui_manager.c

@@ -183,10 +183,12 @@ do_ui_manager (GtkWidget *do_widget)
 
       ui = gtk_ui_manager_new ();
       gtk_ui_manager_insert_action_group (ui, actions, 0);
+      g_object_unref (actions);
       gtk_window_add_accel_group (GTK_WINDOW (window), 
 				  gtk_ui_manager_get_accel_group (ui));
       gtk_window_set_title (GTK_WINDOW (window), "UI Manager");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+
       
       if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error))
 	{
@@ -223,6 +225,7 @@ do_ui_manager (GtkWidget *do_widget)
       gtk_widget_grab_default (button);
 
       gtk_widget_show_all (window);
+      g_object_unref (ui);
     }
   else
     {

docs/reference/ChangeLog

@@ -1,3 +1,168 @@
+2007-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.8 ===
+
+2007-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf/gdk-pixbuf-sections.txt: Correct the include
+	for GdkPixdata.  (#394000, Samuel Cormier-Iijima)
+
+2007-01-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.7 ===
+
+2006-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.6 ===
+
+2006-10-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.5 ===
+
+2006-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.4 ===
+
+2006-09-22  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gtk/tmpl/gtkprintcontext.sgml:
+	* gtk/tmpl/gtkpagesetup.sgml: Apply a patch
+	to fix some typos.  (#355961, Claudio Saavedra)
+
+2006-09-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.3 ===
+
+2006-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/question_index.sgml: Rewrite the answer for
+	automatic scrolling.
+
+2006-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.2 ===
+
+2006-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktable.sgml: Fix docs for gtk_table_set_row/col_spacing.
+	(#348728)
+
+	* gtk/running.sgml: Document new GTK_DEBUG values.  (#350023,
+	Mart Raudsepp)
+
+2006-08-14  Emmanuele Bassi  <ebassi@gnome.org>
+
+	* gtk/tmpl/gtkrecentchoosermenu.sgml: Add a warning about
+	the semantics of gtk_recent_chooser_add_filter() and of
+	gtk_recent_chooser_remove_filter() when applied to a
+	GtkRecentChooserMenu.
+
+2006-08-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkruler.sgml: Fix a swapped argument 
+	description.  (#351241, Étienne Bersac)
+
+2006-08-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkcelllayout.sgml: Add an explanation
+	of attributes.  (#349367, Don Anderson)
+
+	* gtk/tmpl/gtkrecentmanager.sgml: Fix a typo.  (#349120, Vincent Untz) 
+
+2006-07-23  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.1 ===
+
+2006-07-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk.types: Add  gtk_cell_renderer_spin_get_type  (#347710,
+	Guillaume Cottenceau)
+
+2006-07-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk.types: Add missing types  (#347037, Josh Green)
+
+2006-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtktooltips.sgml: Fix a FIXME (#346092,
+	Claudio Saavedra, Priit Laes)
+
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.0 ===
+
+2006-06-30 Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprintsettings.sgml: Document print-to-file specific
+	settings.  (#346241, Carolyn MacLeod)
+
+2006-06-28  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprintjob.sgml: Document GtkPrintJobCompleteFunc
+
+	* gtk/tmpl/gtkrange.sgml: Document GtkSensitivityType
+
+	* gtk/gtk-sections.txt: Remove gtk_print_operation_set_show_dialog
+
+	* gtk/tmpl/gtkcontainer.sgml: Updates.
+
+	* gtk/tmpl/gtkenums.sgml: Document GTK_ARROW_NONE.
+	* gtk/tmpl/gtkarrow.sgml: Cleanups
+	* gtk/gtk-sections.txt: Add some private things
+
+2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.9.4 ===
+
+2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Some additions
+
+	* gtk/tmpl/gtkprintunixdialog.sgml: Document some of the
+	print capabilities
+
+	* gtk/question_index.sgml: Add some questions.
+
+2006-06-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtk-sections.txt: Remove unused print-to-file setting
+
+2006-06-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprinter.sgml: Document GtkPrinterFunc
+
+	* gtk/gtk-sections.txt: Add gtk_enumerate_printers
+
+2006-06-19  Alexander Larsson  <alexl@redhat.com>
+
+	* gtk/gtk-sections.txt:
+	Add gtk_label_set_line_wrap_mode and gtk_label_get_line_wrap_mode
+
+2006-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.3 ===
+
+2006-06-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprintunixdialog.sgml: Document resonses used
+	by GtkPrintUnixDialog.  (#344558, Christian Persch)
+
+2006-06-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprintoperation.sgml: Updates
+
+	* gtk/gtk-sections.txt: Replace pdf_target by export_filename
+
+	* gtk/tmpl/gtkprintoperation.sgml: Remove GTK_PRINT_OPERATION_RESULT_PREVIEW.
+
+	* gtk/tmpl/gtkstock.sgml: Correct a filename (#344239,
+	John Darrington)
+
+2006-06-07  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkprintoperation.sgml:
+	* gtk/gtk-sections.txt: Additions
+
 2006-06-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.9.2 ===

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

@@ -89,6 +89,7 @@ gdk_pixbuf_copy
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk-pixbuf/gdk-pixdata.h</INCLUDE>
 <FILE>inline</FILE>
 GdkPixdata
 GdkPixdataType

docs/reference/gtk/gtk-sections.txt

@@ -2008,6 +2008,7 @@ gtk_label_set_max_width_chars
 gtk_label_get
 gtk_label_parse_uline
 gtk_label_set_line_wrap
+gtk_label_set_line_wrap_mode
 gtk_label_set
 gtk_label_get_layout_offsets
 gtk_label_get_mnemonic_keyval
@@ -2026,6 +2027,7 @@ gtk_label_get_max_width_chars
 gtk_label_get_label
 gtk_label_get_layout
 gtk_label_get_line_wrap
+gtk_label_get_line_wrap_mode
 gtk_label_get_mnemonic_widget
 gtk_label_get_selection_bounds
 gtk_label_get_use_markup
@@ -2739,6 +2741,7 @@ gtk_range_get_value
 gtk_range_set_increments
 gtk_range_set_range
 gtk_range_set_value
+GtkSensitivityType
 gtk_range_set_lower_stepper_sensitivity
 gtk_range_get_lower_stepper_sensitivity
 gtk_range_set_upper_stepper_sensitivity
@@ -4502,6 +4505,14 @@ gtk_tree_view_set_destroy_count_func
 GtkTreeViewRowSeparatorFunc
 gtk_tree_view_get_row_separator_func
 gtk_tree_view_set_row_separator_func
+gtk_tree_view_get_rubber_banding
+gtk_tree_view_set_rubber_banding
+gtk_tree_view_get_enable_tree_lines
+gtk_tree_view_set_enable_tree_lines
+GtkTreeViewGridLines
+gtk_tree_view_get_grid_lines
+gtk_tree_view_set_grid_lines
+
 <SUBSECTION Standard>
 GtkTreeSelectionClass
 GTK_TREE_VIEW
@@ -4637,6 +4648,7 @@ GTK_IS_CELL_RENDERER_SPIN
 GTK_IS_CELL_RENDERER_SPIN_CLASS
 GTK_CELL_RENDERER_SPIN_GET_CLASS
 <SUBSECTION Private>
+GtkCellRendererSpinPrivate
 gtk_cell_renderer_spin_get_type
 </SECTION>
 
@@ -5922,6 +5934,7 @@ GTK_STOCK_OPEN
 GTK_STOCK_ORIENTATION_LANDSCAPE
 GTK_STOCK_ORIENTATION_PORTRAIT
 GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE
+GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT
 GTK_STOCK_PASTE
 GTK_STOCK_PREFERENCES
 GTK_STOCK_PRINT
@@ -6074,10 +6087,13 @@ gtk_icon_source_get_type
 <TITLE>High-level Printing API</TITLE>
 GtkPrintOperation
 GtkPrintStatus
+GtkPrintOperationAction
 GtkPrintOperationResult
 GtkPrintError
 GTK_PRINT_ERROR
 gtk_print_operation_new
+gtk_print_operation_set_allow_async
+gtk_print_operation_get_error
 gtk_print_operation_set_default_page_setup
 gtk_print_operation_get_default_page_setup
 gtk_print_operation_set_print_settings
@@ -6087,21 +6103,26 @@ gtk_print_operation_set_n_pages
 gtk_print_operation_set_current_page
 gtk_print_operation_set_use_full_page
 gtk_print_operation_set_unit
-gtk_print_operation_set_show_dialog
-gtk_print_operation_set_pdf_target 
+gtk_print_operation_set_export_filename 
 gtk_print_operation_set_show_progress
 gtk_print_operation_set_track_print_status
 gtk_print_operation_set_custom_tab_label
 gtk_print_operation_run
-gtk_print_operation_run_async
 gtk_print_operation_cancel
 gtk_print_operation_get_status
 gtk_print_operation_get_status_string
 gtk_print_operation_is_finished
+gtk_print_operation_get_error
 gtk_print_run_page_setup_dialog
 GtkPageSetupDoneFunc
 gtk_print_run_page_setup_dialog_async
 
+<SUBSECTION Preview>
+GtkPrintOperationPreview
+gtk_print_operation_preview_end_preview
+gtk_print_operation_preview_is_selected
+gtk_print_operation_preview_render_page
+
 <SUBSECTION Standard>
 GTK_TYPE_PRINT_OPERATION
 GTK_PRINT_OPERATION
@@ -6109,10 +6130,15 @@ GTK_IS_PRINT_OPERATION
 GTK_IS_PRINT_OPERATION_CLASS
 GTK_PRINT_OPERATION_CLASS
 GTK_PRINT_OPERATION_GET_CLASS
+GTK_IS_PRINT_OPERATION_PREVIEW
+GTK_PRINT_OPERATION_PREVIEW
+GTK_PRINT_OPERATION_PREVIEW_GET_IFACE
+GTK_TYPE_PRINT_OPERATION_PREVIEW
 
 <SUBSECTION Private>
 gtk_print_error_quark
 gtk_print_operation_get_type
+gtk_print_operation_preview_get_type
 GtkPrintOperationPrivate
 </SECTION>
 
@@ -6145,6 +6171,7 @@ GTK_PRINT_UNIX_DIALOG_GET_CLASS
 <SUBSECTION Private>
 GtkPrintUnixDialogPrivate
 gtk_print_unix_dialog_get_type
+gtk_print_capabilities_get_type
 </SECTION>
 
 
@@ -6164,7 +6191,11 @@ gtk_printer_get_job_count
 gtk_printer_is_active
 gtk_printer_is_virtual
 gtk_printer_is_default
+gtk_printer_accepts_ps
+gtk_printer_accepts_pdf
 gtk_printer_compare
+GtkPrinterFunc
+gtk_enumerate_printers
 
 <SUBSECTION Standard>
 GTK_TYPE_PRINTER
@@ -6247,9 +6278,6 @@ gtk_print_settings_set_resolution
 GTK_PRINT_SETTINGS_SCALE
 gtk_print_settings_get_scale
 gtk_print_settings_set_scale
-GTK_PRINT_SETTINGS_PRINT_TO_FILE
-gtk_print_settings_get_print_to_file
-gtk_print_settings_set_print_to_file
 GtkPrintPages
 GTK_PRINT_SETTINGS_PRINT_PAGES
 gtk_print_settings_get_print_pages
@@ -6277,9 +6305,12 @@ gtk_print_settings_set_finishings
 GTK_PRINT_SETTINGS_OUTPUT_BIN
 gtk_print_settings_get_output_bin
 gtk_print_settings_set_output_bin
+GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT
+GTK_PRINT_SETTINGS_OUTPUT_URI
 GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA
 GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION
 
+
 <SUBSECTION Standard>
 GTK_TYPE_PRINT_SETTINGS
 GTK_PRINT_SETTINGS
@@ -6367,6 +6398,7 @@ gtk_page_setup_get_type
 <TITLE>GtkPrintContext</TITLE>
 GtkPrintContext
 gtk_print_context_get_cairo_context
+gtk_print_context_set_cairo_context
 gtk_print_context_get_page_setup
 gtk_print_context_get_width
 gtk_print_context_get_height

docs/reference/gtk/gtk.types

@@ -28,6 +28,7 @@ gtk_cell_renderer_combo_get_type
 gtk_cell_renderer_get_type
 gtk_cell_renderer_pixbuf_get_type
 gtk_cell_renderer_progress_get_type
+gtk_cell_renderer_spin_get_type
 gtk_cell_renderer_text_get_type
 gtk_cell_renderer_toggle_get_type
 gtk_cell_view_get_type
@@ -121,6 +122,11 @@ gtk_radio_menu_item_get_type
 gtk_radio_tool_button_get_type
 gtk_range_get_type
 gtk_rc_style_get_type
+gtk_recent_chooser_get_type
+gtk_recent_chooser_dialog_get_type
+gtk_recent_chooser_menu_get_type
+gtk_recent_chooser_widget_get_type
+gtk_recent_manager_get_type
 gtk_ruler_get_type
 gtk_scale_get_type
 gtk_scrollbar_get_type

docs/reference/gtk/question_index.sgml

@@ -524,6 +524,45 @@ volatile GType dummy = GTK_TYPE_BLAH;
 </para>
 </answer>
 </qandaentry>
+
+<qandaentry>
+<question>
+<para>
+How do I create a transparent toplevel window ?
+</para>
+</question>
+
+<answer>
+<para>
+To make a window transparent, it needs to use a visual which supports that.
+This is done by getting the RGBA colormap of the screen with 
+gdk_screen_get_rgba_colormap() and setting it on the window. Note that
+gdk_screen_get_rgba_colormap() will return %NULL if transparent windows
+are not supported on the screen; also note that this may change from
+screen to screen, so it needs to be repeated whenever the window is moved
+to a different screen.
+<informalexample><programlisting>
+GdkColormap *colormap;
+
+colormap = gdk_screen_get_rgba_colormap (screen);
+if (!colormap)
+  colormap = gtk_screen_get_rgb_colormap (screen);
+
+gtk_widget_set_colormap (widget, colormap);
+</programlisting></informalexample>
+One possibility to fill the alpha channel on the window is to use
+gdk_draw_rgb_32_image().
+</para>
+<para>
+Note that the presence of an RGBA visual is no guarantee that the
+window will actually appear transparent on screen. On X11, this 
+requires a compositing manager to be running. See 
+gtk_widget_is_composited() for a way to find out if the alpha
+channel will be respected.
+</para>
+</answer>
+</qandaentry>
+
 </qandadiv>
 
 <qandadiv><title>Which widget should I use...</title>
@@ -718,18 +757,21 @@ How do I make a text view scroll to the end of the buffer automatically ?
 
 <answer>
 <para>
-The "insert" <link linkend="GtkTextMark">mark</link> marks the insertion point
-where gtk_text_buffer_insert() inserts new text into the buffer. The text is inserted 
-<emphasis>before</emphasis> the "insert" mark, so that it generally stays 
-at the end of the buffer. If it gets explicitly moved to some other position, 
-e.g. when the user selects some text, use gtk_text_buffer_move_mark() to set it to 
-the desired location before inserting more text. The "insert" mark of a buffer can be 
-obtained with gtk_text_buffer_get_insert().
+A good way to keep a text buffer scrolled to the end is to place a
+<link linkend="GtkTextMark">mark</link> at the end of the buffer, and
+give it right gravity. The gravity has the effect that text inserted
+at the mark gets inserted <emphasis>before</emphasis>, keeping the mark
+at the end. 
 </para>
 
 <para> 
 To ensure that the end of the buffer remains visible, use
-gtk_text_view_scroll_to_mark() to scroll to the "insert" mark after inserting new text.
+gtk_text_view_scroll_to_mark() to scroll to the mark after 
+inserting new text.
+</para>
+
+<para>
+The gtk-demo application contains an example of this technique. 
 </para>
 </answer>
 </qandaentry>
@@ -892,6 +934,83 @@ See gtk_tree_view_set_expander_column() and gtk_tree_view_column_set_visible().
 
 </qandadiv>
 
+<qandadiv><title>Using cairo with GTK+</title>
+
+<qandaentry>
+<question><para>
+How do I use cairo to draw in GTK+ applications ?
+</para></question>
+
+<answer><para>
+USe gdk_cairo_create() to obtain a cairo context for drawing
+on a GDK window or pixmap. See <link linkend="gdk-Cairo-Interaction">Cairo 
+Interaction</link> for some more useful functions.
+</para></answer>
+</qandaentry>
+
+<qandaentry>
+<question><para>
+I have created a cairo context with gdk_cairo_create(), but when I
+later use it, my drawing does not show up. Why is that ?
+</para></question>
+
+<answer>
+<para>
+All drawing in GTK+ is normally done in an expose handler, and GTK+
+creates a temporary pixmap for double-buffering the drawing. If you 
+create a cairo context outside the expose handler, it is backed
+by the GDK window itself, not the double-buffering pixmap. Consequently,
+any drawing you do with that cairo context gets overwritten at the 
+end of the expose handler, when the double-buffering pixmap is copied
+back.
+</para>
+<para>
+Possible solutions to this problem are:
+<itemizedlist>
+<listitem><para>
+Turn off double-buffering, with gtk_widget_set_double_buffered().
+This is not ideal, since it can cause some flickering.
+</para></listitem>
+<listitem><para>
+Create the cairo context inside the expose handler. If you do this,
+gdk_create_cairo() arranges for it to be backed by the double-buffering 
+pixmap. This is the preferred solution, and is used throughout GTK+
+itself.
+</para></listitem>
+</itemizedlist>
+</para>
+</answer>
+</qandaentry>
+
+<qandaentry>
+<question><para>
+Can I improve the performance of my application by using the
+Glitz backend of cairo ?
+</para></question>
+
+<answer><para>
+No. The GDK X11 backend uses the cairo X backend (and the other
+GDK backends use their respective native cairo backends). The
+GTK+ developers believe that the best way to improving the GDK
+drawing performance is to optimize the cairo X backend and the
+relevant code paths in the X server that is uses (mostly the
+Render extension).
+</para></answer>
+</qandaentry>
+
+<qandaentry>
+<question><para>
+Can I use cairo to draw on a #GdkPixbuf ?
+</para></question>
+
+<answer><para>
+No, at least not yet. The cairo image surface does not support the
+pixel format used by GdkPixbuf. 
+</para></answer>
+</qandaentry>
+
+</qandadiv>
+
 </qandaset>
 
 </refsect1>

docs/reference/gtk/running.sgml

@@ -174,6 +174,14 @@ additional environment variables.
       <term>geometry</term>
       <listitem><para>Size allocation</para></listitem>
     </varlistentry>
+    <varlistentry>
+      <term>icontheme</term>
+      <listitem><para>Icon themes</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>printing</term>
+      <listitem><para>Printing support</para></listitem>
+    </varlistentry>
 
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all debug options.

docs/reference/gtk/tmpl/gtk-unused.sgml

@@ -342,6 +342,12 @@ Turns off certain object flags.  (Private)
 </para>
 
 
+<!-- ##### MACRO GTK_PRINT_SETTINGS_PRINT_TO_FILE ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GTK_STOCK_BUTTON_APPLY ##### -->
 <para>
 
@@ -378,14 +384,6 @@ Turns off certain object flags.  (Private)
 </para>
 
 
-<!-- ##### MACRO GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT ##### -->
-<para>
-The "Reverse Portrait Orientation" item.
-<inlinegraphic fileref="gtk-orientation-reverse-portrait.png" format="PNG"></inlinegraphic>
-</para>
-
-@Since: 2.10
-
 <!-- ##### MACRO GTK_TIPS_QUERY ##### -->
 <para>
 
@@ -879,12 +877,78 @@ You may not attach these to signals created with the
 </para>
 
 
+<!-- ##### ARG GtkFileChooser:action ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:do-overwrite-confirmation ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:extra-widget ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG GtkFileChooser:file-system ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### ARG GtkFileChooser:file-system-backend ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:filter ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:local-only ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:preview-widget ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:preview-widget-active ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:select-multiple ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:show-hidden ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkFileChooser:use-preview-label ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ENUM GtkFontFilterType ##### -->
 <para>
 A set of bit flags used to specify the filter being set
@@ -1166,6 +1230,66 @@ after other user handlers and the default handler.
 </para>
 
 
+<!-- ##### ARG GtkRecentChooser:filter ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:limit ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:local-only ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:recent-manager ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:select-multiple ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:show-icons ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:show-not-found ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:show-private ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:show-tips ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG GtkRecentChooser:sort-type ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG GtkScrolledWindow:shadow ##### -->
 <para>
 
@@ -2845,6 +2969,14 @@ Set the the handle size to @size x @size pixels.
 @settings: 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_print_settings_get_print_to_file ##### -->
+<para>
+
+</para>
+
+@settings: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_print_settings_set_num_copies ##### -->
 <para>
 
@@ -2853,6 +2985,14 @@ Set the the handle size to @size x @size pixels.
 @settings: 
 @num_copies: 
 
+<!-- ##### FUNCTION gtk_print_settings_set_print_to_file ##### -->
+<para>
+
+</para>
+
+@settings: 
+@print_to_file: 
+
 <!-- ##### FUNCTION gtk_rc_init ##### -->
 <para>
 Internal function.

docs/reference/gtk/tmpl/gtkarrow.sgml

@@ -39,35 +39,20 @@ style of an arrow can be changed after creation by using gtk_arrow_set().
 
 <!-- ##### STRUCT GtkArrow ##### -->
 <para>
-The #GtkArrow-struct containes the following fields.
+The #GtkArrow struct containes the following fields.
 (These fields should be considered read-only. They should never be set by
-an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#gint16 <structfield>arrow_type</structfield>;</entry>
-<entry>the direction of the arrow, one of #GtkArrowType.</entry>
-</row>
-
-<row>
-<entry>#gint16 <structfield>shadow_type</structfield>;</entry>
-<entry>the style of the arrow, one of #GtkShadowType.</entry>
-</row>
-</tbody></tgroup></informaltable>
+an application.)
 </para>
 
 
 <!-- ##### ARG GtkArrow:arrow-type ##### -->
-<para>
-
+<para>
+
 </para>
 
 <!-- ##### ARG GtkArrow:shadow-type ##### -->
-<para>
-
+<para>
+
 </para>
 
 <!-- ##### FUNCTION gtk_arrow_new ##### -->

docs/reference/gtk/tmpl/gtkcelllayout.sgml

@@ -11,6 +11,18 @@ want to provide a #GtkTreeViewColumn-like API for packing cells, setting
 attributes and data funcs. 
 </para>
 
+<para>
+One of the notable features provided by implementations of GtkCellLayout
+are <emphasis>attributes</emphasis>. Attributes let you set the properties
+in flexible ways. They can just be set to constant values like regular
+properties. But they can also be mapped to a column of the underlying 
+tree model with gtk_cell_layout_set_attributes(), which means that the value 
+of the attribute can change from cell to cell as they are rendered by the 
+cell renderer. Finally, it is possible to specify a function with 
+gtk_cell_layout_set_cell_data_func() that is called to determine the value 
+of the attribute for each cell that is rendered.
+</para>
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrendererspin.sgml

@@ -38,7 +38,21 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
 
 </para>
 
-@parent: 
+
+<!-- ##### ARG GtkCellRendererSpin:adjustment ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererSpin:climb-rate ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCellRendererSpin:digits ##### -->
+<para>
+
+</para>
 
 <!-- ##### FUNCTION gtk_cell_renderer_spin_new ##### -->
 <para>

docs/reference/gtk/tmpl/gtkcontainer.sgml

@@ -260,7 +260,6 @@ Does the same as gtk_container_set_border_width().
 Does the same as gtk_container_get_children().
 </para>
 
-@Returns: 
 @Deprecated: Use gtk_container_get_children() instead.
 
 

docs/reference/gtk/tmpl/gtkenums.sgml

@@ -58,7 +58,7 @@ Used to indicate the direction in which a #GtkArrow should point.
 @GTK_ARROW_DOWN: Represents a downward pointing arrow.
 @GTK_ARROW_LEFT: Represents a left pointing arrow.
 @GTK_ARROW_RIGHT: Represents a right pointing arrow.
-@GTK_ARROW_NONE: 
+@GTK_ARROW_NONE: No arrow. Since 2.10.
 
 <!-- ##### ENUM GtkAttachOptions ##### -->
 <para>

docs/reference/gtk/tmpl/gtkfilechooser.sgml

@@ -672,61 +672,6 @@ gtk_widget_destroy (chooser);
 
 @filechooser: the object which received the signal.
 
-<!-- ##### ARG GtkFileChooser:action ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:do-overwrite-confirmation ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:extra-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:file-system-backend ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:filter ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:local-only ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:preview-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:preview-widget-active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:select-multiple ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:show-hidden ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooser:use-preview-label ##### -->
-<para>
-
-</para>
-
 <!-- ##### ENUM GtkFileChooserAction ##### -->
     <para>
       Describes whether a #GtkFileChooser is being used to open

docs/reference/gtk/tmpl/gtklabel.sgml

@@ -258,6 +258,11 @@ described below.
 
 </para>
 
+<!-- ##### ARG GtkLabel:wrap-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_label_new ##### -->
 <para>
 
@@ -385,6 +390,15 @@ probably only used within the Gtk+ library itself for menu items and such.
 @wrap: 
 
 
+<!-- ##### FUNCTION gtk_label_set_line_wrap_mode ##### -->
+<para>
+
+</para>
+
+@label: 
+@wrap_mode: 
+
+
 <!-- ##### MACRO gtk_label_set ##### -->
 <para>
 Aliases gtk_label_set_text().  Probably used for backward compatibility with
@@ -548,6 +562,15 @@ Gtk+ 1.0.x.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_label_get_line_wrap_mode ##### -->
+<para>
+
+</para>
+
+@label: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_label_get_mnemonic_widget ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtknotebook.sgml

@@ -46,6 +46,7 @@ will be a popup menu allowing the users to switch pages.
 
 @notebook: the object which received the signal.
 @arg1: 
+@Returns: 
 
 <!-- ##### SIGNAL GtkNotebook::focus-tab ##### -->
 <para>
@@ -98,8 +99,8 @@ will be a popup menu allowing the users to switch pages.
 
 @notebook: the object which received the signal.
 @arg1: 
-@:
 @Param3: 
+@Returns: 
 
 <!-- ##### SIGNAL GtkNotebook::select-page ##### -->
 <para>
@@ -712,5 +713,6 @@ If the function returns %NULL, the drag will be cancelled.
 
 @func: 
 @data: 
+@destroy: 
 
 

docs/reference/gtk/tmpl/gtkpagesetup.sgml

@@ -8,7 +8,7 @@ Stores page setup information
 <para>
 A GtkPageSetup object stores the page size, orientation and margins. 
 The idea is that you can get one of these from the page setup dialog 
-and then pass it to the #GtkPrittntOperation when printing. 
+and then pass it to the #GtkPrintOperation when printing. 
 The benefit of splitting this out of the #GtkPrintSettings is that 
 these affect the actual layout of the page, and thus need to be set 
 long before user prints. 

docs/reference/gtk/tmpl/gtkprintcontext.sgml

@@ -29,7 +29,7 @@ draw_page (GtkPrintOperation *operation,
   PangoLayout *layout;
   PangoFontDescription *desc;
   
-  cr = gtk_print_context_get_cairo (context);
+  cr = gtk_print_context_get_cairo_context (context);
 
   /* Draw a red rectangle, as wide as the paper (inside the margins) */
   cairo_set_source_rgb (cr, 1.0, 0, 0);
@@ -101,6 +101,17 @@ Printing support was added in GTK+ 2.10.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_print_context_set_cairo_context ##### -->
+<para>
+
+</para>
+
+@context: 
+@cr: 
+@dpi_x: 
+@dpi_y: 
+
+
 <!-- ##### FUNCTION gtk_print_context_get_page_setup ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkprinter.sgml

@@ -43,6 +43,16 @@ Printing support was added in GTK+ 2.10.
 @printer: the object which received the signal.
 @arg1: 
 
+<!-- ##### ARG GtkPrinter:accepts-pdf ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkPrinter:accepts-ps ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkPrinter:backend ##### -->
 <para>
 
@@ -185,6 +195,24 @@ Printing support was added in GTK+ 2.10.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_printer_accepts_ps ##### -->
+<para>
+
+</para>
+
+@printer: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_printer_accepts_pdf ##### -->
+<para>
+
+</para>
+
+@printer: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_printer_compare ##### -->
 <para>
 
@@ -195,3 +223,26 @@ Printing support was added in GTK+ 2.10.
 @Returns: 
 
 
+<!-- ##### USER_FUNCTION GtkPrinterFunc ##### -->
+<para>
+The type of function passed to gtk_enumerate_printers().
+Note that you need to ref @printer, if you want to keep
+a reference to it after the function has returned.
+</para>
+
+@printer: a #GtkPrinter
+@data: user data passed to gtk_enumerate_printers()
+@Returns: %TRUE to stop the enumeration, %FALSE to continue
+
+
+<!-- ##### FUNCTION gtk_enumerate_printers ##### -->
+<para>
+
+</para>
+
+@func: 
+@data: 
+@destroy: 
+@wait: 
+
+

docs/reference/gtk/tmpl/gtkprintjob.sgml

@@ -14,7 +14,7 @@ you use the non-portable #GtkPrintUnixDialog API.
 Use gtk_print_job_get_surface() to obtain the cairo surface
 onto which the pages must be drawn. Use gtk_print_job_send()
 to send the finished job to the printer. If you don't use cairo
-#GtkPrintJob also  supports printing of manually generated postscript,
+#GtkPrintJob also supports printing of manually generated postscript,
 via gtk_print_job_set_source_file().
 <!-- FIXME more details needed here -->
 </para>
@@ -34,7 +34,8 @@ Printing support was added in GTK+ 2.10.
 
 <!-- ##### STRUCT GtkPrintJob ##### -->
 <para>
-
+The GtkPrintJob struct contains only private members
+and should not be directly accessed.
 </para>
 
 
@@ -65,14 +66,21 @@ Printing support was added in GTK+ 2.10.
 
 </para>
 
-<!-- ##### USER_FUNCTION GtkPrintJobCompleteFunc ##### -->
+<!-- ##### ARG GtkPrintJob:track-print-status ##### -->
 <para>
 
 </para>
 
-@print_job: 
-@user_data: 
-@error: 
+<!-- ##### USER_FUNCTION GtkPrintJobCompleteFunc ##### -->
+<para>
+The type of callback that is passed to gtk_print_job_send().
+It is called when the print job has been completely sent.
+</para>
+
+@print_job: the #GtkPrintJob
+@user_data: user data that has been passed to gtk_print_job_send()
+@error: a #GError that contains error information if the sending
+  of the print job failed, otherwise %NULL
 
 
 <!-- ##### FUNCTION gtk_print_job_new ##### -->
@@ -153,8 +161,6 @@ Printing support was added in GTK+ 2.10.
 @callback: 
 @user_data: 
 @dnotify: 
-@error: 
-@Returns: 
 
 
 <!-- ##### FUNCTION gtk_print_job_set_track_print_status ##### -->

docs/reference/gtk/tmpl/gtkprintoperation.sgml

@@ -48,7 +48,8 @@ do_print (void)
   g_signal_connect (print, "begin_print", G_CALLBACK (begin_print), NULL);
   g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), NULL);
 
-  res = gtk_print_operation_run (print, GTK_WINDOW (main_window), NULL);
+  res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+                                 GTK_WINDOW (main_window), NULL);
 
   if (res == GTK_PRINT_OPERATION_RESULT_APPLY)
     {
@@ -63,6 +64,16 @@ do_print (void)
 </programlisting>
 </example>
 
+<para>
+By default GtkPrintOperation uses an external application to do
+print preview. To implement a custom print preview, an application 
+must connect to the preview signal. The functions 
+gtk_print_operation_print_preview_render_page(), 
+gtk_print_operation_preview_end_preview() and 
+gtk_print_operation_preview_is_selected() are useful 
+when implementing a print preview.
+</para>
+
 <para>
 Printing support was added in GTK+ 2.10.
 </para>
@@ -86,15 +97,15 @@ Printing support was added in GTK+ 2.10.
 
 </para>
 
-@printoperation: the object which received the signal.
-@arg1: 
+@printoperation: 
+@context: 
 
 <!-- ##### SIGNAL GtkPrintOperation::create-custom-widget ##### -->
 <para>
 
 </para>
 
-@printoperation: the object which received the signal.
+@printoperation: 
 @Returns: 
 
 <!-- ##### SIGNAL GtkPrintOperation::custom-widget-apply ##### -->
@@ -102,9 +113,17 @@ Printing support was added in GTK+ 2.10.
 
 </para>
 
-@printoperation: the object which received the signal.
+@printoperation: 
 @widget: 
 
+<!-- ##### SIGNAL GtkPrintOperation::done ##### -->
+<para>
+
+</para>
+
+@printoperation: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL GtkPrintOperation::draw-page ##### -->
 <para>
 
@@ -159,6 +178,11 @@ Printing support was added in GTK+ 2.10.
 
 @printoperation: the object which received the signal.
 
+<!-- ##### ARG GtkPrintOperation:allow-async ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkPrintOperation:current-page ##### -->
 <para>
 
@@ -174,6 +198,11 @@ Printing support was added in GTK+ 2.10.
 
 </para>
 
+<!-- ##### ARG GtkPrintOperation:export-filename ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkPrintOperation:job-name ##### -->
 <para>
 
@@ -184,26 +213,11 @@ Printing support was added in GTK+ 2.10.
 
 </para>
 
-<!-- ##### ARG GtkPrintOperation:pdf-target ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkPrintOperation:print-settings ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkPrintOperation:show-dialog ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPrintOperation:show-preview ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkPrintOperation:show-progress ##### -->
 <para>
 
@@ -236,28 +250,50 @@ Printing support was added in GTK+ 2.10.
 
 <!-- ##### ENUM GtkPrintStatus ##### -->
 <para>
-
+The status gives a rough indication of the completion
+of a running print operation.
 </para>
 
-@GTK_PRINT_STATUS_INITIAL: 
-@GTK_PRINT_STATUS_PREPARING: 
-@GTK_PRINT_STATUS_GENERATING_DATA: 
-@GTK_PRINT_STATUS_SENDING_DATA: 
-@GTK_PRINT_STATUS_PENDING: 
-@GTK_PRINT_STATUS_PENDING_ISSUE: 
-@GTK_PRINT_STATUS_PRINTING: 
-@GTK_PRINT_STATUS_FINISHED: 
-@GTK_PRINT_STATUS_FINISHED_ABORTED: 
+@GTK_PRINT_STATUS_INITIAL: The printing has not started yet; this
+  status is set initially, and while the print dialog is shown.
+@GTK_PRINT_STATUS_PREPARING: This status is set while the begin-print 
+  signal is emitted and during pagination.
+@GTK_PRINT_STATUS_GENERATING_DATA: This status is set while the
+  pages are being rendered.
+@GTK_PRINT_STATUS_SENDING_DATA: The print job is being sent off to the 
+  printer.
+@GTK_PRINT_STATUS_PENDING: The print job has been sent to the printer,
+  but is not printed for some reason, e.g. the printer may be stopped.
+@GTK_PRINT_STATUS_PENDING_ISSUE: Some problem has occurred during 
+  printing, e.g. a paper jam.
+@GTK_PRINT_STATUS_PRINTING: The printer is processing the print job.
+@GTK_PRINT_STATUS_FINISHED: The printing has been completed successfully.
+@GTK_PRINT_STATUS_FINISHED_ABORTED: The printing has been aborted.
+
+<!-- ##### ENUM GtkPrintOperationAction ##### -->
+<para>
+The @action parameter to gtk_print_operation_run()
+determines what action the print operation should perform.
+</para>
+
+@GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG: Show the print dialog.
+@GTK_PRINT_OPERATION_ACTION_PRINT: Start to print without showing
+   the print dialog, based on the current print settings.
+@GTK_PRINT_OPERATION_ACTION_PREVIEW: Show the print preview.
+@GTK_PRINT_OPERATION_ACTION_EXPORT: Export to a file. This requires
+  the export-filename property to be set.
 
 <!-- ##### ENUM GtkPrintOperationResult ##### -->
 <para>
-
+A value of this type is returned by gtk_print_operation_run().
 </para>
 
-@GTK_PRINT_OPERATION_RESULT_ERROR: 
-@GTK_PRINT_OPERATION_RESULT_APPLY: 
-@GTK_PRINT_OPERATION_RESULT_CANCEL: 
-@GTK_PRINT_OPERATION_RESULT_PREVIEW: 
+@GTK_PRINT_OPERATION_RESULT_ERROR: An error has occured.
+@GTK_PRINT_OPERATION_RESULT_APPLY: The print settings should be stored.
+@GTK_PRINT_OPERATION_RESULT_CANCEL: The print operation has been canceled,
+  the print settings should not be stored.
+@GTK_PRINT_OPERATION_RESULT_IN_PROGRESS: The print operation is complete
+  yet. This value will only be returned when running asynchronously.
 
 <!-- ##### ENUM GtkPrintError ##### -->
 <para>
@@ -283,6 +319,24 @@ The #GQuark used for #GtkPrintError errors.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_print_operation_set_allow_async ##### -->
+<para>
+
+</para>
+
+@op: 
+@allow_async: 
+
+
+<!-- ##### FUNCTION gtk_print_operation_get_error ##### -->
+<para>
+
+</para>
+
+@op: 
+@error: 
+
+
 <!-- ##### FUNCTION gtk_print_operation_set_default_page_setup ##### -->
 <para>
 
@@ -364,16 +418,7 @@ The #GQuark used for #GtkPrintError errors.
 @unit: 
 
 
-<!-- ##### FUNCTION gtk_print_operation_set_show_dialog ##### -->
-<para>
-
-</para>
-
-@op: 
-@show_dialog: 
-
-
-<!-- ##### FUNCTION gtk_print_operation_set_pdf_target ##### -->
+<!-- ##### FUNCTION gtk_print_operation_set_export_filename ##### -->
 <para>
 
 </para>
@@ -415,20 +460,12 @@ The #GQuark used for #GtkPrintError errors.
 </para>
 
 @op: 
+@action: 
 @parent: 
 @error: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_print_operation_run_async ##### -->
-<para>
-
-</para>
-
-@op: 
-@parent: 
-
-
 <!-- ##### FUNCTION gtk_print_operation_cancel ##### -->
 <para>
 
@@ -464,6 +501,15 @@ The #GQuark used for #GtkPrintError errors.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_print_operation_get_error ##### -->
+<para>
+
+</para>
+
+@op: 
+@error: 
+
+
 <!-- ##### FUNCTION gtk_print_run_page_setup_dialog ##### -->
 <para>
 
@@ -477,11 +523,14 @@ The #GQuark used for #GtkPrintError errors.
 
 <!-- ##### USER_FUNCTION GtkPageSetupDoneFunc ##### -->
 <para>
-
+The type of function that is passed to gtk_print_run_page_setup_dialog_async().
+This function will be called when the page setup dialog is dismissed, and
+also serves as destroy notify for @data.
 </para>
 
-@page_setup: 
-@data: 
+@page_setup: the #GtkPageSetup that has been
+@data: user data that has been passed to 
+       gtk_print_run_page_setup_dialog_async().
 
 
 <!-- ##### FUNCTION gtk_print_run_page_setup_dialog_async ##### -->
@@ -496,3 +545,36 @@ The #GQuark used for #GtkPrintError errors.
 @data: 
 
 
+<!-- ##### STRUCT GtkPrintOperationPreview ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gtk_print_operation_preview_end_preview ##### -->
+<para>
+
+</para>
+
+@preview: 
+
+
+<!-- ##### FUNCTION gtk_print_operation_preview_is_selected ##### -->
+<para>
+
+</para>
+
+@preview: 
+@page_nr: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_print_operation_preview_render_page ##### -->
+<para>
+
+</para>
+
+@preview: 
+@page_nr: 
+
+

docs/reference/gtk/tmpl/gtkprintsettings.sgml

@@ -602,31 +602,6 @@ Printing support was added in GTK+ 2.10.
 @scale: 
 
 
-<!-- ##### MACRO GTK_PRINT_SETTINGS_PRINT_TO_FILE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION gtk_print_settings_get_print_to_file ##### -->
-<para>
-
-</para>
-
-@settings: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_print_settings_set_print_to_file ##### -->
-<para>
-
-</para>
-
-@settings: 
-@print_to_file: 
-
-
 <!-- ##### ENUM GtkPrintPages ##### -->
 <para>
 
@@ -855,6 +830,23 @@ Printing support was added in GTK+ 2.10.
 @output_bin: 
 
 
+<!-- ##### MACRO GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT ##### -->
+<para>
+The key used by the "Print to file" printer to store the format
+of the output. The supported values are "PS" and "PDF".
+</para>
+
+
+
+<!-- ##### MACRO GTK_PRINT_SETTINGS_OUTPUT_URI ##### -->
+<para>
+The key used by the "Print to file" printer to store the URI
+to which the output should be written. GTK+ itself supports
+only "file://" URIs.
+</para>
+
+
+
 <!-- ##### MACRO GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkprintunixdialog.sgml

@@ -18,6 +18,20 @@ to use gtk_print_unix_dialog_get_selected_printer() to obtain
 a #GtkPrinter object and use it to construct a #GtkPrintJob using
 gtk_print_job_new().
 </para>
+<para>
+#GtkPrintUnixDialog uses the following response values:
+<variablelist>
+  <varlistentry><term>%GTK_RESPONSE_OK</term>
+    <listitem><para>for the "Print" button</para></listitem>
+  </varlistentry>
+  <varlistentry><term>%GTK_RESPONSE_APPLY</term>
+    <listitem><para>for the "Preview" button</para></listitem>
+  </varlistentry>
+  <varlistentry><term>%GTK_RESPONSE_CANCEL</term>
+    <listitem><para>for the "Cancel" button</para></listitem>
+  </varlistentry>
+</variablelist>
+</para>
 
 <!-- FIXME example here -->
 
@@ -144,7 +158,9 @@ Printing support was added in GTK+ 2.10.
 
 <!-- ##### ENUM GtkPrintCapabilities ##### -->
 <para>
-
+An enum for specifying which features the print dialog should offer.
+I neither %GTK_PRINT_CAPABILITY_GENERATE_PDF nor %GTK_PRINT_CAPABILITY_GENERATE_PS is
+specified, GTK+ assumes that all formats are supported.
 </para>
 
 @GTK_PRINT_CAPABILITY_PAGE_SET: 
@@ -152,6 +168,9 @@ Printing support was added in GTK+ 2.10.
 @GTK_PRINT_CAPABILITY_COLLATE: 
 @GTK_PRINT_CAPABILITY_REVERSE: 
 @GTK_PRINT_CAPABILITY_SCALE: 
+@GTK_PRINT_CAPABILITY_GENERATE_PDF: The program will send the document to the printer in PDF format
+@GTK_PRINT_CAPABILITY_GENERATE_PS: The program will send the document to the printer in Postscript format
+@GTK_PRINT_CAPABILITY_PREVIEW: 
 
 <!-- ##### FUNCTION gtk_print_unix_dialog_set_manual_capabilities ##### -->
 <para>

docs/reference/gtk/tmpl/gtkprogress.sgml

@@ -206,7 +206,9 @@ the #GtkProgress.
 
 @progress: a #GtkProgress.
 @value: the current progress value.
-@min: the minimum progress value.
+@hmin: 
 @max: the maximum progress value.
+<!-- # Unused Parameters # -->
+@min: the minimum progress value.
 
 

docs/reference/gtk/tmpl/gtkrange.sgml

@@ -118,6 +118,16 @@ Emitted when the range value changes.
 
 </para>
 
+<!-- ##### ARG GtkRange:trough-side-details ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:trough-under-steppers ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_range_get_adjustment ##### -->
 <para>
 
@@ -210,6 +220,17 @@ Emitted when the range value changes.
 @value: 
 
 
+<!-- ##### ENUM GtkSensitivityType ##### -->
+<para>
+Determines how GTK+ handles the sensitivity of stepper arrows
+at the end of range widgets.
+</para>
+
+@GTK_SENSITIVITY_AUTO: The arrow is made insensitive if the
+   thumb is at the end
+@GTK_SENSITIVITY_ON: The arrow is always sensitive
+@GTK_SENSITIVITY_OFF: The arrow is always insensitive
+
 <!-- ##### FUNCTION gtk_range_set_lower_stepper_sensitivity ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkrecentchooser.sgml

@@ -31,6 +31,20 @@ Recently used files are supported since GTK+ 2.10.
 </para>
 
 
+<!-- ##### SIGNAL GtkRecentChooser::item-activated ##### -->
+<para>
+
+</para>
+
+@recentchooser: the object which received the signal.
+
+<!-- ##### SIGNAL GtkRecentChooser::selection-changed ##### -->
+<para>
+
+</para>
+
+@recentchooser: the object which received the signal.
+
 <!-- ##### STRUCT GtkRecentChooserIface ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml

@@ -16,6 +16,18 @@ Note that #GtkRecentChooserMenu does not have any methods of its own.  Instead,
 you should use the functions that work on a #GtkRecentChooser.
 </para>
 
+<para>
+Note also that #GtkRecentChooserMenu does not support multiple filters, as it
+has no way to let the user choose between them as the #GtkRecentChooserWidget
+and #GtkRecentChooserDialog widgets do. Thus using gtk_recent_chooser_add_filter()
+on a #GtkRecentChooserMenu widget will yield the same effects as using
+gtk_recent_chooser_set_filter(), replacing any currently set filter
+with the supplied filter; gtk_recent_chooser_remove_filter() will remove
+any currently set #GtkRecentFilter object and will unset the current filter;
+gtk_recent_chooser_list_filters() will return a list containing a single
+#GtkRecentFilter object.
+</para>
+
 <para>
 Recently used files are supported since GTK+ 2.10.
 </para>
@@ -34,6 +46,11 @@ Recently used files are supported since GTK+ 2.10.
 </para>
 
 
+<!-- ##### ARG GtkRecentChooserMenu:show-numbers ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gtk_recent_chooser_menu_new ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkrecentmanager.sgml

@@ -53,7 +53,7 @@ if (error)
 else
   {
     /* Use the info object */
-    g_object_unref (info);
+    gtk_recent_info_unref (info);
   }
   </programlisting>
 </informalexample>
@@ -79,6 +79,28 @@ and it will contain information about current recent manager
 for that screen.</para>
 
 
+<!-- ##### SIGNAL GtkRecentManager::changed ##### -->
+<para>
+
+</para>
+
+@recentmanager: the object which received the signal.
+
+<!-- ##### ARG GtkRecentManager:filename ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRecentManager:limit ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRecentManager:size ##### -->
+<para>
+
+</para>
+
 <!-- ##### STRUCT GtkRecentInfo ##### -->
 <para>
 Contains informations found when looking up an entry of the

docs/reference/gtk/tmpl/gtkruler.sgml

@@ -93,8 +93,8 @@ This sets the range of the ruler using gfloat lower, gfloat upper, gfloat positi
 </para>
 
 @ruler: the gtkruler
-@lower: the upper limit of the ruler
-@upper: the lower limit of the ruler
+@lower: the lower limit of the ruler
+@upper: the upper limit of the ruler
 @position: the mark on the ruler
 @max_size: the maximum size of the ruler
 

docs/reference/gtk/tmpl/gtkscrolledwindow.sgml

@@ -95,6 +95,7 @@ only be accessed using the functions below.
 @scrolledwindow: the object which received the signal.
 @arg1: 
 @arg2: 
+@Returns: 
 
 <!-- ##### ARG GtkScrolledWindow:hadjustment ##### -->
 <para>

docs/reference/gtk/tmpl/gtkstock.sgml

@@ -331,7 +331,7 @@ The "File" icon.
 <!-- ##### MACRO GTK_STOCK_FIND ##### -->
 <para>
 The "Find" item.
-<inlinegraphic fileref="gtk-search.png" format="PNG"></inlinegraphic>
+<inlinegraphic fileref="gtk-find.png" format="PNG"></inlinegraphic>
 </para>
 
 
@@ -703,6 +703,15 @@ The "Reverse Landscape Orientation" item.
 @Since: 2.10
 
 
+<!-- ##### MACRO GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT ##### -->
+<para>
+The "Reverse Portrait Orientation" item.
+<inlinegraphic fileref="gtk-orientation-reverse-portrait.png" format="PNG"></inlinegraphic>
+</para>
+
+@Since: 2.10
+
+
 <!-- ##### MACRO GTK_STOCK_PASTE ##### -->
 <para>
 The "Paste" item.

docs/reference/gtk/tmpl/gtktable.sgml

@@ -226,7 +226,7 @@ As there are many options associated with gtk_table_attach(), this convenience f
 
 <!-- ##### FUNCTION gtk_table_set_row_spacing ##### -->
 <para>
-Changes the space between a given table row and its surrounding rows.
+Changes the space between a given table row and the subsequent row.
 </para>
 
 @table: a #GtkTable containing the row whose properties you wish to change.
@@ -236,7 +236,8 @@ Changes the space between a given table row and its surrounding rows.
 
 <!-- ##### FUNCTION gtk_table_set_col_spacing ##### -->
 <para>
-Alters the amount of space between a given table column and the adjacent columns.
+Alters the amount of space between a given table column and the following 
+column.
 </para>
 
 @table: a #GtkTable.

docs/reference/gtk/tmpl/gtktoolbar.sgml

@@ -87,7 +87,6 @@ accessed through the function described below.
 
 @toolbar: the object which received the signal.
 @Returns: 
-@:
 @Returns: 
 @Returns: 
 @Returns: 

docs/reference/gtk/tmpl/gtktooltips.sgml

@@ -133,7 +133,7 @@ Sets the time between the user moving the mouse over a widget and the widget's t
 </para>
 
 @tooltips: a #GtkTooltips.
-@delay: an integer value representing seconds (FIXME: double-check this).
+@delay: an integer value representing milliseconds.
 
 
 <!-- ##### FUNCTION gtk_tooltips_set_tip ##### -->

docs/reference/gtk/tmpl/gtktreemodelfilter.sgml

@@ -144,6 +144,7 @@ particularly efficient operation.
 @filter: 
 @filter_iter: 
 @child_iter: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_tree_model_filter_convert_iter_to_child_iter ##### -->

docs/reference/gtk/tmpl/gtktreeview.sgml

@@ -170,11 +170,21 @@ they work together.
 @treeview: the object which received the signal.
 @Returns: 
 
+<!-- ##### ARG GtkTreeView:enable-grid-lines ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTreeView:enable-search ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkTreeView:enable-tree-lines ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTreeView:expander-column ##### -->
 <para>
 
@@ -265,6 +275,16 @@ they work together.
 
 </para>
 
+<!-- ##### ARG GtkTreeView:grid-line-pattern ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:grid-line-width ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
 <para>
 
@@ -285,6 +305,16 @@ they work together.
 
 </para>
 
+<!-- ##### ARG GtkTreeView:tree-line-pattern ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:tree-line-width ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTreeView:vertical-separator ##### -->
 <para>
 
@@ -1149,3 +1179,67 @@ returns.
 @destroy: 
 
 
+<!-- ##### FUNCTION gtk_tree_view_get_rubber_banding ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_tree_view_set_rubber_banding ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@enable: 
+
+
+<!-- ##### FUNCTION gtk_tree_view_get_enable_tree_lines ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_tree_view_set_enable_tree_lines ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@enabled: 
+
+
+<!-- ##### ENUM GtkTreeViewGridLines ##### -->
+<para>
+
+</para>
+
+@GTK_TREE_VIEW_GRID_LINES_NONE: 
+@GTK_TREE_VIEW_GRID_LINES_HORIZONTAL: 
+@GTK_TREE_VIEW_GRID_LINES_VERTICAL: 
+@GTK_TREE_VIEW_GRID_LINES_BOTH: 
+
+<!-- ##### FUNCTION gtk_tree_view_get_grid_lines ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_tree_view_set_grid_lines ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@grid_lines: 
+
+

docs/tutorial/gtk-tut.sgml

@@ -64,32 +64,7 @@ GNU Network Object Model Environment (GNOME) project. GTK is built on
 top of GDK (GIMP Drawing Kit) which is basically a wrapper around the
 low-level functions for accessing the underlying windowing functions
 (Xlib in the case of the X windows system), and gdk-pixbuf, a library for
-client-side image manipulation.
-</para>
-<para>The primary authors of GTK are:</para>
-
-<itemizedlist>
-<listitem><simpara> Peter Mattis <ulink url="mailto:petm@xcf.berkeley.edu">
-petm@xcf.berkeley.edu</ulink></simpara>
-</listitem>
-<listitem><simpara> Spencer Kimball <ulink url="mailto:spencer@xcf.berkeley.edu">
-spencer@xcf.berkeley.edu</ulink></simpara>
-</listitem>
-<listitem><simpara> Josh MacDonald <ulink url="mailto:jmacd@xcf.berkeley.edu">
-jmacd@xcf.berkeley.edu</ulink></simpara>
-</listitem>
-</itemizedlist>
-
-<para>GTK is currently maintained by:</para>
-
-<itemizedlist>
-<listitem><simpara> Owen Taylor <ulink url="mailto:otaylor@redhat.com">
-otaylor@redhat.com</ulink></simpara>
-</listitem>
-<listitem><simpara> Tim Janik <ulink url="mailto:timj@gtk.org">
-timj@gtk.org</ulink></simpara>
-</listitem>
-</itemizedlist>
+client-side image manipulation.</para>
 
 <para>GTK is essentially an object oriented application programmers
 interface (API). Although written completely in C, it is implemented
@@ -6025,7 +6000,7 @@ void gtk_color_selection_set_current_alpha( GtkColorSelection *colorsel,
 gtk_color_selection_set_current_color() with a pointer to a GdkColor. 
 Setting the opacity (alpha channel) is done with 
 gtk_color_selection_set_current_alpha(). The alpha value should be between
-0 (fully transparent) and 65636 (fully opaque).
+0 (fully transparent) and 65535 (fully opaque).
 </para>
 
 <programlisting role="C">

gdk-2.0-uninstalled.pc.in

@@ -5,4 +5,4 @@ Description: GIMP Drawing Kit (${target} target), Not Installed
 Version: @VERSION@
 Requires: gdk-pixbuf-2.0-uninstalled @GDK_PACKAGES@
 Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-@GTK_API_VERSION@.la @GDK_EXTRA_LIBS@
-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gdk -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_EXTRA_CFLAGS@

gdk-pixbuf/ChangeLog

@@ -1,3 +1,136 @@
+2007-01-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.8 ===
+
+2007-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_write): Just
+	call gdk_pixbuf_loader_close to close the loader in
+	the error case. Fixes memory leaks in the error case,
+	pointed out by David Ne¿as.
+
+2007-01-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.7 ===
+
+2007-01-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* io-bmp.c (OneLine32): Fix a warning
+
+2006-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* io-bmp.c (decode_bitmasks): Handle bmps
+	with more than 8 bits per channel.  (#172584,
+	David Costanzo)
+
+	* io-bmp.c: Handle offsets more carefully. (#172188, 
+	David Costanzo)
+	
+	* io-bmp.c: Handle v5 and OS/2 v2 bmps.
+	
+	* io-bmp.c: Handle alpha masks in v4 and v5 bmps.
+
+2006-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_write): Emit
+	the closed signal when closing the loader, pointed out
+	by David Necas.
+
+2006-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* io-gif.c (gif_get_lzw): Handle invalid gif animations
+	a little bit more robustly.  (#357974, Vassilis Pandis,
+	patch by Felix Riemann)
+
+	* gdk-pixbuf-data.c (gdk_pixbuf_new_from_data):
+	* gdk-pixbuf.c (gdk_pixbuf_new): Remove redundant size
+	checks, and document that width, height must be > 0.
+	(#343330, Felix Riemann)
+
+	* Makefile.am: Link against GLib.  (#341158, Alexey Rusakov)
+
+2006-12-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Don't
+	spew a warning if the printer is already closed.
+
+2006-12-09  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_write): Behave as
+	documented and close the loader when returning FALSE. 
+
+2006-10-29  Tor Lillqvist  <tml@novell.com>
+
+	* pixbufloader_*.def
+	* Makefile.am (EXTRA_DIST): Remove pixbufloader_*.def, they are
+	not used. (#365388) They were all identical, and exported just two
+	symbols, so if somebody needs them for a MSVC build that doesn't
+	use built-in modules it's trivial to hack makefile.msc to produce
+	a common .def file for the loaders. The two symbols that need to
+	be exported are fill_info and fill_vtable.
+
+2006-10-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.6 ===
+
+2006-10-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.5 ===
+
+2006-09-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.4 ===
+
+2006-09-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* io-pnm.c: Simplify and fix reading of ASCII images. 
+
+2006-09-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.3 ===
+
+2006-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.2 ===
+
+2006-08-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-io.c (gdk_pixbuf_new_from_file_at_scale): 
+	Stop loading an animation if the first frame is complete.
+	(#350911, Christian Neumair)
+
+2006-07-23  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.1 ===
+
+2006-07-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_load_module) 
+	(gdk_pixbuf_loader_write, gdk_pixbuf_loader_close) 
+	(gdk_pixbuf_loader_ensure_error): Put the code to protect
+	against broken loaders that forget to set error in an
+	auxiliary function and call it in more places.  (#346428,
+	 Catmur)
+
+	* io-xbm.c: Fix incremental loading of 
+	xbms.  (#346427, Ed Catmur)
+	Also make the xbm loader accept const variations.
+
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.0 ===
+
+2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* pixops/*.S: NetBSD portability fixes.  (#346374,
+	Thomas Klausner)
+	
+	* === Released 2.9.4 ===
+
+2006-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.3 ===
+
 2006-06-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.9.2 ===

gdk-pixbuf/Makefile.am

@@ -6,7 +6,7 @@ no_undefined = -no-undefined
 endif
 
 if OS_WIN32
-gdk_pixbuf_def = $(srcdir)/gdk_pixbuf.def
+gdk_pixbuf_def = gdk_pixbuf.def
 gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def)
 
 gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o
@@ -50,7 +50,7 @@ gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
 	 $(PERL) $(srcdir)/makegdkpixbufalias.pl -def < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = abicheck.sh pltcheck.sh
 endif
 
 lib_LTLIBRARIES = 		\
@@ -273,7 +273,6 @@ INCLUDES = \
 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
 	-DGTK_PREFIX=\"$(prefix)\"		\
 	$(INCLUDED_LOADER_DEFINE) 		\
 	$(GTK_DEBUG_FLAGS)			\
@@ -281,7 +280,7 @@ INCLUDES = \
 	-DGDK_PIXBUF_ENABLE_BACKEND
 
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
+LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
 
 noinst_PROGRAMS = test-gdk-pixbuf
 test_gdk_pixbuf_LDADD = $(LDADDS)
@@ -433,23 +432,11 @@ EXTRA_DIST =					\
 	gdk-pixbuf.symbols			\
 	makegdkpixbufalias.pl			\
 	abicheck.sh				\
+	pltcheck.sh				\
 	gdk_pixbuf.def				\
 	gdk_pixbuf.rc				\
 	gdk-pixbuf-marshal.c			\
 	gdk-pixbuf-marshal.list			\
-	pixbufloader_ico.def			\
-	pixbufloader_ani.def			\
-	pixbufloader_pnm.def			\
-	pixbufloader_xpm.def			\
-	pixbufloader_bmp.def			\
-	pixbufloader_jpeg.def			\
-	pixbufloader_ras.def			\
-	pixbufloader_gif.def			\
-	pixbufloader_png.def			\
-	pixbufloader_tiff.def			\
-	pixbufloader_wbmp.def			\
-	pixbufloader_xbm.def			\
-	pixbufloader_tga.def			\
 	gen-color-table.pl
 
 if CROSS_COMPILING

gdk-pixbuf/abicheck.sh

@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

gdk-pixbuf/gdk-pixbuf-data.c

@@ -31,16 +31,16 @@
 
 /**
  * gdk_pixbuf_new_from_data:
- * @data: Image data in 8-bit/sample packed format.
- * @colorspace: Colorspace for the image data.
- * @has_alpha: Whether the data has an opacity channel.
- * @bits_per_sample: Number of bits per sample.
- * @width: Width of the image in pixels.
- * @height: Height of the image in pixels.
- * @rowstride: Distance in bytes between row starts.
+ * @data: Image data in 8-bit/sample packed format
+ * @colorspace: Colorspace for the image data
+ * @has_alpha: Whether the data has an opacity channel
+ * @bits_per_sample: Number of bits per sample
+ * @width: Width of the image in pixels, must be > 0
+ * @height: Height of the image in pixels, must be > 0
+ * @rowstride: Distance in bytes between row starts
  * @destroy_fn: Function used to free the data when the pixbuf's reference count
- * drops to zero, or %NULL if the data should not be freed.
- * @destroy_fn_data: Closure data to pass to the destroy notification function.
+ * drops to zero, or %NULL if the data should not be freed
+ * @destroy_fn_data: Closure data to pass to the destroy notification function
  * 
  * Creates a new #GdkPixbuf out of in-memory image data.  Currently only RGB
  * images with 8 bits per sample are supported.

gdk-pixbuf/gdk-pixbuf-io.c

@@ -1095,6 +1095,9 @@ gdk_pixbuf_new_from_file_at_scale (const char *filename,
 		gint height;
 		gboolean preserve_aspect_ratio;
 	} info;
+	GdkPixbufAnimation *animation;
+	GdkPixbufAnimationIter *iter;
+	gboolean has_frame;
 
 	g_return_val_if_fail (filename != NULL, NULL);
         g_return_val_if_fail (width > 0 || width == -1, NULL);
@@ -1122,7 +1125,8 @@ gdk_pixbuf_new_from_file_at_scale (const char *filename,
 
 	g_signal_connect (loader, "size-prepared", G_CALLBACK (size_prepared_cb), &info);
 
-	while (!feof (f) && !ferror (f)) {
+	has_frame = FALSE;
+	while (!has_frame && !feof (f) && !ferror (f)) {
 		length = fread (buffer, 1, sizeof (buffer), f);
 		if (length > 0)
 			if (!gdk_pixbuf_loader_write (loader, buffer, length, error)) {
@@ -1131,11 +1135,20 @@ gdk_pixbuf_new_from_file_at_scale (const char *filename,
 				g_object_unref (loader);
 				return NULL;
 			}
+		
+		animation = gdk_pixbuf_loader_get_animation (loader);
+		if (animation) {
+			iter = gdk_pixbuf_animation_get_iter (animation, 0);
+			if (!gdk_pixbuf_animation_iter_on_currently_loading_frame (iter)) {
+				has_frame = TRUE;
+			}
+			g_object_unref (iter);
+		}
 	}
 
 	fclose (f);
 
-	if (!gdk_pixbuf_loader_close (loader, error)) {
+	if (!gdk_pixbuf_loader_close (loader, error) && !has_frame) {
 		g_object_unref (loader);
 		return NULL;
 	}
@@ -2264,7 +2277,3 @@ gdk_pixbuf_get_formats (void)
 
 #define __GDK_PIXBUF_IO_C__
 #include "gdk-pixbuf-aliasdef.c"
-
-
-
-

gdk-pixbuf/gdk-pixbuf-loader.c

@@ -303,6 +303,27 @@ gdk_pixbuf_loader_update (GdkPixbuf *pixbuf,
                                MIN (height, gdk_pixbuf_animation_get_height (priv->animation)));
 }
 
+/* Defense against broken loaders; DO NOT take this as a GError example! */
+static void
+gdk_pixbuf_loader_ensure_error (GdkPixbufLoader *loader,
+                                GError         **error)
+{ 
+        GdkPixbufLoaderPrivate *priv = loader->priv;
+
+        if (error == NULL || *error != NULL)
+                return;
+
+        g_warning ("Bug! loader '%s' didn't set an error on failure",
+                   priv->image_module->module_name);
+        g_set_error (error,
+                     GDK_PIXBUF_ERROR,
+                     GDK_PIXBUF_ERROR_FAILED,
+                     _("Internal error: Image loader module '%s' failed to"
+                       " complete an operation, but didn't give a reason for"
+                       " the failure"),
+                     priv->image_module->module_name);
+}
+
 static gint
 gdk_pixbuf_loader_load_module (GdkPixbufLoader *loader,
                                const char      *image_type,
@@ -358,23 +379,7 @@ gdk_pixbuf_loader_load_module (GdkPixbufLoader *loader,
   
         if (priv->context == NULL)
                 {
-                        /* Defense against broken loaders; DO NOT take this as a GError
-                         * example
-                         */
-                        if (error && *error == NULL)
-                                {
-                                        g_warning ("Bug! loader '%s' didn't set an error on failure",
-                                                   priv->image_module->module_name);
-                                        g_set_error (error,
-                                                     GDK_PIXBUF_ERROR,
-                                                     GDK_PIXBUF_ERROR_FAILED,
-                                                     _("Internal error: Image loader module '%s'"
-                                                       " failed to begin loading an image, but didn't"
-                                                       " give a reason for the failure"),
-                                                     priv->image_module->module_name);
-
-                                }
-      
+                        gdk_pixbuf_loader_ensure_error (loader, error);
                         return 0;
                 }
   
@@ -450,7 +455,7 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader,
       
                         eaten = gdk_pixbuf_loader_eat_header_write (loader, buf, count, error);
                         if (eaten <= 0)
-                                return FALSE;
+                               goto fail; 
       
                         count -= eaten;
                         buf += eaten;
@@ -458,27 +463,18 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader,
   
         if (count > 0 && priv->image_module->load_increment)
                 {
-                        gboolean retval;
-                        retval = priv->image_module->load_increment (priv->context, buf, count,
-                                                                     error);
-                        if (!retval && error && *error == NULL)
-                                {
-                                        /* Fix up busted image loader */
-                                        g_warning ("Bug! loader '%s' didn't set an error on failure",
-                                                   priv->image_module->module_name);
-                                        g_set_error (error,
-                                                     GDK_PIXBUF_ERROR,
-                                                     GDK_PIXBUF_ERROR_FAILED,
-                                                     _("Internal error: Image loader module '%s'"
-                                                       " failed to begin loading an image, but didn't"
-                                                       " give a reason for the failure"),
-                                                     priv->image_module->module_name);
-                                }
-
-                        return retval;
+                        if (!priv->image_module->load_increment (priv->context, buf, count,
+                                                                 error))
+				goto fail;
                 }
       
         return TRUE;
+
+ fail:
+        gdk_pixbuf_loader_ensure_error (loader, error);
+        gdk_pixbuf_loader_close (loader, NULL);
+        
+        return FALSE;
 }
 
 /**
@@ -696,8 +692,8 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
   
         priv = loader->priv;
   
-        /* we expect it's not closed */
-        g_return_val_if_fail (priv->closed == FALSE, TRUE);
+        if (priv->closed)
+                return TRUE;
   
         /* We have less the LOADER_HEADER_SIZE bytes in the image.  
          * Flush it, and keep going. 
@@ -716,7 +712,10 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
         if (priv->image_module && priv->image_module->stop_load && priv->context) 
                 {
                         if (!priv->image_module->stop_load (priv->context, error))
-                                retval = FALSE;
+                                {
+                                        gdk_pixbuf_loader_ensure_error (loader, error);
+                                        retval = FALSE;
+                                }
                 }
   
         priv->closed = TRUE;

gdk-pixbuf/gdk-pixbuf.c

@@ -30,6 +30,9 @@
 #define GDK_PIXBUF_COMPILATION
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
+/* Include the marshallers */
+#include <glib-object.h>
+#include "gdk-pixbuf-marshal.c"
 #include "gdk-pixbuf-alias.h"
 
 static void gdk_pixbuf_finalize     (GObject        *object);
@@ -221,11 +224,11 @@ free_buffer (guchar *pixels, gpointer data)
 
 /**
  * gdk_pixbuf_new:
- * @colorspace: Color space for image.
- * @has_alpha: Whether the image should have transparency information.
- * @bits_per_sample: Number of bits per color sample.
- * @width: Width of image in pixels.
- * @height: Height of image in pixels.
+ * @colorspace: Color space for image
+ * @has_alpha: Whether the image should have transparency information
+ * @bits_per_sample: Number of bits per color sample
+ * @width: Width of image in pixels, must be > 0
+ * @height: Height of image in pixels, must be > 0
  *
  * Creates a new #GdkPixbuf structure and allocates a buffer for it.  The 
  * buffer has an optimal rowstride.  Note that the buffer is not cleared;
@@ -251,9 +254,6 @@ gdk_pixbuf_new (GdkColorspace colorspace,
 	g_return_val_if_fail (width > 0, NULL);
 	g_return_val_if_fail (height > 0, NULL);
 
-        if (width <= 0 || height <= 0)
-                return NULL;
-
 	channels = has_alpha ? 4 : 3;
         rowstride = width * channels;
         if (rowstride / channels != width || rowstride + 3 < 0) /* overflow */
@@ -753,11 +753,5 @@ gdk_pixbuf_get_property (GObject         *object,
           }
 }
 
-
-
-/* Include the marshallers */
-#include <glib-object.h>
-#include "gdk-pixbuf-marshal.c"
-
 #define __GDK_PIXBUF_C__
 #include "gdk-pixbuf-aliasdef.c"

gdk-pixbuf/gdk-pixdata.c

@@ -17,9 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <config.h>
-#include "gdk-pixdata.h"
 
 #include "gdk-pixbuf-private.h"
+#include "gdk-pixdata.h"
 #include "gdk-pixbuf-alias.h"
 #include <string.h>
 

gdk-pixbuf/io-bmp.c

@@ -159,6 +159,7 @@ struct bmp_progressive_state {
 
 	guchar *buff;
 	guint BufferSize;
+	guint BufferPadding;
 	guint BufferDone;
 
 	guchar (*Colormap)[3];
@@ -181,6 +182,7 @@ struct bmp_progressive_state {
 	int r_mask, r_shift, r_bits;
 	int g_mask, g_shift, g_bits;
 	int b_mask, b_shift, b_bits;
+	int a_mask, a_shift, a_bits;
 
 	GdkPixbuf *pixbuf;	/* Our "target" */
 };
@@ -245,6 +247,11 @@ static gboolean grow_buffer (struct bmp_progressive_state *State,
   return TRUE;
 }
 
+static gboolean
+decode_bitmasks (guchar *buf,
+		 struct bmp_progressive_state *State, 
+		 GError **error);
+
 static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
                              struct bmp_progressive_state *State,
                              GError **error)
@@ -252,7 +259,6 @@ static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
 	gint clrUsed;
 
         /* FIXME this is totally unrobust against bogus image data. */
-
 	if (State->BufferSize < lsb_32 (&BIH[0]) + 14) {
 		State->BufferSize = lsb_32 (&BIH[0]) + 14;
 		if (!grow_buffer (State, error))
@@ -265,17 +271,32 @@ static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
 #endif    
 
 	State->Header.size = lsb_32 (&BIH[0]);
-	if (State->Header.size == 108) {
+	if (State->Header.size == 124) {
+                /* BMP v5 */
+		State->Header.width = lsb_32 (&BIH[4]);
+		State->Header.height = lsb_32 (&BIH[8]);
+		State->Header.depth = lsb_16 (&BIH[14]);
+		State->Compressed = lsb_32 (&BIH[16]);
+	} else if (State->Header.size == 108) {
+                /* BMP v4 */
+		State->Header.width = lsb_32 (&BIH[4]);
+		State->Header.height = lsb_32 (&BIH[8]);
+		State->Header.depth = lsb_16 (&BIH[14]);
+		State->Compressed = lsb_32 (&BIH[16]);
+	} else if (State->Header.size == 64) {
+                /* BMP OS/2 v2 */
 		State->Header.width = lsb_32 (&BIH[4]);
 		State->Header.height = lsb_32 (&BIH[8]);
 		State->Header.depth = lsb_16 (&BIH[14]);
 		State->Compressed = lsb_32 (&BIH[16]);
 	} else if (State->Header.size == 40) {
+                /* BMP v3 */ 
 		State->Header.width = lsb_32 (&BIH[4]);
 		State->Header.height = lsb_32 (&BIH[8]);
 		State->Header.depth = lsb_16 (&BIH[14]);
 		State->Compressed = lsb_32 (&BIH[16]);
 	} else if (State->Header.size == 12) {
+                /* BMP OS/2 */
 		State->Header.width = lsb_16 (&BIH[4]);
 		State->Header.height = lsb_16 (&BIH[6]);
 		State->Header.depth = lsb_16 (&BIH[10]);
@@ -297,9 +318,9 @@ static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
 	if (clrUsed != 0)
 		State->Header.n_colors = clrUsed;
 	else
-            State->Header.n_colors = 1 << State->Header.depth;
+            State->Header.n_colors = (1 << State->Header.depth);
 	
-	if (State->Header.n_colors > 1 << State->Header.depth) {
+	if (State->Header.n_colors > (1 << State->Header.depth)) {
 		g_set_error (error,
 			     GDK_PIXBUF_ERROR,
 			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
@@ -417,8 +438,19 @@ static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
 	
 	State->BufferDone = 0;
 	if (State->Type <= 8) {
+                gint samples;
+
 		State->read_state = READ_STATE_PALETTE;
-		State->BufferSize = lsb_32 (&BFH[10]) - 14 - State->Header.size; 
+
+		/* Allocate enough to hold the palette */
+	        samples = (State->Header.size == 12 ? 3 : 4);
+		State->BufferSize = State->Header.n_colors * samples;
+
+		/* Skip over everything between the palette and the data.
+		   This protects us against a malicious BFH[10] value.
+                */
+		State->BufferPadding = (lsb_32 (&BFH[10]) - 14 - State->Header.size) - State->BufferSize;
+
 	} else if (State->Compressed == BI_RGB) {
 		if (State->BufferSize < lsb_32 (&BFH[10]))
 		{
@@ -433,8 +465,19 @@ static gboolean DecodeHeader(unsigned char *BFH, unsigned char *BIH,
 			State->BufferSize = State->LineWidth;
 		}
 	} else if (State->Compressed == BI_BITFIELDS) {
-		State->read_state = READ_STATE_BITMASKS;
-		State->BufferSize = 12;
+               if (State->Header.size == 108 || State->Header.size == 124) 
+               {
+			/* v4 and v5 have the bitmasks in the header */
+			if (!decode_bitmasks (&BIH[40], State, error)) {
+			       State->read_state = READ_STATE_ERROR;
+			       return FALSE;
+                        }
+               }
+               else 
+               {
+		       State->read_state = READ_STATE_BITMASKS;
+		       State->BufferSize = 12;
+               }
 	} else {
 		g_set_error (error,
 			     GDK_PIXBUF_ERROR,
@@ -511,12 +554,13 @@ find_bits (int n, int *lowest, int *n_set)
 		}
 }
 
-/* Decodes the 3 shorts that follow for the bitmasks for BI_BITFIELDS coding */
+/* Decodes the bitmasks for BI_BITFIELDS coding */
 static gboolean
 decode_bitmasks (guchar *buf,
 		 struct bmp_progressive_state *State, 
 		 GError **error)
 {
+        State->a_mask = State->a_shift = State->a_bits = 0;
 	State->r_mask = buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24);
 	buf += 4;
 
@@ -529,17 +573,55 @@ decode_bitmasks (guchar *buf,
 	find_bits (State->g_mask, &State->g_shift, &State->g_bits);
 	find_bits (State->b_mask, &State->b_shift, &State->b_bits);
 
-	if (State->r_bits == 0 || State->g_bits == 0 || State->b_bits == 0) {
-		State->r_mask = 0x7c00;
-		State->r_shift = 10;
-		State->g_mask = 0x03e0;
-		State->g_shift = 5;
-		State->b_mask = 0x001f;
-		State->b_shift = 0;
+        /* v4 and v5 have an alpha mask */
+        if (State->Header.size == 108 || State->Header.size == 124) {
+	      buf += 4;
+	      State->a_mask = buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24);
+	      find_bits (State->a_mask, &State->a_shift, &State->a_bits);
+        }
 
-		State->r_bits = State->g_bits = State->b_bits = 5;
+	if (State->r_bits == 0 || State->g_bits == 0 || State->b_bits == 0) {
+                if (State->Type == 16) {
+		       State->r_mask = 0x7c00;
+		       State->r_shift = 10;
+		       State->g_mask = 0x03e0;
+		       State->g_shift = 5;
+		       State->b_mask = 0x001f;
+		       State->b_shift = 0;
+
+		       State->r_bits = State->g_bits = State->b_bits = 5;
+                }
+                else {
+		       State->r_mask = 0x00ff0000;
+		       State->r_shift = 16;
+		       State->g_mask = 0x0000ff00;
+		       State->g_shift = 8;
+		       State->b_mask = 0x000000ff;
+		       State->b_shift = 0;
+		       State->a_mask = 0xff000000;
+		       State->a_shift = 24;
+
+		       State->r_bits = State->g_bits = State->b_bits = State->a_bits = 8;
+                }
 	}
 
+        if (State->r_bits > 8) { 
+          State->r_shift += State->r_bits - 8;
+          State->r_bits = 8;
+        }
+        if (State->g_bits > 8) { 
+          State->g_shift += State->g_bits - 8;
+          State->g_bits = 8;
+        }
+        if (State->b_bits > 8) { 
+          State->b_shift += State->b_bits - 8;
+          State->b_bits = 8;
+        }
+        if (State->a_bits > 8) { 
+          State->a_shift += State->a_bits - 8;
+          State->a_bits = 8;
+        }
+
 	State->read_state = READ_STATE_DATA;
 	State->BufferDone = 0;
 	State->BufferSize = State->LineWidth;
@@ -573,6 +655,7 @@ gdk_pixbuf__bmp_image_begin_load(GdkPixbufModuleSizeFunc size_func,
 	context->read_state = READ_STATE_HEADERS;
 
 	context->BufferSize = 26;
+	context->BufferPadding = 0;
 	context->buff = g_malloc(26);
 	context->BufferDone = 0;
 	/* 14 for the BitmapFileHeader, 12 for the BitmapImageHeader */
@@ -644,28 +727,35 @@ static void OneLine32(struct bmp_progressive_state *context)
 		int r_lshift, r_rshift;
 		int g_lshift, g_rshift;
 		int b_lshift, b_rshift;
+		int a_lshift, a_rshift;
 
 		r_lshift = 8 - context->r_bits;
 		g_lshift = 8 - context->g_bits;
 		b_lshift = 8 - context->b_bits;
+		a_lshift = 8 - context->a_bits;
 
 		r_rshift = context->r_bits - r_lshift;
 		g_rshift = context->g_bits - g_lshift;
 		b_rshift = context->b_bits - b_lshift;
+		a_rshift = context->a_bits - a_lshift;
 
 		for (i = 0; i < context->Header.width; i++) {
-			int v, r, g, b;
+			int v, r, g, b, a;
 
-			v = src[0] | (src[1] << 8) | (src[2] << 16);
+			v = src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24);
 
 			r = (v & context->r_mask) >> context->r_shift;
 			g = (v & context->g_mask) >> context->g_shift;
 			b = (v & context->b_mask) >> context->b_shift;
+			a = (v & context->a_mask) >> context->a_shift;
 
 			*pixels++ = (r << r_lshift) | (r >> r_rshift);
 			*pixels++ = (g << g_lshift) | (g >> g_rshift);
 			*pixels++ = (b << b_lshift) | (b >> b_rshift);
-			*pixels++ = 0xff;
+                        if (context->a_bits)
+			  *pixels++ = 0xff - ((a << a_lshift) | (a >> a_rshift));
+                        else
+                          *pixels++ = 0xff;
 
 			src += 4;
 		}
@@ -1078,6 +1168,7 @@ gdk_pixbuf__bmp_image_load_increment(gpointer data,
 	    (struct bmp_progressive_state *) data;
 
 	gint BytesToCopy;
+	gint BytesToRemove;
 
 	if (context->read_state == READ_STATE_DONE)
 		return TRUE;
@@ -1103,6 +1194,19 @@ gdk_pixbuf__bmp_image_load_increment(gpointer data,
 				break;
 		}
 
+		/* context->buff is full.  Now we discard all "padding" */
+		if (context->BufferPadding != 0) {
+			BytesToRemove = context->BufferPadding - size;
+			if (BytesToRemove > size) {
+				BytesToRemove = size;
+			}
+			size -= BytesToRemove;
+			context->BufferPadding -= BytesToRemove;
+
+			if (context->BufferPadding != 0)
+				break;
+		}
+
 		switch (context->read_state) {
 		case READ_STATE_HEADERS:
 			if (!DecodeHeader (context->buff,

gdk-pixbuf/io-gif.c

@@ -908,6 +908,11 @@ gif_get_lzw (GifContext *context)
 
                 /* Only call prepare_func for the first frame */
 		if (context->animation->frames->next == NULL) { 
+			if (context->animation->width == 0 )
+				context->animation->width = gdk_pixbuf_get_width(context->frame->pixbuf);
+			if (context->animation->height == 0)
+				context->animation->height = gdk_pixbuf_get_height (context->frame->pixbuf);
+
                         if (context->prepare_func)
                                 (* context->prepare_func) (context->frame->pixbuf,
                                                            GDK_PIXBUF_ANIMATION (context->animation),

gdk-pixbuf/io-pnm.c

@@ -527,109 +527,90 @@ pnm_read_raw_scanline (PnmLoaderContext *context)
 }
 
 static gint
-pnm_read_ascii_scanline (PnmLoaderContext *context)
+pnm_read_ascii_mono_scanline (PnmLoaderContext *context)
 {
 	PnmIOBuffer *inbuf;
-	guint offset;
-	guint value, numval, i;
-	guchar data;
-	guchar mask;
+	guint value;
+	gint retval;
+	guchar *dptr;
+	gint max_length;
+
+	if (context->type == PNM_FORMAT_PBM)
+		max_length = 1;
+	else
+		max_length = -1;
+
+	inbuf = &context->inbuf;
+
+	context->dptr = context->pixels + context->output_row * context->rowstride;
+
+	dptr = context->dptr + context->output_col * 3;
+
+	while (TRUE) {
+		retval = pnm_read_next_value (inbuf, max_length, &value, context->error);
+		if (retval != PNM_OK)
+			return retval;
+
+		if (context->type == PNM_FORMAT_PBM) {
+			value = value ? 0 : 0xff;
+		}
+		else {
+			/* scale the color up or down to an 8-bit color depth */
+			if (value > context->maxval)
+				value = 255;
+			else
+				value = (guchar)(255 * value / context->maxval);
+		}
+			
+		*dptr++ = value;
+		*dptr++ = value;
+		*dptr++ = value;
+
+		context->output_col++;
+
+		if (context->output_col == context->width) {
+			context->output_col = 0;
+			context->output_row++;
+			break;
+		}
+	}
+
+	return PNM_OK;
+}
+
+static gint
+pnm_read_ascii_color_scanline (PnmLoaderContext *context)
+{
+	PnmIOBuffer *inbuf;
+	guint value, i;
 	guchar *dptr;
 	gint retval;
-	gint max_length;
-	
-	g_return_val_if_fail (context != NULL, PNM_FATAL_ERR);
-	
-	data = mask = 0;
 	
 	inbuf = &context->inbuf;
 	
 	context->dptr = context->pixels + context->output_row * context->rowstride;
 	
-	switch (context->type) {
-	case PNM_FORMAT_PBM:
-		max_length = 1;
-		numval = MIN (8, context->width - context->output_col);
-		offset = context->output_col / 8;
-		break;
-	case PNM_FORMAT_PGM:
-		max_length = -1;
-		numval = 1;
-		offset = context->output_col;
-		break;
-	case PNM_FORMAT_PPM:
-		max_length = -1;
-		numval = 3;
-		offset = context->output_col * 3;
-		break;
-		
-	default:
-		g_set_error (context->error,
-			     GDK_PIXBUF_ERROR,
-			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-			     _("PNM image format is invalid"));
-
-		return PNM_FATAL_ERR;
-	}
-	
-	dptr = context->dptr + offset + context->scan_state;
+	dptr = context->dptr + context->output_col * 3 + context->scan_state;
 	
 	while (TRUE) {
-		if (context->type == PNM_FORMAT_PBM) {
-			mask = 0x80;
-			data = 0;
-			numval = MIN (8, context->width - context->output_col);
-		}
-		
-		for (i = context->scan_state; i < numval; i++) {
-			retval = pnm_read_next_value (inbuf, max_length, 
-						      &value, context->error);
+		for (i = context->scan_state; i < 3; i++) {
+			retval = pnm_read_next_value (inbuf, -1, &value, context->error);
 			if (retval != PNM_OK) {
 				/* save state and return */
 				context->scan_state = i;
 				return retval;
 			}
 			
-			switch (context->type) {
-			case PNM_FORMAT_PBM:
-				if (value)
-					data |= mask;
-				mask >>= 1;
-				
-				break;
-			case PNM_FORMAT_PGM:
-			case PNM_FORMAT_PPM:
-				/* scale the color up or down to an 8-bit color depth */
-				if (value > context->maxval)
-					*dptr++ = 255;
-				else
-					*dptr++ = (guchar)(255 * value / context->maxval);
-				break;
-			default:
-				g_set_error (context->error,
-					     GDK_PIXBUF_ERROR,
-					     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-					     _("PNM image format is invalid"));
-				return PNM_FATAL_ERR;
-				break;
-			}
+			if (value > context->maxval)
+				*dptr++ = 255;
+			else
+				*dptr++ = (guchar)(255 * value / context->maxval);
 		}
 		
 		context->scan_state = 0;
-		
-		if (context->type == PNM_FORMAT_PBM) {
-			*dptr++ = data;
-			context->output_col += numval;
-		} else {
-			context->output_col++;
-		}
+		context->output_col++;
 		
 		if (context->output_col == context->width) {
-			if (context->type == PNM_FORMAT_PBM)
-				explode_bitmap_into_buf (context);
-			else if (context->type == PNM_FORMAT_PGM)
-				explode_gray_into_buf (context);
-			
 			context->output_col = 0;
 			context->output_row++;
 			break;
@@ -659,8 +640,12 @@ pnm_read_scanline (PnmLoaderContext *context)
 		break;
 	case PNM_FORMAT_PBM:
 	case PNM_FORMAT_PGM:
+		retval = pnm_read_ascii_mono_scanline (context);
+		if (retval != PNM_OK)
+			return retval;
+		break;		
 	case PNM_FORMAT_PPM:
-		retval = pnm_read_ascii_scanline (context);
+		retval = pnm_read_ascii_color_scanline (context);
 		if (retval != PNM_OK)
 			return retval;
 		break;

gdk-pixbuf/io-xbm.c

@@ -143,10 +143,12 @@ next_int (FILE *fstream)
 }
 
 static gboolean
-read_bitmap_file_data (FILE *fstream,
-		       guint *width, guint *height,
+read_bitmap_file_data (FILE    *fstream,
+		       guint   *width, 
+		       guint   *height,
 		       guchar **data,
-		       int *x_hot, int *y_hot)
+		       int     *x_hot, 
+		       int     *y_hot)
 {
 	guchar *bits = NULL;		/* working variable */
 	char line[MAX_SIZE];		/* input line from file */
@@ -198,8 +200,12 @@ read_bitmap_file_data (FILE *fstream,
     
 		if (sscanf (line, "static short %s = {", name_and_type) == 1)
 			version10p = 1;
+		else if (sscanf (line,"static const unsigned char %s = {",name_and_type) == 1)
+			version10p = 0;
 		else if (sscanf (line,"static unsigned char %s = {",name_and_type) == 1)
 			version10p = 0;
+		else if (sscanf (line, "static const char %s = {", name_and_type) == 1)
+			version10p = 0;
 		else if (sscanf (line, "static char %s = {", name_and_type) == 1)
 			version10p = 0;
 		else
@@ -267,7 +273,9 @@ read_bitmap_file_data (FILE *fstream,
 
 
 static GdkPixbuf *
-gdk_pixbuf__xbm_image_load_real (FILE *f, XBMData *context, GError **error)
+gdk_pixbuf__xbm_image_load_real (FILE     *f, 
+				 XBMData  *context, 
+				 GError  **error)
 {
 	guint w, h;
 	int x_hot, y_hot;
@@ -340,8 +348,6 @@ gdk_pixbuf__xbm_image_load_real (FILE *f, XBMData *context, GError **error)
 	if (context) {
 		if (context->update_func)
 			(* context->update_func) (pixbuf, 0, 0, w, h, context->user_data);
-		g_object_unref (pixbuf);
-		pixbuf = NULL;
 	}
 
 	return pixbuf;
@@ -351,7 +357,8 @@ gdk_pixbuf__xbm_image_load_real (FILE *f, XBMData *context, GError **error)
 /* Static loader */
 
 static GdkPixbuf *
-gdk_pixbuf__xbm_image_load (FILE *f, GError **error)
+gdk_pixbuf__xbm_image_load (FILE    *f, 
+			    GError **error)
 {
 	return gdk_pixbuf__xbm_image_load_real (f, NULL, error);
 }
@@ -365,11 +372,11 @@ gdk_pixbuf__xbm_image_load (FILE *f, GError **error)
  */
 
 static gpointer
-gdk_pixbuf__xbm_image_begin_load (GdkPixbufModuleSizeFunc size_func,
-                                  GdkPixbufModulePreparedFunc prepare_func,
-				  GdkPixbufModuleUpdatedFunc update_func,
-				  gpointer user_data,
-				  GError **error)
+gdk_pixbuf__xbm_image_begin_load (GdkPixbufModuleSizeFunc       size_func,
+                                  GdkPixbufModulePreparedFunc   prepare_func,
+				  GdkPixbufModuleUpdatedFunc    update_func,
+				  gpointer                      user_data,
+				  GError                      **error)
 {
 	XBMData *context;
 	gint fd;
@@ -398,8 +405,8 @@ gdk_pixbuf__xbm_image_begin_load (GdkPixbufModuleSizeFunc size_func,
 }
 
 static gboolean
-gdk_pixbuf__xbm_image_stop_load (gpointer data,
-                                 GError **error)
+gdk_pixbuf__xbm_image_stop_load (gpointer   data,
+                                 GError   **error)
 {
 	XBMData *context = (XBMData*) data;
         gboolean retval = TRUE;
@@ -410,10 +417,13 @@ gdk_pixbuf__xbm_image_stop_load (gpointer data,
 	rewind (context->file);
 	if (context->all_okay) {
                 GdkPixbuf *pixbuf;
-                pixbuf = gdk_pixbuf__xbm_image_load_real (context->file, context,
+                pixbuf = gdk_pixbuf__xbm_image_load_real (context->file, 
+							  context,
                                                           error);
                 if (pixbuf == NULL)
                         retval = FALSE;
+		else
+			g_object_unref (pixbuf);
         }
 
 	fclose (context->file);
@@ -425,10 +435,10 @@ gdk_pixbuf__xbm_image_stop_load (gpointer data,
 }
 
 static gboolean
-gdk_pixbuf__xbm_image_load_increment (gpointer data,
+gdk_pixbuf__xbm_image_load_increment (gpointer       data,
                                       const guchar  *buf,
-                                      guint    size,
-                                      GError **error)
+                                      guint          size,
+                                      GError       **error)
 {
 	XBMData *context = (XBMData *) data;
 

gdk-pixbuf/pixbufloader_ani.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_bmp.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_gif.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_ico.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_jpeg.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_pcx.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_png.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_pnm.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_ras.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_tga.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_tiff.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_wbmp.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_xbm.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixbufloader_xpm.def

@@ -1,3 +0,0 @@
-EXPORTS
-	fill_vtable
-	fill_info

gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S

@@ -22,7 +22,7 @@ gcc2_compiled.:
 .text
 	.align 16
 
-#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)	
 	
 /* Magic indicating no need for an executable stack */
 #if !defined __powerpc64__ && !defined __ia64__

gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S

@@ -22,7 +22,7 @@ gcc2_compiled.:
 .text
 	.align 16
 
-#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)	
 
 /* Magic indicating no need for an executable stack */
 #if !defined __powerpc64__ && !defined __ia64__

gdk-pixbuf/pixops/have_mmx.S

@@ -22,7 +22,7 @@ gcc2_compiled.:
 .text
 	.align 16
 
-#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
 
 /* Magic indicating no need for an executable stack */
 #if !defined __powerpc64__ && !defined __ia64__

gdk-pixbuf/pixops/scale_line_22_33_mmx.S

@@ -22,7 +22,7 @@ gcc2_compiled.:
 .text
 	.align 16
 
-#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
 	
 /* Magic indicating no need for an executable stack */
 #if !defined __powerpc64__ && !defined __ia64__

gdk-pixbuf/pltcheck.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+LANG=C
+
+status=0
+
+if ! which readelf 2>/dev/null >/dev/null; then
+	echo "'readelf' not found; skipping test"
+	exit 0
+fi
+
+for so in .libs/libgdk_pixbuf*.so; do
+	echo Checking $so for local PLT entries
+	readelf -r $so | grep 'JU\?MP_SLOT' | grep 'gdk_pixbuf' && status=1
+done
+
+exit $status

gdk/Makefile.am

@@ -16,7 +16,8 @@ EXTRA_DIST =			\
 	gdk.symbols		\
 	makegdkalias.pl		\
 	gdkaliasdef.c		\
-	abicheck.sh
+	abicheck.sh		\
+	pltcheck.sh
 
 INCLUDES =                              \
 	-DG_LOG_DOMAIN=\"Gdk\"		\
@@ -24,8 +25,7 @@ INCLUDES =                              \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk-pixbuf 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
-	-DGDK_DISABLE_DEPRECATED	\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED \
 	$(GTK_DEBUG_FLAGS) 		\
 	$(GDK_DEP_CFLAGS)
 
@@ -202,7 +202,7 @@ gdkaliasdef.c: gdk.symbols
 	 $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = pltcheck.sh abicheck.sh
 endif
 
 

gdk/abicheck.sh

@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
 nm -D -g --defined-only .libs/libgdk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

gdk/directfb/gdkdirectfb.h

@@ -36,8 +36,6 @@
 #include <cairo.h>
 #include <directfb.h>
 #include "gdk/gdkprivate.h"
-//#include "gdk/gdkwindow.h"
-#include "gdkdisplay-directfb.h"
 
 /* macro for a safe call to DirectFB functions */
 #define DFBCHECK(x...) \
@@ -85,6 +83,15 @@ GdkWindow * gdk_directfb_window_new         (GdkWindow             *parent,
 
 GdkVisual * gdk_directfb_visual_by_format   (DFBSurfacePixelFormat  pixel_format);
 
+IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window);
+IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window);
+
+#if (DIRECTFB_MICRO_VERSION > 25)
+GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent,
+                IDirectFBSurface *subsurface);
+#endif
+
+
 G_END_DECLS
 
 #endif /* __GDK_DIRECTFB_H__ */

gdk/directfb/gdkdisplay-directfb.c

@@ -104,7 +104,6 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
     }
   _gdk_display = g_object_new(GDK_TYPE_DISPLAY_DFB,NULL);
   _gdk_display->directfb=directfb;
-  _gdk_events_init ();
 
   ret = directfb->GetDisplayLayer (directfb, DLID_PRIMARY, &layer);
   if (ret != DFB_OK)
@@ -115,7 +114,6 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
       return NULL;
     }
 
-  layer->EnableCursor (layer, 1);
 
   ret=directfb->GetInputDevice (directfb, DIDID_KEYBOARD, &keyboard);
 
@@ -131,16 +129,19 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
 
   _gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL);
 
-  _gdk_windowing_window_init ();
-
   _gdk_visual_init ();
+
   gdk_screen_set_default_colormap (_gdk_screen,
                                    gdk_screen_get_system_colormap (_gdk_screen));
+  _gdk_windowing_window_init ();
   _gdk_windowing_image_init ();
 
   _gdk_input_init ();
   _gdk_dnd_init ();
 
+  _gdk_events_init ();
+  layer->EnableCursor (layer, 1);
+
   g_signal_emit_by_name (gdk_display_manager_get (),
 			 "display_opened", _gdk_display);
 

gdk/directfb/gdkdrawable-directfb.c

@@ -32,6 +32,7 @@
 
 #include <config.h>
 #include "gdk.h"
+#include <assert.h>
 
 #include <string.h>
 
@@ -63,9 +64,6 @@ static void gdk_directfb_draw_lines (GdkDrawable *drawable,
                                      GdkPoint    *points,
                                      gint         npoints);
 
-static void inline gdk_directfb_update_region (GdkDrawableImplDirectFB *impl,
-                                               GdkRegion               *region);
-
 static cairo_surface_t *gdk_directfb_ref_cairo_surface (GdkDrawable *drawable);
 
 
@@ -450,23 +448,20 @@ _gdk_directfb_draw_rectangle (GdkDrawable *drawable,
             }
         }
 
-      gdk_directfb_update_region (impl, clip);
       gdk_region_destroy (clip);
     }
   else
     {
 
-      DFBRegion region = { x, y, x + width+1, y + height+1 };
+      DFBRegion region = { x, y, x + width, y + height };
       impl->surface->SetClip (impl->surface, &region);
 
       /*  DirectFB does not draw rectangles the X way. Using DirectFB,
           a filled Rectangle has the same size as a drawn one, while
           X draws the rectangle one pixel taller and wider.  */
       impl->surface->DrawRectangle (impl->surface,
-                                    x, y, width + 1, height + 1);
+                                    x, y, width , height);
       impl->surface->SetClip (impl->surface, NULL);
-
-      _gdk_directfb_update (impl, &region);
     }
 }
 
@@ -527,8 +522,6 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable,
 
               }
             impl->surface->SetClip (impl->surface, NULL);
-
-            gdk_directfb_update_region (impl, clip);
             gdk_region_destroy (clip);
 
             return;
@@ -630,7 +623,6 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
                            xdest, ydest);
     }
   impl->surface->SetClip (impl->surface, NULL);
-  gdk_directfb_update_region (impl, clip);
   gdk_region_destroy (clip);
 }
 
@@ -678,8 +670,6 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
     }
 
   gdk_region_destroy (clip);
-
-  _gdk_directfb_update (impl, &region);
 }
 
 static void
@@ -758,8 +748,6 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
       if (segs->y2 > region.y2)
         region.y2 = segs->y2;
     }
-
-  _gdk_directfb_update (impl, &region);
 }
 
 static void
@@ -827,8 +815,6 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
   impl->surface->SetClip (impl->surface, NULL);
 
   gdk_region_destroy (clip);
-
-  _gdk_directfb_update (impl, &region);
 }
 
 static void
@@ -882,8 +868,6 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
       image_private->surface->Lock (image_private->surface, DSLF_WRITE,
                                     &image->mem, &pitch);
       image->bpl = pitch;
-
-      gdk_directfb_update_region (impl, clip);
     }
 
   gdk_region_destroy (clip);
@@ -1031,32 +1015,6 @@ gdk_drawable_impl_directfb_get_type (void)
   return object_type;
 }
 
-static inline void
-gdk_directfb_update_region (GdkDrawableImplDirectFB *impl,
-                            GdkRegion               *region)
-{
-  DFBRegion reg = { region->extents.x1,     region->extents.y1,
-                    region->extents.x2 , region->extents.y2  };
-
-  _gdk_directfb_update (impl, &reg);
-}
-
-void
-_gdk_directfb_update (GdkDrawableImplDirectFB *impl,
-                      DFBRegion               *region)
-{
-  g_return_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (impl));
-
-  if (impl->buffered)
-    return;
-
-  if (!impl->surface)
-    return;
-
-  impl->surface->Flip (impl->surface, region, 0);
-}
-
-
 static GdkScreen * gdk_directfb_get_screen (GdkDrawable    *drawable){
         return gdk_screen_get_default();
 }
@@ -1076,14 +1034,19 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
     g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
 
     GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
-	IDirectFB *dfb = GDK_DISPLAY_DFB(gdk_drawable_get_display(drawable))->directfb;
+    IDirectFB *dfb = GDK_DISPLAY_DFB(gdk_drawable_get_display(drawable))->directfb;
     if (!impl->cairo_surface) {
-	impl->cairo_surface = cairo_directfb_surface_create(dfb ,impl->surface);
-      	cairo_surface_set_user_data (impl->cairo_surface, 
-			             &gdk_directfb_cairo_key,drawable, 
-				     gdk_directfb_cairo_surface_destroy);
-		//XXX!!! MAJOR HACK so cairo coexists with direct drawing
-		//impl->surface->Unlock( impl->surface );
+//      IDirectFBSurface *surface;
+     // if (impl->surface->GetSubSurface (impl->surface, NULL, &surface) == DFB_OK) {
+        //impl->cairo_surface = cairo_directfb_surface_create (dfb, surface);
+        g_assert( impl->surface != NULL);
+        impl->cairo_surface = cairo_directfb_surface_create (dfb,impl->surface);
+        g_assert( impl->cairo_surface != NULL);
+        cairo_surface_set_user_data (impl->cairo_surface, 
+                                     &gdk_directfb_cairo_key, drawable, 
+                                     gdk_directfb_cairo_surface_destroy);
+       // surface->Release (surface);
+      //}
     } else {
         cairo_surface_reference (impl->cairo_surface);
     }

gdk/directfb/gdkgeometry-directfb.c

@@ -119,8 +119,7 @@ gdk_window_scroll (GdkWindow *window,
               impl->surface->SetClip (impl->surface, &update);
               impl->surface->Blit (impl->surface, impl->surface, NULL, dx, dy);
               impl->surface->SetClip (impl->surface, NULL);
-
-              _gdk_directfb_update (impl, &update);
+              impl->surface->Flip(impl->surface,&update,0);
             }
         }
     }
@@ -238,18 +237,18 @@ gdk_window_move_region (GdkWindow *window,
 	if (impl->surface)
 	{
     	DFBRectangle source = { dest_extents.x - dx, 
-							 dest_extents.y - dy,
+					    dest_extents.y - dy,
                              dest_extents.width,
                              dest_extents.height};
     	DFBRegion destination = { dest_extents.x, 
-							 	  dest_extents.y,
-                             	  dest_extents.width,
-                             	  dest_extents.height};
+						 dest_extents.y,
+                             	 dest_extents.x+dest_extents.width-1,
+                             	 dest_extents.y+dest_extents.height-1};
 
               impl->surface->SetClip (impl->surface, &destination);
               impl->surface->Blit (impl->surface, impl->surface,&source,dx,dy);
               impl->surface->SetClip (impl->surface, NULL);
-              _gdk_directfb_update (impl, &destination);
+              impl->surface->Flip(impl->surface,&destination,0);
 	}
   gdk_region_destroy (src_region);
   gdk_region_destroy (dest_region);

gdk/directfb/gdkkeys-directfb.c

@@ -1670,6 +1670,8 @@ _gdk_directfb_keyboard_init (void)
 
 	if (!keyboard)
 		return;
+    if( directfb_keymap )    
+            return;
 
 	keyboard->GetDescription (keyboard, &desc);
 	_gdk_display->keymap=g_object_new (gdk_keymap_get_type (), NULL);
@@ -1682,7 +1684,6 @@ _gdk_directfb_keyboard_init (void)
 
 	length = directfb_max_keycode - desc.min_keycode + 1;
 
-	g_assert (directfb_keymap == NULL);
 
 	directfb_keymap = g_new0 (guint, 4 * length);
 

gdk/directfb/gdkmain-directfb.c

@@ -105,7 +105,7 @@ _gdk_windowing_exit (void)
 gchar *
 gdk_get_display (void)
 {
-  return "DirectFB";
+  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
 }
 
 

gdk/directfb/gdkprivate-directfb.h

@@ -70,7 +70,6 @@ struct _GdkDrawableImplDirectFB
 
   GdkRegion              *paint_region;
   gint                    paint_depth;
-
   gint                    width;
   gint                    height;
   gint                    abs_x;
@@ -140,6 +139,7 @@ typedef struct
 struct _GdkWindowImplDirectFB
 {
   GdkDrawableImplDirectFB drawable;
+  GdkWindow             *gdkWindow;
 
   IDirectFBWindow        *window;
 

gdk/directfb/gdkvisual-directfb.c

@@ -54,16 +54,16 @@ static GdkVisualDirectFB * gdk_directfb_visual_create (DFBSurfacePixelFormat  pi
 
 static DFBSurfacePixelFormat formats[] =
 {
-  DSPF_RGB32,
   DSPF_ARGB,
+  DSPF_LUT8,
+  DSPF_RGB32,
   DSPF_RGB24,
   DSPF_RGB16,
   DSPF_ARGB1555,
-  DSPF_LUT8,
   DSPF_RGB332
 };
 
-static GdkVisual         * system_visual = NULL;
+GdkVisual         * system_visual = NULL;
 static GdkVisualDirectFB * visuals[G_N_ELEMENTS (formats) + 1] = { NULL };
 static gint                available_depths[G_N_ELEMENTS (formats) + 1] = {0};
 static GdkVisualType       available_types[G_N_ELEMENTS (formats) + 1]  = {0};
@@ -110,7 +110,7 @@ gdk_visual_get_type (void)
 }
 
 void
-_gdk_visual_init (void)
+_gdk_visual_init ()
 {
   DFBResult              ret;
   DFBDisplayLayerConfig  dlc;
@@ -118,11 +118,10 @@ _gdk_visual_init (void)
   IDirectFBSurface      *dest;
   gint                   i, c;
 
-  GdkWindowImplDirectFB  *root_impl = GDK_WINDOW_IMPL_DIRECTFB (
-						GDK_WINDOW_OBJECT(_gdk_parent_root)->impl);
 
   _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc);
-  
+  g_assert( dlc.pixelformat != DSPF_UNKNOWN);
+
   dest = gdk_display_dfb_create_surface(_gdk_display,dlc.pixelformat,8,8);
   g_assert (dest != NULL);
 
@@ -134,6 +133,10 @@ _gdk_visual_init (void)
      If you want to use a special pixelformat that is not registered
      here, you can create it using the DirectFB-specific function
      gdk_directfb_visual_by_format().
+     Note:
+     changed to do all formats but we should redo this code
+     to ensure the base format ARGB LUT8 RGB etc then add ones supported
+     by the hardware
    */
   for (i = 0, c = 0; i < G_N_ELEMENTS (formats); i++)
     {
@@ -144,21 +147,18 @@ _gdk_visual_init (void)
       desc.width       = 8;
       desc.height      = 8;
       desc.pixelformat = formats[i];
-
       //call direct so fail silently  is ok
       if (_gdk_display->directfb->CreateSurface (_gdk_display->directfb,
-	 &desc, &src) != DFB_OK)
+	 &desc, &src) != DFB_OK) 
         continue;
 
+      visuals[i] = gdk_directfb_visual_create (formats[i]);
+
       dest->GetAccelerationMask (dest, src, &acc);
 
-      if (acc & DFXL_BLIT)
+      if (acc & DFXL_BLIT || formats[i] == dlc.pixelformat)
         {
-          visuals[c] = gdk_directfb_visual_create (formats[i]);
-
-          if (formats[i] == root_impl->drawable.format)
             system_visual = GDK_VISUAL (visuals[c]);
-          
           c++;
         }
 
@@ -167,17 +167,14 @@ _gdk_visual_init (void)
 
   dest->Release (dest);
 
+  //fallback to ARGB must be supported
   if (!system_visual)
     {
-      visuals[c] = gdk_directfb_visual_create (root_impl->drawable.format);
-      system_visual = GDK_VISUAL (visuals[c]);      
+       g_assert (visuals[DSPF_ARGB] != NULL);
+       system_visual = GDK_VISUAL(visuals[DSPF_ARGB]);
     }
 
-  g_assert (system_visual);
-  /*
-	Now we can set up the system colormap
-  */
-  gdk_drawable_set_colormap (GDK_DRAWABLE (_gdk_parent_root),gdk_colormap_get_system());
+  g_assert (system_visual != NULL);
 }
 
 gint
@@ -195,6 +192,7 @@ gdk_visual_get_best_type (void)
 GdkVisual*
 gdk_screen_get_system_visual (GdkScreen *screen)
 {
+  g_assert( system_visual);
   return system_visual;
 }
 
@@ -211,10 +209,12 @@ gdk_visual_get_best_with_depth (gint depth)
 
   for (i = 0; visuals[i]; i++)
     {
-      GdkVisual *visual = GDK_VISUAL (visuals[i]);
+      if( visuals[i] ) {
+        GdkVisual *visual = GDK_VISUAL (visuals[i]);
 
-      if (depth == visual->depth)
-        return visual;
+        if (depth == visual->depth)
+            return visual;
+      }
     }
 
   return NULL;
@@ -227,10 +227,12 @@ gdk_visual_get_best_with_type (GdkVisualType visual_type)
 
   for (i = 0; visuals[i]; i++)
     {
-      GdkVisual *visual = GDK_VISUAL (visuals[i]);
+      if( visuals[i] ) {
+        GdkVisual *visual = GDK_VISUAL (visuals[i]);
 
-      if (visual_type == visual->type)
-        return visual;
+        if (visual_type == visual->type)
+            return visual;
+      }
     }
 
   return NULL;
@@ -244,10 +246,12 @@ gdk_visual_get_best_with_both (gint          depth,
 
   for (i = 0; visuals[i]; i++)
     {
-      GdkVisual *visual = GDK_VISUAL (visuals[i]);
+      if( visuals[i] ) {
+        GdkVisual *visual = GDK_VISUAL (visuals[i]);
 
-      if (depth == visual->depth && visual_type == visual->type)
-        return visual;
+        if (depth == visual->depth && visual_type == visual->type)
+            return visual;
+      }
     }
 
   return system_visual;
@@ -286,7 +290,10 @@ gdk_screen_list_visuals (GdkScreen *screen)
   gint   i;
 
   for (i = 0; visuals[i]; i++)
-    list = g_list_append (list, visuals[i]);
+   if( visuals[i] ) {
+        GdkVisual * vis = GDK_VISUAL(visuals[i]);
+        list = g_list_append (list,vis);
+   }
 
   return list;
 }
@@ -314,7 +321,7 @@ gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format)
 
   /* first check if one the registered visuals matches */
   for (i = 0; visuals[i]; i++)
-    if (visuals[i]->format == pixel_format)
+    if ( visuals[i] && visuals[i]->format == pixel_format)
       return GDK_VISUAL (visuals[i]);
 
   /* none matched, try to create a new one for this pixel_format */
@@ -333,9 +340,7 @@ gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format)
     test->Release (test);
   }
 
-  visuals[i] = gdk_directfb_visual_create (pixel_format);
-
-  return GDK_VISUAL (visuals[i]);
+  return GDK_VISUAL(gdk_directfb_visual_create (pixel_format));
 }
 
 GdkScreen *