2.5.2

ChangeLog

@@ -1,3 +1,17 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
+	* gdk/abicheck.sh:
+	* gtk/abicheck.sh: Make work during make distcheck.
+	
+	* docs/RELEASE-HOWTO: Add hint about doing make check 
+	before make distcheck.
+	
+	* gtk/gtk.symbols: Add some missing symbols.
+
+	* gtk/gtkiconview.c: Add some missing statics.
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates for 2.5.2

ChangeLog.pre-2-10

@@ -1,3 +1,17 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
+	* gdk/abicheck.sh:
+	* gtk/abicheck.sh: Make work during make distcheck.
+	
+	* docs/RELEASE-HOWTO: Add hint about doing make check 
+	before make distcheck.
+	
+	* gtk/gtk.symbols: Add some missing symbols.
+
+	* gtk/gtkiconview.c: Add some missing statics.
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates for 2.5.2

ChangeLog.pre-2-6

@@ -1,3 +1,17 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
+	* gdk/abicheck.sh:
+	* gtk/abicheck.sh: Make work during make distcheck.
+	
+	* docs/RELEASE-HOWTO: Add hint about doing make check 
+	before make distcheck.
+	
+	* gtk/gtk.symbols: Add some missing symbols.
+
+	* gtk/gtkiconview.c: Add some missing statics.
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates for 2.5.2

ChangeLog.pre-2-8

@@ -1,3 +1,17 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
+	* gdk/abicheck.sh:
+	* gtk/abicheck.sh: Make work during make distcheck.
+	
+	* docs/RELEASE-HOWTO: Add hint about doing make check 
+	before make distcheck.
+	
+	* gtk/gtk.symbols: Add some missing symbols.
+
+	* gtk/gtkiconview.c: Add some missing statics.
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates for 2.5.2

INSTALL

@@ -18,8 +18,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.5.1.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.5.1			   # change to the toplevel directory
+  % gzip -cd gtk+-2.5.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.5.2			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK
   [ Become root if necessary ]

README

@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.5.1. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.5.2. 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.

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -1,7 +1,11 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
 2004-08-01  Matthias Clasen  <mclasen@redhat.com>
-                                                                                
-        * === Released 2.5.1 ===
-                                                                                
+
+	* === Released 2.5.1 ===
+
 Tue Jul 20 23:26:10 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gdk-pixbuf-xlibrgb.c:  Include config.h first.  (#148034)

docs/RELEASE-HOWTO

@@ -19,24 +19,27 @@ Without those packages make distcheck will *not* pass.
 3) Verify that the version in configure.in has been bumped after the last
 release. (Note that this is critical, a slip-up here will cause the soname 
 to change).
-4) Add === Released 2.x.y === at the top of all ChangeLog files
-5) make distcheck
-6) Fix broken stuff found by 5) repeat
-7) cvs commit; you'll have a bunch of po file changes, and maybe some
+4) Make sure that make check is happy (If you don't do it here, make distcheck
+will also catch it, but it is kind of disheartening to see make distcheck fail
+due to an extraneous symbol after watching it build the docs for an hour...)
+5) Add === Released 2.x.y === at the top of all ChangeLog files
+6) make distcheck
+7) Fix broken stuff found by 5) repeat
+8) cvs commit; you'll have a bunch of po file changes, and maybe some
 doc changes too (NOTE: be sure to use cvs with compression, else you'll
 end up waiting for a long time :).
-8) If 7) fails because someone else committed inbetween, curse, cvs up,
+9) If 7) fails because someone else committed inbetween, curse, cvs up,
 fix conflicts and go to 5)
-9) type 'cvs tag GTK_2_x_y' in the toplevel directory
-10) You now have the tarball, and the CVS tag, now upload the tarball to
+10) type 'cvs tag GTK_2_x_y' in the toplevel directory
+11) You now have the tarball, and the CVS tag, now upload the tarball to
 gnome.org and gtk.org
-11) Go to the gnome-announce list archives, find the last announce message,
+12) Go to the gnome-announce list archives, find the last announce message,
 create a new message in the same form, replacing version numbers, commentary
 at the top about "what this release is about" and the Summary of changes.
-12) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
+13) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
 gtk-devel-list. Set reply-to to gnome-hackers.
-13) Bump the version number in configure.in. 
-14) Create a new milestone in bugzilla and move the remaining bugs from the
+14) Bump the version number in configure.in. 
+15) Create a new milestone in bugzilla and move the remaining bugs from the
 2.x.y milestone over to the new one.
-15) Add a link to the release announcement to www.gtk.org which lives in
+16) Add a link to the release announcement to www.gtk.org which lives in
 the gtk-web cvs module.

docs/reference/ChangeLog

@@ -1,3 +1,7 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk-pixbuf/gdk-pixbuf-csource.xml: Document bugs of

docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1

@@ -21,77 +21,81 @@
 .SH NAME
 gdk-pixbuf-csource \- C code generation utility for GdkPixbuf images
 .SH "SYNOPSIS"
-
-.nf
-\fBgdk-pixbuf-csource\fR [options] [image]
-.fi
-
-.nf
-\fBgdk-pixbuf-csource\fR [options] --build-list [[name] [image]...]
-.fi
+.ad l
+.hy 0
+.HP 19
+\fBgdk\-pixbuf\-csource\fR [options] [image]
+.ad
+.hy
+.ad l
+.hy 0
+.HP 19
+\fBgdk\-pixbuf\-csource\fR [options] \-\-build\-list [[name]\ [image]...]
+.ad
+.hy
 
 .SH "DESCRIPTION"
 
 .PP
- \fBgdk-pixbuf-csource\fR is a small utility that generates C code containing images, useful for compiling images directly into programs\&.
+ \fBgdk\-pixbuf\-csource\fR is a small utility that generates C code containing images, useful for compiling images directly into programs\&.
 
 .SH "INVOCATION"
 
 .PP
- \fBgdk-pixbuf-csource\fR either takes as input one image file name to generate code for, or, using the \fB--build-list\fR option, a list of (\fIname\fR, \fIimage\fR) pairs to generate code for a list of images into named variables\&.
+ \fBgdk\-pixbuf\-csource\fR either takes as input one image file name to generate code for, or, using the \fB\-\-build\-list\fR option, a list of (\fIname\fR, \fIimage\fR) pairs to generate code for a list of images into named variables\&.
 
 .SS "Options"
 
 .TP
-\fB--stream\fR
+\fB\-\-stream\fR
 Generate pixbuf data stream (a single string containing a serialized GdkPixdata structure in network byte order)\&.
 
 .TP
-\fB--struct\fR
-Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk-pixdata\&.h\fR)\&.
+\fB\-\-struct\fR
+Generate GdkPixdata structure (needs the GdkPixdata structure definition from \fIgdk\-pixdata\&.h\fR)\&.
 
 .TP
-\fB--macros\fR
+\fB\-\-macros\fR
 Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and *_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image\&.
 
 .TP
-\fB--rle\fR
-Enables run-length encoding for the generated pixel data (default)\&.
+\fB\-\-rle\fR
+Enables run\-length encoding for the generated pixel data (default)\&.
 
 .TP
-\fB--raw\fR
-Disables run-length encoding for the generated pixel data\&.
+\fB\-\-raw\fR
+Disables run\-length encoding for the generated pixel data\&.
 
 .TP
-\fB--extern\fR
+\fB\-\-extern\fR
 Generate extern symbols\&.
 
 .TP
-\fB--static\fR
+\fB\-\-static\fR
 Generate static symbols (default)\&.
 
 .TP
-\fB--decoder\fR
-Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition to decode run-length encoded image data\&.
+\fB\-\-decoder\fR
+Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition to decode run\-length encoded image data\&.
 
 .TP
-\fB--name=identifier\fR
-Specifies the identifier name (prefix) for the generated variables or macros (useful only if \fB--build-list\fR was not specified)\&.
+\fB\-\-name=identifier\fR
+Specifies the identifier name (prefix) for the generated variables or macros (useful only if \fB\-\-build\-list\fR was not specified)\&.
 
 .TP
-\fB--build-list\fR
+\fB\-\-build\-list\fR
 Enables (\fIname\fR, \fIimage\fR) pair parsing mode\&.
 
 .TP
-\fB-h\fR, \fB--help\fR
+\fB\-h\fR, \fB\-\-help\fR
 Print brief help and exit\&.
 
 .TP
-\fB-v\fR, \fB--version\fR
+\fB\-v\fR, \fB\-\-version\fR
 Print version and exit\&.
 
 .TP
-\fB--g-fatal-warnings\fR
+\fB\-\-g\-fatal\-warnings\fR
 Make warnings fatal (causes the program to abort)\&.
 
 .SH "SEE ALSO"
