commit 153521468709891e49030e200422c0520921a9f5
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Sun Feb 21 16:29:15 2010 -0500

    Fix the large array test to work

    Fix by Sven Herzberg, bug 568760
    (cherry picked from commit dcdc409cd88f6d47eb54a7eee528be6c8667d394)

 glib/tests/array-test.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit 05b6b3ce07d1dd315b09db541a9af3f515b6736f
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Mar 15 22:50:46 2010 -0400

    Updates

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

commit ccc815e9345d3d7a977ac23d89bd9162755c92ab
Author: Thomas Kristensen <thomas.k.kristensen@tandberg.com>
Date:   Sun Mar 14 11:47:17 2010 +0200

    Close the socket event in finalizer instead of in close method

    There might be a GSource attached to a GMainContext, about to be
    removed by a
    pending cancellation. Deleting the handle too early will trigger a
    g_warning in
    the "select()" call in GMainContext. Attached patch fixes this
    by deferring
    destruction of WSAEVENT object until GSocket's finalize().

    Patch from bug #612702.

    Signed-off-by: Tor Lillqvist <tml@iki.fi>

 gio/gsocket.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

commit f01c4be9c4ccb66d44912dd0bfc57c8b38bce844
Author: Stefan Kost <ensonic@users.sf.net>
Date:   Sat Mar 6 13:36:38 2010 +0200

    docs: exchange "Subversion" with "source code repository"

    Fixes the outdated reference.
    (cherry picked from commit fa32ee56109e295f3dae95c8bbdf98a99f1bc66e)

 docs/reference/gobject/tut_gsignal.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 1feffa2b99d83e9f13768c17d80ef29144e35c55
Author: Christian Dywan <christian@twotoasts.de>
Date:   Thu Mar 4 11:02:31 2010 +0100

    Add licence headers to gnativevolumemonitor.c/h

    Fixes bug #609531

 gio/gnativevolumemonitor.c |   22 ++++++++++++++++++++++
 gio/gnativevolumemonitor.h |   26 ++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 0 deletions(-)

commit 46999595da4e5e82f2a77deea1785cb575416394
Author: Dan Winship <danw@gnome.org>
Date:   Wed Mar 3 08:35:32 2010 -0500

    GResolver: fix Windows 2000 workaround

    Move the <wspiapi.h> include from gwin32resolver.c to
    gnetworkingprivate.h, since gthreadedresolver.c needs it too.

    https://bugzilla.gnome.org/show_bug.cgi?id=611696
    (cherry picked from commit 9a886135c80233a5a40071189df7693151201954)

 gio/gnetworkingprivate.h |    8 ++++++++
 gio/gwin32resolver.c     |    8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 242ccb0258d788c55aa9abe1e8c19a12ecd63459
Author: Emilio Pozuelo Monfort <pochu27@gmail.com>
Date:   Tue Feb 23 18:19:16 2010 +0100

    Test for unexisting files in $TMP and not in $HOME

    Some buildd environments have an unwritable $HOME, which makes the
    test that looks for an unexisting file there fail. Use $TMP instead,
    which should be more reliable.

    https://bugzilla.gnome.org/show_bug.cgi?id=610860
    (cherry picked from commit a7cc500d3829db1a8757ae940db09869b78bdca8)

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

commit bc8a748291dbd37698564fb3417e2b7465023974
Author: Emilio Pozuelo Monfort <pochu27@gmail.com>
Date:   Fri Feb 19 19:00:02 2010 +0100

    Don't fail a couple of tests when running as root

    root can access and write to a directory when it doesn't have
    exec and write permissions respectively. So expect the tests that
    check that to succeed rather than to fail when running as root.

    https://bugzilla.gnome.org/show_bug.cgi?id=552912
    (cherry picked from commit 202d7d37d6ce066291504276810c350c9a3feb7a)

 gio/tests/live-g-file.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

commit afd5dcc026fc6f339911575ef665bed44afaa13d
Author: Alexander Larsson <alexl@redhat.com>
Date:   Mon Feb 22 12:37:16 2010 +0100

    Keep metadata when files are renamed and trashed

    This fixes https://bugzilla.gnome.org/show_bug.cgi?id=609813
    (cherry picked from commit 4535683b3f42b6840e01bd94fe6ea792b0ebeecf)

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

