commit 9da3dc292c1a0e3e0418eec2b909163ff2b68be8
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Wed Oct 19 15:26:25 2011 -0400

    more NEWS

 NEWS |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

commit 2a98cc635e03e57623268045cb0d6761b1619fea
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Wed Oct 19 15:07:22 2011 -0400

    The usual docs unbreaking...

 docs/reference/glib/Makefile.am       |    1 +
 docs/reference/glib/building.sgml     |    2 +-
 docs/reference/glib/glib-sections.txt |    4 +---
 glib/giochannel.c                     |   10 +++++++++-
 glib/gmessages.c                      |    2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

commit 3fd412549fa50e06f92fb279d54a5d5b668600bc
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Wed Oct 19 10:11:54 2011 -0400

    configure.ac: join the cargo-cult of _cv_

    For some reason, the setting of g_atomic_lock_free wasn't making
    it down
    to the lower part of the configure script where glibconfig.h was being
    generated when building using mingw32-configure.

    If we prefix glib_cv_ to the start of the variable name (like everyone
    else is doing) then it magically starts working.

    I love you, automake.

 configure.ac |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

commit 612d2384670378d23e46046ab42ca98d618aba43
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Tue Oct 18 16:19:43 2011 +0100

    gdbus-non-socket test: avoid use of a GMainContext across a fork

    See https://bugzilla.gnome.org/show_bug.cgi?id=658999 for why
    this would
    be bad.

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=662100
    Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
    Reviewed-by: David Zeuthen <davidz@redhat.com>

 gio/tests/gdbus-non-socket.c |   51
 +++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 13 deletions(-)