@@ -102,12 +106,12 @@ The GdkPixbuf documentation, shipped with the Gtk+ distribution, available from
 .SH "BUGS"
 
 .PP
-None known yet\&.
+The runlength encoder gets out of sync with the pixel boundaries, since it includes the rowstride padding in the encoded stream\&. Furthermore, it generates pixbufs with suboptimal rowstride in some cases\&.
 
 .SH "AUTHOR"
 
 .PP
- \fBgdk-pixbuf-csource\fR was written by Tim Janik <timj@gtk\&.org>\&.
+ \fBgdk\-pixbuf\-csource\fR was written by Tim Janik <timj@gtk\&.org>\&.
 
 .PP
 This manual page was provided by Tim Janik <timj@gtk\&.org>\&.

docs/reference/gdk/tmpl/dnd.sgml

@@ -213,3 +213,12 @@ should do with the dropped data.
 @time_: 
 
 
+<!-- ##### FUNCTION gdk_drag_drop_succeeded ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+

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

@@ -1639,6 +1639,15 @@ If the window shrinks automatically when widgets within it shrink.
 @notify_data: 
 @notify_func: 
 
+<!-- ##### FUNCTION gtk_action_group_translate_string ##### -->
+<para>
+
+</para>
+
+@action_group: 
+@string: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_arg_copy ##### -->
 <para>
 It will either copy data into an existing argument or allocate a new argument

docs/reference/gtk/tmpl/gtkaboutdialog.sgml

@@ -265,6 +265,7 @@ link is activated.
 
 @about: the #GtkAboutDialog in which the link was activated
 @link: the URL or email address to whiche the activated link points
+@data: 
 
 
 <!-- ##### FUNCTION gtk_about_dialog_set_email_hook ##### -->
@@ -273,6 +274,8 @@ link is activated.
 </para>
 
 @func: 
+@data: 
+@destroy: 
 @Returns: 
 
 
@@ -282,6 +285,8 @@ link is activated.
 </para>
 
 @func: 
+@data: 
+@destroy: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkaction.sgml

@@ -117,6 +117,11 @@ and should not be accessed directly.
 
 </para>
 
+<!-- ##### ARG GtkAction:visible-overflown ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkAction:visible-vertical ##### -->
 <para>
 
@@ -161,6 +166,15 @@ and should not be accessed directly.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_action_set_sensitive ##### -->
+<para>
+
+</para>
+
+@action: 
+@sensitive: 
+
+
 <!-- ##### FUNCTION gtk_action_is_visible ##### -->
 <para>
 
@@ -179,6 +193,15 @@ and should not be accessed directly.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_action_set_visible ##### -->
+<para>
+
+</para>
+
+@action: 
+@visible: 
+
+
 <!-- ##### FUNCTION gtk_action_activate ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkactiongroup.sgml

@@ -332,13 +332,3 @@ gtk_action_group_add_radio_actions() to construct groups of radio actions.
 @domain: 
 
 
-<!-- ##### FUNCTION gtk_action_group_translate_string ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@string: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcombobox.sgml

@@ -42,6 +42,11 @@ a widget used to choose from a list of items.
 
 </para>
 
+<!-- ##### ARG GtkComboBox:focus-on-click ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkComboBox:has-frame ##### -->
 <para>
 
@@ -314,3 +319,21 @@ a widget used to choose from a list of items.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_combo_box_set_focus_on_click ##### -->
+<para>
+
+</para>
+
+@combo: 
+@focus_on_click: 
+
+
+<!-- ##### FUNCTION gtk_combo_box_get_focus_on_click ##### -->
+<para>
+
+</para>
+
+@combo: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -38,6 +38,13 @@ The #GtkEntry-struct struct contains only private data.
 
 @entry: the object which received the signal.
 
+<!-- ##### SIGNAL GtkEntry::backspace ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+
 <!-- ##### SIGNAL GtkEntry::copy-clipboard ##### -->
 <para>
 
@@ -395,6 +402,26 @@ use gtk_editable_set_editable() instead.
 @y: 
 
 
+<!-- ##### FUNCTION gtk_entry_layout_index_to_text_index ##### -->
+<para>
+
+</para>
+
+@entry: 
+@layout_index: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_entry_text_index_to_layout_index ##### -->
+<para>
+
+</para>
+
+@entry: 
+@text_index: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_entry_get_max_length ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkfilechooser.sgml