commit 0e8a69e997cc33b2c6f52dd492755250221ff678
Author: Colin Walters <walters@verbum.org>
Date:   Fri Feb 19 16:06:22 2010 -0500

    [gutf8.c] Add a bit of documentation to UNICODE_VALID
    (cherry picked from commit 5047fd7f688dc0a3e4c148864f63961389bc83f9)

 glib/gutf8.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

commit e9f6a664bb0fbd23e7f9596c96444efba1c280d8
Author: Alexander Larsson <alexl@redhat.com>
Date:   Mon Feb 15 10:13:10 2010 +0100

    Set result_uncertain in win32 g_content_type_guess implementation

    Fixes bug #609143
    (cherry picked from commit b37da7134b127e6c92e7002150077515dc7d42b4)

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

commit 6a3ccc000edb45290b19eb93d006164179f9c3ca
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Sat Mar 13 14:19:13 2010 -0500

    Clean up another include

 glib/gstrfuncs.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 7c4fb85d83a8190697ae584671eb0d6c2c227455
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Sat Mar 13 14:18:16 2010 -0500

    Clean up an include

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

commit 479409612350594dc3e702c3a18fc6e4b2b7b649
Author: Tor Lillqvist <tml@iki.fi>
Date:   Fri Mar 12 10:42:43 2010 +0200

    The SO_KEEPALIVE value seems to actually be a char on Windows

    Do still use a BOOL variable, but initialize it to FALSE before the
    getsockopt(), and drop the assertion on Windows. Should fix bug

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

commit fdbeaf71d22e263456b8491b39d8818360eefb42
Author: Fridrich Strba <fridrich.strba@bluewin.ch>
Date:   Fri Mar 5 23:15:45 2010 +0100

    Adding new defines first appeared in 2.22 into glibconfig.h.win32.in

 glibconfig.h.win32.in |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

commit 7bac7f447482a624e15f7cb315dbfa54c40661bb
Author: Tor Lillqvist <tml@iki.fi>
Date:   Sat Feb 6 10:40:03 2010 +0200

    Drop empty elements from the VS9 vcproj files

    Dunno if this makes sense, if one lets VS edit the it will put them
    back anyway. But it's more pleasing to the eye.

 build/win32/vs9/gio.vcproj                         |   50 -----
 build/win32/vs9/glib-genmarshal.vcproj             |   50 -----
 build/win32/vs9/glib.vcproj                        |  230
 +++++---------------
 build/win32/vs9/gmodule.vcproj                     |   50 -----
 build/win32/vs9/gobject.vcproj                     |   50 -----
 build/win32/vs9/gspawn-win32-helper-console.vcproj |   50 -----
 build/win32/vs9/gspawn-win32-helper.vcproj         |   50 -----
 build/win32/vs9/gthread.vcproj                     |   50 -----
 build/win32/vs9/testglib.vcproj                    |   50 -----
 9 files changed, 60 insertions(+), 570 deletions(-)

commit 54bbf29f1526a0a72bde897fbef4f45340b5e4e3
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 19:57:38 2010 +0200

    Further work on VS9 project files

 build/win32/vs9/README.txt     |   16 ++++++++++++----
 build/win32/vs9/glib.vsprops   |   32 ++++++++++++++++++++++++++++++--
 build/win32/vs9/install.vcproj |    8 ++++----
 3 files changed, 46 insertions(+), 10 deletions(-)

commit cff040704ebb8dd403555ae58b4179638bf0239d
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 19:54:50 2010 +0200

    Clarify use of struct stat on Windows

 gio/glocalfile.c     |   23 ++++++++++++++---------
 gio/glocalfileinfo.c |   10 ++++++----
 glib/gstdio.c        |   24 +++++++++++++++++++-----
 glib/gstdio.h        |   37 +++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 18 deletions(-)

commit 4b995337fe933900749b0a1488ec8af0fcf5dc1d
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 19:20:08 2010 +0200

    Internally use the _stati64 API explicitly on Windows

    Avoids warnings and confusion when compiling with MSVC.

 glib/giowin32.c    |   24 ++++++++++--------------
 glib/gkeyfile.c    |    5 ++---
 glib/gmappedfile.c |    5 ++---
 3 files changed, 14 insertions(+), 20 deletions(-)

commit e27528caccf0b2084a35f242e3a780ecbdcb1504
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 15:24:56 2010 +0200

    Enable libtool compatible DLL naming in the VS9 projects

 build/win32/vs9/gio.vcproj     |    8 ++++----
 build/win32/vs9/glib.vcproj    |    8 ++++----
 build/win32/vs9/glib.vsprops   |   28 +++++++++++++++++++++++++++-
 build/win32/vs9/gmodule.vcproj |    8 ++++----
 build/win32/vs9/gobject.vcproj |    8 ++++----
 build/win32/vs9/gthread.vcproj |    8 ++++----
 6 files changed, 47 insertions(+), 21 deletions(-)

