[glib/wip/gsettings-list: 45/45] Merge branch 'master' into wip/gsettings-list
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gsettings-list: 45/45] Merge branch 'master' into wip/gsettings-list
- Date: Thu, 2 Dec 2010 17:09:20 +0000 (UTC)
commit 3ed846e753ab337c5b5668fb26ede181fa6a4360
Merge: 93c26b9 3e61cb2
Author: Rodrigo Moya <rodrigo gnome-db org>
Date: Thu Dec 2 18:08:37 2010 +0100
Merge branch 'master' into wip/gsettings-list
NEWS | 40 ++
configure.ac | 2 +-
docs/reference/gio/gio-docs.xml | 24 +-
docs/reference/gio/gio-sections.txt | 192 +++++-
docs/reference/gio/gio.types | 8 +
docs/reference/gio/overview.xml | 24 +-
docs/reference/glib/changes.sgml | 8 -
docs/reference/glib/glib-docs.sgml | 4 +
docs/reference/glib/glib-sections.txt | 2 +
docs/reference/gobject/gobject-docs.sgml | 4 +
docs/reference/gobject/gobject-sections.txt | 2 +
gio/Makefile.am | 21 +-
gio/gaction.c | 2 +-
gio/gactiongroup.c | 2 +-
gio/gappinfo.c | 4 +-
gio/gappinfo.h | 3 +
gio/gapplicationcommandline.c | 3 +-
gio/gapplicationimpl-dbus.c | 6 +-
gio/gasynchelper.c | 102 ++-
gio/gasynchelper.h | 4 +-
gio/gcancellable.c | 116 ++++
gio/gcancellable.h | 2 +
gio/gdesktopappinfo.c | 166 ++++-
gio/gdummytlsbackend.c | 274 ++++++++
gio/gdummytlsbackend.h | 46 ++
gio/gfilemonitor.c | 28 +-
gio/gfilemonitor.h | 2 +-
gio/gio-marshal.list | 4 +
gio/gio.h | 8 +
gio/gio.symbols | 109 +++-
gio/gioenums.h | 100 +++
gio/giomodule.c | 8 +-
gio/giotypes.h | 42 ++
gio/glib-compile-schemas.c | 4 +-
gio/gperiodic.c | 91 ++-
gio/gpermission.c | 2 +-
gio/gpollableinputstream.c | 303 ++++++++
gio/gpollableinputstream.h | 101 +++
gio/gpollableoutputstream.c | 200 ++++++
gio/gpollableoutputstream.h | 98 +++
gio/gproxyconnection.c | 155 -----
gio/gproxyconnection.h | 69 --
gio/gsettings.c | 8 +-
gio/gsettingsbackend.c | 2 +-
gio/gsettingsschema.c | 2 +
gio/gsimpleaction.c | 2 +-
gio/gsimpleactiongroup.c | 2 +-
gio/gsimplepermission.c | 2 +-
gio/gsocket.c | 33 +-
gio/gsocketclient.c | 332 ++++++++--
gio/gsocketclient.h | 7 +
gio/gsocketconnection.c | 3 +-
gio/gsocketinputstream.c | 59 ++-
gio/gsocketoutputstream.c | 60 ++-
gio/gsocks5proxy.c | 2 +-
gio/gtcpconnection.c | 2 +-
gio/gtcpwrapperconnection.c | 199 ++++++
gio/gtcpwrapperconnection.h | 68 ++
gio/gtlsbackend.c | 201 ++++++
gio/gtlsbackend.h | 92 +++
gio/gtlscertificate.c | 486 +++++++++++++
gio/gtlscertificate.h | 75 ++
gio/gtlsclientconnection.c | 333 +++++++++
gio/gtlsclientconnection.h | 72 ++
gio/gtlsconnection.c | 727 ++++++++++++++++++++
gio/gtlsconnection.h | 137 ++++
gio/gtlsserverconnection.c | 96 +++
gio/gtlsserverconnection.h | 61 ++
gio/gunixinputstream.c | 55 ++-
gio/gunixoutputstream.c | 54 ++-
gio/gwin32appinfo.c | 22 +
gio/tests/.gitignore | 1 +
gio/tests/Makefile.am | 5 +
gio/tests/desktop-app-info.c | 72 ++
gio/tests/g-icon.c | 6 +-
gio/tests/gschema-compile.c | 6 +-
gio/tests/pollable.c | 240 +++++++
.../inherit-gettext-domain.gschema.xml | 8 +
gio/tests/schema-tests/wrong-category.gschema.xml | 4 +-
gio/tests/socket-client.c | 195 ++++---
gio/tests/socket-common.c | 61 ++
gio/tests/socket-server.c | 164 +++---
glib/gdatetime.c | 2 +-
glib/glib.symbols | 2 +
glib/gmain.c | 287 +++++++--
glib/gmain.h | 17 +-
glib/gutils.c | 8 +-
glib/gvariant.h | 6 +-
gobject/gobject.c | 1 +
gobject/gobject.symbols | 1 +
gobject/gsourceclosure.c | 39 +-
gobject/gsourceclosure.h | 6 +-
gobject/tests/properties.c | 37 +
po/POTFILES.in | 5 +-
po/ar.po | 2 +-
po/be.po | 2 +-
po/bg.po | 2 +-
po/ca valencia po | 2 +-
po/cs.po | 2 +-
po/da.po | 2 +-
po/de.po | 2 +-
po/el.po | 2 +-
po/en_GB.po | 2 +-
po/es.po | 329 +++++-----
po/et.po | 2 +-
po/eu.po | 2 +-
po/fi.po | 2 +-
po/fr.po | 2 +-
po/gl.po | 159 +++--
po/he.po | 4 +-
po/hu.po | 2 +-
po/hy.po | 2 +-
po/id.po | 2 +-
po/it.po | 2 +-
po/ja.po | 2 +-
po/lt.po | 2 +-
po/nb.po | 2 +-
po/nl.po | 2 +-
po/pa.po | 2 +-
po/pl.po | 2 +-
po/pt.po | 2 +-
po/pt_BR.po | 2 +-
po/ro.po | 2 +-
po/sl.po | 2 +-
po/sr.po | 2 +-
po/sr latin po | 2 +-
po/sv.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_HK.po | 2 +-
po/zh_TW.po | 2 +-
130 files changed, 6352 insertions(+), 958 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