@@ -550,6 +550,24 @@ class "GtkFileChooserDefault" binding "my-own-gtkfilechooser-bindings"
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_file_chooser_set_show_hidden ##### -->
+<para>
+
+</para>
+
+@chooser: 
+@show_hidden: 
+
+
+<!-- ##### FUNCTION gtk_file_chooser_get_show_hidden ##### -->
+<para>
+
+</para>
+
+@chooser: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_file_chooser_set_current_name ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml

@@ -9,13 +9,11 @@ GtkFileChooserButton
 
 </para>
 
-
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-
 <!-- ##### STRUCT GtkFileChooserButton ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtktextview.sgml

@@ -26,6 +26,13 @@ types related to the text widget and how they work together.
 </para>
 
 
+<!-- ##### SIGNAL GtkTextView::backspace ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+
 <!-- ##### SIGNAL GtkTextView::copy-clipboard ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtktreeview.sgml

@@ -191,6 +191,11 @@ linkend="GtkTreeModel">GtkTreeModel</link> interface.
 
 </para>
 
+<!-- ##### ARG GtkTreeView:hover-expand ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkTreeView:hover-selection ##### -->
 <para>
 
@@ -989,6 +994,24 @@ has some similarity to strcmp() returning 0 for equal strings.
 @hover: 
 
 
+<!-- ##### FUNCTION gtk_tree_view_get_hover_expand ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_tree_view_set_hover_expand ##### -->
+<para>
+
+</para>
+
+@tree_view: 
+@expand: 
+
+
 <!-- ##### USER_FUNCTION GtkTreeDestroyCountFunc ##### -->
 <para>
 

gdk-pixbuf/ChangeLog

@@ -1,3 +1,17 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
+	* abicheck.sh: Make work in make distcheck.
+
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* Makefile.am: Use the same prefix when creating 
+	gdk-pixbuf-marshal.c and gdk-pixbuf-marshal.h
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): _-prefix
+	the marshalers.
+
 2004-08-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_mime_type): Use

gdk-pixbuf/Makefile.am

@@ -40,10 +40,10 @@ uninstall-ms-lib:
 endif
 
 gdk_pixbuf.def: gdk-pixbuf.symbols