commit 46ac248e74a32cdcebe84552fba7fee1d1803848
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 15:00:15 2010 +0200

    Use inherited properties in all configurations in gmodule, too

 build/win32/vs9/gmodule.vcproj |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

commit 44f967f96348a3899048f77febde7b46b07fcbd9
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 14:51:56 2010 +0200

    Use README.txt instead of README for Windows developer friendliness

 build/win32/vs9/Makefile.am |    2 +-
 build/win32/vs9/README      |   29 -----------------------------
 build/win32/vs9/README.txt  |   29 +++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 30 deletions(-)

commit aabcffc6ad085338041bb1d8a40d76b2ba5079f2
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 14:50:36 2010 +0200

    Update README for VS9 build

 build/win32/vs9/README |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

commit 1b036c38966e1db6b3abe2963b4d09c9b05dcef1
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 14:36:23 2010 +0200

    Refactor VS9 project files

    Factor out common parts into a vsprops file. Drop empty elements for
    tools that aren't used.

 build/win32/vs9/Makefile.am                        |    9 +-
 build/win32/vs9/gio.vcproj                         |  184
 +++----------------
 build/win32/vs9/glib-genmarshal.vcproj             |  138 +-------------
 build/win32/vs9/glib.vcproj                        |  194
 +++-----------------
 build/win32/vs9/glib.vsprops                       |  196
 ++++++++++++++++++++
 build/win32/vs9/gmodule.vcproj                     |  173
 ++----------------
 build/win32/vs9/gobject.vcproj                     |  178
 ++----------------
 build/win32/vs9/gspawn-win32-helper-console.vcproj |  142 +--------------
 build/win32/vs9/gspawn-win32-helper.vcproj         |  142 +--------------
 build/win32/vs9/gthread.vcproj                     |  150 +--------------
 build/win32/vs9/install.vcproj                     |  164
 +----------------
 build/win32/vs9/testglib.vcproj                    |  142 +--------------
 12 files changed, 319 insertions(+), 1493 deletions(-)

commit d8fe5a4670149ecd59b827b3df57e232cab59005
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 14:35:04 2010 +0200

    Don't use deprecated g_win32 API

 tests/testglib.c |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

commit dce6ec3b7f2d18316976844c7d9ea70041a2fc17
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 01:01:57 2010 +0200

    Put a version info resource also in the gio DLL

    Also, distribute gio/gio.rc(.in).

 configure.in    |    1 +
 gio/Makefile.am |   19 ++++++++++++++++++-
 gio/gio.rc.in   |    2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

commit bbd9273d9ed722bdecf31d340c52111c78491e8c
Author: Tor Lillqvist <tml@iki.fi>
Date:   Thu Feb 4 00:11:44 2010 +0200

    Update copyright years

 glib/glib.rc.in       |    2 +-
 gmodule/gmodule.rc.in |    2 +-
 gobject/gobject.rc.in |    2 +-
 gthread/gthread.rc.in |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit 47ec8bd70fd2fe2b6de2c3300afaa5f32e337aa4
Author: Tor Lillqvist <tml@iki.fi>
Date:   Wed Feb 3 18:09:28 2010 +0200

    Fix the "install" VS9 project

    Install also ghostutils.h. Don't bother mentioning any pointless
    PreprocessorDefinitions for the "install" project, as all it does is
    copy files.

 build/win32/vs9/install.vcproj |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit a4f8aba4dd0c2a8e18de0f1edc06f1b5c0e137fc
Author: Tor Lillqvist <tml@iki.fi>
Date:   Tue Feb 2 21:24:45 2010 +0200

    Link with dnsapi.lib also in 32-bit builds

 build/win32/vs9/gio.vcproj |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 1df72e5d8cb5c3f30d7b3175c27ddb14ad9b9ccd
Author: Tor Lillqvist <tml@iki.fi>
Date:   Tue Feb 2 21:23:27 2010 +0200

    Include also testglib.vcproj in tarball

 build/win32/vs9/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 4eef1b6783393cdea71a8d7dabd8370184649078
