[glib/gvariant: 97/97] Merge branch 'master' into gvariant



commit bb2af31aae0bf41066638339ce51fb82936dd9a9
Merge: 59ef9bc... 2a78adc...
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Nov 30 19:29:33 2009 -0500

    Merge branch 'master' into gvariant

 NEWS                                        |   61 ++
 configure.in                                |   19 +-
 docs/reference/gio/gio-docs.xml             |   32 +-
 docs/reference/gio/gio-sections.txt         |  138 ++++
 docs/reference/gio/gio.types                |   10 +
 docs/reference/glib/tmpl/glib-unused.sgml   |   67 ++
 docs/reference/glib/tmpl/macros_misc.sgml   |    9 +-
 docs/reference/glib/tmpl/unicode.sgml       |    4 +-
 docs/reference/glib/tmpl/version.sgml       |   68 --
 docs/reference/gobject/gobject-sections.txt |    1 +
 gio-2.0.pc.in                               |    1 +
 gio/Makefile.am                             |   15 +
 gio/fen/fen-data.c                          |    4 -
 gio/gappinfo.c                              |   27 +
 gio/gappinfo.h                              |    3 +
 gio/gasyncinitable.c                        |   38 +-
 gio/gcancellable.c                          |   86 ++-
 gio/gcharsetconverter.c                     |  469 +++++++++++++
 gio/gcharsetconverter.h                     |   56 ++
 gio/gcontenttype.c                          |    5 +-
 gio/gconverter.c                            |  234 +++++++
 gio/gconverter.h                            |   94 +++
 gio/gconverterinputstream.c                 |  555 +++++++++++++++
 gio/gconverterinputstream.h                 |   80 +++
 gio/gconverteroutputstream.c                |  606 +++++++++++++++++
 gio/gconverteroutputstream.h                |   80 +++
 gio/gdesktopappinfo.c                       |   26 +-
 gio/gdummyfile.c                            |    6 -
 gio/gfile.c                                 |   46 ++-
 gio/gfile.h                                 |    2 +
 gio/gio.h                                   |    6 +
 gio/gio.symbols                             |  485 ++++++++------
 gio/gioenums.h                              |   57 ++-
 gio/giotypes.h                              |    6 +
 gio/glocaldirectorymonitor.c                |    7 -
 gio/glocalfile.c                            |   10 +-
 gio/glocalfileinfo.c                        |    7 +-
 gio/glocalfileinputstream.c                 |    6 -
 gio/glocalfilemonitor.c                     |    7 -
 gio/gmount.c                                |   41 +-
 gio/gmount.h                                |    3 +
 gio/goutputstream.c                         |   29 +-
 gio/goutputstream.h                         |    1 +
 gio/gsocket.c                               |    3 +-
 gio/gsocketlistener.c                       |  225 +++++++
 gio/gsocketlistener.h                       |    3 +
 gio/gunionvolumemonitor.c                   |    9 +-
 gio/gunixfdlist.c                           |  391 +++++++++++
 gio/gunixfdlist.h                           |   89 +++
 gio/gunixfdmessage.c                        |  193 ++++--
 gio/gunixfdmessage.h                        |    7 +-
 gio/gunixvolume.c                           |  120 ++--
 gio/gunixvolumemonitor.c                    |   12 -
 gio/gwin32mount.c                           |    2 +-
 gio/gwin32volumemonitor.c                   |    6 +-
 gio/gzlibcompressor.c                       |  324 +++++++++
 gio/gzlibcompressor.h                       |   51 ++
 gio/gzlibdecompressor.c                     |  296 ++++++++
 gio/gzlibdecompressor.h                     |   50 ++
 gio/inotify/ginotifydirectorymonitor.c      |   10 +-
 gio/inotify/ginotifyfilemonitor.c           |   10 +-
 gio/pltcheck.sh                             |    2 +-
 gio/tests/Makefile.am                       |   21 +-
 gio/tests/converter-stream.c                |  572 ++++++++++++++++
 gio/tests/filter-cat.c                      |  227 +++++++
 gio/tests/resolver.c                        |    5 +-
 gio/tests/unix-fd.c                         |  197 ++++++
 gio/tests/unix-streams.c                    |    2 +-
 gio/win32/gwinhttpfile.c                    |    4 +-
 gio/win32/gwinhttpfileinputstream.c         |    4 +-
 gio/win32/gwinhttpfileoutputstream.c        |    4 +-
 gio/win32/gwinhttpvfs.c                     |    2 +-
 gio/xdgmime/xdgmimecache.c                  |    1 -
 glib-zip.in                                 |    9 +-
 glib/gfileutils.c                           |   51 +-
 glib/giowin32.c                             |    3 +-
 glib/gtester.c                              |    2 +-
 glib/gutils.h                               |    2 +
 glib/tests/option-context.c                 |    6 +
 glibconfig.h.win32.in                       |    8 +-
 gmodule-2.0-uninstalled.pc.in               |    4 +-
 gmodule-2.0.pc.in                           |    4 +-
 gmodule-export-2.0.pc.in                    |    4 +-
 gmodule-no-export-2.0-uninstalled.pc.in     |    4 +-
 gmodule-no-export-2.0.pc.in                 |    4 +-
 gobject/Makefile.am                         |    3 +-
 gobject/gatomicarray.c                      |  169 +++++
 gobject/gatomicarray.h                      |   60 ++
 gobject/gobject.c                           |   26 +-
 gobject/gtype.c                             |  716 +++++++++++++-------
 gobject/gtypemodule.h                       |   27 +-
 gobject/tests/Makefile.am                   |    4 +-
 gobject/tests/dynamictests.c                |  235 +++++++
 m4macros/glib-2.0.m4                        |    3 +-
 po/am.po                                    |  282 +++++----
 po/ar.po                                    |  285 +++++----
 po/as.po                                    |  287 +++++----
 po/az.po                                    |  282 +++++----
 po/be.po                                    |  283 +++++----
 po/be latin po                              |  286 +++++----
 po/bg.po                                    |  287 +++++----
 po/bn.po                                    |  287 +++++----
 po/bn_IN.po                                 |  287 +++++----
 po/bs.po                                    |  282 +++++----
 po/ca.po                                    |  307 +++++----
 po/ca valencia po                           |  285 +++++----
 po/cs.po                                    |  287 +++++----
 po/cy.po                                    |  282 +++++----
 po/da.po                                    |  287 +++++----
 po/de.po                                    |  287 +++++----
 po/dz.po                                    |  282 +++++----
 po/el.po                                    |  286 +++++----
 po/en shaw po                               |  967 ++++++++++++++-------------
 po/en_CA.po                                 |  285 +++++----
 po/en_GB.po                                 |  287 +++++----
 po/eo.po                                    |  282 +++++----
 po/es.po                                    |  298 +++++----
 po/et.po                                    |   48 +-
 po/eu.po                                    |  287 +++++----
 po/fa.po                                    |  282 +++++----
 po/fi.po                                    |  287 +++++----
 po/fr.po                                    |  287 +++++----
 po/ga.po                                    |  282 +++++----
 po/gl.po                                    |  291 +++++----
 po/gu.po                                    |  287 +++++----
 po/he.po                                    |  287 +++++----
 po/hi.po                                    |  287 +++++----
 po/hr.po                                    |  282 +++++----
 po/hu.po                                    |  287 +++++----
 po/hy.po                                    |  282 +++++----
 po/id.po                                    |  282 +++++----
 po/is.po                                    |  282 +++++----
 po/it.po                                    |  287 +++++----
 po/ja.po                                    |  287 +++++----
 po/ka.po                                    |  282 +++++----
 po/kn.po                                    |  287 +++++----
 po/ko.po                                    |  287 +++++----
 po/ku.po                                    |  282 +++++----
 po/lt.po                                    |  285 +++++----
 po/lv.po                                    |  282 +++++----
 po/mai.po                                   |  285 +++++----
 po/mg.po                                    |  282 +++++----
 po/mk.po                                    |  285 +++++----
 po/ml.po                                    |  287 +++++----
 po/mn.po                                    |  282 +++++----
 po/mr.po                                    |  287 +++++----
 po/ms.po                                    |  282 +++++----
 po/nb.po                                    |  300 +++++----
 po/ne.po                                    |  282 +++++----
 po/nl.po                                    |  285 +++++----
 po/nn.po                                    |  285 +++++----
 po/oc.po                                    |  282 +++++----
 po/or.po                                    |  287 +++++----
 po/pa.po                                    |  287 +++++----
 po/pl.po                                    |  287 +++++----
 po/ps.po                                    |  282 +++++----
 po/pt.po                                    |  287 +++++----
 po/pt_BR.po                                 |  291 +++++----
 po/ro.po                                    |  287 +++++----
 po/ru.po                                    |  287 +++++----
 po/rw.po                                    |  282 +++++----
 po/si.po                                    |  282 +++++----
 po/sk.po                                    |  285 +++++----
 po/sl.po                                    |  331 +++++-----
 po/sq.po                                    |  288 +++++----
 po/sr.po                                    |  287 +++++----
 po/sr ije po                                |  282 +++++----
 po/sr latin po                              |  287 +++++----
 po/sv.po                                    |  289 +++++----
 po/ta.po                                    |  287 +++++----
 po/te.po                                    |  287 +++++----
 po/th.po                                    |  287 +++++----
 po/tl.po                                    |  282 +++++----
 po/tr.po                                    |  287 +++++----
 po/tt.po                                    |  282 +++++----
 po/uk.po                                    |  287 +++++----
 po/vi.po                                    |  285 +++++----
 po/wa.po                                    |  282 +++++----
 po/xh.po                                    |  282 +++++----
 po/yi.po                                    |  282 +++++----
 po/zh_CN.po                                 |  285 +++++----
 po/zh_HK.po                                 |  287 +++++----
 po/zh_TW.po                                 |  287 +++++----
 tests/gobject/dynamictype.c                 |   51 ++-
 184 files changed, 20813 insertions(+), 12841 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]