commit d6a4369089ad3dd4ab047989ba1ff31904b17eb6
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Sat Feb 4 18:43:13 2012 -0500

    2.31.16

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 439c8365da232ceb715f14f3f0a7a0751e35547c
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Sat Feb 4 11:51:45 2012 -0500

    Updates

 NEWS |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

commit 59a0134de8ba98d05d97d8fcded4e86bac7fe606
Author: Ravi Sankar Guntur <ravi.g@samsung.com>
Date:   Sat Feb 4 00:14:56 2012 +0530

    fix memory leak in g_bookmark_file_parse()

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

    Signed-off-by: Ravi Sankar Guntur <ravi.g@samsung.com>

 glib/gbookmarkfile.c |   48
 ++++++++++++++++++++----------------------------
 1 files changed, 20 insertions(+), 28 deletions(-)

commit 7e3eeb2ba12c056308020afa1b26891e5d514539
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sat Feb 4 12:32:51 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  160
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 82 insertions(+), 78 deletions(-)

commit f43565c822697504e32d2d329f4ea1c6c073d514
Author: Dan Winship <danw@gnome.org>
Date:   Fri Feb 3 11:29:46 2012 -0500

    gio/tests/file: use g_file_new_tmp()

    Rather than misusing g_file_open_tmp(), misuse g_file_new_tmp()
    instead. Progress! (Also, gets rid of a compile warning about close()
    on win32.)

 gio/tests/file.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

commit cc4c1e89f439244fd0af0afd45ca40015cea4634
Author: Dan Winship <danw@gnome.org>
Date:   Fri Feb 3 12:08:40 2012 -0500

    gio/tests/socket-common.c: add a missing #ifdef G_OS_UNIX

 gio/tests/socket-common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit d22c36cf00878a949261603ebac9515245e829bd
Author: Dan Winship <danw@gnome.org>
Date:   Fri Feb 3 11:39:27 2012 -0500

    gioenums.h: clean up a few GIOErrorEnum descriptions

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

commit e9caa11aa5b12a424bc0602855b6960d29aa4a3c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Fri Feb 3 16:29:28 2012 +0100

    Updated Spanish translation

 po/es.po |  265
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 132 insertions(+), 133 deletions(-)

commit 3b8ba958f5a0d1e129219cab10ced9c0fa03c1cc
Author: Alexander Larsson <alexl@redhat.com>
Date:   Fri Feb 3 15:11:23 2012 +0100

    Fix warning to refer to to-pixdata, not xmllint

 gio/glib-compile-resources.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ac800fa8febe2370cab2de2e0f4ed5abb431e963
Author: Alexander Larsson <alexl@redhat.com>
Date:   Fri Feb 3 15:05:03 2012 +0100

    Fix GResourceFile get_parent()

    This was erronously losing the last char.

 gio/gresourcefile.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 260a9cc290c42f06af89db33306df7a990448ed9
Author: Christian Persch <chpe@gnome.org>
Date:   Wed Feb 1 14:59:22 2012 +0100

    resource: tests: Use g_assert_cmp[u]int

    ... instead of just g_assert(), so when the test does fail, one
    immediately
    can see the actual value the variable had.

 gio/tests/resources.c |   56
 ++++++++++++++++++++++++------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

commit cb1dd2143dc6f5b5881b6d94abb7dd6f05137c76
Author: Christian Persch <chpe@gnome.org>
Date:   Tue Jan 31 18:10:55 2012 +0100

    resources: compiler: Fix entity processing of xml-stripblanks

    Preserve entities instead of replacing them!

    Bug #669173.

 gio/glib-compile-resources.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 296a2a72c6837ddc90a372b5bc6aea95a9bf82be
Author: Christian Persch <chpe@gnome.org>
Date:   Tue Jan 31 18:01:25 2012 +0100

    resources: compiler: Make to-pixbuf failure fatal

    Bug #669123.

 gio/glib-compile-resources.c |   12 +++++++++---
 gio/gresource.c              |    9 +++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

commit 387ed239e236cad1c3a54d08a34194c36bb59dba
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Thu Feb 2 10:48:11 2012 -0500

    gsettings tool: fix a memory error

    8852d4e9a08e7fbc9df7fb99a54b112f5049ee19 introduced a memory error by
    taking the type of a GVariant, freeing the GVariant and using the type
    after the free.

    This delays the free until after we've used the type.

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

 gio/gsettings-tool.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 552b815365649521379c60b672f608a40a8a5f44