Author: Sven Herzberg <herzi@gnome-de.org>
Date:   Wed Jan 13 14:47:58 2010 +0100

    properly abort instead of looping infinitely

    Fixes: Bug 568760 - nautilus freezes due to a bug in garray.c:322

    * glib/garray.c: increase the size of potential return values by
      using an unsigned result; properly check if we still handle
      valid size
      proposals, return the original request if there's no usable
      size left
    * tests/array-test.c: reproduce the error condition of the bug report

 glib/garray.c           |   18 ++++++++++--------
 glib/tests/array-test.c |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

commit 2fa2f18ef5f5e556807216432ba13f09c6604957
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Wed Jan 6 20:56:59 2010 -0500

    Bump version

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

commit cd2765c6c4a526e11776d135a25068943c9fcf1d
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Wed Jan 6 20:55:52 2010 -0500

    2.22.4

 docs/reference/gobject/tmpl/gobject-unused.sgml |   27
 +++++++++++++++++++++++
 po/am.po                                        |   12 +++++-----
 po/ar.po                                        |   12 +++++-----
 po/as.po                                        |   12 +++++-----
 po/az.po                                        |   12 +++++-----
 po/be.po                                        |   12 +++++-----
 po/be@latin.po                                  |   12 +++++-----
 po/bg.po                                        |   12 +++++-----
 po/bn.po                                        |   12 +++++-----
 po/bn_IN.po                                     |   12 +++++-----
 po/bs.po                                        |   12 +++++-----
 po/ca.po                                        |   12 +++++-----
 po/ca@valencia.po                               |   12 +++++-----
 po/cs.po                                        |   12 +++++-----
 po/cy.po                                        |   12 +++++-----
 po/da.po                                        |   12 +++++-----
 po/de.po                                        |   12 +++++-----
 po/dz.po                                        |   12 +++++-----
 po/el.po                                        |   12 +++++-----
 po/en_CA.po                                     |   12 +++++-----
 po/en_GB.po                                     |   12 +++++-----
 po/eo.po                                        |   12 +++++-----
 po/es.po                                        |   12 +++++-----
 po/et.po                                        |   12 +++++-----
 po/eu.po                                        |   12 +++++-----
 po/fa.po                                        |   12 +++++-----
 po/fi.po                                        |   12 +++++-----
 po/fr.po                                        |   12 +++++-----
 po/ga.po                                        |   12 +++++-----
 po/gl.po                                        |   12 +++++-----
 po/gu.po                                        |   12 +++++-----
 po/he.po                                        |   12 +++++-----
 po/hi.po                                        |   12 +++++-----
 po/hr.po                                        |   12 +++++-----
 po/hu.po                                        |   12 +++++-----
 po/hy.po                                        |   12 +++++-----
 po/id.po                                        |   12 +++++-----
 po/is.po                                        |   12 +++++-----
 po/it.po                                        |   12 +++++-----
 po/ja.po                                        |   12 +++++-----
 po/ka.po                                        |   12 +++++-----
 po/kn.po                                        |   12 +++++-----
 po/ko.po                                        |   12 +++++-----
 po/ku.po                                        |   12 +++++-----
 po/lt.po                                        |   12 +++++-----
 po/lv.po                                        |   12 +++++-----
 po/mai.po                                       |   12 +++++-----
 po/mg.po                                        |   12 +++++-----
 po/mk.po                                        |   12 +++++-----
 po/ml.po                                        |   12 +++++-----
 po/mn.po                                        |   12 +++++-----
 po/mr.po                                        |   12 +++++-----
 po/ms.po                                        |   12 +++++-----
 po/nb.po                                        |   12 +++++-----
 po/ne.po                                        |   12 +++++-----
 po/nl.po                                        |   12 +++++-----
 po/nn.po                                        |   12 +++++-----
 po/oc.po                                        |   12 +++++-----
 po/or.po                                        |   12 +++++-----
 po/pa.po                                        |   12 +++++-----
 po/pl.po                                        |   12 +++++-----
 po/ps.po                                        |   12 +++++-----
 po/pt.po                                        |   12 +++++-----
 po/pt_BR.po                                     |   12 +++++-----
 po/ro.po                                        |   12 +++++-----
 po/ru.po                                        |   12 +++++-----
 po/rw.po                                        |   12 +++++-----
 po/si.po                                        |   12 +++++-----
 po/sk.po                                        |   12 +++++-----
 po/sl.po                                        |   12 +++++-----
 po/sq.po                                        |   12 +++++-----
 po/sr.po                                        |   12 +++++-----
 po/sr@ije.po                                    |   12 +++++-----
 po/sr@latin.po                                  |   12 +++++-----
 po/sv.po                                        |   12 +++++-----
 po/ta.po                                        |   12 +++++-----
 po/te.po                                        |   12 +++++-----
 po/th.po                                        |   12 +++++-----
 po/tl.po                                        |   12 +++++-----
 po/tr.po                                        |   12 +++++-----
 po/tt.po                                        |   12 +++++-----
 po/uk.po                                        |   12 +++++-----
 po/vi.po                                        |   12 +++++-----
 po/wa.po                                        |   12 +++++-----
 po/xh.po                                        |   12 +++++-----
 po/yi.po                                        |   12 +++++-----
 po/zh_CN.po                                     |   12 +++++-----
 po/zh_HK.po                                     |   12 +++++-----
 po/zh_TW.po                                     |   12 +++++-----
 89 files changed, 555 insertions(+), 528 deletions(-)

