diff --git a/ChangeLog b/ChangeLog index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4d25d64dd..65ed42cab 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,27 @@ +Mon Oct 16 11:11:06 2000 Tim Janik + + * configure.in: up version number to 1.2.9, interface 9, binary 9. + + * gstrfuncs.c (g_printf_string_upper_bound): added patchy hack to + pad us around segfaults for usages of '\'' in decimal conversions. + applied patch from jody: + +2000-10-15 Jody Goldberg + + * gstrfuncs.c (g_printf_string_upper_bound) : Add 'G' as a valid + character. + +Sun Aug 6 20:06:02 2000 Tim Janik + + * gmessages.c (g_log_domain_check_free): keep *last updated while + running through the domain list, so we don't screw up the removal, + patch provided by Gady Kozma . + +Sun Aug 6 20:03:41 2000 Tim Janik + + * gmessages.c (g_log_remove_handler): keep *last updated while running + through the handler list, so we don't screw up the removal. + 2000-09-30 Martin Baulig * glib.pc.in, gmodule.pc.in, gthread.pc.in: Provide diff --git a/configure.in b/configure.in index 3f023a427..c51d4b269 100644 --- a/configure.in +++ b/configure.in @@ -33,9 +33,9 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl # GLIB_MAJOR_VERSION=1 GLIB_MINOR_VERSION=2 -GLIB_MICRO_VERSION=8 -GLIB_INTERFACE_AGE=8 -GLIB_BINARY_AGE=8 +GLIB_MICRO_VERSION=9 +GLIB_INTERFACE_AGE=9 +GLIB_BINARY_AGE=9 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION dnl AC_DIVERT_POP()dnl diff --git a/glib/gmessages.c b/glib/gmessages.c index fe569b49d..9c75c4de6 100644 --- a/glib/gmessages.c +++ b/glib/gmessages.c @@ -175,7 +175,8 @@ g_log_domain_check_free (GLogDomain *domain) g_free (domain); break; } - work = work->next; + last = work; + work = last->next; } g_mutex_unlock (g_messages_lock); } @@ -313,7 +314,8 @@ g_log_remove_handler (const gchar *log_domain, g_log_domain_check_free (domain); return; } - work = work->next; + last = work; + work = last->next; } } g_warning ("g_log_remove_handler(): could not find handler with id `%d' for domain \"%s\"", diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 68ac1e8c5..bdf0f8649 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -849,6 +849,9 @@ g_printf_string_upper_bound (const gchar* format, long_int = TRUE; extra_long = TRUE; break; + case '\'': + len += 64; + break; case 's': string_arg = va_arg (args, char *); if (string_arg) @@ -891,6 +894,7 @@ g_printf_string_upper_bound (const gchar* format, case 'E': case 'f': case 'g': + case 'G': #ifdef HAVE_LONG_DOUBLE if (extra_long) (void) va_arg (args, long double); diff --git a/gmessages.c b/gmessages.c index fe569b49d..9c75c4de6 100644 --- a/gmessages.c +++ b/gmessages.c @@ -175,7 +175,8 @@ g_log_domain_check_free (GLogDomain *domain) g_free (domain); break; } - work = work->next; + last = work; + work = last->next; } g_mutex_unlock (g_messages_lock); } @@ -313,7 +314,8 @@ g_log_remove_handler (const gchar *log_domain, g_log_domain_check_free (domain); return; } - work = work->next; + last = work; + work = last->next; } } g_warning ("g_log_remove_handler(): could not find handler with id `%d' for domain \"%s\"", diff --git a/gstrfuncs.c b/gstrfuncs.c index 68ac1e8c5..bdf0f8649 100644 --- a/gstrfuncs.c +++ b/gstrfuncs.c @@ -849,6 +849,9 @@ g_printf_string_upper_bound (const gchar* format, long_int = TRUE; extra_long = TRUE; break; + case '\'': + len += 64; + break; case 's': string_arg = va_arg (args, char *); if (string_arg) @@ -891,6 +894,7 @@ g_printf_string_upper_bound (const gchar* format, case 'E': case 'f': case 'g': + case 'G': #ifdef HAVE_LONG_DOUBLE if (extra_long) (void) va_arg (args, long double);