Author: Kalev Lember <kalevlember@gmail.com>
Date:   Wed Feb 1 18:44:15 2012 +0200

    gio: Convert data-to-c.c to perl

    Helper scripts in C can be problematic for cross compiling: the
    compiler
    produces executables for the target platform, which the host is
    usually
    unable to run.

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

 gio/Makefile.am  |   10 +++-------
 gio/data-to-c.c  |   51
 ---------------------------------------------------
 gio/data-to-c.pl |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 58 deletions(-)

commit 053b011cccdf8463a10ae09799dd43048bb6c9f0
Author: Benjamin Otte <otte@redhat.com>
Date:   Wed Feb 1 16:25:01 2012 +0100

    docs: Clarify GSocketClient reuse policy

 gio/gsocketclient.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit a60f475b36a35081913c8fa51dc4de6381aaee56
Author: Kalev Lember <kalevlember@gmail.com>
Date:   Wed Feb 1 15:48:28 2012 +0200

    gio/tests: Fix out-of-source build

    The glib-compile-resources --generate-dependencies call was failing,
    although not stopping the build.

    Failed to open file 'test2.gresource.xml': No such file or directory
    Failed to open file 'test3.gresource.xml': No such file or directory
    Failed to open file 'test4.gresource.xml': No such file or directory
    Failed to open file 'test.gresource.xml': No such file or directory

 gio/tests/Makefile.am |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 9cf678ed2233ecb603eda92cf727e8cf8ec27335
Author: Kalev Lember <kalevlember@gmail.com>
Date:   Wed Feb 1 10:09:57 2012 +0200

    gio.symbols: Add g_static_* symbols

    ... which were added in b79cfda49c.

 gio/gio.symbols |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 0bb201348f7fad556197bec979fc488354ac8a9d
Author: Kalev Lember <kalevlember@gmail.com>
Date:   Wed Feb 1 09:10:29 2012 +0200

    gresource-tool: include sys/mman.h conditionally

    It's only needed for code guarded by HAVE_LIBELF, so ifdef the include
    as well.

 gio/gresource-tool.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 3758b41e08147ca15d5f348afa8e84d9ea6a6a0b
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Jan 31 22:00:45 2012 -0500

    Add a test to show that GMarkup properly handles > in content

 glib/tests/markups/valid-15.expected |    3 +++
 glib/tests/markups/valid-15.gmarkup  |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

commit 47aa8c43e8d63af27ea60befbeb498d9c6be17b6
Author: Alexander Larsson <alexl@redhat.com>
Date:   Tue Jan 31 16:07:09 2012 +0100

    resources: Add to-pixdata preprocessing option

 docs/reference/gio/glib-compile-resources.xml |    9 +++
 gio/glib-compile-resources.c                  |   67
 ++++++++++++++++++++++++-
 gio/gresource.c                               |   13 ++++-
 3 files changed, 85 insertions(+), 4 deletions(-)

commit b79cfda49c59b348c9c713f5f04fd9ec982b6c9d
Author: Alexander Larsson <alexl@redhat.com>
Date:   Tue Jan 31 10:51:44 2012 +0100

    Make constructor-based resource registration malloc free

    We need to do this because constructors run before main() and
    thus before any call to g_mem_set_vtable, making it impossible to
    use that function if constructors call g_malloc.

    We do this by making the constructors just register the static data
    for lazy registration, doing the lazy registration when using
    the global resource set.

 gio/glib-compile-resources.c |   80 ++++++++----------
 gio/gresource.c              |  189
 ++++++++++++++++++++++++++++++++++++++----
 gio/gresource.h              |   14 +++
 3 files changed, 223 insertions(+), 60 deletions(-)

commit 2496c8b53e0fde02328a43b16542353a8a1643d7
Author: Alexander Larsson <alexl@redhat.com>
Date:   Tue Jan 31 10:51:23 2012 +0100

    resources: Minor fixes to the docs

 gio/gresource.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 8ab7ed8ffc2da341064d759776b1e985a2fd24a7
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Jan 30 18:47:31 2012 -0500

    Bump version number

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit d332bdcc583c67e17d2d508225200372f2981ad4
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Jan 30 18:46:18 2012 -0500

    2.31.14

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e6713ec8105b8197a0b56e9f15b48dfa9550ffe1
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Jan 30 18:45:45 2012 -0500

    Fix distclean

 gio/Makefile.am       |    4 ++--
 gio/tests/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)