commit a227525d612ef57cdbb88210f83bb0ef54a466ef
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Wed Jan 6 19:32:12 2010 -0500

    Updates

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

commit 2c0c35af564fd29b10345b38505ccae70d59eaad
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Wed Jan 6 13:23:48 2010 -0500

    Fix the filename roundtrip check

    The check was always failing because the code was comparing
    the wrong strings. Reported in bug 605977.
    (cherry picked from commit f2d8f6287d6e3fcb9e58402c2051d557f7e41632)

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

commit 40005647ed81d6bbc13fac581ce44505deb042ca
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Tue Jan 5 18:49:23 2010 -0500

    GUnixFDMessage: fix a small typo in an extra check

    In the deserialise function, GUnixFDMessage was comparing 'level' to
    both SOL_SOCKET and SCM_RIGHTS.  It is correct to compare 'type' to
    SCM_RIGHTS.  The code passed tests only because:

    1) it's a "should always be OK" double-check

    2) SOL_SOCKET and SCM_RIGHTS, by chance, both have the value '1' on
       Linux systems.
    (cherry picked from commit baf20e09842a97c2d7925dff5ff9c6d35e36b27d)

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

commit aecd2616c78e82fcff49c584448a010da381f944
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Jan 5 18:18:55 2010 -0500

    Fix a memleak

    An early exit in expand_application_parameters forgot to free
    a GString. Reported by Steve Grubb.
    (cherry picked from commit b00c6d7fb5798b4e528554e1221a553ab95506ed)

 gio/gdesktopappinfo.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

commit 6a8828d40f07bef12c902cf271fd5b37b0be616c
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Jan 5 18:16:37 2010 -0500

    Fix an off-by-one error

    Reported by Steve Grubb.
    (cherry picked from commit 6cee86a3efc98333282218f8eb1e0149a7cd703d)

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

commit 41b39280692c70ee2aaae73377f07fff35f1ea5e
Author: Javier Jardón <jjardon@gnome.org>
Date:   Mon Dec 28 02:04:01 2009 +0100

    [docs] Fix 'Deprecated' tag on some win32 functions

    Fix g_win32_get_package_installation_directory() and
    g_win32_get_package_installation_subdirectory_utf8()
    (cherry picked from commit 73ca6f70199353c22bf2d6aa99d5cd1eaea76702)

 glib/gwin32.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 70731424fd25c0032a026646a2cd75226ce2e656
Author: Javier Jardón <jjardon@gnome.org>
Date:   Thu Dec 24 05:05:21 2009 +0100

    [docs] Fix 'Deprecated' tag in g_date_set_time()
    (cherry picked from commit 85e00d3a9433a5f83f9897c832fa00e4e0540e2c)

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

commit 2ad84bbc03389a9da24ff2a2dac1c455a5fb1655
Author: Kamal Mostafa <kamal@whence.com>
Date:   Fri Dec 18 10:34:05 2009 -0800

    Fix typo "Performace" in gtester-report Details pop-up window
    (cherry picked from commit 046e521b4f08a88c889620225faea7284356eb23)

 glib/gtester-report |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 1a0f372907414a148a652aedb39068bd9b83790b
Author: Dan Winship <danw@gnome.org>
Date:   Fri Dec 18 10:26:09 2009 +0100

    Fix UnixWare build by not using "sa_len" as a variable name

    https://bugzilla.gnome.org/show_bug.cgi?id=604875
    (cherry picked from commit 28d91b5bb6f0543c259976d8338a7b4d95054dd3)

 gio/gnetworkingprivate.h |    2 +-
 gio/gresolver.c          |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit bd6dce6046c908424ac284b53a49d58d0ef0665a
