[glib/application: 134/135] Merge branch 'master' into application
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/application: 134/135] Merge branch 'master' into application
- Date: Thu, 5 Aug 2010 23:57:52 +0000 (UTC)
commit 886ae786ca5044665e0e8a9871303f6e632717bd
Merge: b028531 970d063
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Aug 5 11:46:02 2010 -0400
Merge branch 'master' into application
NEWS | 69 +
configure.ac | 24 +-
docs/reference/gio/gio-sections.txt | 4 +
docs/reference/gio/overview.xml | 10 +-
docs/reference/glib/tmpl/error_reporting.sgml | 5 +
docs/reference/glib/tmpl/glib-unused.sgml | 40 +
docs/reference/glib/tmpl/messages.sgml | 27 +-
docs/reference/glib/tmpl/version.sgml | 41 -
docs/reference/gobject/gobject-sections.txt | 1 +
gio/Makefile.am | 1 +
gio/gapplication.c | 2 +-
gio/gasynchelper.c | 8 +-
gio/gcredentials.c | 4 +-
gio/gdbusconnection.c | 60 +-
gio/gdbusmessage.c | 242 ++-
gio/gdbusmessage.h | 4 +
gio/gdbusmethodinvocation.c | 37 +
gio/gdbusprivate.c | 13 +-
gio/gdbusprivate.h | 1 +
gio/gdbusproxy.c | 10 +-
gio/gdbusserver.c | 16 +-
gio/gdelayedsettingsbackend.c | 50 +-
gio/gio.symbols | 15 +
gio/gioenums.h | 17 +-
gio/giomodule.c | 7 +-
gio/giostream.c | 6 +-
gio/gkeyfilesettingsbackend.c | 18 +-
gio/gmemorysettingsbackend.c | 24 +-
gio/gnetworkaddress.c | 3 +-
gio/gnullsettingsbackend.c | 12 +-
gio/gschema-compile.c | 241 ++-
gio/gsettings-mapping.c | 18 +-
gio/gsettings-tool.c | 102 +-
gio/gsettings.c | 95 +-
gio/gsettings.h | 8 +-
gio/gsettingsbackend.c | 22 +-
gio/gsettingsbackend.h | 19 +-
gio/gsettingsbackendinternal.h | 2 +-
gio/gsocket.c | 2 +
gio/gsocketclient.c | 2 +-
gio/gsocketconnection.c | 2 +-
gio/gsocketlistener.c | 6 +-
gio/inotify/inotify-helper.c | 2 +-
gio/tests/.gitignore | 3 +-
gio/tests/Makefile.am | 21 +-
gio/tests/appinfo.c | 62 +
gio/tests/application.c | 36 +
gio/tests/buffered-input-stream.c | 2 +
gio/tests/buffered-output-stream.c | 9 +-
gio/tests/converter-stream.c | 22 +
gio/tests/data-input-stream.c | 31 +
gio/tests/data-output-stream.c | 32 +-
gio/tests/file.c | 38 +
gio/tests/g-icon.c | 116 ++-
gio/tests/gdbus-connection.c | 193 ++-
gio/tests/gdbus-exit-on-close.c | 2 +-
gio/tests/gdbus-peer.c | 27 +
gio/tests/gdbus-proxy.c | 177 ++
gio/tests/gdbus-serialization.c | 380 ++++-
gio/tests/gschema-compile.c | 4 +-
gio/tests/gsettings.c | 85 +-
gio/tests/icons.c | 122 --
gio/tests/memory-input-stream.c | 63 +
gio/tests/memory-output-stream.c | 31 +-
gio/tests/network-address.c | 92 +
gio/tests/org.gtk.test.gschema.xml | 6 +
gio/tests/unix-streams.c | 2 +-
gio/tests/volumemonitor.c | 178 ++
glib/Makefile.am | 2 +-
glib/gbookmarkfile.c | 6 +-
glib/gdate.c | 2 +
glib/gmem.c | 2 +-
glib/gnulib/Makefile.am | 3 +-
glib/goption.c | 28 +-
glib/gvariant-parser.c | 2 +-
glib/gvariant.c | 1 +
glib/pcre/Makefile.am | 5 -
glib/pcre/pcre_info.c | 93 -
glib/pcre/pcre_internal.h | 2 +-
glib/pcre/pcre_maketables.c | 143 --
glib/pcre/pcre_refcount.c | 82 -
glib/pcre/pcre_valid_utf8.c | 14 -
glib/pcre/pcre_version.c | 90 -
glib/tests/.gitignore | 8 +
glib/tests/Makefile.am | 37 +
glib/tests/array-test.c | 464 +++++-
glib/tests/bookmarkfile.c | 298 +++
{tests => glib/tests}/bookmarks/fail-01.xbel | 0
{tests => glib/tests}/bookmarks/fail-02.xbel | 0
{tests => glib/tests}/bookmarks/fail-03.xbel | 0
{tests => glib/tests}/bookmarks/fail-04.xbel | 0
{tests => glib/tests}/bookmarks/fail-05.xbel | 0
{tests => glib/tests}/bookmarks/fail-06.xbel | 0
{tests => glib/tests}/bookmarks/fail-07.xbel | 0
{tests => glib/tests}/bookmarks/fail-08.xbel | 0
{tests => glib/tests}/bookmarks/fail-09.xbel | 0
{tests => glib/tests}/bookmarks/fail-10.xbel | 0
{tests => glib/tests}/bookmarks/fail-11.xbel | 0
{tests => glib/tests}/bookmarks/fail-12.xbel | 0
{tests => glib/tests}/bookmarks/fail-13.xbel | 0
{tests => glib/tests}/bookmarks/fail-14.xbel | 0
{tests => glib/tests}/bookmarks/fail-15.xbel | 0
{tests => glib/tests}/bookmarks/fail-16.xbel | 0
{tests => glib/tests}/bookmarks/fail-17.xbel | 0
{tests => glib/tests}/bookmarks/valid-01.xbel | 0
{tests => glib/tests}/bookmarks/valid-02.xbel | 0
{tests => glib/tests}/bookmarks/valid-03.xbel | 0
glib/tests/error.c | 73 +
glib/tests/gvariant.c | 4 +-
glib/tests/keyfile.c | 48 +
glib/tests/logging.c | 147 ++
{tests => glib/tests}/markup-collect.c | 113 +-
glib/tests/markup-escape.c | 159 ++
glib/tests/markup-parse.c | 290 +++
glib/tests/markups/fail-1.expected | 1 +
{tests => glib/tests}/markups/fail-1.gmarkup | 0
glib/tests/markups/fail-10.expected | 4 +
{tests => glib/tests}/markups/fail-10.gmarkup | 0
glib/tests/markups/fail-11.expected | 7 +
{tests => glib/tests}/markups/fail-11.gmarkup | 0
glib/tests/markups/fail-12.expected | 1 +
{tests => glib/tests}/markups/fail-12.gmarkup | 0
glib/tests/markups/fail-13.expected | 1 +
{tests => glib/tests}/markups/fail-13.gmarkup | 0
glib/tests/markups/fail-14.expected | 4 +
{tests => glib/tests}/markups/fail-14.gmarkup | 0
glib/tests/markups/fail-15.expected | 8 +
{tests => glib/tests}/markups/fail-15.gmarkup | 0
glib/tests/markups/fail-16.expected | 2 +
{tests => glib/tests}/markups/fail-16.gmarkup | 0
glib/tests/markups/fail-17.expected | 1 +
{tests => glib/tests}/markups/fail-17.gmarkup | 0
glib/tests/markups/fail-18.expected | 1 +
{tests => glib/tests}/markups/fail-18.gmarkup | 0
glib/tests/markups/fail-19.expected | 1 +
{tests => glib/tests}/markups/fail-19.gmarkup | 0
glib/tests/markups/fail-2.expected | 1 +
{tests => glib/tests}/markups/fail-2.gmarkup | 0
glib/tests/markups/fail-20.expected | 1 +
{tests => glib/tests}/markups/fail-20.gmarkup | 0
glib/tests/markups/fail-21.expected | 1 +
{tests => glib/tests}/markups/fail-21.gmarkup | 0
glib/tests/markups/fail-22.expected | 2 +
{tests => glib/tests}/markups/fail-22.gmarkup | 0
glib/tests/markups/fail-23.expected | 4 +
{tests => glib/tests}/markups/fail-23.gmarkup | 0
glib/tests/markups/fail-24.expected | 1 +
{tests => glib/tests}/markups/fail-24.gmarkup | 0
glib/tests/markups/fail-25.expected | 1 +
{tests => glib/tests}/markups/fail-25.gmarkup | 0
glib/tests/markups/fail-26.expected | 2 +
{tests => glib/tests}/markups/fail-26.gmarkup | 0
glib/tests/markups/fail-27.expected | 2 +
{tests => glib/tests}/markups/fail-27.gmarkup | 0
glib/tests/markups/fail-28.expected | 2 +
{tests => glib/tests}/markups/fail-28.gmarkup | 0
glib/tests/markups/fail-29.expected | 2 +
{tests => glib/tests}/markups/fail-29.gmarkup | 0
{tests => glib/tests}/markups/fail-3.gmarkup | 0
glib/tests/markups/fail-30.expected | 2 +
{tests => glib/tests}/markups/fail-30.gmarkup | 0
glib/tests/markups/fail-31.expected | 2 +
{tests => glib/tests}/markups/fail-31.gmarkup | 0
glib/tests/markups/fail-32.expected | 2 +
{tests => glib/tests}/markups/fail-32.gmarkup | 0
glib/tests/markups/fail-33.expected | 2 +
{tests => glib/tests}/markups/fail-33.gmarkup | 0
glib/tests/markups/fail-34.expected | 2 +
{tests => glib/tests}/markups/fail-34.gmarkup | 0
glib/tests/markups/fail-35.expected | 2 +
{tests => glib/tests}/markups/fail-35.gmarkup | 0
{tests => glib/tests}/markups/fail-36.gmarkup | 0
glib/tests/markups/fail-37.expected | 1 +
{tests => glib/tests}/markups/fail-37.gmarkup | 0
glib/tests/markups/fail-38.expected | 3 +
{tests => glib/tests}/markups/fail-38.gmarkup | 0
glib/tests/markups/fail-39.expected | 3 +
{tests => glib/tests}/markups/fail-39.gmarkup | 0
glib/tests/markups/fail-4.expected | 1 +
{tests => glib/tests}/markups/fail-4.gmarkup | 0
glib/tests/markups/fail-40.expected | 2 +
{tests => glib/tests}/markups/fail-40.gmarkup | 0
glib/tests/markups/fail-5.expected | 1 +
{tests => glib/tests}/markups/fail-5.gmarkup | 0
glib/tests/markups/fail-6.expected | 1 +
{tests => glib/tests}/markups/fail-6.gmarkup | 0
glib/tests/markups/fail-7.expected | 1 +
{tests => glib/tests}/markups/fail-7.gmarkup | 0
glib/tests/markups/fail-8.expected | 3 +
{tests => glib/tests}/markups/fail-8.gmarkup | 0
glib/tests/markups/fail-9.expected | 1 +
{tests => glib/tests}/markups/fail-9.gmarkup | 0
.../tests/markups/valid-1.expected | 0
{tests => glib/tests}/markups/valid-1.gmarkup | 0
.../tests/markups/valid-10.expected | 0
{tests => glib/tests}/markups/valid-10.gmarkup | 0
.../tests/markups/valid-11.expected | 0
{tests => glib/tests}/markups/valid-11.gmarkup | 0
.../tests/markups/valid-2.expected | 0
{tests => glib/tests}/markups/valid-2.gmarkup | 0
.../tests/markups/valid-3.expected | 0
{tests => glib/tests}/markups/valid-3.gmarkup | 0
.../tests/markups/valid-4.expected | 0
{tests => glib/tests}/markups/valid-4.gmarkup | 0
.../tests/markups/valid-5.expected | 0
{tests => glib/tests}/markups/valid-5.gmarkup | 0
.../tests/markups/valid-6.expected | 0
{tests => glib/tests}/markups/valid-6.gmarkup | 0
.../tests/markups/valid-7.expected | 0
{tests => glib/tests}/markups/valid-7.gmarkup | 0
.../tests/markups/valid-8.expected | 0
{tests => glib/tests}/markups/valid-8.gmarkup | 0
.../tests/markups/valid-9.expected | 0
{tests => glib/tests}/markups/valid-9.gmarkup | 0
glib/tests/node.c | 117 ++
glib/tests/option-context.c | 240 ++-
glib/tests/pattern.c | 244 +++
glib/tests/printf.c | 241 +++-
glib/tests/queue.c | 1043 ++++++++++
glib/tests/regex.c | 106 +
glib/tests/scannerapi.c | 3 +
glib/tests/shell.c | 229 +++
glib/tests/strfuncs.c | 5 +
glib/tests/string.c | 29 +-
glib/tests/testing.c | 18 +-
glib/tests/tree.c | 66 +-
glib/tests/utf8-misc.c | 44 +
glib/tests/utf8-pointer.c | 41 +-
gmodule/Makefile.am | 1 +
gobject/Makefile.am | 3 +-
gobject/gbinding.c | 255 +++-
gobject/gbinding.h | 53 +-
gobject/gclosure.c | 15 +
gobject/gmarshal.list | 1 +
gobject/gobject.c | 14 +-
gobject/gobject.symbols | 2 +
gobject/gobjectnotifyqueue.c | 64 +-
gobject/tests/Makefile.am | 2 +-
gobject/tests/binding.c | 101 +-
gthread/Makefile.am | 1 +
gthread/tests/1bit-mutex.c | 8 +-
m4macros/.gitignore | 5 +
po/POTFILES.in | 2 +
po/es.po | 504 ++++--
po/fr.po | 2016 ++++++++++++--------
po/gl.po | 537 ++++--
po/he.po | 494 ++++--
po/nb.po | 554 ++++--
po/zh_CN.po | 349 ++--
tests/.gitignore | 2 +
tests/Makefile.am | 23 +-
tests/bookmarkfile-test.c | 188 --
tests/completion-test.c | 8 +
tests/gobject/Makefile.am | 1 +
tests/markup-escape-test.c | 132 --
tests/markup-test.c | 214 ---
tests/patterntest.c | 308 ---
tests/queue-test.c | 962 ----------
tests/refcount/Makefile.am | 3 +
tests/refcount/properties3.c | 204 ++
tests/refcount/properties4.c | 169 ++
tests/run-bookmark-test.sh | 34 -
tests/run-markup-tests.sh | 41 -
tests/shell-test.c | 297 ---
264 files changed, 10307 insertions(+), 4907 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
