Strip the prefix "IA__" from function names, since that is what GTK+ uses

2004-09-09  Matthias Clasen  <mclasen@redhat.com>

	* glib/gmessages.c (g_return_if_fail_warning): Strip the
	prefix "IA__" from function names, since that is what
	GTK+ uses for the PLT-reduction aliases.

diff --git a/ChangeLog b/ChangeLog
index d92f9eb7c313ae7b4f854f9302a2560e69fee0de..cfe668bdb1a63a3f88de02f4544e98c90cc7d44b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmessages.c (g_return_if_fail_warning): Strip the
+       prefix "IA__" from function names, since that is what
+       GTK+ uses for the PLT-reduction aliases. 
+
 Thu Sep  9 13:52:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmessages.c (g_return_if_fail_warning): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d92f9eb7c313ae7b4f854f9302a2560e69fee0de..cfe668bdb1a63a3f88de02f4544e98c90cc7d44b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmessages.c (g_return_if_fail_warning): Strip the
+       prefix "IA__" from function names, since that is what
+       GTK+ uses for the PLT-reduction aliases. 
+
 Thu Sep  9 13:52:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmessages.c (g_return_if_fail_warning): 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d92f9eb7c313ae7b4f854f9302a2560e69fee0de..cfe668bdb1a63a3f88de02f4544e98c90cc7d44b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2004-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmessages.c (g_return_if_fail_warning): Strip the
+       prefix "IA__" from function names, since that is what
+       GTK+ uses for the PLT-reduction aliases. 
+
 Thu Sep  9 13:52:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmessages.c (g_return_if_fail_warning): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d92f9eb7c313ae7b4f854f9302a2560e69fee0de..cfe668bdb1a63a3f88de02f4544e98c90cc7d44b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmessages.c (g_return_if_fail_warning): Strip the
+       prefix "IA__" from function names, since that is what
+       GTK+ uses for the PLT-reduction aliases. 
+
 Thu Sep  9 13:52:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmessages.c (g_return_if_fail_warning): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d92f9eb7c313ae7b4f854f9302a2560e69fee0de..cfe668bdb1a63a3f88de02f4544e98c90cc7d44b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-09-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmessages.c (g_return_if_fail_warning): Strip the
+       prefix "IA__" from function names, since that is what
+       GTK+ uses for the PLT-reduction aliases. 
+
 Thu Sep  9 13:52:26 2004  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmessages.c (g_return_if_fail_warning): 

diff --git a/glib/gmessages.c b/glib/gmessages.c
index da1d93947aed0ef6363560574dac1c71980d557f..8e33e080aec7b11afcff6366e11f828eacc291d0 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -565,6 +565,12 @@ g_return_if_fail_warning (const char *log_domain,
                          const char *pretty_function,
                          const char *expression)
 {
+  /*
+   * Omit the prefix used by the PLT-reduction
+   * technique used in GTK+. 
+   */
+  if (g_str_has_prefix (pretty_function, "IA__"))
+    pretty_function += 4;
   g_log (log_domain,
         G_LOG_LEVEL_CRITICAL,
         "%s: assertion `%s' failed",