commit be89f052c2f578a812d7bba4bbd02be04a4fdc03
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Tue Oct 18 16:18:21 2011 +0100

    gdbus-exit-on-close test: cover more possibilities

    We didn't previously test anything except the implicit default
    of TRUE.
    Now we test implicit TRUE, explicit TRUE, explicit FALSE, and
    disconnecting at the local end (which regressed while fixing Bug
    #651268).

    Also avoid some questionable use of a main context, which fell foul of
    Bug #658999 and caused this test to be disabled in master.

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=662100
    Bug-NB: NB#287088
    Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
    Reviewed-by: David Zeuthen <davidz@redhat.com>

 gio/tests/gdbus-exit-on-close.c |  141
 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 125 insertions(+), 16 deletions(-)

commit 5e0492da509aad12b93b732c449dae1a016367c1
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Wed Oct 19 10:49:56 2011 +0100

    GDBusWorker: if a read was cancelled it means we closed the connection

    This was a regression caused by my previous work on GDBusWorker
    thread-safety
    (Bug #651268). The symptom is that if you disconnect a GDBusConnection
    locally, the default implementation of GDBusConnection::closed
    terminates your process, even though it shouldn't do that for
    locally-closed connections; this is because GDBusWorker didn't think a
    cancelled read was a local close.

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=662100
    Bug-NB: NB#287088
    Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
    Reviewed-by: David Zeuthen <davidz@redhat.com>

 gio/gdbusprivate.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

commit 6c33e1cd9d9e247b8b2aa95e9617904a317b78c6
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Tue Oct 18 16:27:21 2011 +0100

    Revert "Disable two GDBus tests"

    This reverts commit 05ef173466e32d8b3d212803e4a72239913a362d.

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=662100
    Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
    Reviewed-by: David Zeuthen <davidz@redhat.com>

 gio/tests/gdbus-exit-on-close.c |    3 +--
 gio/tests/gdbus-non-socket.c    |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

commit 99f0eaa4c5a86f6fa721044bb6841f6bda4c689b
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Tue Oct 18 23:26:00 2011 -0400

    Fix bug in g_static_rec_mutex_unlock_full()

    pthreads doesn't implement the _lock_full() and _unlock_full()
    calls on
    recursive mutexes so we don't have it on GRecMutex either.  Now that
    we're using GRecMutex to implement GStaticRecMutex, we have to fake it
    by keeping an internal counter of the number of locks and calling
    g_rec_mutex_unlock() the appropriate number of times.

    The code to do this looked like:

      depth = mutex->depth;
      while (mutex->depth--)
        g_rec_mutex_unlock (rm);
      return depth;

    which unfortunately did one last decrement after mutex->depth was
    already zero (leaving it equal to -1).

    When locked the next time, the count would then increase from -1 to 0
    and then the next _unlock_full() call would not do any calls to
    g_rec_mutex_unlock(), leading to a deadlock.

    https://bugzilla.gnome.org/show_bug.cgi?id=661914

 glib/deprecated/gthread-deprecated.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit aba0f0c38bbfa11ad48b5410ebdbed2a99e68c58
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Tue Oct 18 16:21:50 2011 -0400

    gatomic: introduce G_ATOMIC_LOCK_FREE

    We clean up the detection of if we should do 'real' atomic
    operations or
    mutex-emulated ones with the introduction of a new (public) macro:
    G_ATOMIC_LOCK_FREE.  If defined, our atomic operations are
    guaranteed to
    be done in hardware.

    We need to use __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 to determine if our
    compiler supports GCC-style atomic operations from the gatomic.h
    header
    because we might be building a program against GLib using a different
    set of compiler options (or a different compiler) than was used
    to build
    GLib itself.

    Unfortunately, this macro is not available on clang, so it has
    currently
    regressed to using the mutex emulation.  A bug about that has been
    opened here:

      http://llvm.org/bugs/show_bug.cgi?id=11174

 configure.ac                           |   85
 ++++++++++++++++++++------------
 docs/reference/glib/glib-overrides.txt |    5 ++
 docs/reference/glib/glib-sections.txt  |    3 +
 glib/gatomic.c                         |   48 ++++++++++--------
 glib/gatomic.h                         |    4 +-
 glib/glibconfig.h.win32.in             |    2 +
 6 files changed, 93 insertions(+), 54 deletions(-)

commit c9b6c3c85ac8f870ff193ae75b2bd19a7a310ec9
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Tue Oct 18 16:21:17 2011 -0400

    gatomic: cast to the correct pointer sign

    In the fallback case of the g_atomic_int_ macros we had some (gint*)
    casts that should have been (guint*) casts.

 glib/gatomic.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 4641d13770d4591ce85c5d8ffaf0484703666cc4
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Tue Oct 18 22:28:23 2011 +0200

    [l10n] Updated German translation

 po/de.po | 5958
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2981 insertions(+), 2977 deletions(-)

commit 915e2238c478737def2f8919204ee10d06ecb98a
Author: David Zeuthen <davidz@redhat.com>
Date:   Thu Oct 13 16:53:44 2011 -0400

    gio: Introduce get_sort_key() methods on GDrive, GVolume and GMount

    This is needed to implement efficient and predictable proxy volume
    monitors, see

     https://bugzilla.gnome.org/show_bug.cgi?id=661711

    for details.

    Signed-off-by: David Zeuthen <davidz@redhat.com>

 docs/reference/gio/gio-sections.txt |    3 +++
 gio/gdrive.c                        |   25 +++++++++++++++++++++++++
 gio/gdrive.h                        |    5 +++++
 gio/gio.symbols                     |    3 +++
 gio/gmount.c                        |   25 +++++++++++++++++++++++++
 gio/gmount.h                        |    5 +++++
 gio/gvolume.c                       |   25 +++++++++++++++++++++++++
 gio/gvolume.h                       |    5 +++++
 8 files changed, 96 insertions(+), 0 deletions(-)

commit 4a25d21bd08b7dcf38f781bf678ee8fffe817203
Author: Javier Jardón <jjardon@gnome.org>
Date:   Sun Oct 2 17:58:16 2011 +0100

    tests/gobject: Use G_VALUE_INIT

 tests/gobject/override.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 108480b7baad8d02b7b0f9729146a04ad09219de
Author: Javier Jardón <jjardon@gnome.org>
Date:   Fri Sep 30 17:19:50 2011 +0100

    gobject: Use G_VALUE_INIT

 gobject/gbinding.c              |   16 ++++++++--------
 gobject/gobject.c               |    8 ++++----
 gobject/gparam.c                |    4 ++--
 gobject/gsignal.c               |    6 +++---
 gobject/gsourceclosure.c        |    6 +++---
 gobject/gvaluetypes.c           |    2 +-
 gobject/tests/boxed.c           |   26 +++++++++++++-------------
 gobject/tests/enums.c           |    4 ++--
 gobject/tests/ifaceproperties.c |    4 ++--
 gobject/tests/param.c           |   12 ++++++------
 gobject/tests/reference.c       |    2 +-
 gobject/tests/valuearray.c      |    2 +-
 12 files changed, 46 insertions(+), 46 deletions(-)

commit 8d3250016dac9d43b2a2de6dacb670a9fbc88808
Author: Javier Jardón <jjardon@gnome.org>
Date:   Fri Sep 30 17:08:15 2011 +0100

    gio: Use G_VALUE_INIT

 gio/gasynchelper.c               |    4 ++--
 gio/gcancellable.c               |    4 ++--
 gio/gdbus-2.0/codegen/codegen.py |    6 +++---
 gio/gdbusnameowning.c            |    6 +++---
 gio/gdbusnamewatching.c          |    4 ++--
 gio/gpollableinputstream.c       |    4 ++--
 gio/gsettings.c                  |    4 ++--
 gio/gsocket.c                    |    4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

commit f07201c314e891354f236d7ec49a11700ce02da0
Author: Sjoerd Simons <sjoerd@luon.net>
Date:   Sun Oct 16 10:57:29 2011 +0100

    GDBusConnection: Fix race in /gdbus/connection/life-cycle

    GDBusConnection sets the closed flag in the worker thread, then
    adds an
    idle callback (which refs the Connection) to signal this in the main
    thread. The tests session_bus_down doesn't spin the mainloop, so the
    "closed" signal will always fire if iterating the mainloop later (and
    drops the ref when doing so). But _is_closed can return TRUE even
    before
    signalling this, in which case the "closed" signal isn't fired and the
    ref isn't dropped, causing the test to fail.

    Instead simply always wait for the closed signal, which is a good
    thing
    to check anyway and ensures the ref is closed.

    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=661896
    Reviewed-by: Matthias Clasen <mclasen@redhat.com>

 gio/tests/gdbus-connection.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

commit cf3f1b026b13fe377057f6e1102eefaad1e24c72
Author: Alexander Larsson <alexl@redhat.com>
Date:   Tue Oct 18 14:15:07 2011 +0200

    Actually Don't define GLIB_COMPILATION in libgthread

    Last commit was wrong, fixing it up

 glib/gthread-win32.c   |    9 +++++++--
 gthread/Makefile.am    |    1 -
 gthread/gthread-impl.c |    4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

commit be770969e93f989d7165b240c4e7e5e6ac9c0587
Author: Alexander Larsson <alexl@redhat.com>
Date:   Tue Oct 18 13:34:06 2011 +0200

    Don't define GLIB_COMPILATION in libgthread

    This was turning all the GLIB_VARs in the glib headers into
    dllexports on windows, causing all sort of nastiness. libgthread is
    mostly empty now anyway, so we don't need any GLIB_COMPILATION like
    flag.

 glib/gthread-win32.c   |    9 ++-------
 gthread/gthread-impl.c |    4 ----
 2 files changed, 2 insertions(+), 11 deletions(-)

commit 735420e54690d5971a0e258e12fff6ee79ae34a6
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Oct 17 17:01:36 2011 -0400

    Fix an include guard mismatch

    Spotted by Colin Walters.

 glib/gcharset.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 52389bd01067284565b007bc156643d534282842
Author: Alexander Larsson <alexl@redhat.com>
Date:   Mon Oct 17 23:00:29 2011 +0200

    Fix up testcase broken due to g_thread_new API change

 gio/tests/win32-streams.c |    4 ++--