Merge branch 'master' into toolpalette

12 files changed, 75 insertions, 14 deletions

diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.types b/docs/reference/gdk-pixbuf/gdk-pixbuf.types
index bf3fd9963f..6169c7b36c 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.types
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.types
@@ -4,3 +4,5 @@ gdk_pixbuf_get_type
 gdk_pixbuf_loader_get_type
 gdk_pixbuf_animation_get_type
 gdk_pixbuf_animation_iter_get_type
+gdk_pixbuf_simple_anim_get_type
+
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index c7fb92b366..7114c2eab9 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -1182,6 +1182,7 @@ gtk_dialog_set_default_response
 gtk_dialog_set_has_separator
 gtk_dialog_set_response_sensitive
 gtk_dialog_get_response_for_widget
+gtk_dialog_get_widget_for_response
 gtk_dialog_get_action_area
 gtk_dialog_get_content_area
 <SUBSECTION>
@@ -2633,7 +2634,6 @@ gtk_message_dialog_get_type
 GtkInfoBar
 gtk_info_bar_new
 gtk_info_bar_new_with_buttons
-gtk_info_bar_set_contents
 gtk_info_bar_add_action_widget
 gtk_info_bar_add_button
 gtk_info_bar_add_buttons
@@ -2732,8 +2732,12 @@ gtk_notebook_set_group_id
 gtk_notebook_get_group_id
 gtk_notebook_set_group
 gtk_notebook_get_group
+gtk_notebook_set_action_widget
+gtk_notebook_get_action_widget
 GtkNotebookWindowCreationFunc
 gtk_notebook_set_window_creation_hook
+gtk_notebook_set_action_widget
+gtk_notebook_get_action_widget
 <SUBSECTION Standard>
 GTK_NOTEBOOK
 GTK_IS_NOTEBOOK
@@ -2820,7 +2824,6 @@ gtk_option_menu_get_type
 <FILE>gtkpaned</FILE>
 <TITLE>GtkPaned</TITLE>
 GtkPaned
-gtk_paned_new
 gtk_paned_add1
 gtk_paned_add2
 gtk_paned_gutter_size
@@ -3315,7 +3318,6 @@ gtk_recent_action_get_type
 <TITLE>GtkRuler</TITLE>
 GtkRuler
 GtkRulerMetric
-gtk_ruler_new
 gtk_ruler_set_metric
 gtk_ruler_set_range
 gtk_ruler_get_metric
@@ -3337,8 +3339,6 @@ gtk_ruler_draw_pos
 <FILE>gtkscale</FILE>
 <TITLE>GtkScale</TITLE>
 GtkScale
-gtk_scale_new
-gtk_scale_new_with_range
 gtk_scale_set_digits
 gtk_scale_set_draw_value
 gtk_scale_set_value_pos
@@ -3391,7 +3391,6 @@ gtk_scale_button_get_type
 <FILE>gtkscrollbar</FILE>
 <TITLE>GtkScrollbar</TITLE>
 GtkScrollbar
-gtk_scrollbar_new
 <SUBSECTION Standard>
 GTK_SCROLLBAR
 GTK_IS_SCROLLBAR
@@ -3437,7 +3436,6 @@ gtk_scrolled_window_get_type
 <FILE>gtkseparator</FILE>
 <TITLE>GtkSeparator</TITLE>
 GtkSeparator
-gtk_separator_new
 <SUBSECTION Standard>
 GTK_SEPARATOR
 GTK_IS_SEPARATOR
@@ -5395,6 +5393,7 @@ gtk_viewport_set_hadjustment
 gtk_viewport_set_vadjustment
 gtk_viewport_set_shadow_type
 gtk_viewport_get_shadow_type
+gtk_viewport_get_bin_window
 <SUBSECTION Standard>
 GTK_VIEWPORT
 GTK_IS_VIEWPORT
@@ -5825,6 +5824,7 @@ gtk_window_get_urgency_hint
 gtk_window_get_accept_focus
 gtk_window_get_focus_on_map
 gtk_window_get_group
+gtk_window_get_window_type
 gtk_window_move
 gtk_window_parse_geometry
 gtk_window_reshow_with_initial_size
@@ -7046,8 +7046,10 @@ gtk_paper_size_to_key_file
 
 <SUBSECTION Standard>
 GTK_TYPE_PAPER_SIZE
+
 <SUBSECTION Private>
 gtk_paper_size_get_type
+gtk_custom_paper_unix_dialog_get_type
 </SECTION>
 
 
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index c29bd26ea4..e5a26bb792 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -215,7 +215,6 @@ Emits a #GtkButton::clicked signal to the given #GtkButton.
 @button: The #GtkButton you want to send the signal to.
 
 
-
 <!-- ##### FUNCTION gtk_button_enter ##### -->
 <para>
 Emits a #GtkButton::enter signal to the given #GtkButton.
diff --git a/docs/reference/gtk/tmpl/gtkcelleditable.sgml b/docs/reference/gtk/tmpl/gtkcelleditable.sgml
index 3230ddf12c..ebcea5faf4 100644
--- a/docs/reference/gtk/tmpl/gtkcelleditable.sgml
+++ b/docs/reference/gtk/tmpl/gtkcelleditable.sgml
@@ -38,6 +38,11 @@ to be usable when editing the contents of a #GtkTreeView cell.
 
 @celleditable: the object which received the signal.
 