-	(echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk_pixbuf.def
+	(echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES $(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk_pixbuf.def
 
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
-	 ./makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h
+	 ./makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h
 
 if OS_UNIX
 TESTS = abicheck.sh
@@ -404,7 +404,7 @@ MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h
 # gdk-pixbuf-marshal.c
 #
 $(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-	(echo -e "#include \"gdk-pixbuf-alias.h\"" | $(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \
+	(echo -e "#include \"gdk-pixbuf-alias.h\"" | $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \
 	&& cp xgen-gmc gdk-pixbuf-marshal.c \
 	&& rm -f xgen-gmc xgen-gmc~
 

gdk-pixbuf/abicheck.sh

@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P gdk-pixbuf.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' | sort > expected-abi
 nm -D .libs/libgdk_pixbuf-2.0.so | grep " T " | cut -c12- | sort > actual-abi
-diff -u expected-abi actual-abi
+diff -u expected-abi actual-abi && rm expected-abi actual-abi

gdk-pixbuf/gdk-pixbuf-loader.c

@@ -135,7 +135,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GdkPixbufLoaderClass, size_prepared),
                               NULL, NULL,
-                              gdk_pixbuf_marshal_VOID__INT_INT,
+                              _gdk_pixbuf_marshal_VOID__INT_INT,
                               G_TYPE_NONE, 2, 
                               G_TYPE_INT,
                               G_TYPE_INT);
@@ -155,7 +155,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_prepared),
                               NULL, NULL,
-                              gdk_pixbuf_marshal_VOID__VOID,
+                              _gdk_pixbuf_marshal_VOID__VOID,
                               G_TYPE_NONE, 0);
 
         /**
@@ -178,7 +178,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_updated),
                               NULL, NULL,
-                              gdk_pixbuf_marshal_VOID__INT_INT_INT_INT,
+                              _gdk_pixbuf_marshal_VOID__INT_INT_INT_INT,
                               G_TYPE_NONE, 4,
                               G_TYPE_INT,
                               G_TYPE_INT,
@@ -200,7 +200,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GdkPixbufLoaderClass, closed),
                               NULL, NULL,
-                              gdk_pixbuf_marshal_VOID__VOID,
+                              _gdk_pixbuf_marshal_VOID__VOID,
                               G_TYPE_NONE, 0);
 }
 

gdk/Makefile.am

@@ -177,10 +177,10 @@ uninstall-ms-lib:
 endif
 
 gdk.def: gdk.symbols
-	(echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES gdk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk.def
+	(echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES $(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk.def
 
 gdkalias.h: gdk.symbols
-	 ./makegdkalias.pl <gdk.symbols > gdkalias.h
+	 ./makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh

gdk/abicheck.sh

@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DGDK_WINDOWING_X11 gdk.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' | sort > expected-abi
 nm -D .libs/libgdk-x11-2.0.so | grep " T " | cut -c12- | sort > actual-abi
-diff -u expected-abi actual-abi
+diff -u expected-abi actual-abi && rm expected-abi actual-abi

gtk/Makefile.am

@@ -71,10 +71,10 @@ uninstall-ms-lib:
 endif
 
 gtk.def: gtk.symbols
-	(echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gtk.def
+	(echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 $(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gtk.def
 
 gtkalias.h: gtk.symbols
-	  ./makegtkalias.pl < gtk.symbols > gtkalias.h
+	  ./makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh

gtk/abicheck.sh

@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 gtk.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' | sort > expected-abi
 nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -c12- | sort > actual-abi
-diff -u expected-abi actual-abi
+diff -u expected-abi actual-abi && rm expected-abi actual-abi

gtk/gtk.symbols

@@ -118,6 +118,8 @@ gtk_action_is_visible
 gtk_action_new
 gtk_action_set_accel_group
 gtk_action_set_accel_path
+gtk_action_set_sensitive
+gtk_action_set_visible
 gtk_action_unblock_activate_from
 gtk_adjustment_changed
 gtk_adjustment_clamp_page
@@ -429,6 +431,7 @@ gtk_combo_box_get_active_iter
 gtk_combo_box_get_active_text
 gtk_combo_box_get_add_tearoffs
 gtk_combo_box_get_column_span_column
+gtk_combo_box_get_focus_on_click
 gtk_combo_box_get_model
 gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_row_separator_func
@@ -447,6 +450,7 @@ gtk_combo_box_set_active
 gtk_combo_box_set_active_iter
 gtk_combo_box_set_add_tearoffs
 gtk_combo_box_set_column_span_column
+gtk_combo_box_set_focus_on_click
 gtk_combo_box_set_model
 gtk_combo_box_set_row_separator_func
 gtk_combo_box_set_row_span_column

gtk/gtkiconview.c

@@ -5073,7 +5073,7 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model,
   return;
 }
 
-gint
+static gint
 gtk_icon_view_accessible_item_compare (GtkIconViewItemAccessibleInfo *i1,
                                        GtkIconViewItemAccessibleInfo *i2)
 {
@@ -5618,7 +5618,7 @@ gtk_icon_view_accessible_get_type (void)
   return type;
 }
 
-AtkObject *
+static AtkObject *
 gtk_icon_view_accessible_new (GObject *obj)
 {
   AtkObject *accessible;

gtk/xdgmime/ChangeLog

@@ -1,3 +1,7 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
 Wed Aug 11 20:44:35 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* xdgmime.h (xdg_mime_shutdown): Add the XDG_PREFIX to
@@ -5,7 +9,7 @@ Wed Aug 11 20:44:35 2004  Matthias Clasen  <maclas@gmx.de>
 
 2004-08-01  Matthias Clasen  <mclasen@redhat.com>
 
-        * === Released 2.5.1 ===
+	* === Released 2.5.1 ===
 
 Tue Jul 20 22:24:35 2004  Matthias Clasen  <maclas@gmx.de>
 

po-properties/ChangeLog

@@ -1,17 +1,21 @@
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
 2004-08-16  Christian Rose  <menthos@menthos.com>
 
 	* bs.po: Added Bosnian translation by
 	Kenan Hadžiavdić <kenanh@frisurf.no>.
 
 2004-08-01  Matthias Clasen  <mclasen@redhat.com>
-                                                                                
-        * === Released 2.5.1 ===
-                                                                                
+
+	* === Released 2.5.1 ===
+
 2004-07-26  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Fix for #148437. Thanks to Robert Ögren for
 	discovering the problem.
-                                                                                
+
 2004-07-21  Christian Rose  <menthos@menthos.com>
 
 	* uz.po: Updated Uzbek translation by