*** empty log message ***

9 files changed, 32 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 72d894938..c6ca487fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-02  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/glib.symbols: Add new functions.
+
+	* glib/gconvert.c: Fix doc comment for 
+	g_get_filename_charsets().
+
 	* glib/gconvert.c (g_filename_display_name): New function to
 	convert a filename to a UTF-8 string for display purposes.
 	(g_get_filename_charsets): New function to return the 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72d894938..c6ca487fb 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-11-02  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/glib.symbols: Add new functions.
+
+	* glib/gconvert.c: Fix doc comment for 
+	g_get_filename_charsets().
+
 	* glib/gconvert.c (g_filename_display_name): New function to
 	convert a filename to a UTF-8 string for display purposes.
 	(g_get_filename_charsets): New function to return the 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 72d894938..c6ca487fb 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,10 @@
 2004-11-02  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/glib.symbols: Add new functions.
+
+	* glib/gconvert.c: Fix doc comment for 
+	g_get_filename_charsets().
+
 	* glib/gconvert.c (g_filename_display_name): New function to
 	convert a filename to a UTF-8 string for display purposes.
 	(g_get_filename_charsets): New function to return the 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 72d894938..c6ca487fb 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-11-02  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/glib.symbols: Add new functions.
+
+	* glib/gconvert.c: Fix doc comment for 
+	g_get_filename_charsets().
+
 	* glib/gconvert.c (g_filename_display_name): New function to
 	convert a filename to a UTF-8 string for display purposes.
 	(g_get_filename_charsets): New function to return the 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 72d894938..c6ca487fb 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-11-02  Matthias Clasen  <mclasen@redhat.com>
 
+	* glib/glib.symbols: Add new functions.
+
+	* glib/gconvert.c: Fix doc comment for 
+	g_get_filename_charsets().
+
 	* glib/gconvert.c (g_filename_display_name): New function to
 	convert a filename to a UTF-8 string for display purposes.
 	(g_get_filename_charsets): New function to return the 
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 9752ae28c..c0f41bd43 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -1010,7 +1010,7 @@ filename_charset_cache_free (gpointer data)
   g_free (cache);
 }
 
-/*
+/**
  * g_get_filename_charsets:
  * @charsets: return location for the %NULL-terminated list of encoding names
  *
@@ -1155,7 +1155,7 @@ void
 _g_convert_thread_init (void)
 {
   const gchar **dummy;
-  (void) get_filename_charsets (&dummy);
+  (void) g_get_filename_charsets (&dummy);
 }
 
 /**
diff --git a/glib/glib.symbols b/glib/glib.symbols
index fe47872e8..44c52958a 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -168,6 +168,7 @@ g_file_get_contents PRIVATE
 #ifdef G_OS_WIN32
 g_file_get_contents_utf8
 #endif
+g_filename_display_name
 g_filename_from_uri
 g_filename_from_utf8 PRIVATE
 #ifdef G_OS_WIN32
@@ -199,6 +200,7 @@ g_get_current_dir PRIVATE
 g_get_current_dir_utf8
 #endif
 g_get_current_time
+g_get_filename_charsets
 g_getenv
 g_get_home_dir PRIVATE
 #ifdef G_OS_WIN32
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index fb046568d..a0861851a 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -4,6 +4,8 @@
 
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* abicheck.sh: Strip Win32 specific defs file syntax.
+
 	* Makefile.am (gobjectalias.h): Fix srcdir != builddir 
 	builds.  (#156447, Thomas Fitzsimmons)
 
diff --git a/gobject/abicheck.sh b/gobject/abicheck.sh
index f560949e7..8a53bec18 100755
--- a/gobject/abicheck.sh
+++ b/gobject/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX ${srcdir:-.}/gobject.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P -DG_OS_UNIX ${srcdir:-.}/gobject.symbols | sed -e '/^$/d' -e 's/ PRIVATE$//' | sort > expected-abi
 nm -D .libs/libgobject-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
 diff -u expected-abi actual-abi && rm expected-abi actual-abi