+<!-- ##### ARG GtkCellEditable:editing-canceled ##### -->
+<para>
+
+</para>
+
 <!-- ##### STRUCT GtkCellEditableIface ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 8eb1a6b2a2..ecf4d83f62 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -368,6 +368,16 @@ directly, but into the @vbox and @action_area, as described above.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_dialog_get_widget_for_response ##### -->
+<para>
+
+</para>
+
+@dialog: 
+@response_id: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_dialog_get_action_area ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkinputdialog.sgml b/docs/reference/gtk/tmpl/gtkinputdialog.sgml
index e17b244740..47abfdcb50 100644
--- a/docs/reference/gtk/tmpl/gtkinputdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkinputdialog.sgml
@@ -49,6 +49,7 @@ to #GDK_MODE_ENABLED.
 
 @inputdialog: the object which received the signal.
 @deviceid: The ID of the newly disabled device.
+<!-- # Unused Parameters # -->
 @Deprecated: 2.20: Don't use this widget anymore.
 
 <!-- ##### SIGNAL GtkInputDialog::enable-device ##### -->
@@ -60,6 +61,7 @@ mode of a device from #GDK_MODE_DISABLED to a
 
 @inputdialog: the object which received the signal.
 @deviceid: The ID of the newly enabled device.
+<!-- # Unused Parameters # -->
 @Deprecated: 2.20: Don't use this widget anymore.
 
 <!-- ##### FUNCTION gtk_input_dialog_new ##### -->
@@ -69,3 +71,5 @@ Creates a new #GtkInputDialog.
 
 @Returns: the new #GtkInputDialog.
 @Deprecated: 2.20: Don't use this widget anymore.
+
+
diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index 0dc90496af..93e616af09 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -26,9 +26,14 @@ The GtkNoteboopk implementation of the GtkBuildable interface
 supports placing children into tabs by specifying "tab" as the
 "type" attribute of a &lt;child&gt; element. Note that the content
 of the tab must be created before the tab can be filled.
-A tab child can be specified without specifying a &lt;child&gt; 
+A tab child can be specified without specifying a &lt;child&gt;
 type attribute.
 </para>
+<para>
+To add a child widget in the notebooks action area, specify
+"action-start" or "action-end" as the "type" attribute of the &lt;child&gt;
+element.
+</para>
 <example>
 <title>A UI definition fragment with GtkNotebook</title>
 <programlisting><![CDATA[
diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index e990c50609..a6c944d8a6 100644
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -841,6 +841,21 @@ Does the same as gtk_style_apply_default_background().
 @orientation: 
 
 
+<!-- ##### FUNCTION gtk_paint_spinner ##### -->
+<para>
+
+</para>
+
+@style: 
+@window: 
+@state_type: 
+@step: 
+@x: 
+@y: 
+@width: 
+@height: 
+
+
 <!-- ##### FUNCTION gtk_paint_string ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml
index ff66730859..c52ee0f974 100644
--- a/docs/reference/gtk/tmpl/gtktexttag.sgml
+++ b/docs/reference/gtk/tmpl/gtktexttag.sgml
@@ -22,8 +22,8 @@ See <application>gtk-demo</application> for numerous examples.
 </para>
 
 <para>
-The "invisible" property was not implemented for GTK+ 2.0; it's
-planned to be implemented in future releases.
+The "invisible" property was not implemented for GTK+ 2.0.
+It is working (with minor issues) since 2.8.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
diff --git a/docs/reference/gtk/tmpl/gtktooltip.sgml b/docs/reference/gtk/tmpl/gtktooltip.sgml
index 0640729b57..71edd3584e 100644
--- a/docs/reference/gtk/tmpl/gtktooltip.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltip.sgml
@@ -132,6 +132,16 @@ return %TRUE to show the window, %FALSE to not show it.
 @size: 
 
 
+<!-- ##### FUNCTION gtk_tooltip_set_icon_from_gicon ##### -->
+<para>
+
+</para>
+
+@tooltip: 
+@gicon: 
+@size: 
+
+
 <!-- ##### FUNCTION gtk_tooltip_set_custom ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkviewport.sgml b/docs/reference/gtk/tmpl/gtkviewport.sgml
index c6343cb8e0..610563b21d 100644
--- a/docs/reference/gtk/tmpl/gtkviewport.sgml
+++ b/docs/reference/gtk/tmpl/gtkviewport.sgml
@@ -123,3 +123,12 @@ exactly this, so you can ignore the presence of the viewport.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_viewport_get_bin_window ##### -->
+<para>
+
+</para>
+
+@viewport: 
+@Returns: 
+
+
diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index f45f6972f0..9a7c9f1c11 100755
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -11154,7 +11154,7 @@ tictactoe_get_type (void)
 
   if (!ttt_type)
     {
-      static const GTypeInfo ttt_info =
+      const GTypeInfo ttt_info =
       {
 	sizeof (TictactoeClass),
 	NULL, /* base_init */
@@ -14606,7 +14606,7 @@ tictactoe_get_type (void)
 
   if (!ttt_type)
     {
-      static const GTypeInfo ttt_info =
+      const GTypeInfo ttt_info =
       {
 	sizeof (TictactoeClass),
 	NULL, /* base_init */
@@ -14963,7 +14963,7 @@ gtk_dial_get_type ()
 
   if (!dial_type)
     {
-      static const GTypeInfo dial_info =
+      const GTypeInfo dial_info =
       {
 	sizeof (GtkDialClass),
 	NULL,