diff -Nru --exclude reference --exclude po glib2.0-2.24.0/ChangeLog glib2.0-2.24.1/ChangeLog --- glib2.0-2.24.0/ChangeLog 2010-03-26 17:50:28.000000000 +0100 +++ glib2.0-2.24.1/ChangeLog 2010-05-03 03:23:26.000000000 +0200 @@ -1,3 +1,336 @@ +commit 87e4516650bb0f01033268e3f7f77ecd5d4cab2a +Author: Matthias Clasen +Date: Sun May 2 20:56:24 2010 -0400 + + Updates + + NEWS | 23 +++++++++++++++++++++++ + 1 files changed, 23 insertions(+), 0 deletions(-) + +commit 503949b12d100ff2d89b8bbb1771729f8a251688 +Author: Behdad Esfahbod +Date: Thu Apr 22 19:48:13 2010 -0400 + + Bug 615379 - g_new macros crash if sizeof(struct_type) == 0 + (cherry picked from commit 00a7c2e635a4fa95257779c271f0eaa5992e2b37) + + glib/gmem.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit f2b4060717dc4bd63b21a6c1d554fe06ece59de7 +Author: Colin Walters +Date: Wed Apr 21 16:44:26 2010 -0400 + + Fix typo in GMutex error message + (cherry picked from commit 0d9a40b8943ec3b9926efad93a28687708cc2038) + + gthread/gthread-impl.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e7a7d6873cb49f6c8bba5c2a5d078dbe607d62bd +Author: Ryan Lortie +Date: Thu Apr 15 10:11:30 2010 -0400 + + g_string_append_len() accept NULL with length == 0 + (cherry picked from commit 056326c1e96db2c2101fa320062e0c9146f0d73f) + + glib/gstring.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 7fb9b876fa6ec63c05df1c5e441bcc87e48397e2 +Author: Ryan Lortie +Date: Wed Apr 14 23:35:56 2010 -0400 + + GVariant: fix for g_variant_iter_loop() + (cherry picked from commit d17f4bee175cd9149d5f2b1ed1ae6d262d6a1394) + + glib/gvariant.c | 14 +++++++++----- + 1 files changed, 9 insertions(+), 5 deletions(-) + +commit e61a90b9eea2eac924f66c1d137381daff6cedfd +Author: Benjamin Otte +Date: Fri Mar 26 20:37:09 2010 +0100 + + Fix race in g_cancellable_cancel() + + We need to check priv->cancelled after taking the lock. Previously we + only checked it just before taking the lock, which left a small chance + for a race. + (cherry picked from commit e7763678b56e3be073cc55d707a6e92fc2055ee0) + + gio/gcancellable.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit c25c40fdd9be7612882c4d3162d3bf3917ee2e6d +Author: Benjamin Otte +Date: Fri Mar 26 20:36:10 2010 +0100 + + Remove unneccessary variable from g_cancellable_cancel() + + The variable makes a complicated function even more complicated. + (cherry picked from commit 5527a2ac2ce2b5bea10867fb2e39d2f1914cfbe6) + + gio/gcancellable.c | 25 ++++++++++--------------- + 1 files changed, 10 insertions(+), 15 deletions(-) + +commit b28b1e589e0464bb92aef75e7b03797410a7ec56 +Author: Carles Ferrando +Date: Fri Apr 23 00:42:04 2010 +0200 + + Updated Catalan (Valencian) translation + + po/ca@valencia.po | 1252 + +++++++++++++++++++++++++++-------------------------- + 1 files changed, 636 insertions(+), 616 deletions(-) + +commit d4f50a33d46e61fe065a1cdfc266159d4a612197 +Author: Shankar Prasad +Date: Thu Apr 22 16:21:42 2010 +0530 + + Updated Kannada translations + + po/kn.po | 1025 + +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 517 insertions(+), 508 deletions(-) + +commit f54c7f9c7736247b113bb643ac7e90150d8dd1b8 +Author: Javier Jardón +Date: Tue Apr 20 01:04:31 2010 +0200 + + [docs] Fix G_VALUE_COLLECT_INIT documentation + + Add the documentation to the corresponding section + + This macro was introduced in + commit 546fc0ca331c8d1b3393fe218a697b6a1a1c1072 + + docs/reference/gobject/gobject-sections.txt | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 324f928af62d8a0aa132a5caaec107d4daa76429 +Author: David Zeuthen +Date: Mon Apr 19 10:42:42 2010 -0400 + + Bug 615111 – GAsyncInitable's default implementation is broken + + Signed-off-by: David Zeuthen + + gio/gasyncinitable.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e51ec13ab4bc629f73b41f2ad3e96b3a787a8760 +Author: Ryan Lortie +Date: Sat Apr 10 22:01:02 2010 -0400 + + Add g_return_if_fail()s to g_variant_new_from_data() + + also, document that @type must be definite + + glib/gvariant.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit 48cfffc7b185f3e3367bac0beb04e66f536ec25d +Author: Jordi Serratosa +Date: Fri Apr 2 14:03:16 2010 +0200 + + Fixes to Catalan translation + + po/ca.po | 958 + +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 482 insertions(+), 476 deletions(-) + +commit 634fdaa4ba91ee49fa95f5f62e045f0901ae4e4f +Author: Theppitak Karoonboonyanan +Date: Tue Apr 6 14:41:11 2010 +0700 + + Updated Thai translation. + + po/th.po | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) + +commit 70a4217ba35492cd8e3549ca8da3fcc950421790 +Author: Tor Lillqvist +Date: Tue Mar 30 19:39:19 2010 +0300 + + Clarify _g_stat_struct mess + + Use "struct stat" instead of "struct _stat" in the MinGW-or-64-bit + case. Should fix bug #614372. + + glib/gstdio.c | 2 +- + glib/gstdio.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c3f1025c33ab295eedcf41beeea276171ae2dc27 +Author: Javier Jardón +Date: Mon Mar 29 18:20:03 2010 +0200 + + Remove g_type_class_get_private() public documentation + + This is a internal function needed for the documented + G_TYPE_CLASS_GET_PRIVATE() macro + + This was introduced by error in + commit 81e2aa941bbfd02bf1b6235da12834d282ceda0c + + docs/reference/gobject/tmpl/gobject-unused.sgml | 9 --------- + 1 files changed, 0 insertions(+), 9 deletions(-) + +commit 0f51e995658a50dbecb74b006f05a1ea69f43558 +Author: Javier Jardón +Date: Sun Mar 28 17:43:33 2010 +0200 + + Fix g_type_class_add_private() documentation + + This fixes commit 81e2aa941bbfd02bf1b6235da12834d282ceda0c + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=614185 + + gobject/gtype.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- + 1 files changed, 44 insertions(+), 4 deletions(-) + +commit 461a4097d1a0a10106254a8fe917fc4e78ccff92 +Author: Ask H. Larsen +Date: Sun Mar 28 00:13:28 2010 +0100 + + Updated Danish translation + + po/da.po | 951 + +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 479 insertions(+), 472 deletions(-) + +commit 2e27703a815e221052dd4db3e9e848e2401c3b8b +Author: Chao-Hsiung Liao +Date: Sat Mar 27 20:50:57 2010 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 966 + +++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 951 + +++++++++++++++++++++++++++++----------------------------- + 2 files changed, 962 insertions(+), 955 deletions(-) + +commit 0e3c6ef848259051e4c8c8996a71c0d2d8c9b9f0 +Author: Jamil Ahmed +Date: Sat Mar 27 17:44:03 2010 +0600 + + Updated Bengali translation + + po/bn.po | 1181 + +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 594 insertions(+), 587 deletions(-) + +commit 22dc3dd6487e2c794376a5c6850c3a3e7c2beea9 +Author: Matthias Clasen +Date: Fri Mar 26 15:09:13 2010 -0400 + + Bump version + + configure.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit ca631653acc1e1db0c3ebb05759d05f8bdc35ba6 +Author: Matthias Clasen +Date: Fri Mar 26 15:08:00 2010 -0400 + + 2.24.0 + + po/af.po | 24 +- + po/am.po | 24 +- + po/ar.po | 24 +- + po/as.po | 24 +- + po/ast.po | 24 +- + po/az.po | 24 +- + po/be.po | 24 +- + po/be@latin.po | 24 +- + po/bg.po | 24 +- + po/bn.po | 24 +- + po/bn_IN.po | 24 +- + po/bs.po | 24 +- + po/ca.po | 24 +- + po/ca@valencia.po | 24 +- + po/cs.po | 24 +- + po/cy.po | 24 +- + po/da.po | 24 +- + po/de.po | 24 +- + po/dz.po | 24 +- + po/el.po | 24 +- + po/en@shaw.po | 24 +- + po/en_CA.po | 24 +- + po/en_GB.po | 24 +- + po/eo.po | 24 +- + po/es.po | 24 +- + po/et.po | 24 +- + po/eu.po | 82 ++-- + po/fa.po | 24 +- + po/fi.po | 24 +- + po/fr.po | 24 +- + po/ga.po | 24 +- + po/gl.po | 24 +- + po/gu.po | 24 +- + po/he.po | 24 +- + po/hi.po | 24 +- + po/hr.po | 24 +- + po/hu.po | 24 +- + po/hy.po | 24 +- + po/id.po | 24 +- + po/is.po | 24 +- + po/it.po | 24 +- + po/ja.po | 24 +- + po/ka.po | 24 +- + po/kn.po | 24 +- + po/ko.po | 24 +- + po/ku.po | 24 +- + po/lt.po | 24 +- + po/lv.po | 24 +- + po/mai.po | 24 +- + po/mg.po | 24 +- + po/mk.po | 24 +- + po/ml.po | 24 +- + po/mn.po | 24 +- + po/mr.po | 24 +- + po/ms.po | 24 +- + po/nb.po | 24 +- + po/nds.po | 24 +- + po/ne.po | 24 +- + po/nl.po | 24 +- + po/nn.po | 24 +- + po/oc.po | 24 +- + po/or.po | 24 +- + po/pa.po | 24 +- + po/pl.po | 24 +- + po/ps.po | 24 +- + po/pt.po | 24 +- + po/pt_BR.po | 24 +- + po/ro.po | 24 +- + po/ru.po | 24 +- + po/rw.po | 24 +- + po/si.po | 24 +- + po/sk.po | 24 +- + po/sl.po | 24 +- + po/sq.po | 24 +- + po/sr.po | 24 +- + po/sr@ije.po | 24 +- + po/sr@latin.po | 24 +- + po/sv.po | 24 +- + po/ta.po | 24 +- + po/te.po | 24 +- + po/th.po | 24 +- + po/tl.po | 24 +- + po/tr.po | 24 +- + po/tt.po | 24 +- + po/uk.po | 946 +++++++++++++++++++------------------- + po/vi.po | 1311 + +++++++++++++++++++++++++---------------------------- + po/wa.po | 24 +- + po/xh.po | 24 +- + po/yi.po | 24 +- + po/zh_CN.po | 24 +- + po/zh_HK.po | 24 +- + po/zh_TW.po | 24 +- + 92 files changed, 2209 insertions(+), 2266 deletions(-) + commit 5ba8043f1217b338e220f0c6b427e58e28c241e8 Author: Matthias Clasen Date: Fri Mar 26 11:15:49 2010 -0400 diff -Nru --exclude reference --exclude po glib2.0-2.24.0/config.h.win32 glib2.0-2.24.1/config.h.win32 --- glib2.0-2.24.0/config.h.win32 2010-03-26 17:50:29.000000000 +0100 +++ glib2.0-2.24.1/config.h.win32 2010-05-03 03:23:26.000000000 +0200 @@ -35,13 +35,13 @@ #define GETTEXT_PACKAGE "glib20" /* Define to the GLIB binary age */ -#define GLIB_BINARY_AGE 2400 +#define GLIB_BINARY_AGE 2401 /* Byte contents of gmutex */ /* #undef GLIB_BYTE_CONTENTS_GMUTEX */ /* Define to the GLIB interface age */ -#define GLIB_INTERFACE_AGE 0 +#define GLIB_INTERFACE_AGE 1 /* Define the location where the catalogs will be installed */ #define GLIB_LOCALE_DIR "NONE/share/locale" @@ -50,7 +50,7 @@ #define GLIB_MAJOR_VERSION 2 /* Define to the GLIB micro version */ -#define GLIB_MICRO_VERSION 0 +#define GLIB_MICRO_VERSION 1 /* Define to the GLIB minor version */ #define GLIB_MINOR_VERSION 24 @@ -706,13 +706,13 @@ #define PACKAGE_NAME "glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "glib 2.24.0" +#define PACKAGE_STRING "glib 2.24.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "glib" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.24.0" +#define PACKAGE_VERSION "2.24.1" /* Maximum POSIX RT priority */ /* #undef POSIX_MAX_PRIORITY */ diff -Nru --exclude reference --exclude po glib2.0-2.24.0/configure glib2.0-2.24.1/configure --- glib2.0-2.24.0/configure 2010-03-26 16:01:30.000000000 +0100 +++ glib2.0-2.24.1/configure 2010-05-03 02:59:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for glib 2.24.0. +# Generated by GNU Autoconf 2.65 for glib 2.24.1. # # Report bugs to . # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='glib' PACKAGE_TARNAME='glib' -PACKAGE_VERSION='2.24.0' -PACKAGE_STRING='glib 2.24.0' +PACKAGE_VERSION='2.24.1' +PACKAGE_STRING='glib 2.24.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib' PACKAGE_URL='' @@ -1609,7 +1609,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures glib 2.24.0 to adapt to many kinds of systems. +\`configure' configures glib 2.24.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1679,7 +1679,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glib 2.24.0:";; + short | recursive ) echo "Configuration of glib 2.24.1:";; esac cat <<\_ACEOF @@ -1824,7 +1824,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glib configure 2.24.0 +glib configure 2.24.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2605,7 +2605,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by glib $as_me 2.24.0, which was +It was created by glib $as_me 2.24.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3419,7 +3419,7 @@ # Define the identity of the package. PACKAGE='glib' - VERSION='2.24.0' + VERSION='2.24.1' # Some tools Automake needs. @@ -3473,10 +3473,10 @@ GLIB_MAJOR_VERSION=2 GLIB_MINOR_VERSION=24 -GLIB_MICRO_VERSION=0 -GLIB_INTERFACE_AGE=0 -GLIB_BINARY_AGE=2400 -GLIB_VERSION=2.24.0 +GLIB_MICRO_VERSION=1 +GLIB_INTERFACE_AGE=1 +GLIB_BINARY_AGE=2401 +GLIB_VERSION=2.24.1 @@ -3492,19 +3492,19 @@ $as_echo "#define GLIB_MINOR_VERSION 24" >>confdefs.h -$as_echo "#define GLIB_MICRO_VERSION 0" >>confdefs.h +$as_echo "#define GLIB_MICRO_VERSION 1" >>confdefs.h -$as_echo "#define GLIB_INTERFACE_AGE 0" >>confdefs.h +$as_echo "#define GLIB_INTERFACE_AGE 1" >>confdefs.h -$as_echo "#define GLIB_BINARY_AGE 2400" >>confdefs.h +$as_echo "#define GLIB_BINARY_AGE 2401" >>confdefs.h # libtool versioning LT_RELEASE=2.24 LT_CURRENT=2400 -LT_REVISION=0 +LT_REVISION=1 LT_AGE=2400 LT_CURRENT_MINUS_AGE=0 @@ -19711,7 +19711,7 @@ Report bugs to ." lt_cl_version="\ -glib config.lt 2.24.0 +glib config.lt 2.24.1 configured by $0, generated by GNU Autoconf 2.65. Copyright (C) 2008 Free Software Foundation, Inc. @@ -28538,7 +28538,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by glib $as_me 2.24.0, which was +This file was extended by glib $as_me 2.24.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28604,7 +28604,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -glib config.status 2.24.0 +glib config.status 2.24.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru --exclude reference --exclude po glib2.0-2.24.0/configure.in glib2.0-2.24.1/configure.in --- glib2.0-2.24.0/configure.in 2010-03-26 15:39:48.000000000 +0100 +++ glib2.0-2.24.1/configure.in 2010-05-03 01:58:58.000000000 +0200 @@ -23,8 +23,8 @@ # m4_define([glib_major_version], [2]) m4_define([glib_minor_version], [24]) -m4_define([glib_micro_version], [0]) -m4_define([glib_interface_age], [0]) +m4_define([glib_micro_version], [1]) +m4_define([glib_interface_age], [1]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) m4_define([glib_version], diff -Nru --exclude reference --exclude po glib2.0-2.24.0/debian/changelog glib2.0-2.24.1/debian/changelog --- glib2.0-2.24.0/debian/changelog 2010-05-05 15:24:57.000000000 +0200 +++ glib2.0-2.24.1/debian/changelog 2010-05-05 15:24:58.000000000 +0200 @@ -1,3 +1,18 @@ +glib2.0 (2.24.1-0ubuntu1) lucid-proposed; urgency=low + + * New upstream version (lp: #575777): + Bugs fixed: + 615379 g_new macros crash if sizeof(struct_type) == 0 + 614185 g_type_class_add_private() documentation is not correct + 614372 g_stat() is funny + 615111 GAsyncInitable's default implementation is broken + Fix race in g_cancellable_cancel + Fix for g_variant_iter_loop + Make g_string_append_len() accept NULL lf len == 0 + Fix typo in GMutex error message + + -- Sebastien Bacher Wed, 05 May 2010 12:42:47 +0200 + glib2.0 (2.24.0-0ubuntu2) lucid; urgency=low * No change rebuild to get dbgsym back for lucid diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gio/gasyncinitable.c glib2.0-2.24.1/gio/gasyncinitable.c --- glib2.0-2.24.0/gio/gasyncinitable.c 2010-03-17 21:55:32.000000000 +0100 +++ glib2.0-2.24.1/gio/gasyncinitable.c 2010-05-03 01:58:59.000000000 +0200 @@ -201,7 +201,7 @@ { GError *error = NULL; - if (!g_initable_init (G_INITABLE (res), cancellable, &error)) + if (!g_initable_init (G_INITABLE (object), cancellable, &error)) { g_simple_async_result_set_from_error (res, error); g_error_free (error); diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gio/gcancellable.c glib2.0-2.24.1/gio/gcancellable.c --- glib2.0-2.24.0/gio/gcancellable.c 2010-03-17 21:55:32.000000000 +0100 +++ glib2.0-2.24.1/gio/gcancellable.c 2010-05-03 02:42:25.000000000 +0200 @@ -613,7 +613,6 @@ void g_cancellable_cancel (GCancellable *cancellable) { - gboolean cancel; GCancellablePrivate *priv; if (cancellable == NULL || @@ -621,10 +620,14 @@ return; priv = cancellable->priv; - cancel = FALSE; G_LOCK(cancellable); - cancel = TRUE; + if (priv->cancelled) + { + G_UNLOCK (cancellable); + return; + } + priv->cancelled = TRUE; priv->cancelled_running = TRUE; #ifdef G_OS_WIN32 @@ -642,22 +645,19 @@ } G_UNLOCK(cancellable); - if (cancel) - { - g_object_ref (cancellable); - g_signal_emit (cancellable, signals[CANCELLED], 0); + g_object_ref (cancellable); + g_signal_emit (cancellable, signals[CANCELLED], 0); - G_LOCK(cancellable); + G_LOCK(cancellable); - priv->cancelled_running = FALSE; - if (priv->cancelled_running_waiting) - g_cond_broadcast (cancellable_cond); - priv->cancelled_running_waiting = FALSE; + priv->cancelled_running = FALSE; + if (priv->cancelled_running_waiting) + g_cond_broadcast (cancellable_cond); + priv->cancelled_running_waiting = FALSE; - G_UNLOCK(cancellable); + G_UNLOCK(cancellable); - g_object_unref (cancellable); - } + g_object_unref (cancellable); } /** diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gio/gio.rc glib2.0-2.24.1/gio/gio.rc --- glib2.0-2.24.0/gio/gio.rc 2010-03-26 17:48:39.000000000 +0100 +++ glib2.0-2.24.1/gio/gio.rc 2010-05-03 03:22:49.000000000 +0200 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,24,0,0 - PRODUCTVERSION 2,24,0,0 + FILEVERSION 2,24,1,0 + PRODUCTVERSION 2,24,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "Gio" - VALUE "FileVersion", "2.24.0.0" + VALUE "FileVersion", "2.24.1.0" VALUE "InternalName", "libgio-2.0-0" VALUE "LegalCopyright", "Copyright © 2006-2010 Red Hat, Inc. and others." VALUE "OriginalFilename", "libgio-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.24.0" + VALUE "ProductVersion", "2.24.1" END END BLOCK "VarFileInfo" diff -Nru --exclude reference --exclude po glib2.0-2.24.0/glib/glib.rc glib2.0-2.24.1/glib/glib.rc --- glib2.0-2.24.0/glib/glib.rc 2010-03-26 17:48:20.000000000 +0100 +++ glib2.0-2.24.1/glib/glib.rc 2010-05-03 03:22:33.000000000 +0200 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,24,0,0 - PRODUCTVERSION 2,24,0,0 + FILEVERSION 2,24,1,0 + PRODUCTVERSION 2,24,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GLib" - VALUE "FileVersion", "2.24.0.0" + VALUE "FileVersion", "2.24.1.0" VALUE "InternalName", "libglib-2.0-0" VALUE "LegalCopyright", "Copyright © 1995-2010 Peter Mattis, Spencer Kimball, Josh MacDonald and others." VALUE "OriginalFilename", "libglib-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.24.0" + VALUE "ProductVersion", "2.24.1" END END BLOCK "VarFileInfo" diff -Nru --exclude reference --exclude po glib2.0-2.24.0/glib/gmem.h glib2.0-2.24.1/glib/gmem.h --- glib2.0-2.24.0/glib/gmem.h 2010-03-17 21:55:34.000000000 +0100 +++ glib2.0-2.24.1/glib/gmem.h 2010-05-03 02:45:45.000000000 +0200 @@ -88,7 +88,7 @@ if (__s == 1) \ __p = g_##func (__n); \ else if (__builtin_constant_p (__n) && \ - __n <= G_MAXSIZE / __s) \ + (__s == 0 || __n <= G_MAXSIZE / __s)) \ __p = g_##func (__n * __s); \ else \ __p = g_##func##_n (__n, __s); \ @@ -102,7 +102,7 @@ if (__s == 1) \ __p = g_##func (__p, __n); \ else if (__builtin_constant_p (__n) && \ - __n <= G_MAXSIZE / __s) \ + (__s == 0 || __n <= G_MAXSIZE / __s)) \ __p = g_##func (__p, __n * __s); \ else \ __p = g_##func##_n (__p, __n, __s); \ diff -Nru --exclude reference --exclude po glib2.0-2.24.0/glib/gstdio.c glib2.0-2.24.1/glib/gstdio.c --- glib2.0-2.24.0/glib/gstdio.c 2010-03-13 20:05:53.000000000 +0100 +++ glib2.0-2.24.1/glib/gstdio.c 2010-05-03 01:58:59.000000000 +0200 @@ -473,7 +473,7 @@ (!g_path_is_absolute (filename) || len > g_path_skip_root (filename) - filename)) wfilename[len] = '\0'; - retval = _wstat (wfilename, buf); + retval = _wstat (wfilename, (void*) buf); save_errno = errno; g_free (wfilename); diff -Nru --exclude reference --exclude po glib2.0-2.24.0/glib/gstdio.h glib2.0-2.24.1/glib/gstdio.h --- glib2.0-2.24.0/glib/gstdio.h 2010-03-13 20:05:53.000000000 +0100 +++ glib2.0-2.24.1/glib/gstdio.h 2010-05-03 01:58:59.000000000 +0200 @@ -110,7 +110,7 @@ #else -#define _g_stat_struct _stat +#define _g_stat_struct stat #endif diff -Nru --exclude reference --exclude po glib2.0-2.24.0/glib/gstring.c glib2.0-2.24.1/glib/gstring.c --- glib2.0-2.24.0/glib/gstring.c 2010-03-17 21:55:34.000000000 +0100 +++ glib2.0-2.24.1/glib/gstring.c 2010-05-03 02:43:10.000000000 +0200 @@ -874,7 +874,7 @@ gssize len) { g_return_val_if_fail (string != NULL, NULL); - g_return_val_if_fail (val != NULL, string); + g_return_val_if_fail (len == 0 || val != NULL, string); return g_string_insert_len (string, -1, val, len); } diff -Nru --exclude reference --exclude po glib2.0-2.24.0/glib/gvariant.c glib2.0-2.24.1/glib/gvariant.c --- glib2.0-2.24.0/glib/gvariant.c 2010-03-26 13:34:20.000000000 +0100 +++ glib2.0-2.24.1/glib/gvariant.c 2010-05-03 02:42:45.000000000 +0200 @@ -3473,17 +3473,21 @@ else /* tuple, dictionary entry */ { - GVariantIter iter; + gint index = 0; g_assert (**str == '(' || **str == '{'); - g_variant_iter_init (&iter, value); (*str)++; while (**str != ')' && **str != '}') { - value = g_variant_iter_next_value (&iter); - g_variant_valist_get (str, value, free, app); - g_variant_unref (value); + if (value != NULL) + { + GVariant *child = g_variant_get_child_value (value, index++); + g_variant_valist_get (str, child, free, app); + g_variant_unref (child); + } + else + g_variant_valist_get (str, NULL, free, app); } (*str)++; } @@ -4087,7 +4091,7 @@ /** * g_variant_new_from_data: - * @type: a #GVariantType + * @type: a definite #GVariantType * @data: the serialised data * @size: the size of @data * @trusted: %TRUE if @data is definitely in normal form @@ -4129,6 +4133,9 @@ GVariant *value; GBuffer *buffer; + g_return_val_if_fail (g_variant_type_is_definite (type), NULL); + g_return_val_if_fail (data != NULL || size == 0, NULL); + if (notify) buffer = g_buffer_new_from_pointer (data, size, notify, user_data); else diff -Nru --exclude reference --exclude po glib2.0-2.24.0/glibconfig.h.win32 glib2.0-2.24.1/glibconfig.h.win32 --- glib2.0-2.24.0/glibconfig.h.win32 2010-03-26 17:50:29.000000000 +0100 +++ glib2.0-2.24.1/glibconfig.h.win32 2010-05-03 03:23:26.000000000 +0200 @@ -158,7 +158,7 @@ #define GLIB_MAJOR_VERSION 2 #define GLIB_MINOR_VERSION 24 -#define GLIB_MICRO_VERSION 0 +#define GLIB_MICRO_VERSION 1 #define G_OS_WIN32 #define G_PLATFORM_WIN32 diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gmodule/gmodule.rc glib2.0-2.24.1/gmodule/gmodule.rc --- glib2.0-2.24.0/gmodule/gmodule.rc 2010-03-26 17:48:21.000000000 +0100 +++ glib2.0-2.24.1/gmodule/gmodule.rc 2010-05-03 03:22:35.000000000 +0200 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,24,0,0 - PRODUCTVERSION 2,24,0,0 + FILEVERSION 2,24,1,0 + PRODUCTVERSION 2,24,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GModule" - VALUE "FileVersion", "2.24.0.0" + VALUE "FileVersion", "2.24.1.0" VALUE "InternalName", "libgmodule-2.0-0" VALUE "LegalCopyright", "Copyright © 1998-2010 Tim Janik and others." VALUE "OriginalFilename", "libgmodule-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.24.0" + VALUE "ProductVersion", "2.24.1" END END BLOCK "VarFileInfo" diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gobject/gobject.rc glib2.0-2.24.1/gobject/gobject.rc --- glib2.0-2.24.0/gobject/gobject.rc 2010-03-26 17:48:25.000000000 +0100 +++ glib2.0-2.24.1/gobject/gobject.rc 2010-05-03 03:22:41.000000000 +0200 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,24,0,0 - PRODUCTVERSION 2,24,0,0 + FILEVERSION 2,24,1,0 + PRODUCTVERSION 2,24,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GObject" - VALUE "FileVersion", "2.24.0.0" + VALUE "FileVersion", "2.24.1.0" VALUE "InternalName", "libgobject-2.0-0" VALUE "LegalCopyright", "Copyright © 1998-2010 Tim Janik, Red Hat, Inc. and others" VALUE "OriginalFilename", "libgobject-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.24.0" + VALUE "ProductVersion", "2.24.1" END END BLOCK "VarFileInfo" diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gobject/gtype.c glib2.0-2.24.1/gobject/gtype.c --- glib2.0-2.24.0/gobject/gtype.c 2010-03-26 14:57:22.000000000 +0100 +++ glib2.0-2.24.1/gobject/gtype.c 2010-04-19 14:11:11.000000000 +0200 @@ -4373,12 +4373,52 @@ * the type and all of its parent types are allocated * sequentially in the same memory block as the public * structures. This function should be called in the + * type's class_init() function. The private structure can + * be retrieved using the G_TYPE_INSTANCE_GET_PRIVATE() macro. + * The following example shows attaching a private structure + * MyObjectPrivate to an object + * MyObject defined in the standard GObject + * fashion. * type's class_init() function. * - * The private structure can be retrieved using the - * G_TYPE_CLASS_GET_PRIVATE() macro. - - * Since: 2.24 + * |[ + * typedef struct _MyObject MyObject; + * typedef struct _MyObjectPrivate MyObjectPrivate; + * + * struct _MyObject { + * GObject parent; + * + * MyObjectPrivate *priv; + * }; + * + * struct _MyObjectPrivate { + * int some_field; + * }; + * + * static void + * my_object_class_init (MyObjectClass *klass) + * { + * g_type_class_add_private (klass, sizeof (MyObjectPrivate)); + * } + * + * static void + * my_object_init (MyObject *my_object) + * { + * my_object->priv = G_TYPE_INSTANCE_GET_PRIVATE (my_object, + * MY_TYPE_OBJECT, + * MyObjectPrivate); + * } + * + * static int + * my_object_get_some_field (MyObject *my_object) + * { + * MyObjectPrivate *priv = my_object->priv; + * + * return priv->some_field; + * } + * ]| + * + * Since: 2.4 */ void g_type_class_add_private (gpointer g_class, diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gthread/gthread-impl.c glib2.0-2.24.1/gthread/gthread-impl.c --- glib2.0-2.24.0/gthread/gthread-impl.c 2010-03-17 21:55:35.000000000 +0100 +++ glib2.0-2.24.1/gthread/gthread-impl.c 2010-05-03 02:45:11.000000000 +0200 @@ -105,7 +105,7 @@ g_thread_functions_for_glib_use.thread_self (&self); if (g_system_thread_equal (info->owner, self)) - g_error ("Trying to recursivly lock a mutex at '%s', " + g_error ("Trying to recursively lock a mutex at '%s', " "previously locked at '%s'", loc, info->location); diff -Nru --exclude reference --exclude po glib2.0-2.24.0/gthread/gthread.rc glib2.0-2.24.1/gthread/gthread.rc --- glib2.0-2.24.0/gthread/gthread.rc 2010-03-26 17:48:22.000000000 +0100 +++ glib2.0-2.24.1/gthread/gthread.rc 2010-05-03 03:22:37.000000000 +0200 @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,24,0,0 - PRODUCTVERSION 2,24,0,0 + FILEVERSION 2,24,1,0 + PRODUCTVERSION 2,24,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GThread" - VALUE "FileVersion", "2.24.0.0" + VALUE "FileVersion", "2.24.1.0" VALUE "InternalName", "libgthread-2.0-0" VALUE "LegalCopyright", "Copyright © 1995-2010 Peter Mattis, Spencer Kimball, Josh MacDonald, Sebastian Wilhelmi and others." VALUE "OriginalFilename", "libgthread-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.24.0" + VALUE "ProductVersion", "2.24.1" END END BLOCK "VarFileInfo" diff -Nru --exclude reference --exclude po glib2.0-2.24.0/INSTALL glib2.0-2.24.1/INSTALL --- glib2.0-2.24.0/INSTALL 2010-03-26 17:50:28.000000000 +0100 +++ glib2.0-2.24.1/INSTALL 2010-05-03 03:23:26.000000000 +0200 @@ -1,8 +1,8 @@ Simple install procedure ======================== - % gzip -cd glib-2.24.0.tar.gz | tar xvf - # unpack the sources - % cd glib-2.24.0 # change to the toplevel directory + % gzip -cd glib-2.24.1.tar.gz | tar xvf - # unpack the sources + % cd glib-2.24.1 # change to the toplevel directory % ./configure # run the `configure' script % make # build GLIB diff -Nru --exclude reference --exclude po glib2.0-2.24.0/NEWS glib2.0-2.24.1/NEWS --- glib2.0-2.24.0/NEWS 2010-03-26 15:39:28.000000000 +0100 +++ glib2.0-2.24.1/NEWS 2010-05-03 02:56:18.000000000 +0200 @@ -1,3 +1,26 @@ +Overview of Changes from GLib 2.24.0 to GLib 2.24.1 +=================================================== + +* Bugs fixed: + 615379 g_new macros crash if sizeof(struct_type) == 0 + 614185 g_type_class_add_private() documentation is not correct + 614372 g_stat() is funny + 615111 GAsyncInitable's default implementation is broken + Fix race in g_cancellable_cancel() + Fix for g_variant_iter_loop() + Make g_string_append_len() accept NULL lf len == 0 + Fix typo in GMutex error message + +* Translation updates: + Bengali India + Catalan + Catalan (Valencian) + Danish + Kannada + Thai + Traditional Chinese + + Overview of Changes from GLib 2.23.6 to GLib 2.24.0 =================================================== diff -Nru --exclude reference --exclude po glib2.0-2.24.0/README glib2.0-2.24.1/README --- glib2.0-2.24.0/README 2010-03-26 17:50:28.000000000 +0100 +++ glib2.0-2.24.1/README 2010-05-03 03:23:26.000000000 +0200 @@ -1,7 +1,7 @@ General Information =================== -This is GLib version 2.24.0. GLib is the low-level core +This is GLib version 2.24.1. GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads,