[glib/wip/gapplication: 50/50] Merge branch 'master' into wip/gapplication
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gapplication: 50/50] Merge branch 'master' into wip/gapplication
- Date: Fri, 28 May 2010 13:17:35 +0000 (UTC)
commit 0fa39294821f0159980bc3aa0a776b6adcc528c4
Merge: 3d3acd2 91ec834
Author: Colin Walters <walters verbum org>
Date: Fri May 28 09:17:09 2010 -0400
Merge branch 'master' into wip/gapplication
NEWS | 61 +
config.h.win32.in | 20 +-
configure.in | 2 +-
docs/reference/.gitignore | 1 +
docs/reference/gio/migrating-gconf.xml | 23 +-
docs/reference/glib/Makefile.am | 28 +-
docs/reference/glib/glib-gettextize.1 | 71 --
docs/reference/glib/glib-sections.txt | 1 +
docs/reference/glib/gtester-report.1 | 44 -
docs/reference/glib/gtester.1 | 101 --
docs/reference/glib/tmpl/i18n.sgml | 11 +
docs/reference/gobject/Makefile.am | 33 +-
docs/reference/gobject/glib-genmarshal.1 | 307 -----
docs/reference/gobject/glib-mkenums.1 | 246 ----
docs/reference/gobject/gobject-query.1 | 83 --
docs/reference/gobject/gobject-sections.txt | 1 +
gio/fen/fen-node.c | 21 +-
gio/gcredentials.c | 2 +-
gio/gdbus-tool.c | 49 +-
gio/gdbusaddress.c | 6 +
gio/gdbusauth.c | 8 +-
gio/gdbusauthmechanismexternal.c | 4 +-
gio/gdbusauthmechanismsha1.c | 27 +-
gio/gdbusconnection.c | 271 +++--
gio/gdbusconnection.h | 2 +
gio/gdbusmessage.c | 58 +-
gio/gdbusmessage.h | 4 +-
gio/gdbusmethodinvocation.c | 28 +-
gio/gdbusnameowning.c | 2 +
gio/gdbusnamewatching.c | 2 +
gio/gdbusprivate.c | 106 ++-
gio/gdbusprivate.h | 7 +-
gio/gdbusproxy.c | 78 +-
gio/gdbusserver.c | 7 +
gio/gfile.c | 17 +-
gio/gio.symbols | 12 +-
gio/glocalfileinputstream.c | 20 +-
gio/glocalfileiostream.c | 8 +-
gio/glocalfileoutputstream.c | 30 +-
gio/glocalfileoutputstream.h | 6 +
gio/gschema-compile.c | 15 +-
gio/gsettings-tool.c | 2 +-
gio/gsettings.c | 7 +-
gio/gsettingsbackend.c | 2 +-
gio/gsettingsbackend.h | 5 +
gio/pltcheck.sh | 2 +-
gio/tests/Makefile.am | 5 +
gio/tests/gdbus-connection.c | 11 +-
gio/tests/gdbus-example-peer.c | 1 +
gio/tests/gdbus-export.c | 14 +-
gio/tests/gdbus-names.c | 2 +
gio/tests/gdbus-peer.c | 18 +
gio/tests/gdbus-threading.c | 17 +-
glib/glib.symbols | 4 +
glib/gmain.c | 88 ++-
glib/gmain.h | 9 +-
glib/gstrfuncs.c | 27 +
glib/gstrfuncs.h | 4 +-
glib/gvariant-serialiser.c | 18 +
glib/gvariant.c | 3 +-
glib/tests/gvariant.c | 111 ++-
gobject/Makefile.am | 2 -
gobject/glib-genmarshal.1 | 212 ----
gobject/glib-mkenums.1 | 169 ---
m4macros/gsettings.m4 | 73 +-
po/Makefile.in.in | 2 +
po/POTFILES.in | 2 +
po/af.po | 712 +++++++++++-
po/am.po | 710 +++++++++++-
po/ar.po | 714 +++++++++++-
po/as.po | 716 +++++++++++-
po/ast.po | 716 +++++++++++-
po/az.po | 711 +++++++++++-
po/be.po | 734 +++++++++++--
po/be latin po | 737 +++++++++++--
po/bg.po | 716 +++++++++++-
po/bn.po | 716 +++++++++++-
po/bn_IN.po | 716 +++++++++++-
po/bs.po | 711 +++++++++++-
po/ca.po | 716 +++++++++++-
po/ca valencia po | 716 +++++++++++-
po/cs.po | 716 +++++++++++-
po/cy.po | 713 +++++++++++-
po/da.po | 718 +++++++++++-
po/de.po | 716 +++++++++++-
po/dz.po | 711 +++++++++++-
po/el.po | 727 +++++++++++-
po/en shaw po | 724 +++++++++++-
po/en_CA.po | 714 +++++++++++-
po/en_GB.po | 716 +++++++++++-
po/eo.po | 710 +++++++++++-
po/es.po | 423 ++++----
po/et.po | 735 +++++++++++--
po/eu.po | 716 +++++++++++-
po/fa.po | 711 +++++++++++-
po/fi.po | 716 +++++++++++-
po/fr.po | 716 +++++++++++-
po/ga.po | 712 +++++++++++-
po/gl.po | 668 ++++++-----
po/gu.po | 716 +++++++++++-
po/he.po | 716 +++++++++++-
po/hi.po | 716 +++++++++++-
po/hr.po | 711 +++++++++++-
po/hu.po | 716 +++++++++++-
po/hy.po | 711 +++++++++++-
po/id.po | 1617 ++++++++++++++++++---------
po/is.po | 711 +++++++++++-
po/it.po | 720 +++++++++++-
po/ja.po | 716 +++++++++++-
po/ka.po | 712 +++++++++++-
po/kn.po | 716 +++++++++++-
po/ko.po | 716 +++++++++++-
po/ku.po | 710 +++++++++++-
po/lt.po | 716 +++++++++++-
po/lv.po | 710 +++++++++++-
po/mai.po | 713 +++++++++++-
po/mg.po | 711 +++++++++++-
po/mk.po | 714 +++++++++++-
po/ml.po | 716 +++++++++++-
po/mn.po | 711 +++++++++++-
po/mr.po | 716 +++++++++++-
po/ms.po | 711 +++++++++++-
po/nb.po | 718 +++++++++++--
po/nds.po | 711 +++++++++++-
po/ne.po | 711 +++++++++++-
po/nl.po | 725 +++++++++++--
po/nn.po | 714 +++++++++++-
po/oc.po | 710 +++++++++++-
po/or.po | 716 +++++++++++-
po/pa.po | 716 +++++++++++-
po/pl.po | 716 +++++++++++-
po/ps.po | 713 +++++++++++-
po/pt.po | 716 +++++++++++-
po/pt_BR.po | 716 +++++++++++-
po/ro.po | 716 +++++++++++-
po/ru.po | 716 +++++++++++-
po/rw.po | 726 +++++++++++--
po/si.po | 712 +++++++++++-
po/sk.po | 711 +++++++++++-
po/sl.po | 716 +++++++++++-
po/sq.po | 760 ++++++++++++--
po/sr.po | 716 +++++++++++-
po/sr ije po | 711 +++++++++++-
po/sr latin po | 716 +++++++++++-
po/sv.po | 716 +++++++++++-
po/ta.po | 716 +++++++++++-
po/te.po | 716 +++++++++++-
po/th.po | 716 +++++++++++-
po/tl.po | 711 +++++++++++-
po/tr.po | 716 +++++++++++-
po/tt.po | 710 +++++++++++-
po/uk.po | 716 +++++++++++-
po/vi.po | 716 +++++++++++-
po/wa.po | 711 +++++++++++-
po/xh.po | 711 +++++++++++-
po/yi.po | 710 +++++++++++-
po/zh_CN.po | 716 +++++++++++-
po/zh_HK.po | 716 +++++++++++-
po/zh_TW.po | 716 +++++++++++-
tests/mainloop-test.c | 6 +-
160 files changed, 60760 insertions(+), 8299 deletions(-)
---
diff --cc gio/tests/Makefile.am
index 02fafc5,caab309..5a3fe89
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@@ -50,9 -54,8 +54,10 @@@ TEST_PROGS +=
gdbus-error \
gdbus-peer \
gdbus-exit-on-close \
+ application \
+ testapps \
$(NULL)
+ endif
SAMPLE_PROGS = \
resolver \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
