2.9.4

15 files changed, 151 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 7987aca139..4481666219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.9.4 ===
 
 	* modules/printbackends/file/gtkprintbackendfile.c: 
 	Apply a patch by Christian Persch to support PostScript and PDF
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7987aca139..4481666219 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,6 @@
 2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.9.4 ===
 
 	* modules/printbackends/file/gtkprintbackendfile.c: 
 	Apply a patch by Christian Persch to support PostScript and PDF
diff --git a/INSTALL b/INSTALL
index df49d9d32b..25f2e018cf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,8 +18,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.9.3.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.9.3			   # change to the toplevel directory
+  % gzip -cd gtk+-2.9.4.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.9.4			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK
   [ Become root if necessary ]
diff --git a/NEWS b/NEWS
index fe2293a435..a18f6eba87 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ Overview of Changes from GTK+ 2.9.3 to 2.9.4
  - 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 of PostScript
+   can generate PDF or PostScript
  - Add a function to the low-level API to 
    enumerate all printers
 
diff --git a/README b/README
index 14720bf72a..260372f737 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.9.3. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.9.4. 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.
diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog
index 6c0a99bba2..2b2f1e23e6 100644
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.9.4 ===
+
 2006-06-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.9.3 ===
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 91aca32868..b855fb7c60 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,4 +1,10 @@
 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
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 8be1211662..3f31a245df 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -4506,6 +4506,12 @@ 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
@@ -6164,6 +6170,7 @@ GTK_PRINT_UNIX_DIALOG_GET_CLASS
 <SUBSECTION Private>
 GtkPrintUnixDialogPrivate
 gtk_print_unix_dialog_get_type
+gtk_print_capabilities_get_type
 </SECTION>
 
 
@@ -6183,6 +6190,8 @@ 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
diff --git a/docs/reference/gtk/question_index.sgml b/docs/reference/gtk/question_index.sgml
index 87f4d98c84..441def5a5a 100644
--- a/docs/reference/gtk/question_index.sgml
+++ b/docs/reference/gtk/question_index.sgml
@@ -553,6 +553,13 @@ gtk_widget_set_colormap (widget, colormap);
 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>
 
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 52976371b8..5a8e625b8c 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/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>
 
@@ -2837,6 +2843,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>
 
@@ -2845,6 +2859,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.
diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 5c194e1d86..7f6d796914 100644
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/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>
 
diff --git a/docs/reference/gtk/tmpl/gtkprinter.sgml b/docs/reference/gtk/tmpl/gtkprinter.sgml
index 9c5d8d0145..677245c9f6 100644
--- a/docs/reference/gtk/tmpl/gtkprinter.sgml
+++ b/docs/reference/gtk/tmpl/gtkprinter.sgml
@@ -195,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>
 
@@ -212,9 +230,9 @@ 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 
+@printer: a #GtkPrinter
+@data: user data passed to gtk_enumerate_printers()
+@Returns: %TRUE to stop the enumeration, %FALSE to continue
 
 
 <!-- ##### FUNCTION gtk_enumerate_printers ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkprintjob.sgml b/docs/reference/gtk/tmpl/gtkprintjob.sgml
index e284036c53..a8ee316939 100644
--- a/docs/reference/gtk/tmpl/gtkprintjob.sgml
+++ b/docs/reference/gtk/tmpl/gtkprintjob.sgml
@@ -65,6 +65,11 @@ Printing support was added in GTK+ 2.10.
 
 </para>
 
+<!-- ##### ARG GtkPrintJob:track-print-status ##### -->
+<para>
+
+</para>
+
 <!-- ##### USER_FUNCTION GtkPrintJobCompleteFunc ##### -->
 <para>
 
@@ -153,8 +158,6 @@ Printing support was added in GTK+ 2.10.
 @callback: 
 @user_data: 
 @dnotify: 
-@error: 
-@Returns: 
 
 
 <!-- ##### FUNCTION gtk_print_job_set_track_print_status ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkprintsettings.sgml b/docs/reference/gtk/tmpl/gtkprintsettings.sgml
index e637908fc5..d7a9375406 100644
--- a/docs/reference/gtk/tmpl/gtkprintsettings.sgml
+++ b/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>
 
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index c3d73742b7..5a61328034 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -1197,3 +1197,49 @@ returns.
 @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: 
+
+