Set the width of the layout to the actual wrap width (our requisition) not

Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtklabel.c (gtk_label_ensure_layout): Set
        the width of the layout to the actual wrap width
        (our requisition) not the width we set when calculating
        the width. This results in the lines being justified
        within the correct area. (#79157, Anders Carlsson)

        * gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected
        registered parameter types of "accel_activate" and
        "accel_changed" signals. (Patch from Murray Cumming, #78798)

        * gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
        binary-version and type to correspond to the
        current ordering in _gtk_get_module_path.
        (#78746, Sergey Kuzminov)

        * gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
        pointing to the GTK_PATH documentation.

        * gtk/Makefile.am (uninstall-local): Delete
        key themes as well. (#81286, Kristian Rietveld.)

45 files changed, 587 insertions, 54 deletions

diff --git a/ChangeLog b/ChangeLog
index 01f15e561..23c21b7e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_ensure_layout): Set
+	the width of the layout to the actual wrap width 
+	(our requisition) not the width we set when calculating
+	the width. This results in the lines being justified
+	within the correct area. (#79157, Anders Carlsson)
+
+	* gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected 
+	registered parameter types of "accel_activate" and 
+	"accel_changed" signals. (Patch from Murray Cumming, #78798)
+	
+	* gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
+	binary-version and type to correspond to the 
+	current ordering in _gtk_get_module_path.
+	(#78746, Sergey Kuzminov) 
+
+	* gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
+	pointing to the GTK_PATH documentation.
+
+	* gtk/Makefile.am (uninstall-local): Delete 
+	key themes as well. (#81286, Kristian Rietveld.)
+
 Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 01f15e561..23c21b7e7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,26 @@
+Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_ensure_layout): Set
+	the width of the layout to the actual wrap width 
+	(our requisition) not the width we set when calculating
+	the width. This results in the lines being justified
+	within the correct area. (#79157, Anders Carlsson)
+
+	* gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected 
+	registered parameter types of "accel_activate" and 
+	"accel_changed" signals. (Patch from Murray Cumming, #78798)
+	
+	* gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
+	binary-version and type to correspond to the 
+	current ordering in _gtk_get_module_path.
+	(#78746, Sergey Kuzminov) 
+
+	* gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
+	pointing to the GTK_PATH documentation.
+
+	* gtk/Makefile.am (uninstall-local): Delete 
+	key themes as well. (#81286, Kristian Rietveld.)
+
 Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 01f15e561..23c21b7e7 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,26 @@
+Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_ensure_layout): Set
+	the width of the layout to the actual wrap width 
+	(our requisition) not the width we set when calculating
+	the width. This results in the lines being justified
+	within the correct area. (#79157, Anders Carlsson)
+
+	* gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected 
+	registered parameter types of "accel_activate" and 
+	"accel_changed" signals. (Patch from Murray Cumming, #78798)
+	
+	* gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
+	binary-version and type to correspond to the 
+	current ordering in _gtk_get_module_path.
+	(#78746, Sergey Kuzminov) 
+
+	* gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
+	pointing to the GTK_PATH documentation.
+
+	* gtk/Makefile.am (uninstall-local): Delete 
+	key themes as well. (#81286, Kristian Rietveld.)
+
 Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 01f15e561..23c21b7e7 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,26 @@
+Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_ensure_layout): Set
+	the width of the layout to the actual wrap width 
+	(our requisition) not the width we set when calculating
+	the width. This results in the lines being justified
+	within the correct area. (#79157, Anders Carlsson)
+
+	* gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected 
+	registered parameter types of "accel_activate" and 
+	"accel_changed" signals. (Patch from Murray Cumming, #78798)
+	
+	* gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
+	binary-version and type to correspond to the 
+	current ordering in _gtk_get_module_path.
+	(#78746, Sergey Kuzminov) 
+
+	* gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
+	pointing to the GTK_PATH documentation.
+
+	* gtk/Makefile.am (uninstall-local): Delete 
+	key themes as well. (#81286, Kristian Rietveld.)
+
 Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 01f15e561..23c21b7e7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,26 @@
+Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_ensure_layout): Set
+	the width of the layout to the actual wrap width 
+	(our requisition) not the width we set when calculating
+	the width. This results in the lines being justified
+	within the correct area. (#79157, Anders Carlsson)
+
+	* gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected 
+	registered parameter types of "accel_activate" and 
+	"accel_changed" signals. (Patch from Murray Cumming, #78798)
+	
+	* gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
+	binary-version and type to correspond to the 
+	current ordering in _gtk_get_module_path.
+	(#78746, Sergey Kuzminov) 
+
+	* gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
+	pointing to the GTK_PATH documentation.
+
+	* gtk/Makefile.am (uninstall-local): Delete 
+	key themes as well. (#81286, Kristian Rietveld.)
+
 Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 01f15e561..23c21b7e7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,26 @@
+Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtklabel.c (gtk_label_ensure_layout): Set
+	the width of the layout to the actual wrap width 
+	(our requisition) not the width we set when calculating
+	the width. This results in the lines being justified
+	within the correct area. (#79157, Anders Carlsson)
+
+	* gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected 
+	registered parameter types of "accel_activate" and 
+	"accel_changed" signals. (Patch from Murray Cumming, #78798)
+	
+	* gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
+	binary-version and type to correspond to the 
+	current ordering in _gtk_get_module_path.
+	(#78746, Sergey Kuzminov) 
+
+	* gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
+	pointing to the GTK_PATH documentation.
+
+	* gtk/Makefile.am (uninstall-local): Delete 
+	key themes as well. (#81286, Kristian Rietveld.)
+
 Tue May 14 15:40:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/x11/gdkwindow-{linux-fb,win32,x11.c} (gdk_window_set_back_pixmap):
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index 7717f7f7f..91ff9ac37 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -32,7 +32,6 @@ drawn onto. This can be a #GdkPixmap, a #GdkBitmap,
 or a #GdkWindow.
 </para>
 
-@user_data: 
 
 <!-- ##### FUNCTION gdk_drawable_ref ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml
index 0e3b6d86f..4d2539e0a 100644
--- a/docs/reference/gdk/tmpl/gcs.sgml
+++ b/docs/reference/gdk/tmpl/gcs.sgml
@@ -37,12 +37,6 @@ It is an opaque structure with no user-visible
 elements.
 </para>
 
-@parent_instance: 
-@clip_x_origin: 
-@clip_y_origin: 
-@ts_x_origin: 
-@ts_y_origin: 
-@colormap: 
 
 <!-- ##### STRUCT GdkGCValues ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml
index d423d554e..17d148c18 100644
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/docs/reference/gdk/tmpl/gdkscreen.sgml
@@ -24,8 +24,9 @@ form a large screen area.
 
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
-The <structname>GdkScreen</structname> struct is the GDK representation of a
- physical screen. All its fields are private and should not be accessed directly. 
+This is a currently just a placeholder typedef for the first argument of 
+the @window_at_pointer function in #GdkPointerHooks. It will be used
+when GDK gets multihead support. 
 </para>
 
 
diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml
index b21093c19..72d5cb39e 100644
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -89,8 +89,6 @@ state; the second phase is to look up the keycode/group/level triplet
 in the keymap and see what keyval it corresponds to.
 </para>
 
-@parent_instance: 
-@display: 
 
 <!-- ##### STRUCT GdkKeymapKey ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml
index 85a722d44..25c02a5af 100644
--- a/docs/reference/gdk/tmpl/pixmaps.sgml
+++ b/docs/reference/gdk/tmpl/pixmaps.sgml
@@ -27,7 +27,6 @@ The type #GdkDrawable refers generically to any of
 these types.
 </para>
 
-@user_data: 
 
 <!-- ##### FUNCTION gdk_pixmap_new ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index fb5fad9f0..c1c91e1e7 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -28,7 +28,6 @@ The type #GdkDrawable refers generically to any of
 these types.
 </para>
 
-@user_data: used to store the #GtkWidget associated with this window
 
 <!-- ##### ENUM GdkWindowType ##### -->
 <para>
@@ -238,15 +237,6 @@ corresponding flag in #GdkWindowAttributesType.
 @GDK_WA_WMCLASS: Honor the wmclass_class and wmclass_name fields
 @GDK_WA_NOREDIR: Honor the override_redirect field
 
-<!-- ##### STRUCT GdkScreen ##### -->
-<para>
-This is a currently just a placeholder typedef for the first argument of 
-the @window_at_pointer function in #GdkPointerHooks. It will be used
-when GDK gets multihead support. 
-</para>
-
-@parent_instance: 
-
 <!-- ##### FUNCTION gdk_window_new ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 5cdcf14f3..143d5ddb6 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1027,12 +1027,6 @@ after other user handlers and the default handler.
 @GTK_FILL_X: 
 @GTK_FILL_Y: 
 
-<!-- ##### ARG GtkPaned:handle-size ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT GtkPatternSpec ##### -->
 <para>
 
@@ -1128,12 +1122,6 @@ and its unique identifying integer.
 @nparams: 
 @params: 
 
-<!-- ##### ARG GtkSpinButton:shadow-type ##### -->
-<para>
-the type of border that surrounds the arrows of a spin button.
-</para>
-
-
 <!-- ##### STRUCT GtkStatusbarMsg ##### -->
 <para>
 Holds the data for a statusbar message. <structfield>text</structfield> holds the actual text string. <structfield>context_id</structfield> is the context that this message is associated with, and <structfield>message_id</structfield> is this particular message's identifier. However, these fields should not be modified directly.
diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml
index b57f1a58e..ceec7a091 100644
--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -157,3 +157,28 @@ box.
 
 </para>
 
+<!-- ##### ARG GtkButtonBox:secondary ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkbox.sgml b/docs/reference/gtk/tmpl/gtkbox.sgml
index 09c0cec70..0e4a35b93 100644
--- a/docs/reference/gtk/tmpl/gtkbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbox.sgml
@@ -382,3 +382,28 @@ how to allocate space for children, equally or variably.  Refers to
 the <structfield>homogeneous</structfield> field of #GtkBox-struct.

 </para>
 
+<!-- ##### ARG GtkBox:expand ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:fill ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:pack-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkBox:position ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index 6d921057e..7b448c1a0 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -249,3 +249,23 @@ The #GtkReliefStyle as outlined in gtk_button_set_relief().
 
 </para>
 
+<!-- ##### ARG GtkButton:default-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:default-outside-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:child-displacement-y ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkButton:child-displacement-x ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
index a0f69d2d8..7b5e72c6a 100644
--- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
@@ -66,3 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
 @Returns: 
 
 
+<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 764e64868..6a113643a 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -298,3 +298,18 @@ was clicked.
 
 </para>
 
+<!-- ##### ARG GtkDialog:content-area-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkDialog:button-spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkDialog:action-area-border ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkfilesel.sgml b/docs/reference/gtk/tmpl/gtkfilesel.sgml
index eb8af4de2..a68d98ebd 100644
--- a/docs/reference/gtk/tmpl/gtkfilesel.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilesel.sgml
@@ -145,8 +145,8 @@ Sets a default path for the file requestor. If @filename includes a directory pa
 <para>
 </para>
 
-@filesel:
-@Returns:
+@filesel: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_file_selection_complete ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkfixed.sgml b/docs/reference/gtk/tmpl/gtkfixed.sgml
index 67bedddd9..814205aa1 100644
--- a/docs/reference/gtk/tmpl/gtkfixed.sgml
+++ b/docs/reference/gtk/tmpl/gtkfixed.sgml
@@ -166,3 +166,13 @@ Moves a child of a #GtkFixed container to the given position.
 @has_window: 
 
 
+<!-- ##### ARG GtkFixed:x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFixed:y ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtklayout.sgml b/docs/reference/gtk/tmpl/gtklayout.sgml
index 632dc43d1..75de3755c 100644
--- a/docs/reference/gtk/tmpl/gtklayout.sgml
+++ b/docs/reference/gtk/tmpl/gtklayout.sgml
@@ -171,3 +171,13 @@ Layout width, see gtk_layout_set_size()
 Layout height, see gtk_layout_set_size()
 </para>
 
+<!-- ##### ARG GtkLayout:x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkLayout:y ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml
index 3b22a5872..30f4e8f85 100644
--- a/docs/reference/gtk/tmpl/gtkmenubar.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenubar.sgml
@@ -64,3 +64,13 @@ Adds a new #GtkMenuItem to the GtkMenuBar at the position defined by @position
 @position: the position in the item list where the @child is added.
 
 
+<!-- ##### ARG GtkMenuBar:shadow-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkMenuBar:internal-padding ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
index d65e13a75..08147c654 100644
--- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
@@ -201,3 +201,8 @@ submenu. For normal applications, the relevant signal is "activate".
 @menuitem: the object which received the signal.
 @arg1: 
 
+<!-- ##### ARG GtkMenuItem:selected-shadow-type ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml
index c9aeaac88..73b570605 100644
--- a/docs/reference/gtk/tmpl/gtkmessagedialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkmessagedialog.sgml
@@ -112,3 +112,8 @@ then call gtk_dialog_add_buttons().
 
 </para>
 
+<!-- ##### ARG GtkMessageDialog:message-border ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index d72d1f0ac..b79951934 100644
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -496,3 +496,33 @@ Whether the popup menu for switching pages is enabled.
 whether the tabs must have all the same size.
 </para>
 
+<!-- ##### ARG GtkNotebook:tab-label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:menu-label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:position ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-expand ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-fill ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkNotebook:tab-pack ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 7ce820209..31debc57f 100644
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -100,3 +100,13 @@ selected value for the option menu.
 
 </para>
 
+<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml
index 2bfa3e5c2..aa1d425e8 100644
--- a/docs/reference/gtk/tmpl/gtkpaned.sgml
+++ b/docs/reference/gtk/tmpl/gtkpaned.sgml
@@ -215,3 +215,8 @@ gutter (the area between the two panes). It does nothing now.
 
 </para>
 
+<!-- ##### ARG GtkPaned:handle-size ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkplug.sgml b/docs/reference/gtk/tmpl/gtkplug.sgml
index ed9fb1d6b..8bb496e4c 100644
--- a/docs/reference/gtk/tmpl/gtkplug.sgml
+++ b/docs/reference/gtk/tmpl/gtkplug.sgml
@@ -47,8 +47,8 @@ inside the first applications window.
 
 </para>
 
-@display: 
 @plug: 
+@display: 
 @socket_id: 
 
 
diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index 8805af8cc..8f4f787e2 100644
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -153,3 +153,33 @@ Emitted when the range value changes.
 
 </para>
 
+<!-- ##### ARG GtkRange:stepper-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:slider-width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:stepper-spacing ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkRange:trough-border ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 843af1120..36b0dbf6d 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -792,11 +792,9 @@ otherwise %NULL.
 
 <!-- ##### FUNCTION gtk_rc_get_module_dir ##### -->
 <para>
-Returns the directory in which GTK+ will look for
-theme engines.
 </para>
 
-@Returns: The directory. (Must be freed with g_free())
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_rc_get_im_module_path ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml
index 086db0018..b78bac4c5 100644
--- a/docs/reference/gtk/tmpl/gtkscale.sgml
+++ b/docs/reference/gtk/tmpl/gtkscale.sgml
@@ -148,3 +148,13 @@ If the current value is displayed as a string next to the slider.
 The position in which the current value is displayed.
 </para>
 
+<!-- ##### ARG GtkScale:slider-length ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScale:value-spacing ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index befa256ea..cc947c106 100644
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -54,3 +54,33 @@ The #GtkScrollbar struct does not contain any public data.
 </para>
 
 
+<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml
index b48709a48..37177cf57 100644
--- a/docs/reference/gtk/tmpl/gtkselection.sgml
+++ b/docs/reference/gtk/tmpl/gtkselection.sgml
@@ -152,10 +152,10 @@ Looks up a given target in a #GtkTargetList.
 <para>
 </para>
 
-@widget:
-@selection:
-@time:
-@Returns:
+@widget: 
+@selection: 
+@time: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_selection_owner_set_for_display ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
index f2cc4cf27..458abe1f6 100644
--- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml
@@ -473,3 +473,8 @@ how a spin button should be updated.
 reads the current value, or sets a new value.
 </para>
 
+<!-- ##### ARG GtkSpinButton:shadow-type ##### -->
+<para>
+the type of border that surrounds the arrows of a spin button.
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkstatusbar.sgml b/docs/reference/gtk/tmpl/gtkstatusbar.sgml
index 3a195ad08..4d7ea2688 100644
--- a/docs/reference/gtk/tmpl/gtkstatusbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkstatusbar.sgml
@@ -138,3 +138,8 @@ Is emitted whenever a new message gets pushed onto a statusbar's stack.
 @context_id: the context id of the relevant message/statusbar.
 @text: the message that was pushed.
 
+<!-- ##### ARG GtkStatusbar:shadow-type ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index 2f2fb10f6..0275f4ef3 100644
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -179,6 +179,16 @@ Returns whether the style is attached to a window.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_style_get_font_for_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@style: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_style_set_font ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml
index 36e409ff2..ba9a97df5 100644
--- a/docs/reference/gtk/tmpl/gtktable.sgml
+++ b/docs/reference/gtk/tmpl/gtktable.sgml
@@ -276,3 +276,43 @@ Sets or retrieves the number of pixels of space between rows.
 Whether each cell in the table should be the same size or not.
 </para>
 
+<!-- ##### ARG GtkTable:left-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:right-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:top-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:bottom-attach ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:x-options ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:y-options ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:x-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTable:y-padding ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 0d511033d..9ebf2d6d8 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -386,3 +386,28 @@ Should be used if you wish to perform an action when ever the style of a toolbar
 
 </para>
 
+<!-- ##### ARG GtkToolbar:shadow-type ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:space-style ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:button-relief ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:internal-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkToolbar:space-size ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index e73011215..b8d73fe9c 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -901,3 +901,28 @@ Function used for #gtk_tree_view_map_expanded_rows.
 
 </para>
 
+<!-- ##### ARG GtkTreeView:expander-size ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:allow-rules ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index d3e6daec0..0aca15d44 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -1320,6 +1320,26 @@ This function is not useful for applications.
 @class: 
 
 
+<!-- ##### FUNCTION gtk_widget_class_find_style_property ##### -->
+<para>
+
+</para>
+
+@klass: 
+@property_name: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_widget_class_list_style_properties ##### -->
+<para>
+
+</para>
+
+@klass: 
+@n_properties: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_widget_region_intersect ##### -->
 <para>
 
@@ -2163,3 +2183,38 @@ a widget changes from un-anchored to anchored or vice-versa.
 
 </para>
 
+<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:focus-padding ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:cursor-color ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:focus-line-width ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
+<para>
+
+</para>
+
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 817a7bdac..da26d76b6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -573,6 +573,8 @@ install-data-local: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
 	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
+	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
 DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
 
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 4cf27e5c9..d6cb323e9 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -119,15 +119,15 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class)
 					G_SIGNAL_DETAILED,
 					0,
 					accel_activate_accumulator, NULL,
-					_gtk_marshal_BOOLEAN__OBJECT_UINT_UINT,
-					G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT);
+					_gtk_marshal_BOOLEAN__OBJECT_UINT_FLAGS,
+					G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, G_TYPE_UINT, GDK_TYPE_MODIFIER_TYPE);
   signal_accel_changed = g_signal_new ("accel_changed",
 				       G_OBJECT_CLASS_TYPE (class),
 				       G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
 				       G_STRUCT_OFFSET (GtkAccelGroupClass, accel_changed),
 				       NULL, NULL,
-				       _gtk_marshal_VOID__UINT_UINT_BOXED,
-				       G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_CLOSURE);
+				       _gtk_marshal_VOID__UINT_FLAGS_BOXED,
+				       G_TYPE_NONE, 3, G_TYPE_UINT, GDK_TYPE_MODIFIER_TYPE, G_TYPE_CLOSURE);
 }
 
 static void
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 5a58e9eb4..936662539 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1447,6 +1447,7 @@ gtk_label_ensure_layout (GtkLabel *label)
 	      
 	      pango_layout_set_width (label->layout, width);
 	      pango_layout_get_extents (label->layout, NULL, &logical_rect);
+	      width = logical_rect.width;
 	      height = logical_rect.height;
 	      
 	      /* Unfortunately, the above may leave us with a very unbalanced looking paragraph,
@@ -1465,7 +1466,7 @@ gtk_label_ensure_layout (GtkLabel *label)
 		      pango_layout_get_extents (label->layout, NULL, &logical_rect);
 		      
 		      if (logical_rect.height <= height)
-			width = perfect_width;
+			width = logical_rect.width;
 		      else
 			{
 			  gint mid_width = (perfect_width + width) / 2;
@@ -1476,7 +1477,7 @@ gtk_label_ensure_layout (GtkLabel *label)
 			      pango_layout_get_extents (label->layout, NULL, &logical_rect);
 			      
 			      if (logical_rect.height <= height)
-				width = mid_width;
+				width = logical_rect.width;
 			    }
 			}
 		    }
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index d1dd2070f..b0fa87862 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -25,7 +25,7 @@ BOOLEAN:BOXED
 BOOLEAN:BOXED,BOXED
 BOOLEAN:ENUM
 BOOLEAN:ENUM,INT
-BOOLEAN:OBJECT,UINT,UINT
+BOOLEAN:OBJECT,UINT,FLAGS
 BOOLEAN:OBJECT,INT,INT,UINT
 BOOLEAN:OBJECT,STRING,STRING,BOXED
 BOOLEAN:OBJECT,BOXED,BOXED
@@ -81,8 +81,8 @@ VOID:POINTER,UINT
 VOID:STRING
 VOID:STRING,STRING
 VOID:STRING,INT,POINTER
+VOID:UINT,FLAGS,BOXED
 VOID:UINT,UINT
-VOID:UINT,UINT,BOXED
 VOID:UINT,STRING
 VOID:UINT,BOXED,UINT,FLAGS,FLAGS
 VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index a44c526ce..91b398483 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -299,9 +299,9 @@ gtk_rc_make_default_dir (const gchar *type)
 
   var = g_getenv ("GTK_EXE_PREFIX");
   if (var)
-    path = g_build_filename (var, "lib", "gtk-2.0", type, GTK_BINARY_VERSION, NULL);
+    path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
   else
-    path = g_build_filename (GTK_LIBDIR, "gtk-2.0", type, GTK_BINARY_VERSION, NULL);
+    path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
 
   return path;
 }
@@ -367,6 +367,16 @@ gtk_rc_get_theme_dir (void)
   return path;
 }
 
+/**
+ * gtk_rc_get_module_dir:
+ * 
+ * Returns a directory in which GTK+ looks for theme engines.
+ * For full information about the search for theme engines,
+ * see the docs for <envvar>GTK_PATH</envvar> in
+ * <xref linkend="gtk-running">.
+ * 
+ * return value: the directory. (Must be freed with g_free())
+ **/
 gchar *
 gtk_rc_get_module_dir (void)
 {