Add hidden aliases for exported symbols which are used internally in order

Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>

	Add hidden aliases for exported symbols which are
	used internally in order to get rid of many PLT
	entries.  (#145519, Arjan van de Ven)

	* gtk/Makefile.am: Add rules to generate gtk.def and
	from gtk.symbols, and make make check check the abi
	with abicheck.sh.
	(gtk_private_h_sources): Add gtkinternals.h
	(gtk_built_private_headers): Add gtkalias.h
	(gtk_extra_sources): Add gtk.symbols
	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh

	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
	The file can be processed by cpp to filter out certain
	subsets of symbols.

	* gtk/abicheck.sh: New file. Script to check the actually
	symbols exported from libgtk-x11.2.0.so against the symbols
	found in gtk.symbols.

	* gtk/makegtkalias.pl: New file. Perl script to generate the
	header containing the alias definitions for internally used
	exported symbols from a list of symbols.

	* gtk/gtkinternals.h: New file. An uninstalled header listing
	symbols which must be exported for some reason and do not appear
	in any other header.

	* gtk/*.c: Include gtkalias.h

ChangeLog

@@ -1,3 +1,35 @@
+Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Add hidden aliases for exported symbols which are
+	used internally in order to get rid of many PLT 
+	entries.  (#145519, Arjan van de Ven)
+	
+	* gtk/Makefile.am: Add rules to generate gtk.def and 
+	from gtk.symbols, and make make check check the abi 
+	with abicheck.sh.
+	(gtk_private_h_sources): Add gtkinternals.h
+	(gtk_built_private_headers): Add gtkalias.h
+	(gtk_extra_sources): Add gtk.symbols
+	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
+
+	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
+	The file can be processed by cpp to filter out certain 
+	subsets of symbols.
+
+	* gtk/abicheck.sh: New file. Script to check the actually 
+	symbols exported from libgtk-x11.2.0.so against the symbols
+	found in gtk.symbols.
+
+	* gtk/makegtkalias.pl: New file. Perl script to generate the 
+	header containing the alias definitions for internally used 
+	exported symbols from a list of symbols.
+
+	* gtk/gtkinternals.h: New file. An uninstalled header listing
+	symbols which must be exported for some reason and do not appear
+	in any other header.
+
+	* gtk/*.c: Include gtkalias.h
+	
 Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.

ChangeLog.pre-2-10

@@ -1,3 +1,35 @@
+Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Add hidden aliases for exported symbols which are
+	used internally in order to get rid of many PLT 
+	entries.  (#145519, Arjan van de Ven)
+	
+	* gtk/Makefile.am: Add rules to generate gtk.def and 
+	from gtk.symbols, and make make check check the abi 
+	with abicheck.sh.
+	(gtk_private_h_sources): Add gtkinternals.h
+	(gtk_built_private_headers): Add gtkalias.h
+	(gtk_extra_sources): Add gtk.symbols
+	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
+
+	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
+	The file can be processed by cpp to filter out certain 
+	subsets of symbols.
+
+	* gtk/abicheck.sh: New file. Script to check the actually 
+	symbols exported from libgtk-x11.2.0.so against the symbols
+	found in gtk.symbols.
+
+	* gtk/makegtkalias.pl: New file. Perl script to generate the 
+	header containing the alias definitions for internally used 
+	exported symbols from a list of symbols.
+
+	* gtk/gtkinternals.h: New file. An uninstalled header listing
+	symbols which must be exported for some reason and do not appear
+	in any other header.
+
+	* gtk/*.c: Include gtkalias.h
+	
 Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.

ChangeLog.pre-2-6

@@ -1,3 +1,35 @@
+Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Add hidden aliases for exported symbols which are
+	used internally in order to get rid of many PLT 
+	entries.  (#145519, Arjan van de Ven)
+	
+	* gtk/Makefile.am: Add rules to generate gtk.def and 
+	from gtk.symbols, and make make check check the abi 
+	with abicheck.sh.
+	(gtk_private_h_sources): Add gtkinternals.h
+	(gtk_built_private_headers): Add gtkalias.h
+	(gtk_extra_sources): Add gtk.symbols
+	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
+
+	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
+	The file can be processed by cpp to filter out certain 
+	subsets of symbols.
+
+	* gtk/abicheck.sh: New file. Script to check the actually 
+	symbols exported from libgtk-x11.2.0.so against the symbols
+	found in gtk.symbols.
+
+	* gtk/makegtkalias.pl: New file. Perl script to generate the 
+	header containing the alias definitions for internally used 
+	exported symbols from a list of symbols.
+
+	* gtk/gtkinternals.h: New file. An uninstalled header listing
+	symbols which must be exported for some reason and do not appear
+	in any other header.
+
+	* gtk/*.c: Include gtkalias.h
+	
 Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.

ChangeLog.pre-2-8

@@ -1,3 +1,35 @@
+Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>
+
+	Add hidden aliases for exported symbols which are
+	used internally in order to get rid of many PLT 
+	entries.  (#145519, Arjan van de Ven)
+	
+	* gtk/Makefile.am: Add rules to generate gtk.def and 
+	from gtk.symbols, and make make check check the abi 
+	with abicheck.sh.
+	(gtk_private_h_sources): Add gtkinternals.h
+	(gtk_built_private_headers): Add gtkalias.h
+	(gtk_extra_sources): Add gtk.symbols
+	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
+
+	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
+	The file can be processed by cpp to filter out certain 
+	subsets of symbols.
+
+	* gtk/abicheck.sh: New file. Script to check the actually 
+	symbols exported from libgtk-x11.2.0.so against the symbols
+	found in gtk.symbols.
+
+	* gtk/makegtkalias.pl: New file. Perl script to generate the 
+	header containing the alias definitions for internally used 
+	exported symbols from a list of symbols.
+
+	* gtk/gtkinternals.h: New file. An uninstalled header listing
+	symbols which must be exported for some reason and do not appear
+	in any other header.
+
+	* gtk/*.c: Include gtkalias.h
+	
 Mon Aug  9 11:49:46 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkmain.c: Only undef gtk_init_check and gtk_init on win32.

gtk/Makefile.am

@@ -70,6 +70,16 @@ install-ms-lib:
 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
+
+gtkalias.h: gtk.symbols
+	 cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DINCLUDE_INTERNAL_SYMBOLS gtk.symbols | ./makegtkalias.pl > gtkalias.h
+
+if OS_UNIX
+TEST = abicheck.sh
+endif
+
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
@@ -284,6 +294,7 @@ gtk_private_h_sources =         \
 	gtkfilechooserutils.h	\
 	gtkfilesystemunix.h	\
 	gtkfilesystemmodel.h	\
+	gtkinternals.h		\
 	gtkpathbar.h		\
 	gtkrbtree.h 		\
 	gtktextbtree.h		\
@@ -523,10 +534,11 @@ gtk_built_public_sources =			\
 	gtkmarshal.h				\
 	gtktypebuiltins.h
 
+# built sources that don't get installed
 gtk_built_private_headers =			\
+	gtkalias.h				\
 	gtkmarshalers.h
 
-# built sources that don't get installed
 gtk_built_sources =				\
 	gtktypebuiltins.c			\
 	gtkmarshalers.c				\
@@ -544,6 +556,7 @@ stamp_files =					\
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
 gtk_extra_sources =				\
+	gtk.symbols				\
 	gtkversion.h.in				\
 	gtkmarshalers.list			\
 	gtkmarshal.list
@@ -610,7 +623,7 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
 	&& echo timestamp > $(@F)
 gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
 	( cd $(srcdir) && glib-mkenums \
-			--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
+			--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtkalias.h\"\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
 			--fprod "\n/* enumerations from \"@filename@\" */" \
 			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
 			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
@@ -711,7 +724,9 @@ EXTRA_DIST +=                   \
 	gtkrc.key.default	\
 	gtkrc.key.emacs		\
 	makefile.msc		\
-	makefile.msc.in
+	makefile.msc.in		\
+	makegtkalias.pl		\
+	abicheck.sh
 
 install-data-local:
 

gtk/abicheck.sh

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

gtk/fnmatch.c

@@ -41,6 +41,8 @@
 #define _GNU_SOURCE
 #endif
 
+#include "gtkalias.h"
+
 static gunichar
 get_char (const char **str)
 {

gtk/gtkaboutdialog.c

@@ -31,8 +31,10 @@
 #include <config.h>
 
 #include <gdk/gdkkeysyms.h>
-#include "gtkaboutdialog.h"
 
+#include "gtkalias.h"
+
+#include "gtkaboutdialog.h"
 #include "gtkbutton.h"
 #include "gtkbbox.h"
 #include "gtkdialog.h"

gtk/gtkaccelgroup.c

@@ -28,6 +28,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "gtkalias.h"
 #include "gtkaccelgroup.h"
 #include "gtkaccelmap.h"
 #include "gtkmain.h"		/* For _gtk_boolean_handled_accumulator */

gtk/gtkaccellabel.c

@@ -30,6 +30,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
 #include "gtkmain.h"

gtk/gtkaccelmap.c

@@ -19,6 +19,7 @@
 
 #include <config.h>
 
+#include "gtkalias.h"
 #include "gtkaccelmap.h"
 
 #include "gtkmarshalers.h"

gtk/gtkaccessible.c

@@ -20,6 +20,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkwidget.h"
 #include "gtkaccessible.h"
 

gtk/gtkaction.c

@@ -30,6 +30,7 @@
 
 #include <config.h>
 
+#include "gtkalias.h"
 #include "gtkaction.h"
 #include "gtkactiongroup.h"
 #include "gtkaccellabel.h"

gtk/gtkactiongroup.c

@@ -30,6 +30,7 @@
 
 #include <config.h>
 
+#include "gtkalias.h"
 #include "gtkactiongroup.h"
 #include "gtkstock.h"
 #include "gtktoggleaction.h"

gtk/gtkadjustment.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"

gtk/gtkalignment.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkalignment.h"
 #include "gtkintl.h"
 

gtk/gtkarrow.c

@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <math.h>
+#include "gtkalias.h"
 #include "gtkarrow.h"
 #include "gtkintl.h"
 

gtk/gtkaspectframe.c

@@ -30,6 +30,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkaspectframe.h"
 #include "gtkintl.h"
 

gtk/gtkbbox.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkbbox.h"
 #include "gtkintl.h"
 

gtk/gtkbin.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkbin.h"
 
 

gtk/gtkbindings.c

@@ -31,6 +31,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <gdkkeysyms.h>
+#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkkeyhash.h"
 #include "gtkwidget.h"

gtk/gtkbox.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkbox.h"
 #include "gtkintl.h"
 

gtk/gtkbutton.c

@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <string.h>
+#include "gtkalias.h"
 #include "gtkalignment.h"
 #include "gtkbutton.h"
 #include "gtklabel.h"

gtk/gtkcalendar.c

@@ -39,6 +39,7 @@
 #include <time.h>
 #include <glib/gprintf.h>
 
+#include "gtkalias.h"
 #include "gtkcalendar.h"
 #include "gtkdnd.h"
 #include "gtkintl.h"

gtk/gtkcelleditable.c

@@ -19,6 +19,7 @@
 
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcelleditable.h"
 #include "gtkmarshalers.h"
 

gtk/gtkcelllayout.c

@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcelllayout.h"
 
 GType

gtk/gtkcellrenderer.c

@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcellrenderer.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"

gtk/gtkcellrenderercombo.c

@@ -20,6 +20,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkintl.h"
 #include "gtkbin.h"
 #include "gtkentry.h"

gtk/gtkcellrendererpixbuf.c

@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include "gtkalias.h"
 #include "gtkcellrendererpixbuf.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"

gtk/gtkcellrendererprogress.c

@@ -27,6 +27,8 @@
 
 #include "config.h"
 #include <stdlib.h>
+
+#include "gtkalias.h"
 #include "gtkcellrendererprogress.h"
 #include "gtkintl.h"
 

gtk/gtkcellrenderertext.c

@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include "gtkalias.h"
 #include "gtkcellrenderertext.h"
 #include "gtkeditable.h"
 #include "gtkentry.h"

gtk/gtkcellrenderertoggle.c

@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include "gtkalias.h"
 #include "gtkcellrenderertoggle.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"

gtk/gtkcellview.c

@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcellview.h"
 #include "gtkcelllayout.h"
 #include "gtkintl.h"

gtk/gtkcheckbutton.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcheckbutton.h"
 #include "gtkintl.h"
 #include "gtklabel.h"

gtk/gtkcheckmenuitem.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcheckmenuitem.h"
 #include "gtkaccellabel.h"
 #include "gtkintl.h"

gtk/gtkclipboard.c

@@ -22,6 +22,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkclipboard.h"
 #include "gtkinvisible.h"
 #include "gtkmain.h"

gtk/gtkclist.c

@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkclist.h"
 #include "gtkbindings.h"

gtk/gtkcolorbutton.c

@@ -30,6 +30,7 @@
 
 #include <config.h>
 
+#include "gtkalias.h"
 #include "gtkcolorbutton.h"
 #include "gdk/gdkkeysyms.h"
 #include "gdk-pixbuf/gdk-pixbuf.h"

gtk/gtkcolorsel.c

@@ -29,6 +29,7 @@
 #include "gdkconfig.h"
 #include <math.h>
 
+#include "gtkalias.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkcolorsel.h"
 #include "gtkhsv.h"

gtk/gtkcolorseldialog.c

@@ -25,6 +25,7 @@
  */
 #include <config.h>
 #include <glib.h>
+#include "gtkalias.h"
 #include "gtkcolorseldialog.h"
 #include "gtkframe.h"
 #include "gtkhbbox.h"

gtk/gtkcombo.c

@@ -33,6 +33,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkarrow.h"
 #include "gtklabel.h"
 #include "gtklist.h"

gtk/gtkcombobox.c

@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcombobox.h"
 
 #include "gtkarrow.h"

gtk/gtkcomboboxentry.c

@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkcomboboxentry.h"
 #include "gtkcelllayout.h"
 

gtk/gtkcontainer.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkprivate.h"
 #include "gtkmain.h"

gtk/gtkctree.c

@@ -33,6 +33,7 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include "gtkalias.h"
 #include "gtkctree.h"
 #include "gtkbindings.h"
 #include "gtkmain.h"

gtk/gtkcurve.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <math.h>
 
+#include "gtkalias.h"
 #include "gtkcurve.h"
 #include "gtkdrawingarea.h"
 #include "gtkmain.h"

gtk/gtkdialog.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkbutton.h"
 #include "gtkdialog.h"
 #include "gtkhbbox.h"

gtk/gtkdnd.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gdkconfig.h"
 
 #include "gdk/gdkkeysyms.h"

gtk/gtkdrawingarea.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkdrawingarea.h"
 
 

gtk/gtkeditable.c

@@ -27,6 +27,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkeditable.h"
 #include "gtkmarshalers.h"
 

gtk/gtkentry.c

@@ -30,6 +30,7 @@
 #include <pango/pango.h>
 
 #include "gdk/gdkkeysyms.h"
+#include "gtkalias.h"
 #include "gtkbindings.h"
 #include "gtkcelleditable.h"
 #include "gtkclipboard.h"
@@ -4156,7 +4157,7 @@ gtk_entry_layout_index_to_text_index (GtkEntry *entry,
  * @entry: a #GtkEntry
  * @text_index: byte index into the entry contents
  * 
- * Converts from a position in the entry's #PangoLayout(returned by
+ * Converts from a position in the entry's #PangoLayout (returned by
  * gtk_entry_get_layout()) to a position in the entry contents
  * (returned by gtk_entry_get_text()).
  * 

gtk/gtkentrycompletion.c

@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkentrycompletion.h"
 #include "gtkentryprivate.h"
 #include "gtkcelllayout.h"

gtk/gtkeventbox.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkeventbox.h"
 #include "gtkintl.h"
 

gtk/gtkexpander.c

@@ -23,6 +23,7 @@
 
 #include <config.h>
 
+#include "gtkalias.h"
 #include "gtkexpander.h"
 
 #include "gtklabel.h"

gtk/gtkfilechooser.c

@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfilechooser.h"
 #include "gtkfilechooserprivate.h"
 #include "gtkfilesystem.h"

gtk/gtkfilechooserdefault.c

@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include "gdk/gdkkeysyms.h"
+#include "gtkalias.h"
 #include "gtkalignment.h"
 #include "gtkbindings.h"
 #include "gtkbutton.h"

gtk/gtkfilechooserdialog.c

@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfilechooserdialog.h"
 #include "gtkfilechooserwidget.h"
 #include "gtkfilechooserutils.h"

gtk/gtkfilechooserembed.c

@@ -1,4 +1,5 @@
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfilechooserembed.h"
 #include "gtkmarshalers.h"
 

gtk/gtkfilechooserentry.c

@@ -21,6 +21,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"

gtk/gtkfilechooserutils.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfilechooserutils.h"
 #include "gtkfilechooser.h"
 #include "gtkfilesystem.h"

gtk/gtkfilechooserwidget.c

@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfilechooserwidget.h"
 #include "gtkfilechooserdefault.h"
 #include "gtkfilechooserutils.h"

gtk/gtkfilefilter.c

@@ -21,6 +21,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkfilefilter.h"
 #include "gtkobject.h"
 #include "gtkprivate.h"

gtk/gtkfilesel.c

@@ -55,6 +55,7 @@
 #endif
 
 #include "gdk/gdkkeysyms.h"
+#include "gtkalias.h"
 #include "gtkbutton.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"

gtk/gtkfilesystem.c

@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <gmodule.h>
+#include "gtkalias.h"
 #include "gtkfilesystem.h"
 #include "gtkicontheme.h"
 #include "gtkmain.h"

gtk/gtkfilesystemmodel.c

@@ -21,6 +21,7 @@
 #include <config.h>
 #include <string.h>
 
+#include "gtkalias.h"
 #include "gtkfilesystemmodel.h"
 #include "gtkfilesystem.h"
 #include "gtkintl.h"

gtk/gtkfilesystemunix.c

@@ -20,6 +20,7 @@
 
 #include <config.h>
 
+#include "gtkalias.h"
 #include "gtkfilesystem.h"
 #include "gtkfilesystemunix.h"
 #include "gtkicontheme.h"

gtk/gtkfilesystemwin32.c

@@ -20,6 +20,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfilesystem.h"
 #include "gtkfilesystemwin32.h"
 #include "gtkintl.h"

gtk/gtkfixed.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkfixed.h"
 #include "gtkintl.h"
 

gtk/gtkfontbutton.c

@@ -28,6 +28,7 @@
 
 #include <config.h>
 
+#include "gtkalias.h"
 #include "gtkfontbutton.h"
 
 #include "gtksignal.h"

gtk/gtkfontsel.c

@@ -39,6 +39,7 @@
 #include "gdk/gdk.h"
 #include "gdk/gdkkeysyms.h"
 
+#include "gtkalias.h"
 #include "gtkfontsel.h"
 
 #include "gtkbutton.h"

gtk/gtkframe.c

@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <string.h>
+#include "gtkalias.h"
 #include "gtkframe.h"
 #include "gtklabel.h"
 #include "gtkintl.h"

gtk/gtkgamma.c

@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "gtkalias.h"
 #include "gtkgamma.h"
 #include "gtkcurve.h"
 #include "gtkdialog.h"

gtk/gtkgc.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkgc.h"
 
 

gtk/gtkhandlebox.c

@@ -27,6 +27,7 @@
 
 #include <config.h>
 #include <stdlib.h>
+#include "gtkalias.h"
 #include "gtkhandlebox.h"
 #include "gtkinvisible.h"
 #include "gtkmain.h"
@@ -274,7 +275,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
 		  GTK_TYPE_WIDGET);
 }
 