Author: Haakon Sporsheim <haakon.sporsheim@gmail.com>
Date:   Tue Jan 5 11:28:43 2010 +0200

    Avoid compilation warning from MSVC

    Signed-off-by: Tor Lillqvist <tml@iki.fi>

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

commit 84e791e580c3a16d628c8161a92a0652aa94b294
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Dec 21 09:11:23 2009 -0500

    Revert the g_set_prgname change

    This change breaks our API and causes warnings from essentially
    all applications.
    See bug 563627.

 glib/gutils.c               |   11 ++---------
 glib/tests/option-context.c |    5 -----
 2 files changed, 2 insertions(+), 14 deletions(-)

commit 7e9ad3d7460059cc29113ec26b769cee0629a453
Author: Gian Mario Tagliaretti <gianmt@gnome.org>
Date:   Wed Dec 16 23:38:39 2009 +0100

    Remove wrong file imports, only gio/gio.h should be included

 gio/gunixconnection.h |    3 +--
 gio/gunixfdmessage.h  |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

commit 3d546303e87bc3b95a4c1124079a1ea6090f569b
Author: Tor Lillqvist <tml@iki.fi>
Date:   Mon Dec 14 03:09:46 2009 +0200

    Check for <wspiapi.h> and use it if present

    Should help bug #603527 if glib is built in an environment that has
    <wspiapi.h>.

 config.h.win32.in    |    7 +++++++
 configure.in         |    2 +-
 gio/gwin32resolver.c |    8 ++++++++
 3 files changed, 16 insertions(+), 1 deletions(-)

commit 3a7a950b2b912d0c22ce1208b883128077319d1e
Author: Matthew W. S. Bell <matthew@bells23.org.uk>
Date:   Wed Dec 2 01:48:30 2009 +0100

    Initialise variable in g_time_val_from_iso8601()

    The function does not initialise the struct tm,
    giving it improper values of tm_isdst making the result
    an hour out.

    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=603540
    (cherry picked from commit 2321e5aed07154761223bb124770beba56700e41)

 glib/gtimer.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit 31f928a2c32f5b219da9c30b8c5bbfcea2343426