-GtkHandleBoxPrivate *
+static GtkHandleBoxPrivate *
 gtk_handle_box_get_private (GtkHandleBox *hb)
 {
   GtkHandleBoxPrivate *private;

gtk/gtkhbbox.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkhbbox.h"
 
 

gtk/gtkhbox.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkhbox.h"
 
 

gtk/gtkhpaned.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkhpaned.h"
 
 static void     gtk_hpaned_class_init     (GtkHPanedClass *klass);

gtk/gtkhruler.c

@@ -28,6 +28,7 @@
 #include <math.h>
 #include <glib/gprintf.h>
 #include <string.h>
+#include "gtkalias.h"
 #include "gtkhruler.h"
 
 

gtk/gtkhscale.c

@@ -28,6 +28,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "gtkalias.h"
 #include "gtkhscale.h"
 #include "gtkintl.h"
 

gtk/gtkhscrollbar.c

@@ -26,6 +26,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkhscrollbar.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkintl.h"

gtk/gtkhseparator.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkhseparator.h"
 
 

gtk/gtkhsv.c

@@ -25,6 +25,7 @@
 #include <config.h>
 #include <math.h>
 #include <string.h>
+#include "gtkalias.h"
 #include "gtkhsv.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"

gtk/gtkiconfactory.c

@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
+#include "gtkalias.h"
 #include <pango/pango-utils.h>	/* For pango_scan_* */
 #include "gtkiconfactory.h"
 #include "stock-icons/gtkstockpixbufs.h"
@@ -38,6 +39,7 @@
 #include "gtkwidget.h"
 #include "gtkintl.h"
 
+
 static GSList *all_icon_factories = NULL;
 
 typedef enum {

gtk/gtkicontheme.c

@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
+#include "gtkalias.h"
 
 #ifdef G_OS_WIN32
 #ifndef S_ISDIR
@@ -40,6 +41,8 @@
 #include "gtksettings.h"
 #include "gtkprivate.h"
 
+
+
 #define DEFAULT_THEME_NAME "hicolor"
 
 typedef struct _GtkIconData GtkIconData;

gtk/gtkiconthemeparser.c

@@ -23,8 +23,11 @@
 #include <locale.h>
 #include <stdlib.h>
 
+#include "gtkalias.h"
 #include "gtkiconthemeparser.h"
 
+
+
 typedef struct _GtkIconThemeFileSection GtkIconThemeFileSection;
 typedef struct _GtkIconThemeFileLine GtkIconThemeFileLine;
 typedef struct _GtkIconThemeFileParser GtkIconThemeFileParser;

gtk/gtkiconview.c

@@ -22,6 +22,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "gtkalias.h"
 #include "gtkiconview.h"
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"

gtk/gtkimage.c

@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <math.h>
+#include "gtkalias.h"
 #include "gtkcontainer.h"
 #include "gtkimage.h"
 #include "gtkiconfactory.h"
@@ -33,6 +34,8 @@
 #include "gtkintl.h"
 #include <string.h>
 
+
+
 #define DEFAULT_ICON_SIZE GTK_ICON_SIZE_BUTTON
 
 static void gtk_image_class_init   (GtkImageClass  *klass);

gtk/gtkimagemenuitem.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkimagemenuitem.h"
 #include "gtkaccellabel.h"
 #include "gtkintl.h"

gtk/gtkimcontext.c

@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <string.h>
-
+#include "gtkalias.h"
 #include "gtkimcontext.h"
 #include "gtkmain.h"		/* For _gtk_boolean_handled_accumulator */
 #include "gtkmarshalers.h"

gtk/gtkimcontextsimple.c

@@ -21,6 +21,7 @@
 #include <stdlib.h>
 
 #include <gdk/gdkkeysyms.h>
+#include "gtkalias.h"
 #include "gtkaccelgroup.h"
 #include "gtkimcontextsimple.h"
 

gtk/gtkimmodule.c

@@ -34,6 +34,7 @@
 
 #include <gmodule.h>
 #include <pango/pango-utils.h>
+#include "gtkalias.h"
 #include "gtkimmodule.h"
 #include "gtkimcontextsimple.h"
 #include "gtkrc.h"

gtk/gtkimmulticontext.c

@@ -22,6 +22,7 @@
 #include <string.h>
 #include <locale.h>
 
+#include "gtkalias.h"
 #include "gtkimmulticontext.h"
 #include "gtkimmodule.h"
 #include "gtkmain.h"

gtk/gtkinputdialog.c

@@ -35,6 +35,7 @@
 #include <config.h>
 #include <glib/gprintf.h>
 #include <stdlib.h>
+#include "gtkalias.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkbutton.h"
 #include "gtkentry.h"
@@ -149,7 +150,7 @@ gtk_input_dialog_get_type (void)
   return input_dialog_type;
 }
 
-GtkInputDialogPrivate *
+static GtkInputDialogPrivate *
 gtk_input_dialog_get_private (GtkInputDialog *input_dialog)
 {
   GtkInputDialogPrivate *private;

gtk/gtkinternals.h

@@ -0,0 +1,41 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#ifndef __GTK_INTERNALS_H__
+#define __GTK_INTERNALS_H__
+
+/* Uninstalled header defining types and functions internal to GDK */
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+GType gtk_im_module_get_type (void);
+GType gtk_file_system_module_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GTK_INTERNALS_H__ */

gtk/gtkinvisible.c

@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include <gdk/gdk.h>
+#include "gtkalias.h"
 #include "gtkinvisible.h"
 #include "gtkintl.h"
 

gtk/gtkitem.c

@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkitem.h"
 #include "gtkmarshalers.h"
 

gtk/gtkitemfactory.c

@@ -29,6 +29,7 @@
 
 #include	<config.h>
 
+#include 	"gtkalias.h"
 #include	"gtkitemfactory.h"
 #include	"gtk/gtkmenubar.h"
 #include	"gtk/gtkmenu.h"

gtk/gtkkeyhash.c

@@ -19,6 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <config.h>
+#include "gtkalias.h"
 #include "gtkdebug.h"
 #include "gtkkeyhash.h"