Author: Alexander Larsson <alexl@redhat.com>
Date:   Mon Dec 7 22:00:51 2009 +0100

    Remove default implementation of async filter steam ops

    Not only is the default implementation broken (it causes infinite
    recursion
    as seen in bug #603982), but its also worthless. If we just fall
    back on the
    default stream operations we automatically get async version based on
    the sync filter stream operations, which is what we want.
    (cherry picked from commit 4fbbe190b7cbfd271bbb18428bc103ebffa41112)

 gio/gfilterinputstream.c  |  185
 +--------------------------------------------
 gio/gfilteroutputstream.c |  173
 ------------------------------------------
 2 files changed, 2 insertions(+), 356 deletions(-)

commit a8027e093e5eda117b7079dc503a6fc8d5b03062
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Dec 1 08:22:54 2009 -0500

    Bump version

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

commit 227609c73b4b1c0127dbb3262ffa49e7492694d4
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Dec 1 08:21:55 2009 -0500

    2.22.3

 docs/reference/glib/tmpl/glib-unused.sgml |   67 +++
 docs/reference/glib/tmpl/macros_misc.sgml |    5 +-
 docs/reference/glib/tmpl/version.sgml     |   68 ---
 po/am.po                                  |  114 ++--
 po/ar.po                                  |  114 ++--
 po/as.po                                  |  114 ++--
 po/az.po                                  |  114 ++--
 po/be.po                                  |  114 ++--
 po/be@latin.po                            |  114 ++--
 po/bg.po                                  |  114 ++--
 po/bn.po                                  |  114 ++--
 po/bn_IN.po                               |  114 ++--
 po/bs.po                                  |  114 ++--
 po/ca.po                                  |  114 ++--
 po/ca@valencia.po                         |  909
 ++++++++++++++---------------
 po/cs.po                                  |  114 ++--
 po/cy.po                                  |  114 ++--
 po/da.po                                  |  114 ++--
 po/de.po                                  |  114 ++--
 po/dz.po                                  |  114 ++--
 po/el.po                                  |  114 ++--
 po/en_CA.po                               |  114 ++--
 po/en_GB.po                               |  114 ++--
 po/eo.po                                  |  114 ++--
 po/es.po                                  |  114 ++--
 po/et.po                                  |  473 +++++++++++++++-
 po/eu.po                                  |  114 ++--
 po/fa.po                                  |  114 ++--
 po/fi.po                                  |  114 ++--
 po/fr.po                                  |  114 ++--
 po/ga.po                                  |  114 ++--
 po/gl.po                                  |  114 ++--
 po/gu.po                                  |  114 ++--
 po/he.po                                  |  114 ++--
 po/hi.po                                  |  114 ++--
 po/hr.po                                  |  114 ++--
 po/hu.po                                  |  114 ++--
 po/hy.po                                  |  114 ++--
 po/id.po                                  |  114 ++--
 po/is.po                                  |  114 ++--
 po/it.po                                  |  114 ++--
 po/ja.po                                  |  114 ++--
 po/ka.po                                  |  114 ++--
 po/kn.po                                  |  114 ++--
 po/ko.po                                  |  114 ++--
 po/ku.po                                  |  114 ++--
 po/lt.po                                  |  114 ++--
 po/lv.po                                  |  114 ++--
 po/mai.po                                 |  114 ++--
 po/mg.po                                  |  114 ++--
 po/mk.po                                  |  114 ++--
 po/ml.po                                  |  114 ++--
 po/mn.po                                  |  114 ++--
 po/mr.po                                  |  114 ++--
 po/ms.po                                  |  114 ++--
 po/nb.po                                  |  114 ++--
 po/ne.po                                  |  114 ++--
 po/nl.po                                  |  114 ++--
 po/nn.po                                  |  114 ++--
 po/oc.po                                  |  114 ++--
 po/or.po                                  |  114 ++--
 po/pa.po                                  |  114 ++--
 po/pl.po                                  |  114 ++--
 po/ps.po                                  |  114 ++--
 po/pt.po                                  |  114 ++--
 po/pt_BR.po                               |  114 ++--
 po/ro.po                                  |  114 ++--
 po/ru.po                                  |  114 ++--
 po/rw.po                                  |  114 ++--
 po/si.po                                  |  114 ++--
 po/sk.po                                  |  114 ++--
 po/sl.po                                  |  114 ++--
 po/sq.po                                  |  114 ++--
 po/sr.po                                  |  114 ++--
 po/sr@ije.po                              |  114 ++--
 po/sr@latin.po                            |  114 ++--
 po/sv.po                                  |  114 ++--
 po/ta.po                                  |  114 ++--
 po/te.po                                  |  114 ++--
 po/th.po                                  |  114 ++--
 po/tl.po                                  |  114 ++--
 po/tr.po                                  |  114 ++--
 po/tt.po                                  |  114 ++--
 po/uk.po                                  |  114 ++--
 po/vi.po                                  |  114 ++--
 po/wa.po                                  |  114 ++--
 po/xh.po                                  |  114 ++--
 po/yi.po                                  |  114 ++--
 po/zh_CN.po                               |  114 ++--
 po/zh_HK.po                               |  114 ++--
 po/zh_TW.po                               |  114 ++--
 91 files changed, 5886 insertions(+), 5440 deletions(-)

commit 189453aa815f260e843e920e3894174a3c555fdd
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Tue Dec 1 00:06:11 2009 -0500

    Disable a test that does not work

 glib/tests/option-context.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit 14e22aae001f7c45a40c64e280fb0fb2c1acc10b
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Mon Nov 30 23:43:33 2009 -0500

    Updates

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

commit 8a190a155c57de6fc0330ff0b25b91579a4be215
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Fri Nov 20 12:54:35 2009 -0600

    Bug 598712 - can't detect text file with backspace

    looks_like_text(): Allow '\b' to appear in text files.
    (cherry picked from commit 48e2a570439373882cf755567e1d147bc5dd50e5)

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

commit 7c177e274a913480cfa67ce09e354e1fa79a1387
Author: Cody Russell <bratsche@gnome.org>
Date:   Mon Nov 23 07:48:14 2009 -0600

    gtester should fail even if -k is passed
    (cherry picked from commit 04d83e8e503a07e7b4279227c8f992ddf7c6ef4e)

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

commit 7a1b265e97442aae1f42e504deb85ac0e58bfc83
Author: Ryan Lortie <desrt@desrt.ca>
Date:   Wed Nov 18 18:43:30 2009 -0600

    Bug 595138 - GFile not robust with invalid input

    Improve handling of g_file_query_default_handler() when called on an
    invalid GFile (ie: one created with an invalid URI).
    (cherry picked from commit 9681d7e75f2d1296a890bfa64b3478ea7025df62)

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

commit be89d5034bd3121280d89d1f13b5a947bbfbb862
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:   Sun Nov 29 19:32:56 2009 +0100

    Updated Catalan Valencian translation

 po/ca@valencia.po | 1135
 +++++++++++++++++++++++++++--------------------------
 1 files changed, 579 insertions(+), 556 deletions(-)

commit b0e4df9375bddcae8558d52cc4049111cbc7cae8
Author: Alexander Larsson <alexl@redhat.com>
Date:   Thu Nov 26 16:05:07 2009 +0100

    Pass in the right device to vfs->local_file_add_info for symlinks

    We used to pass the path for the symlink, but the device of the target
    which is wrong and breaks metadata access.

    https://bugzilla.gnome.org/show_bug.cgi?id=593809
    (cherry picked from commit 2b2195bf68bf68837dc9f6b4765d3716694f42b3)

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

commit c5b846eb13d5a11f15e6f18394b2cea87c268b02
Author: Mures Andone <mures.andone@movial.com>
Date:   Tue Nov 10 14:59:31 2009 +0200

    Fixed bug 91 (GIO monitoring not working due to bad assert)

    https://bugzilla.gnome.org/show_bug.cgi?id=593856
    (cherry picked from commit 96f41b62836810563c4f69ba6d053e91c638728a)

 gio/inotify/ginotifydirectorymonitor.c |   10 ++++++++--
 gio/inotify/ginotifyfilemonitor.c      |   10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

commit fbde782a2ae71ffb712563c91a3d1d225f7b94db
Author: Tor Lillqvist <tml@iki.fi>
Date:   Tue Nov 10 14:19:59 2009 +0200

    Include all of share/gtk-doc/html to get also the gio docs

    Also add -D switches to not pointlessly include entries for
    directories
    in the zip files.

 glib-zip.in |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

commit 7a3ce3f5e057f9424d7e9378114f8ffecfb1a612
Author: Tor Lillqvist <tml@iki.fi>
Date:   Tue Nov 10 01:37:13 2009 +0200

    Avoid gcc warning about redeclaration of atexit() on MinGW

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

commit 1f604fe208edb3c4caa8c79e8157d57f5587fdee
Author: Tor Lillqvist <tml@iki.fi>
Date:   Wed Nov 4 23:59:18 2009 +0200

    Don't call WSAEventSelect() on -1

    If g_io_win32_sock_close() has been called on a socket channel, don't
    later in g_io_win32_free() call WSAEventSelect() on its fd which has
    been set to -1.

 glib/giowin32.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit e7f6869b7e338fff2c3aafeed84aaaf838606624
Author: Hib Eris <hib@hiberis.nl>
Date:   Tue Nov 3 15:06:29 2009 +0200

    Fix check for C++ compiler when cross-compiling

    Use AC_CHECK_TOOLS instead of AC_CHECK_PROGS. Patch from bug #577711.

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

commit 0f5d8b4cbae7e89b79245914f7b22ed38e9455a8
Author: Carlo Bramini <carlo.bramix@libero.it>
Date:   Tue Nov 3 14:26:25 2009 +0200

    Make g_file_test() behave on Windows more like as on POSIX

    Patch from bug #572252.

 glib/gfileutils.c |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

commit 07e22befadf1dc8cb53eb669831cde3bb194595c
Author: Benjamin Otte <otte@gnome.org>
Date:   Wed Oct 28 19:18:20 2009 +0100

    Properly nul-terminate return values from g_convert()

    The patch ensures that multibyte character sets are properly
    nul-terminated. This is an issue because the documentation claims to
    return a "nul-terminated" string and users of the API assume that
    means
    a proper nul-termination in the resulting character set.

    I looked at Pidgin and GStreamer code and found at least 3 cases where
    this was happening.

    This patch also reverts the documentation change from
    8c936178a130f06511164dbd317180177da6b448 as that is now no longer
    necessary.

 glib/gconvert.c |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)

commit 8c936178a130f06511164dbd317180177da6b448
Author: Benjamin Otte <otte@gnome.org>
Date:   Tue Oct 27 21:07:13 2009 +0100

    Clarify documentation about g_convert() nul-terminated returns

    THere is effectively no nul-termination for multibyte characters.

 glib/gconvert.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

commit d8fc1528b74cd79f59b9c630c5f6b170e0b65818
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Sun Oct 25 02:50:12 2009 -0400

    Avoid a warning
[--snip--]
