+commit ae0ed3e435c550c3fae1a86a1c3cb42da319dff2
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 17:42:44 +0100
+
+ Move use of 0 as an error domain into the invalid-usage test
+
+ I think this is invalid, although others might disagree.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ test/core/error-mapping.c | 26 --------------------------
+ test/manual/invalid-usage.c | 25 +++++++++++++++++++++++++
+ 2 files changed, 25 insertions(+), 26 deletions(-)
+
+commit 92c613b8f429a4fe6c762805f1a4f3588511e6a7
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 17:35:42 +0100
+
+ Add a manual test for various invalid behaviour
+
+ Most of this has been sitting in a branch since fd.o #30171; fixing
+ fd.o #40151, another case of library-user error leading to undefined
+ behaviour and a hard-to-diagnose crash, seems a good time to get this
+ merged.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ .gitignore | 1 +
+ configure.ac | 1 +
+ test/Makefile.am | 4 +-
+ test/manual/Makefile.am | 27 ++++
+ test/manual/invalid-usage.c | 295
+ +++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 326 insertions(+), 2 deletions(-)
+
+commit 539bd92b8703134057c039f965ff7a5b5434c3a7
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 17:41:35 +0100
+
+ Remove tests in test-dbus-glib which basically just test error mapping
+
+ Also remove the methods on MyObject that only existed to support these
+ tests; ThrowError is now versatile enough to implement them all.
+
+ Leave ThrowUnregisteredError as it is, since it violates GError
+ expectations (see GNOME#660371), but stop using it in test-dbus-glib -
+ it's enough to use it in test-error-mapping.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ test/core/my-object.c | 36 -------------------------------
+ test/core/test-dbus-glib.c | 45
+ ---------------------------------------
+ test/core/test-service-glib.xml | 9 --------
+ 3 files changed, 90 deletions(-)
+
+commit b0dc0f419b641f4ab8fdd8eaf69f4ed4c2d61159
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 14:56:45 +0100
+
+ Add a new test for error mapping
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ .gitignore | 1 +
+ test/core/Makefile.am | 7 +
+ test/core/error-mapping.c | 327
+ +++++++++++++++++++++++++++++++++++++++++++++
+ test/core/run-test.sh | 1 +
+ 4 files changed, 336 insertions(+)
+
+commit 5aa25d4f3c44e7f46e95b8d8de64bf63f2c7c42e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 17:23:18 +0100
+
+ MyObject: make ThrowError, AsyncThrowError throw a caller-specified
+ error
+
+ This can be used to test arbitrary errors, but only in-process; in
+ tests with the service out-of-process, like test-dbus-glib,
+ the initial
+ error (matching the error they previously threw) will always be used.
+
+ This obsoletes ThrowErrorUnderscore, ThrowErrorMultiWord and
+ ThrowNotSupported, but not ThrowUnregisteredError due to some strange
+ assumptions about the validity of GError domains in that method
+ (see GNOME#660731).
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ test/core/my-object.c | 49
+ +++++++++++++++++++++++++++++++++++--------------
+ test/core/my-object.h | 5 +++++
+ 2 files changed, 40 insertions(+), 14 deletions(-)
+
+commit df3949806818ba0eab495fcaad2c7f3ad38007c7
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 16:14:52 +0100
+
+ test-dbus-glib.c isn't GTest yet, but add bug numbers anyway
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ test/core/test-dbus-glib.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit ead4ef065f700a4b586e78400789a7a18c856cc4
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 14:57:02 +0100
+
+ Add copyright/licensing information to test-dbus-glib
+
+ I've tried to dig up the copyright holders from git history; possibly
+ incomplete, but none of them cared enough to add their own copyright
+ notices, so this is the best we'll get.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ test/core/test-dbus-glib.c | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+commit 309bce6d7965037bc6f1827715d2372ae19c98d5
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 13:23:29 +0100
+
+ Form a valid D-Bus error name if an unmapped error has a negative code
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit ffd32e448a76045696d81a82fec9aeac7dd5e64b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-28 12:20:16 +0100
+
+ If an error code is out of range for its domain, warn about it
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+commit a31371cb5852c485b85926125988c0a170a640ca
+Author: David Woodhouse <dwmw2@infradead.org>
+Date: 2011-09-28 12:16:01 +0100
+
+ Don't crash in gerror_domaincode_to_dbus_error_name if code is out
+ of range
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40151
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 86ba4b0b8591b882803be1a064df4c213349fba0
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-22 18:25:02 +0100
+
+ dbus_g_value_parse_variant: fix several GVariant ref leaks
+
+ g_variant_get_child_value() (and hence g_variant_get_variant(),
+ which is
+ a simple wrapper) returns a ref to the child; we were assuming
+ it didn't.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41125
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+
+ dbus/dbus-gvalue-parse-variant.c | 56
+ ++++++++++++++++++++++++++------------
+ 1 file changed, 38 insertions(+), 18 deletions(-)
+
+commit 51222609f1af2eda0c223881dda3985435c3ad3f
+Author: Colin Walters <walters@verbum.org>
+Date: 2012-01-08 11:29:33 -0500
+
+ test-service-glib: Fix build with GLib 2.30
+
+ Only <glib.h> can be included directly.
+
+ test/core/test-service-glib.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 0215b0af4c95c9b9fc79ada5b99882f1261e2644
+Author: Colin Walters <walters@verbum.org>
+Date: 2012-01-08 11:28:10 -0500
+
+ autogen.sh: Honor NOCONFIGURE=1 environment variable
+
+ http://people.gnome.org/~walters/docs/build-api.txt
+
+ autogen.sh | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+commit 6a8daa9569a4a6c2610758b122f46f181ce52448
+Author: Derek Foreman <derek.foreman@collabora.co.uk>
+Date: 2011-04-20 12:14:23 -0400
+
+ Support building on Android
+
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42532
+
+ .gitignore | 1 +
+ Android.mk | 35 +++++++++++++++++++++++++++++++++++
+ dbus/Makefile.am | 9 +++++++++
+ 3 files changed, 45 insertions(+)
+
+commit dfdb0de78563a01c3d722e1de83d85e90163feaa
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-30 16:12:29 +0100
+
+ Micro version
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit f669a4aa6c7caaf6cbf9395ed14a1a357c4f6004
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-30 12:06:50 +0100
+
+ Prepare 0.98
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 1803b6cf35876247bb3e577bec9be8eed8b1b825
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-08-17 19:28:04 +0100
+
+ invoke_object_method: simplify how we return
+
+ Based on review feedback from Cosimo.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767
+
+ dbus/dbus-gobject.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+commit 83bdd09f6124289dd19556da9334906f28064838
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-08-17 19:26:46 +0100
+
+ dbus-gobject: centralize death-by-OOM and use oom() instead of goto
+
+ You can't recover from OOM (in GLib-land) so there's no point in
+ complicating the code for the reader.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767
+
+ dbus/dbus-gobject.c | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+
+commit 705761ad983392c311c3e66c3ddf7e44e0efbc6f
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-27 18:42:33 +0100
+
+ Fix various minor documentation bugs
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib.c | 2 +-
+ dbus/dbus-glib.h | 2 +-
+ dbus/dbus-gmain.c | 10 +++++-----
+ dbus/dbus-gobject.c | 33
+ +++++++++++++++++++--------------
+ dbus/dbus-gproxy.c | 33
+ ++++++++++++++++++++++++++++-----
+ dbus/dbus-gvalue.c | 2 +-
+ doc/reference/dbus-glib-sections.txt | 6 +++++-
+ 7 files changed, 60 insertions(+), 28 deletions(-)
+
+commit 0d058307cb914fa61e809b9e0500ac139e286ec6
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-27 17:47:03 +0100
+
+ specialized types: improve documentation and document more things
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-gtype-specialized.c | 436
+ +++++++++++++++++++++++++++++-----
+ dbus/dbus-gtype-specialized.h | 6 +-
+ doc/reference/dbus-glib-sections.txt | 1 +
+ 3 files changed, 388 insertions(+), 55 deletions(-)
+
+commit b3af6fdb643f9293d156c95860270a997b9f6843
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-27 17:50:07 +0100
+
+ dbus_g_type_collection_value_iterate, etc.: check that the type
+ is suitable
+
+ Otherwise we'd probably crash when we cast the vtable to an
+ inappropriate
+ type, and call its methods with inappropriate arguments as a result.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-gtype-specialized.c | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
+
+commit 3183d79b119d0296924602f19d9fc2a58a7bd597
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-27 17:47:46 +0100
+
+ dbus_g_type_collection_get_fixed: check preconditions on the type
+ and vtable
+
+ Previously, if it wasn't a collection or didn't have the
+ fixed_accessor,
+ we'd just segfault. Not ideal.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-gtype-specialized.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+commit 7fcaf6c8c6d0e6ade0e8d5460b5311b564a24d3f
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-27 17:41:36 +0100
+
+ dbus-gtype-specialized: warn if vtables have missing callbacks
+
+ It's just about conceivable that they wouldn't segfault, if
+ application
+ authors carefully avoided the unimplemented functionality... but
+ still.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-gtype-specialized.c | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+commit 58ed26382bf23fe9fb592d38b5be2c2c7b2e77e2
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 16:17:10 +0100
+
+ Tidy up docs for DBusGError and its pseudo-methods
+
+ * attach the introductory doc-comments to the enum and macro names,
+ not the internal function
+ * remove docs for method parameters which didn't actually exist
+ * more cross-references
+ * make the domain macro visible in the documentation index
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib.c | 33
+ ++++++++++++++++++---------------
+ doc/reference/dbus-glib-sections.txt | 1 -
+ 2 files changed, 18 insertions(+), 16 deletions(-)
+
+commit 4b6482d5987095b474c9582e7415bf94a154d9b4
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-27 16:25:21 +0100
+
+ Make gtk-doc DOC_SOURCE_DIR absolute, fixing out-of-tree docs
+
+ I used an absolute path to avoid differing behaviour with older
+ versions
+ of gtk-doc, where DOC_SOURCE_DIR was relative to the *source*
+ directory.
+
+ Also resync doc/reference/Makefile.am with gtk-doc's example.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ doc/reference/Makefile.am | 51
+ +++++++++++++++++++++++++++++++++------------
+ 1 file changed, 38 insertions(+), 13 deletions(-)
+
+commit 83471e869e464c63063e9e254bc8c40b25de03b7
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 16:04:29 +0100
+
+ DBusGProxy: be more pedantic about boolean returns
+
+ Returning false doesn't strictly imply that the error is set;
+ if you're
+ being pedantic enough, it's really a tri-state where TRUE indicates
+ success, FALSE indicates failure, and calling the function incorrectly
+ results in undefined behaviour (currently a critical warning and
+ returning FALSE).
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: NB#218973
+
+ dbus/dbus-gproxy.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit c6aa1d7dbdf04501495e4a3b4cfe6e7d808af6dd
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 15:57:44 +0100
+
+ DBusGProxy: misc documentation tidying
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-gproxy.c | 37
+ +++++++++++++++++++++++++---------
+ doc/reference/dbus-glib-sections.txt | 4 ++++
+ 2 files changed, 32 insertions(+), 9 deletions(-)
+
+commit c568ace5ee6a9c13f748d876d69ad50234b2bc78
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 15:57:15 +0100
+
+ DBusGProxy: make argument names in declaration, definition and
+ docs consistent
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib.h | 8 +++----
+ dbus/dbus-gproxy.c | 59
+ +++++++++++++++++++++++++---------------------------
+ 2 files changed, 32 insertions(+), 35 deletions(-)
+
+commit dc766e475f3a42872edbd9c3bcc98714dde8bff7
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 15:55:47 +0100
+
+ DBusGProxy: mark struct contents as private
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9d1cce7c64662733f0b48e52e4d5a1e805a3e246
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 15:40:40 +0100
+
+ Remove declaration of dbus_pending_call_get_g_type, which doesn't
+ exist
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib-lowlevel.h | 8 --------
+ doc/reference/dbus-glib-sections.txt | 2 --
+ 2 files changed, 10 deletions(-)
+
+commit 35e049459945a22b87cc61c05bd903790f05cf40
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 16:17:34 +0100
+
+ Add DBUS_TYPE_CONNECTION, DBUS_TYPE_MESSAGE to the docs, and document
+ them better
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib.c | 15 +++++++++++----
+ doc/reference/dbus-glib-sections.txt | 2 +-
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+commit 43a4bf8b038c08d6b8c565495cbf69433bc2dcc6
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 16:15:43 +0100
+
+ Tidy up docs for DBusGMessage
+
+ * document the instance struct
+ * make argument names match the headers
+ * document the GType macro, not the function it calls, and mention it
+ in the documentation (since this is a boxed type, so it's
+ non-obvious)
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib.c | 28 ++++++++++++++++++----------
+ doc/reference/dbus-glib-sections.txt | 2 +-
+ 2 files changed, 19 insertions(+), 11 deletions(-)
+
+commit 53ac9ee390e173f8e63f276d8c7e211e4fadca4b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 16:34:38 +0100
+
+ Clean up docs for DBusGConnection
+
+ * introductory doc-comment for the (pseudo-)class
+ * attach the doc-comment for the GType to the macro, not the internal
+ function
+ * rename function parameters to match what the header file says
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ dbus/dbus-glib.c | 26 +++++++++++++++++---------
+ doc/reference/dbus-glib-sections.txt | 2 +-
+ 2 files changed, 18 insertions(+), 10 deletions(-)
+
+commit be937e037a6c076cf650bb79aba9c1138da39511
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 16:42:19 +0100
+
+ Ignore non-API source files correctly
+
+ gtk-doc only cares about the basename of the files.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ doc/reference/Makefile.am | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+commit 053d41e56050706b512562f13b9ebde7dac3c60b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 16:42:44 +0100
+
+ Remove stray empty subsection
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ doc/reference/dbus-glib-sections.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+commit 3d02f22d475286db8160604755ee85d24b133005
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 16:13:24 +0100
+
+ Mention which header to include in the gtk-doc
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ doc/reference/dbus-glib-sections.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+commit 30b6a106ed590c0fd97a783998a19779002e65d8
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 16:13:07 +0100
+
+ Add some missing symbols to the docs
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37793
+ Bug-NB: related to NB#218973
+
+ doc/reference/dbus-glib-sections.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit a4bc263721fc5a80a78c6b551f35d281c22694ff
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-21 18:14:46 +0100
+
+ Micro version
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 80e37faeac62a4694514410ec17c2ab4a75d50e6
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-09-21 17:36:11 +0100
+
+ dbus-glib 0.96
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 4bc172fd5f31123ee883c4027e729b38c2777d7d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 17:43:15 +0100
+
+ test-dbus-glib: make lose() abort, and make lose_gerror() more
+ informative
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ test/core/test-dbus-glib.c | 21 ++++-----------------
+ 1 file changed, 4 insertions(+), 17 deletions(-)
+
+commit 9e97f9744e7ffeb04a105087da6143931195ce77
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 16:25:15 +0100
+
+ get_all_object_properties: if _dbus_gvalue_marshal fails, bail out
+
+ This isn't necessarily OOM: _dbus_gvalue_marshal can fail due to
+ programming errors. If so, raise a critical warning, then (if
+ that wasn't
+ fatal) return a D-Bus error to be sent to the caller.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+commit bfd1c05174b86c9dfcf1b22a4fa0b2c552dfc902
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 18:02:47 +0100
+
+ get_all_object_properties: note which operations can only fail via OOM
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 30198a2368c9cd19db4b8f595bfad7a719ada7e9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 16:21:12 +0100
+
+ get_all_object_properties: skip invalidly-named properties, with
+ a critical
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit a2a3315ac9747dcc7dda860ceb1d1f94ab56d29b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-08-17 19:15:05 +0100
+
+ dbus-gobject: add and use connection_send_or_die to check for OOM
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Conflicts:
+ dbus/dbus-gobject.c
+
+ dbus/dbus-gobject.c | 40 +++++++++++++++++++++++++---------------
+ 1 file changed, 25 insertions(+), 15 deletions(-)
+
+commit 22262581b0956f69f321b9e2eb702e3f15b49823
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:50:38 +0100
+
+ emit_signal_for_registration: assert that signal headers are all valid
+
+ This is an assertion, not a return_if_fail, because we already checked
+ the object path in dbus_g_connection_register_g_object and the others
+ in export_signals.
+
+ After these checks, dbus_message_new_signal can really only fail
+ on OOM.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit cccf1e6672fba6b649fe02082c2f087cdf022dcd
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:49:18 +0100
+
+ export_signals: check interface, signal names for validity
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+commit d09dfcb130be0a17f337bd198a9fb43aab7dfa28
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:43:30 +0100
+
+ object_registration_message: check for OOM when a property is absent
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+commit 7b92ac1bfd1e50e842549dbb14b845478d114652
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:42:49 +0100
+
+ object_registration_message: make logic/assertions slightly clearer
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+commit b5b27e4ca0d8ca250fa7649bcf2613e8d889a722
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:42:29 +0100
+
+ object_registration_message: handle remote caller errors better
+
+ If the remote process sends us a wrong message, that's its fault, not
+ ours; we should send back a comprehensible D-Bus error, and not spam
+ to stderr.
+
+ Previously, in each of these cases libdbus would have sent back
+ NoReply,
+ because we declined to handle the method call.
+
+ One case that's still wrong is passing extra arguments to Get,
+ GetAll or
+ Set, like so:
+
+ Get("com.example.Iface", "MyProperty", "extra")
+ Set("com.example.Iface", "MyProperty", Variant("foo"), "extra")
+ GetAll("com.example.Iface", "extra")
+
+ dbus-glib has historically warned, ignored the extra argument(s)
+ and sent
+ back a reply as if they hadn't been there, whereas a stricter
+ implementation (like telepathy-glib's TpDBusPropertiesMixin) would
+ have sent back an error reply and done nothing.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+commit e5cf2be0e03af4df19618076015cc2a6556ca5d4
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:36:09 +0100
+
+ get_object_property: add brief documentation
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit d3aa6c7942cce0cf7b602c6b0854488938f0548e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:25:55 +0100
+
+ get_object_property: unwind on errors, and avoid returning NULL
+
+ Also treat all errors here as programming errors (because this method
+ should never fail), upgrading them from warning to critical; return a
+ D-Bus error reply anyway, to be nicer to our callers.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 33 +++++++++++++++++++++++----------
+ 1 file changed, 23 insertions(+), 10 deletions(-)
+
+commit 98b3b3f323fd4001be0630c3e0a1dc4fb83cdeab
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 15:21:56 +0100
+
+ check_property_access: centralize error handling (and check for OOM)
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 69
+ ++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 43 insertions(+), 26 deletions(-)
+
+commit 6293849bf0469ce8d6d122b38db5091c21304a30
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-08-17 19:11:14 +0100
+
+ dbus-gobject: check for NULL when producing messages
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Conflicts:
+ dbus/dbus-gobject.c
+
+ dbus/dbus-gobject.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 8ec3166b6a40508a91144efedc10dcb32964498e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-05 14:56:16 +0100
+
+ dbus-gobject: factor out reply_or_die, error_or_die and add
+ error-checking
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35766
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 83
+ +++++++++++++++++++++++++++++++--------------------
+ 1 file changed, 50 insertions(+), 33 deletions(-)
+
+commit 7a1abf5243fe5b7adf7211fd7d8c82851f448192
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-04 16:52:58 +0100
+
+ invoke_object_method: if marshalling an out argument fails, discard
+ message
+
+ We shouldn't report this as OOM, because it probably wasn't (it's much
+ more likely to be programming error); we should also continue
+ through the
+ arguments, so that we don't leak them.
+
+ By abandoning the message as soon as we detect a programming error,
+ we can use reply == NULL as an indicator of whether to keep appending.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 47
+ ++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 36 insertions(+), 11 deletions(-)
+
+commit 4ba637e2ae32b2daf224265c22cc8b43cf0a0bbf
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-04 15:45:07 +0100
+
+ invoke_object_method, dbus_g_method_return_error: handle sending
+ failure
+
+ I just made it fatal, since it's either programming error or OOM.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit cd7e9a1c6dd0eef6e867cac80339a38758d0cd6f
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-04 15:44:28 +0100
+
+ gerror_to_dbus_error_message: guarantee to return non-NULL
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit c239a810543bde85dd458012612874cdc81a4151
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-04 15:41:32 +0100
+
+ invoke_object_method: if dbus_message_new_method_return fails,
+ fail hard
+
+ There's no point in doing graceful unwinding here, since it really
+ shouldn't happen.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 480c480b024a77dd8f4efecdb6639d45de9767ce
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-04 15:40:40 +0100
+
+ arg_iterate: document
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35767
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+commit 36b55c3aac5de873a69c9bd0fbe003200a03ba32
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-16 15:33:01 +0100
+
+ dbus_g_proxy_manager_unregister: if GetNameOwner failed, don't assert
+
+ got_name_owner_cb never adds the proxy to the unassociated_proxies
+ list
+ if there is a D-Bus error other than NameHasNoOwner.
+
+ Based on a patch from Janne Karhunen, for Maemo.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38408
+ Bug-NB: NB#116862
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gproxy.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit 18705c42ca6b6a583b64451055eec4dad3aaa3b4
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-17 14:40:28 +0100
+
+ Add a regression test for fd.o #38406
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ .gitignore | 1 +
+ test/core/Makefile.am | 7 ++
+ test/core/proxy-peer.c | 274
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 282 insertions(+)
+
+commit 5d800ca9352b40354a0f4a905c1c0b111b81f030
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-17 14:53:09 +0100
+
+ MyObject: register marshallers so individual tests don't have to
+
+ These marshallers are actually dual-use: they're used to call certain
+ methods on MyObject, and also to bind to its signals.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ test/core/Makefile.am | 4 +++-
+ test/core/my-object.c | 12 ++++++++++++
+ test/core/my-object.h | 1 +
+ test/core/test-dbus-glib.c | 11 ++++-------
+ 4 files changed, 20 insertions(+), 8 deletions(-)
+
+commit 70e09208ab13812037b3cf133df312aacd24d036
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-17 12:18:57 +0100
+
+ DBusGProxy: deal with errors in DBUS_G_VALUE_ARRAY_COLLECT_ALL
+
+ G_VALUE_COLLECT can fail (admittedly, it's a programming error if it
+ does). Previously, we leaked the resulting g_malloc'd string; now we
+ emit a critical warning, free it, and abort the call.
+
+ Based on patches from Kimmo Hämäläinen and Christian Dywan
+ in Maemo's
+ dbus-glib.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406
+ Bug-NB: NB#86280
+ Bug-NB: NB#180486 (CID-34419 to CID-34424 inclusive)
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gproxy.c | 93
+ +++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 66 insertions(+), 27 deletions(-)
+
+commit 2731a2f7f824f9c1cd11dd14e88ff1e0875f280b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-17 12:15:20 +0100
+
+ dbus_g_proxy_call: simplify error handling now that call_id may be 0
+
+ There's no need to special-case it any more - we can just use
+ dbus_g_proxy_end_call_internal and rely on it to cope.
+
+ This reverts the fix for fd.o #12675, since the commit before this one
+ is more general.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gproxy.c | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+commit 1b38cecf7bbdb8a99ef13616b8c661dfb0bc060f
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-17 12:06:11 +0100
+
+ DBusGProxy: cope gracefully with call_id == 0
+
+ As well as happening on a programming error or OOM (which both provoke
+ critical warnings), dbus_g_proxy_begin_call_internal() can
+ legitimately
+ fail if we got disconnected from D-Bus (so can't send any more),
+ but are
+ still working through our backlog of incoming messages (so we haven't
+ got round to the Disconnected message yet, so the DBusGProxy hasn't
+ emitted ::destroy).
+
+ fd.o #12675 fixed dbus_g_proxy_call(), but
+ dbus_g_proxy_call_with_timeout()
+ and the asynchronous API still need similar treatment.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38406
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gproxy.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+commit af31c9c21efeec8a38c73de24d82a2038d80f74e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-08-03 18:38:49 +0100
+
+ registrations test: fix race condition in adding match rules
+
+ If you don't block waiting for the reply to AddMatch, and you're
+ using two
+ connections to the bus, then messages sent from connection 2 might not
+ be matched by connection 1, because they arrive before the AddMatch
+ call
+ from connection 1. This manifests itself as the /registrations/twice
+ test *sometimes* failing (dependent on timing).
+
+ Only tests with two parallel bus connections need this, but to
+ be safe,
+ I've added it throughout this test.
+
+ Reviewed-by: Vivek Dasmohapatra <vivek@collabora.co.uk>
+
+ test/core/registrations.c | 28 +++++++++++++++++++++++++---
+ 1 file changed, 25 insertions(+), 3 deletions(-)
+
+commit 6d06dd358b22057dca1808c1432e620998202c41
+Author: Tim Waugh <twaugh@redhat.com>
+Date: 2011-07-22 15:13:42 +0100
+
+ dbus-binding-tool: fixed "pretty" mode output for methods.
+
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39475
+
+ dbus/dbus-glib-tool.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e294ba3e579db1c12158ce95ad6ff34391cf571a
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-16 18:12:27 +0100
+
+ Show warning if marshalling in dbus_g_method_return fails
+
+ Based on a patch from Christian Dywan <christian.dywan@lanedo.com>.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29884
+ Bug-NB: NB#180486
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit cce0887278ae105f010d35636fc5f6d654c2d41f
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-12-14 15:07:27 +0100
+
+ remove minor dead code in dbus-gparser
+
+ There's no way retval can be false at this location.
+
+ Bug-NB: NB#180486 CID-643
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-gparser.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+commit f446cb80f91b4cf584883b47477295d07dd32eac
+Author: Derek Foreman <derek.foreman@collabora.co.uk>
+Date: 2011-06-02 17:16:42 +0100
+
+ remove remaining inclusions of <glib/gi18n.h> from library
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36428
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-binding-tool-glib.c | 1 -
+ dbus/dbus-gproxy.c | 1 -
+ 2 files changed, 2 deletions(-)
+
+commit 2a85bd434e6d8dba9615a53d288a0a72d6b5e0cf
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-02 13:50:20 +0100
+
+ Regression test for fd.o #37852
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852
+ Reviewed-by: Colin Walters <walters@verbum.org>
+
+ test/core/my-object.c | 17 ++++++++++
+ test/core/my-object.h | 2 ++
+ test/core/registrations.c | 68
+ +++++++++++++++++++++++++++++++++++++++
+ test/core/test-service-glib.xml | 4 +++
+ 4 files changed, 91 insertions(+)
+
+commit 3e0828f57c3925ea9b63d22ab82d991a0fea0536
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-02 13:49:51 +0100
+
+ Fix regression in marshalling objects as object paths
+
+ This regressed while fixing fd.o #36811. NetworkManager apparently
+ uses
+ this idiom.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852
+ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628890
+ Tested-by: Michael Biebl <biebl@debian.org>
+ Reviewed-by: Colin Walters <walters@verbum.org>
+
+ dbus/dbus-gobject.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit f534276eb20d8035566a206d1e38fd651a1eeab9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 17:03:59 +0100
+
+ registrations test: only listen for signals, not all messages
+
+ Otherwise, we'd reply with an error to messages not intended for us.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+
+ test/core/registrations.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 867d670daad983f8b4416528e69d3ad2e0596e88
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 19:44:42 +0100
+
+ 0.95
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 469df67525a9e5363644ac730ac8ec7580a8ebe0
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 19:07:30 +0100
+
+ Prepare 0.94 release
+
+ configure.ac | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit 5a780af947f0141f4e0524aaf62fdd06abe6cd5f
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-04 13:46:11 +0100
+
+ dbus-binding-tool: forbid ReturnVal annotation after the first
+ OUT <arg>
+
+ It has never actually worked correctly (invoke_object_method would
+ always
+ treat the ReturnVal as if it had been the first OUT argument),
+ so let's
+ only allow the situation that worked in practice.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35952
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ dbus/dbus-binding-tool-glib.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+commit a8605cf4c6c9dbc4a933dd744d339744e0102765
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:33:48 +0100
+
+ Fix compiler warnings in dbus-binding-tool
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ dbus/dbus-glib-tool.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 0c162cc63b073a9f50dd11ea99db72fe95a16064
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:33:07 +0100
+
+ Remove all support for Doxygen
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10890
+
+ Doxyfile.in | 180
+ --------------------------------------------------------
+ Makefile.am | 2 -
+ README | 1 -
+ configure.ac | 34 +----------
+ doc/api/README | 3 -
+ 5 files changed, 1 insertion(+), 219 deletions(-)
+
+commit 6e20efb5c4c094915d2b6e86c3cab486a0562a95
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:32:58 +0100
+
+ Use single star in doc-comments not intended for gtk-doc
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10890
+
+ dbus/dbus-glib.h | 4 ++--
+ dbus/dbus-gloader-expat.c | 2 +-
+ dbus/dbus-gproxy.c | 2 +-
+ dbus/dbus-gtest.c | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 1472d195bd201d219aab5bc4b31d80d8340cee5c
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:32:06 +0100
+
+ Remove Doxygen droppings from source code
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10890
+
+ dbus/dbus-gidl.c | 4 ----
+ dbus/dbus-gidl.h | 4 ----
+ dbus/dbus-glib.c | 3 +--
+ dbus/dbus-gmain.c | 22 +++-------------------
+ dbus/dbus-gobject.c | 3 +--
+ dbus/dbus-gparser.c | 4 ----
+ dbus/dbus-gproxy.c | 26 ++------------------------
+ dbus/dbus-gthread.c | 6 ------
+ dbus/dbus-gutils.c | 4 ----
+ dbus/dbus-gutils.h | 4 ----
+ dbus/dbus-gvalue.c | 5 +----
+ 11 files changed, 8 insertions(+), 77 deletions(-)
+
+commit 4c3a346d296789cf3a81f6cc98f64d84ea892247
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:24:36 +0100
+
+ Remove _dbus_g_proxy_test, which isn't called and doesn't do anything
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790
+
+ dbus/dbus-gproxy.c | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+commit cded5996b02ff937a73654788d1f3a7ca46ca0a9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:24:29 +0100
+
+ Remove _dbus_gutils_test, which didn't test anything
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790
+
+ dbus/dbus-gtest.c | 6 +-----
+ dbus/dbus-gutils.c | 17 -----------------
+ 2 files changed, 1 insertion(+), 22 deletions(-)
+
+commit d81722def291666a3c557a18d66be061f8f55e31
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:24:22 +0100
+
+ _dbus_gidl_test: remove unused function which does nothing
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790
+
+ dbus/dbus-gidl.c | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+commit 1f371d3c75a5c2e9979350380e4243e3c445e093
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:23:45 +0100
+
+ dbus-glib-tool: remove regression-test boilerplate which does nothing
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37790
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ dbus/dbus-glib-tool.c | 48
+ ------------------------------------------------
+ 1 file changed, 48 deletions(-)
+
+commit 8abfa07b8acd2d8527785db3711d8a88a213a60e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-06-01 17:18:52 +0100
+
+ dbus-binding-tool: clean up temporary file on error
+
+ This fixes distcheck, which otherwise fails because temporary
+ files are
+ left over after distclean. We could delete them with the build system,
+ but leaving them behind is a bug, so...
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37812
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ dbus/dbus-glib-tool.c | 78
+ ++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 58 insertions(+), 20 deletions(-)
+
+commit d5b9aa101d61bcd2321f0266fa638b644e4cba96
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 14:35:01 +0100
+
+ Remove useless HAVE_GLIB conditional - GLib is mandatory
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789
+
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 601b51279e7fbb08ff6ce8c98eaf4bcee21d46a5
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 14:40:12 +0100
+
+ Remove unused DBUS_DAEMONDIR
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789
+
+ configure.ac | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+commit 1a966d070e71378590fb0b64c5ec7a2e250d397b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 14:39:57 +0100
+
+ Remove vestigial dbus-glib-error-*.h and the machinery to generate
+ them
+
+ This was the only use of DBUS_INCLUDEDIR, so remove that too.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789
+
+ .gitignore | 4 ----
+ configure.ac | 2 --
+ dbus/Makefile.am | 16 ++--------------
+ dbus/make-dbus-glib-error-enum.sh | 2 --
+ dbus/make-dbus-glib-error-switch.sh | 2 --
+ 5 files changed, 2 insertions(+), 24 deletions(-)
+
+commit 98d7cb8c869b53686a742fb48d1f189c74ff1484
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 14:33:18 +0100
+
+ Simplify the check for dbus-1
+
+ As in commit 0f782b4, omitting the action-if-found and
+ action-if-not-found
+ results in much better error messages if this mandatory dependency
+ isn't
+ found.
+
+ Nothing checks HAVE_DBUS (as they shouldn't - it's mandatory!),
+ so there's
+ no point in keeping that either.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789
+
+ configure.ac | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+commit b00d53dd647cf456ddb67c1dfdf44a8d56be90b4
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 18:35:41 +0000
+
+ Add more auto-generated gtkdoc droppings to .gitignore
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37789
+
+ .gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit bd92f266609fef162b6028fd249250b0ab9ae689
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-31 14:46:33 +0100
+
+ Remove support for i18n completely
+
+ As far as I can tell, dbus-glib has never actually been translated
+ into
+ another language, or even had the necessary infrastructure so
+ people could
+ do that. The translated strings are all low-level errors in
+ "programmer
+ English" anyway, and most of them only make sense to D-Bus experts.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36428
+
+ configure.ac | 25 +-----------------
+ dbus/dbus-binding-tool-glib.c | 8 +++---
+ dbus/dbus-glib-tool.c | 35 ++++++++++----------------
+ dbus/dbus-gparser.c | 56
+ +++++++++++++++++++----------------------
+ dbus/dbus-gproxy.c | 8 +++---
+ dbus/dbus-gvalue.c | 41 +++++++++++++++---------------
+ 6 files changed, 68 insertions(+), 105 deletions(-)
+
+commit c37bd4357d50d1cd683ef04f05ee427c9a0f7e9f
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 14:43:15 +0100
+
+ Remove i18n macros from files where they're unused
+
+ dbus-glib-tool (dbus-binding-tool) and dbus-gparser are theoretically
+ localizable, but the library doesn't make any use of gettext.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36428
+
+ dbus/dbus-glib.c | 5 -----
+ dbus/dbus-gmain.c | 4 ----
+ 2 files changed, 9 deletions(-)
+
+commit e8a4f0496d0eec10fc9c76e0ef20e761bb2256c6
+Author: Dan Williams <dcbw@redhat.com>
+Date: 2011-05-31 11:25:59 -0500
+
+ Log error message from failed object registration
+
+ See https://bugzilla.redhat.com/show_bug.cgi?id=708686 for a case
+ of this; it
+ would be extremely helpful to figure out what the error actually
+ was since it
+ appears not to be a double-registration or other such issues after
+ inspection
+ of nm-applet and libnm-glib.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37795
+
+ dbus/dbus-gobject.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit eeb1c50aa03a95c39487e9331107142f27412958
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-20 16:41:28 +0100
+
+ Remind maintainers to update the libtool versioning
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=22854
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+ HACKING | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 9e2031148fd0ee114ec67c681d2b9bcfd84cdaa4
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-20 16:41:00 +0100
+
+ add a Makefile rule to upload a tarball and up-to-date docs
+
+ Simplified from telepathy-glib, which has more elaborate machinery to
+ automate releases.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26952
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+ HACKING | 3 ++-
+ Makefile.am | 12 ++++++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+commit 61f48c290176c007ff0aef6ca4d752491763e4b0
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-30 15:41:27 +0100
+
+ Force a full rebuild for new gcc versions if gcov is enabled
+
+ This avoids a lot of "Version mismatch - expected 406p got
+ 405*". Because
+ we're changing the content of each file after preprocessing, it even
+ defeats ccache, which is desirable here - otherwise we'd get old
+ versions
+ of the profiling code being resurrected from the cache.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37060
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+ configure.ac | 17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
+
+commit 0f320c5224fe39df44648ac75ecce9e0a01079d0
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-30 15:41:01 +0100
+
+ Include config.h in generated C files, and regenerate dbus-gmarshal.c
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37060
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+ dbus/Makefile.am | 3 ++-
+ dbus/dbus-gmarshal.c | 7 +++++--
+ dbus/examples/statemachine/Makefile.am | 4 +++-
+ test/core/Makefile.am | 4 +++-
+ 4 files changed, 13 insertions(+), 5 deletions(-)
+
+commit f91828abb160e44b53a32823516d55d8a5d634bc
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-30 15:39:28 +0100
+
+ Consistently include config.h in all non-generated .c files
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37060
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+ dbus/dbus-gidl.c | 2 ++
+ dbus/dbus-gloader-expat.c | 2 ++
+ dbus/dbus-gparser.c | 3 +++
+ dbus/dbus-gproxy.c | 3 +++
+ dbus/dbus-gthread.c | 2 ++
+ dbus/dbus-gtype-specialized.c | 2 ++
+ dbus/dbus-gvalue-parse-variant.c | 2 ++
+ dbus/examples/example-client.c | 2 ++
+ dbus/examples/example-service.c | 2 ++
+ dbus/examples/example-signal-emitter.c | 2 ++
+ dbus/examples/example-signal-recipient.c | 2 ++
+ dbus/examples/statemachine/statemachine-client.c | 2 ++
+ dbus/examples/statemachine/statemachine-server.c | 2 ++
+ dbus/examples/statemachine/statemachine.c | 2 ++
+ test/core/30574.c | 2 ++
+ test/core/peer-client.c | 2 ++
+ test/core/peer-server.c | 2 ++
+ test/core/test-dbus-glib.c | 2 ++
+ test/core/test-gvariant.c | 2 ++
+ test/core/test-service-glib.c | 2 ++
+ test/core/test-thread-client.c | 2 ++
+ test/core/test-thread-server.c | 2 ++
+ test/core/test-types.c | 2 ++
+ test/core/test-variant-recursion.c | 2 ++
+ test/interfaces/test-client.c | 2 ++
+ test/interfaces/test-objects.c | 2 ++
+ test/interfaces/test-server.c | 2 ++
+ test/test-service.c | 2 ++
+ 28 files changed, 58 insertions(+)
+
+commit 6d6d9a61e47f5bc28b5d61ae0d6cb072a81b5569
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-13 19:00:41 +0100
+
+ dbus_g_proxy_add_signal: document error cases
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36216
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+ dbus/dbus-gproxy.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 52f4e09d49551f3a8ece6578a6cb6e016c03a9d8
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-10 12:00:15 +0100
+
+ dbus-gobject: check various preconditions for methods
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811
+
+ dbus/dbus-gobject.c | 29 ++++++++++++++++++++++++++---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+commit 6a61c922cedad9f5af5c32a0d783e9fbd53f3487
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 12:52:25 +0100
+
+ dbus-gobject: move weakref to ObjectExport, with ObjectRegistration
+ pointing there
+
+ This has the following results:
+
+ * each exported object only needs one weak ref to itself, however many
+ times it is registered
+ * because the ObjectRegistration now points to the ObjectExport,
+ it can always remove itself from the list of registrations even
+ if the
+ actual object has been disposed, avoiding a leak (fd.o #36811)
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811
+
+ dbus/dbus-gobject.c | 89
+ ++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 59 insertions(+), 30 deletions(-)
+
+commit f07cf89fd36aebe5bd32f9e7cff13b5697365917
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 12:25:18 +0100
+
+ Add a regression test for removing all registrations and starting
+ again
+
+ This has been confirmed to fail when the previous commit is reverted.
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811
+
+ test/core/registrations.c | 64
+ +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 64 insertions(+)
+
+commit c3c6f8365f5074f3f59b66c5b4ece1feb214be23
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 12:24:35 +0100
+
+ dbus_g_connection_register_g_object: only hook onto signals on
+ first use
+
+ This fixes a bug in which an empty list of registrations was
+ considered
+ to be synonymous with the object never having been exported, resulting
+ in this failure mode:
+
+ * register object at n locations
+ - the first time, export_signals() is called
+ * unregister all of those locations
+ * register object at a new location
+ - export_signals() is wrongly called again
+ * emit a signal
+ - the D-Bus signal gets emitted twice
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811
+
+ dbus/dbus-gobject.c | 48
+ ++++++++++++++++--------------------------------
+ 1 file changed, 16 insertions(+), 32 deletions(-)
+
+commit 323d5adb48f8630024f2b22172f10684508bd2a8
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 10:47:56 +0100
+
+ dbus_g_connection_register_g_object: attach ObjectExport first
+
+ This means we no longer need the unnecessarily subtle "steal and
+ put back"
+ pattern.
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811
+
+ dbus/dbus-gobject.c | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+commit c9961279c5ac667d4ddca98cbd3a3dfb4f1d8705
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 10:45:58 +0100
+
+ dbus-gobject: wrap the GSList of registrations in a simple struct
+
+ For simplicity, the ObjectExport struct isn't freed until the object
+ is actually destroyed, even if there are no more registrations.
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36811
+
+ dbus/dbus-gobject.c | 77
+ ++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 51 insertions(+), 26 deletions(-)
+
+commit 357fef2267d4243435e0d26ae659d21bd6bcde96
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 16:12:03 +0000
+
+ test/interfaces: test annotated arguments
+
+ The D-Bus Specification doesn't actually allow this, but dbus-glib has
+ always supported it, and indeed understands a couple of <arg>
+ annotations
+ itself - org.freedesktop.DBus.GLib.ReturnVal and ….DBus.GLib.Const.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598
+ Reviewed-by: Robert Ancell <robert.ancell@canonical.com>
+
+ test/interfaces/valid-annotations.xml | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+commit b04f6b33224973cefec959a9fe0f7de655b93d0e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 16:07:39 +0000
+
+ test/interfaces: check that some invalid annotations aren't allowed
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598
+ Reviewed-by: Robert Ancell <robert.ancell@canonical.com>
+
+ .gitignore | 2 ++
+ test/interfaces/Makefile.am | 7 ++++++-
+ test/interfaces/invalid-annotated-node.xml | 8 ++++++++
+ test/interfaces/invalid-nested-annotation.xml | 8 ++++++++
+ test/interfaces/run-test.sh | 20 +++++++++++++++++++-
+ 5 files changed, 43 insertions(+), 2 deletions(-)
+
+commit e4a25a148703ef7ff13e5d87276b5d6fc395a57d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 16:01:39 +0000
+
+ Test that interfaces, methods, properties, signals can be annotated
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598
+ Reviewed-by: Robert Ancell <robert.ancell@canonical.com>
+
+ test/interfaces/Makefile.am | 20 ++++++++++++++++++--
+ test/interfaces/valid-annotations.xml | 21 +++++++++++++++++++++
+ 2 files changed, 39 insertions(+), 2 deletions(-)
+
+commit ac53fc025df08f12532fa7e3e69208db16151935
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 15:51:05 +0000
+
+ Don't .gitignore everything in test/interfaces, and remove some
+ duplication
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598
+ Reviewed-by: Robert Ancell <robert.ancell@canonical.com>
+
+ .gitignore | 19 ++++++-------------
+ 1 file changed, 6 insertions(+), 13 deletions(-)
+
+commit b1338486f0ce5df460e9af67f3738f6a0f829840
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 15:45:57 +0000
+
+ Allow <annotation> inside <property> too
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598
+ Reviewed-by: Robert Ancell <robert.ancell@canonical.com>
+
+ dbus/dbus-gparser.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 160842c85f808a4815d005dd39a0d9419aa06788
+Author: Christian Dywan <christian@lanedo.com>
+Date: 2011-01-04 15:43:05 +0000
+
+ Allow signal annotations in dbus-binding-tool
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27598
+ Bug-NB: NB#163566
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Robert Ancell <robert.ancell@canonical.com>
+
+ dbus/dbus-gparser.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit dcbebd2ee2941136a2e04868da08777c985e0117
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 18:49:19 +0100
+
+ Add a regression test for removing an object from only one connection
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087
+
+ test/core/registrations.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+commit 818b90092102e4fe6d2addfe77ee5a86d50e31c5
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 18:49:06 +0100
+
+ dbus_g_connection_unregister_g_object: only unregister from
+ @connection
+
+ Previously, we unregistered the object from all connections, if it was
+ present on more than one.
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087
+
+ dbus/dbus-gobject.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit 6b29f7f317df7d96a94ac910306508452be9130c
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 18:43:29 +0100
+
+ Add a regression test for registering an object on two connections
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087
+
+ test/core/registrations.c | 101
+ +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 101 insertions(+)
+
+commit 17d5dcf86c766075400aff5d2aa3fe8e599fb715
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 18:19:44 +0100
+
+ fd.o #32087: emit signals on the appropriate connections
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087
+
+ dbus/dbus-gobject.c | 23 +++++------------------
+ 1 file changed, 5 insertions(+), 18 deletions(-)
+
+commit 7f041871c3e5d023ee9cb77609bf0b69ebdbde34
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 16:06:25 +0100
+
+ Add a regression test for re-registering an object at the same path
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793
+
+ test/core/registrations.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+commit 43f9dda46e9279b4489b6bd1efa0e5f9eb825a48
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 16:04:30 +0100
+
+ dbus_g_connection_register_g_object: don't destroy state on early
+ return
+
+ At the beginning of the function we steal the object's state so we
+ can add
+ to the list. After doing that, we must make sure we give it back!
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit 4da28a6c49cecb902544d9152a693105d320cdac
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 11:59:44 +0100
+
+ dbus_g_connection_unregister_g_object: fix out-of-bounds reading
+
+ The list of registrations is singly linked; we only avoid a crash here
+ by luck.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit da740bfd88850c858d1cee079c8d261a79e2c75e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 15:25:08 +0100
+
+ Subsume the test for #5688 into the more general registrations test
+
+ Also test that the object is unregistered by the last unref or
+ by forced
+ disposal, without crashing.
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793
+
+ test/core/5688.c | 81
+ ---------------------------------------------
+ test/core/Makefile.am | 9 -----
+ test/core/registrations.c | 73 ++++++++++++++++++++++++++++++++++++----
+ test/core/run-test.sh | 1 -
+ 4 files changed, 67 insertions(+), 97 deletions(-)
+
+commit 0692c5995ea4a7013b4ab605cd76aca49239168d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 15:08:27 +0100
+
+ Convert registrations test to use GTest
+
+ Also use a private bus connection, for potentially better
+ leak-detection.
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793
+
+ test/core/registrations.c | 74
+ ++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 53 insertions(+), 21 deletions(-)
+
+commit 002feb57cfcfeb439be1ace875a67ad540fed950
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-03 14:49:29 +0100
+
+ Rename test/core/unregister to registrations (no source changes)
+
+ Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36793
+
+ .gitignore | 2 +-
+ test/core/Makefile.am | 6 ++--
+ test/core/registrations.c | 71
+ +++++++++++++++++++++++++++++++++++++++++++++
+ test/core/run-test.sh | 2 +-
+ test/core/unregister.c | 71
+ ---------------------------------------------
+ 5 files changed, 76 insertions(+), 76 deletions(-)
+
+commit 15d9f31812b07439558e615d4d9bdfccaa33dbd5
+Author: Mike Gorse <mgorse@novell.com>
+Date: 2011-03-11 09:26:01 -0600
+
+ Fix removal of old io and timeout handlers when switching
+ GMainContexts
+
+ Bug: http://bugs.freedesktop.org/show_bug.cgi?id=35115
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-gmain.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+commit a1a9a6f973f64e543c3d43b01bd6ef0963f8bf16
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-10 11:17:53 +0100
+
+ test-service: ignore result of dbus_bus_request_name since we look
+ at the error instead
+
+ gcc 4.6 warns for this usage.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062
+
+ test/test-service.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 6c1e9559094be37bf66731b9f09fffcb1a19e8e5
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-10 11:16:45 +0100
+
+ marshal_collection_array: statically assert that size conversion is
+ not needed
+
+ Previously, the function blindly assumed this without a check.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062
+
+ dbus/dbus-gvalue.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+commit 324122a9f0bc859bb424d9026019e9077cda4015
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-10 11:15:32 +0100
+
+ marshal_collection_array: remove set-but-unused variable elt_size
+
+ gcc 4.6 warns about these.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062
+
+ dbus/dbus-gvalue.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+commit 341043e2d776cbd6faaf5b8d6a54a46920bb094c
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 15:18:48 +0100
+
+ marshal_map, marshal_struct: remove unused variable ret
+
+ gcc 4.6 warns about these.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062
+
+ dbus/dbus-gvalue.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+commit 1ea2eee4623cace2e852f1c16b1b1ce23035d037
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 15:18:18 +0100
+
+ demarshal_static_variant: remove useless call to
+ dbus_message_iter_get_arg_type
+
+ gcc 4.6 warns about this.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062
+
+ dbus/dbus-gvalue.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+commit f8a7ccf024a19caa54d6f79cd9d62a63a9b36c5b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-05-04 15:17:51 +0100
+
+ bash completion helper: remove unused variable 'prev', and simplify
+
+ gcc 4.6 warns about this.
+
+ Reviewed-by: Colin Walters <walters@verbum.org>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37062
+
+ dbus/dbus-bash-completion-helper.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+commit 09d85a945760d06447aea09a38ea99d0dc54de2a
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 17:05:04 +0100
+
+ DBusGProxy: link against GIO and use GDBus to check names' syntax
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616
+
+ configure.ac | 2 +-
+ dbus/dbus-gproxy.c | 29 ++++++++++++++++++++---------
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+commit f2b445d0d931f3f680cefe0141e62abeafda9742
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 15:08:36 +0100
+
+ dbus_g_proxy_end_call: check that it's a proxy
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616
+
+ dbus/dbus-gproxy.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 811089dae49c2f47d0f15fd7e9c180674f484391
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 15:08:05 +0100
+
+ dbus_g_proxy_set_interface: check that it's a proxy and not destroyed
+
+ If it has emitted destroy, our use of priv->manager will be a NULL
+ pointer dereference.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616
+
+ dbus/dbus-gproxy.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit af3d48b10042616ac7ecceed5af8ddaeecc093f5
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 15:07:23 +0100
+
+ Document that most DBusGProxy methods stop working on ::destroy
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616
+
+ dbus/dbus-gproxy.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+commit 63bd85823fd3039e88176105434c7bbdeae71e84
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 15:06:18 +0100
+
+ dbus_g_proxy_new_from_proxy: check that the old proxy is in fact
+ a proxy
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=23616
+
+ dbus/dbus-gproxy.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 97de5501c2ebb29e4e32822bae0e45c88140bffd
+Author: Alban Crequy <alban.crequy@collabora.co.uk>
+Date: 2011-04-14 14:48:56 +0100
+
+ DBusGProxy: remove duplicate owner match rules.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33646
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-gproxy.c | 109
+ +++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 82 insertions(+), 27 deletions(-)
+
+commit bc0497ea0c5ac65abc3658a31c95f9b0e15680f3
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-04-13 19:00:23 +0100
+
+ dbus_g_proxy_add_signal: stop falsely claiming that we read
+ introspection
+
+ If we believed the introspection, services could change their
+ introspection and remote-crash us, so it's good that we don't. We
+ shouldn't claim that we do, though.
+
+ The second sentence is subtle: for D-Bus types that dbus-glib can map
+ into more than one GLib type, you must currently use the one that
+ dbus-glib would "naturally" produce. The only example I can find
+ is that
+ object paths must be DBUS_TYPE_G_OBJECT_PATH, even though dbus-glib
+ can
+ also (in principle) unmarshal object-paths as DBUS_TYPE_G_PROXY.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36216
+
+ dbus/dbus-gproxy.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit f5008cc76e0b466c4730e331857bc041aced5e94
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 18:52:27 +0100
+
+ improve documentation of proxy timeouts to mention that -1 is special
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gproxy.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit 25c4b24a0d8490a7ba667b9944ce9b1c0808878a
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 18:52:02 +0100
+
+ Don't allow proxy timeouts to be set negative, except for -1
+
+ libdbus checks this as a precondition, but to avoid astonishing error
+ behaviour (interpreted as OOM), so should we.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gproxy.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 35d1d8479031393f86fe668d2a1f64325b5dd1be
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:35:51 +0100
+
+ DBusGProxy: share OOM handler
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gproxy.c | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+commit 3a0e477ed6648bcb99711976fd51f4c0394000c6
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:32:11 +0100
+
+ dbus_g_proxy_call_no_reply: don't assume NULL message means OOM
+
+ It might either be OOM or bad arguments, probably the latter. That's
+ programming error, but we already raised a critical warning, so
+ be silent.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gproxy.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit d0332f9862c3af18161f58444f35c7d03d9fb067
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:32:00 +0100
+
+ dbus_g_proxy_begin_call_internal: don't assume NULL message means OOM
+
+ It might either be OOM or bad arguments, probably the latter. That's
+ programming error, but we already raised a critical warning, so
+ be silent.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gproxy.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit cd0da3f56873c5399b6247791df16acd3f4a73b1
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:30:29 +0100
+
+ dbus_g_proxy_marshal_args_to_message: diagnose inability to marshal
+ args
+
+ Failure to marshal arguments is entirely reachable, albeit only via
+ programming error.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gproxy.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+commit 8b75efc7941ac789605128d48f82168da18bb9fd
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:27:18 +0100
+
+ marshal_collection_array: simplify exit path
+
+ Also don't assume that failure of dbus_message_iter_close_container is
+ always OOM.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+commit 7729c5a4ee9c1bba0fe3f35d840c542303e26a1a
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:26:56 +0100
+
+ marshal_collection_array: if appending fails, don't assume OOM
+
+ Appending can also fail by appending ((gboolean) 23) or something;
+ admittedly, that's a programming error.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+commit 73c1dc8031df7c9de0ab321f02cc5bedc49be7c1
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:25:50 +0100
+
+ marshal_collection_array: assert validity of signature
+
+ This means we can recognise OOM reliably; do so.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit ca88a4f4adffccc1be8ddc0835d640f36d42f9fc
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:25:25 +0100
+
+ marshal_collection_array: fail early if the array is NULL
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit 7228321ddafc88e12406ca49406dfaa80240be9d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:24:53 +0100
+
+ marshal_collection_ptrarray: abandon broken containers, simplify
+ exit path
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 9e8bed2ec229e48df0b1c63560b183f46d33bffd
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:24:18 +0100
+
+ marshal_collection_ptrarray: assert that the signature is valid
+
+ This means that dbus_message_iter_open_container can't fail except
+ by OOM,
+ so use the shared handler.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 385180d3b1975afce823d4aa9aa5daf82fa09b5a
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:23:46 +0100
+
+ marshal_variant: abandon broken containers rather than closing them
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 72c21e4e4cac8092c1dcf8348fdf3955cb01229c
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:23:34 +0100
+
+ marshal_struct: simplify teardown, and abandon broken containers
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+commit 48cf1b8b147d80265e2ab23b257d5c96ca260db9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:23:08 +0100
+
+ marshal_map: on error, abandon the container instead of closing it
+
+ libdbus considers it to be a programming error if you close a
+ container
+ gracefully when its contents are incomplete.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+commit c827cd5b160b59246305526eac6154006f8bb8d5
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:21:18 +0100
+
+ marshal_signature: check validity of the signature
+
+ Also remove a spurious cast, and comment why we're *not* assuming that
+ failure here is necessarily OOM.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 98e5da6a6363b68042503e8e01819dc86ec7781e
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:20:51 +0100
+
+ marshal_object: check that it's really an object and its path is valid
+
+ Again, we can now assume that failure is OOM.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 5d90b996ad4e9ee927d25fc692c8b08baa2a36b4
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:20:23 +0100
+
+ marshal_object_path: check that it's really a valid object path
+
+ Again, this means failure can only be OOM, so use the shared handler.
+ Also remove an unnecessary cast.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+commit f57e4e33838062e98d39764202fdcd60b709362d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:19:45 +0100
+
+ marshal_proxy: check that it's really a proxy and its path is valid
+
+ This means that dbus_message_iter_append_basic can't fail other
+ than by
+ OOM, so use the shared OOM handler.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit 15bf1a2ef4d8b3e37b056cc893a844706fc714dc
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:18:43 +0100
+
+ marshal_valuearray: simplify teardown
+
+ If close_container fails, it might be an assertion failure in libdbus,
+ so don't assume it's OOM. We have to handle programming errors
+ somewhat
+ gracefully during marshalling anyway, so there's no point in
+ asserting.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+commit d1093f2c3413285c839cdbbca0c848b0d071cb62
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:16:29 +0100
+
+ marshal_valuearray: abandon the container if we fail
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 782412b65a1364f8736e15217aa853083c962935
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:15:27 +0100
+
+ marshal_basic: if marshalling a string fails, critical and return
+ FALSE
+
+ This could be OOM, but it could also be non-UTF-8.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+commit a2c276a49fa9efb8336db74db60dc1bcd2f0e8d6
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:14:25 +0100
+
+ marshal_basic: if a boolean has a non-boolean value, diagnose
+ the error
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 94a501e0e69cf912c7f6a5250fdea0ec5fe673c7
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:13:50 +0100
+
+ dbus-gvalue: replace trivial cases of OOM with a call to a noreturn
+ function
+
+ In these cases there's no invalid value we could be supplying
+ to libdbus,
+ so it's definitely OOM, not a programming error (e.g. non-UTF-8)
+ masquerading as OOM.
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gvalue.c | 31 +++++++++++++++++++------------
+ 1 file changed, 19 insertions(+), 12 deletions(-)
+
+commit 41b2fd28a833995c8ccab1a690c0e3925572488b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 17:54:12 +0100
+
+ When given an object path, use GVariant to check syntactic validity
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ dbus/dbus-gobject.c | 2 +-
+ dbus/dbus-gproxy.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 367a58bc081d451ff90262ae96b7d78ea74f3d11
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-28 19:05:44 +0100
+
+ Depend on dbus 1.2.16 for dbus_message_iter_abandon_container
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 0f782b478a784ac890741e5d84fd741a26d49510
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-03-29 14:45:34 +0100
+
+ Stop overriding pkg-config's nice informative message if GLib is
+ too old
+
+ This means that instead of this rather ambiguous text:
+
+ checking for DBUS_GLIB... no
+ checking for DBUS_GLIB_THREADS... yes
+ configure: error: GLib development libraries not found
+
+ platforms whose GLib is too old will get the conventional output:
+
+ checking for DBUS_GLIB... no
+ configure: error: Package requirements (gobject-2.0 >= 2.26)
+ were not met:
+
+ Requested 'gobject-2.0 >= 2.26' but version of GObject is 2.24.0
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33145
+ Reviewed-by: Colin Walters <walters@verbum.org>
+
+ configure.ac | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+commit ab2a98bd3ae0c59f198e82cba2c81095a47fa58d
+Author: Robert Ancell <robert.ancell@canonical.com>
+Date: 2011-02-15 14:10:34 +1100
+
+ Fix linking order
+
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34282
+
+ dbus/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit af0c64037673d598a6842fb344b5f3dad80ab821
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-06-02 16:31:54 +0100
+
+ docs: correct links in introduction
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=22667 — thanks to
+ Daniel Macks for the bug report!
+
+ doc/reference/dbus-glib-docs.sgml | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+commit 04e11da48a6c2a75bebb5ece31cf86508203dd02
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 16:33:27 +0000
+
+ Add a regression test for errors containing underscores
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30274
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ test/core/my-object.c | 15 +++++++++++++++
+ test/core/my-object.h | 3 ++-
+ test/core/test-dbus-glib.c | 11 +++++++++++
+ test/core/test-service-glib.xml | 3 +++
+ 4 files changed, 31 insertions(+), 1 deletion(-)
+
+commit 2d987890c3ba2fd8efc92f8b75da88904ce425f9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2011-01-04 18:04:11 +0000
+
+ Run run-with-tmp-session-bus.sh directly rather than via ${SHELL}
+
+ It has a correct #!/bin/sh line and is executable, so just running
+ it is
+ fine. This avoids running it under a user's chosen interactive shell,
+ which might be non-POSIX (zsh, csh). Gentoo Portage apparently sets
+ SHELL to /bin/false, presumably to trap this sort of thing.
+
+ (I've tested this on Debian unstable with /bin/sh -> /bin/dash,
+ to check
+ that weren't accidentally relying on $SHELL being bash or similar.)
+
+ Based on a workaround from Myckel Habets on the Gentoo bug.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27193
+ Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=254192
+ Reviewed-by: Colin Walters <walters@verbum.org>
+
+ test/core/run-test.sh | 2 +-
+ test/interfaces/run-test.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6708c68cc9c312ffea600d0020425412ba242ddb
+Author: Christian Dywan <christian@lanedo.com>
+Date: 2011-01-04 18:48:31 +0000
+
+ Cleanup indentation in dbus-glib-binding-tool
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32351
+ Bug-NB: NB#180486
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-binding-tool-glib.c | 134
+ ++++++++++++++++++++---------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+commit f1b8944a93a22d342f744526f5c47e80e394579f
+Author: Christian Dywan <christian@lanedo.com>
+Date: 2011-01-04 18:48:27 +0000
+
+ Plug leaks in dbus-glib-binding-tool
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32351
+ Bug-NB: NB#180486
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-binding-tool-glib.c | 27 +++++++++++++--------------
+ 1 file changed, 13 insertions(+), 14 deletions(-)
+
+commit 4cd1f54f4db5759db3781da4645cebcd4143e9a4
+Author: Christian Dywan <christian@twotoasts.de>
+Date: 2010-09-20 11:57:08 +0200
+
+ Do not squash underscores in error names
+
+ Underscores are used and valid according to the specification.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30274
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-gobject.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+commit d4780b527f5112acf015c0e57c9911e939b16f99
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-07-21 16:32:22 +0200
+
+ Watch server_set_data failure in dbus__server_setup_with_g_main
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29884
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ dbus/dbus-gmain.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit c7b83e5b3bf7291b75399eed3f01ecea0c98702f
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-12-13 10:14:57 -0800
+
+ Verify Increment call in dbus-glib-test
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29884
+ Origin: vendor, Maemo
+ Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+ test/core/test-dbus-glib.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 7e157ee379de430fce9874291701c0c6666d2c2d
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-10 10:44:38 +0000
+
+ Bump version to 0.93 for development
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a12d06317591f954542d5ddbe1a1d3cad10a8156
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-10 10:25:19 +0000
+
+ Release version 0.92
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cb7a627ea838ae453d1401679a2b97acd95ba327
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-10 10:22:40 +0000
+
+ Bump GLib dependency to 2.26.
+
+ G_VARIANT_TYPE_STRING_ARRAY, as used by the GVariant<->GValue
+ conversion
+ functions, was added in 2.26. The previous release should have
+ had this
+ dependency, but I didn't notice.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c12efeeb7d9eb76eeae049528cee09c331551a5e
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-08 00:20:20 -0500
+
+ Bump version to 0.91 for development
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 4d4a1e266727de9ed1cba2707006435a389cac90
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-08 00:16:46 -0500
+
+ HACKING: Fix release URL; be honest about NEWS
+
+ HACKING | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit b3c18c486dbb1fd2c6221d26fd64719d73ff4200
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-08 00:12:00 -0500
+
+ Makefile.am: Remove ChangeLog's spurious FORCE dependency
+
+ This seems to be some kind of leftover from the now-deleted lcov
+ stuff.
+
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ccd31bb39e496ba511e888d793b15bfaa22894f0
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-08 00:08:15 -0500
+
+ Release version 0.90
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 65fb5802295ff28970ac1e3f0d5adaa6927a5773
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2010-11-08 00:04:31 -0500
+
+ Build test/ before its subdirs.
+
+ This fixes running `make check` without first running `make`, since
+ subdirs of test/ depend on the binaries in that directory.
+
+ test/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 22df79e0c1373b696adbbaf2791195f0a8b5fb0f
+Author: Mike Gorse <mgorse@novell.com>
+Date: 2010-10-22 04:33:53 -0400
+
+ Fix switching a connection's GMainContext
+
+ dbus_connection_setup_with_g_main and dbus_server_setup_with_g_main
+ are
+ intended to switch the setup to a new main loop context if they are
+ called with a context other than the one with which they were
+ initially
+ called. However, this does not work in practice. The problem has
+ to do
+ with libdbus maintaining a list of watches associated with the
+ connection. When dbus_connection_set_watch_functions is called, it
+ first adds the existing watches using the new function and data, then
+ removes the watches using the old function and data. Remove_watch
+ calls
+ connection_setup_remove_watch, and the latter does not check that the
+ watch's connection setup matches the connection setup passed to it, so
+ it winds up removing the watch from the new connection setup. (The
+ watch has already been removed from the old setup at this point, as a
+ side effect of dbus_watch_set_data).
+
+ Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=30574>
+ Signed-off-by: Will Thompson <will.thompson@collabora.co.uk>
+
+ .gitignore | 1 +
+ dbus/dbus-gmain.c | 7 ++--
+ test/core/30574.c | 96
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ test/core/Makefile.am | 4 +++
+ test/core/run-test.sh | 1 +
+ 5 files changed, 106 insertions(+), 3 deletions(-)
+
+commit 8f0936de52b62b025385182406e5ea5795503d76
+Merge: 8aca055 afd0987
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 13:06:47 +0100
+
+ Merge branch 'type-names'
+
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30431
+
+commit 8aca05563f86bd24fedb4322363ae844affc3c61
+Merge: 0ab27bb ad4b66d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 12:37:58 +0100
+
+ Merge branch 'gvariant'
+
+ Reviewed-by: Danielle Madeley <danielle.madeley@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30428
+
+commit ad4b66db0e3a6ecab31bed214f341c4b07691224
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 12:15:08 +0100
+
+ copy arrays of 'o', 'g' from GVariant without constructing a format
+ string programmatically
+
+ dbus/dbus-gvalue-parse-variant.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+commit 869c180e12c68ed06fe973c58f26cffbf4a3cec9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 12:13:19 +0100
+
+ output unhandled GVariantClass as ASCII if possible
+
+ dbus/dbus-gvalue-parse-variant.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 42192c5bc0517d747aa83e9ce82e0208c3426aab
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 12:06:36 +0100
+
+ Add dbus_g_value_parse_g_variant to gtkdoc
+
+ doc/reference/dbus-glib-sections.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f3b4a2d82994f0013f14fffbd3fedd8cd45cf7da
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 12:06:07 +0100
+
+ dbus_g_value_parse_variant_by_type: talk about GVariant, not GDBus,
+ in docs
+
+ dbus/dbus-gvalue-parse-variant.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit bc207d10cace8051ff7b2ddf51176030c0d40d17
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 12:05:48 +0100
+
+ Adjust syntax to avoid relying on array/pointer duality
+
+ dbus/dbus-gvalue-parse-variant.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit a66176ecd5eab86d62e23c393c90dfda4d9ca354
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-14 12:04:29 +0100
+
+ dbus_g_value_basic_array_parse_variant: allow the fast path to
+ be taken
+
+ dbus/dbus-gvalue-parse-variant.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b9c4c4bf00321ab1fb092514c6b1312d82a098c3
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-13 13:27:33 +0100
+
+ Test dbus_g_value_parse_g_variant
+
+ Also test dbus_g_value_build_g_variant more thoroughly, by carrying
+ out
+ various round-trip conversions.
+
+ test/core/test-gvariant.c | 283
+ +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 283 insertions(+)
+
+commit 817e1fc7c50ccde3643c20ed837dce00bc16a885
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-13 12:57:35 +0100
+
+ dbus_g_value_build_g_variant: cope with empty arrays, maps
+
+ We can't just derive the type from the first entry if there's no first
+ entry, so for the empty case we need a function whose structure
+ mirrors
+ dbus_g_value_build_g_variant itself, which just returns the type.
+
+ dbus/dbus-gtype-specialized.c | 114
+ ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 112 insertions(+), 2 deletions(-)
+
+commit 53d4457fb5bd71467acb1fbca7ecd80d8e39e189
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-13 12:52:39 +0100
+
+ dbus_g_type_specialized_map_append: document that the value contents
+ are stolen
+
+ This is highly non-obvious, and tripped me up while writing
+ dbus_g_value_parse_g_variant.
+
+ dbus/dbus-gtype-specialized.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 26e1c1d86b6e583ac326674ab8b886673f7c1f90
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-13 12:52:07 +0100
+
+ fd.o #30428: add dbus_g_value_parse_g_variant
+
+ This is the inverse of dbus_g_value_build_g_variant, and can be
+ used to
+ present an API with GVariant 'in' arguments to library users, then
+ translate them into GValue for transmission over dbus-glib, as a
+ transition mechanism.
+
+ dbus/Makefile.am | 2 +
+ dbus/dbus-glib.h | 2 +
+ dbus/dbus-gvalue-parse-variant.c | 525
+ ++++++++++++++++++++++++++++++++++++++
+ dbus/dbus-gvalue-parse-variant.h | 39 +++
+ 4 files changed, 568 insertions(+)
+
+commit abe6ee06e30f71187aeaed2c8804cbcc6692d8cc
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-13 12:48:51 +0100
+
+ replace remnants of gcov support with lcov.am from telepathy-glib
+
+ .gitignore | 4 ++++
+ Makefile.am | 27 +--------------------------
+ tools/lcov.am | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+), 26 deletions(-)
+
+commit b4362df4d4b9ccd3246f102f7990dbda426f1b8c
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-12 15:27:52 +0100
+
+ Remove gcov decoder, which hasn't worked since dbus-glib left libdbus
+
+ Makefile.am | 16 +-
+ test/Makefile.am | 12 +-
+ test/decode-gcov.c | 2652
+ ----------------------------------------------------
+ 3 files changed, 2 insertions(+), 2678 deletions(-)
+
+commit c42b86fecc793edaf82055a3552f1490be8ad29c
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-12 15:19:24 +0100
+
+ Test dbus_g_value_build_g_variant for various fixed arrays
+
+ test/core/test-gvariant.c | 217
+ +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 217 insertions(+)
+
+commit 75161c695e8d9729ead8543b1297202eee1894f9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-12 15:19:05 +0100
+
+ Actually run test/core/test-gvariant
+
+ test/core/run-test.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 48b2b580c4d6fdcd9db83db7acebb0ea4be6fff9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-10-12 14:41:35 +0100
+
+ Give specialized GArrays iteration/appending support
+
+ This is necessary to have dbus_g_value_build_g_variant work on them.
+
+ dbus/dbus-gvalue-utils.c | 162
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 160 insertions(+), 2 deletions(-)
+
+commit 0ab27bb2b7c3f944348e6368069ffbfcfc2bcb5a
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-07-21 17:28:09 +0200
+
+ Free looked up function name in dbus binding tool
+
+ dbus/dbus-binding-tool-glib.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+commit 5784ee8f24334e634e91b8761dfa956f97a0d2ba
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-07-21 17:18:18 +0200
+
+ Always free method_c_name in dbus binding tool
+
+ dbus/dbus-binding-tool-glib.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+commit 4acce76d97825721c1792417994e592542f4d3d9
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-07-21 17:12:34 +0200
+
+ Free path string after emission in in statemachine server example
+
+ dbus/examples/statemachine/statemachine-server.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit ddb48ae24e40c8636b85555e8d288e2a33cadd44
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-07-21 17:10:26 +0200
+
+ Plug leak of expected_str in threaded server test
+
+ test/core/test-thread-server.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit a07afee00e091a11dc9eefd775288a32f0e49e2d
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-07-21 18:41:06 +0200
+
+ Dereference main loop once variant recursion test is done
+
+ test/core/test-variant-recursion.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit ffe66eb93737eb5ac699b8acba7781a5f77bdab6
+Author: Christian Dywan <christian.dywan@lanedo.com>
+Date: 2010-07-22 16:26:15 +0200
+
+ Remove unused method attribute variables in introspect_interfaces
+
+ dbus/dbus-gobject.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+commit afd098718e36b8ce51f565447f429d807bab3785
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2010-09-28 17:19:19 +0100
+
+ Add DBusGObjectPath, DBusGSignature typedefs
+
+ dbus/dbus-glib.h | 2 ++
+ dbus/dbus-gvalue.c | 44
+ ++++++++++++++++++++++++++++++----
+ doc/reference/dbus-glib-sections.txt | 4 +++-
+ 3 files changed, 45 insertions(+), 5 deletions(-)
+
+commit 8318613e6b186bd9e5c8a844c58beebf47426116
+Author: Colin Walters <walters@verbum.org>
+Date: 2010-08-12 10:19:35 -0400
+
+ configure: Release 0.88
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 510bdcd63ae4e588a5cb72727696d5ad7fd5298b
Author: Colin Walters <walters@verbum.org>
-Date: Mon Apr 19 16:47:11 2010 -0400
+Date: 2010-04-19 16:47:11 -0400
Respect property access flags for writing, allow disabling for reads
With this patch, we deny writes to properties which aren't listed
in the XML, or are listed as read-only.
- For backwards compatibility however, we still allow reads. A
+ For backwards compatibility however, we still allow reads. A
service may disable this by calling
dbus_glib_global_set_disable_legacy_property_access().
- dbus/dbus-binding-tool-glib.c | 53 +++++--
- dbus/dbus-glib.h | 2 +
- dbus/dbus-gobject.c | 293
+ dbus/dbus-binding-tool-glib.c | 53 +++++--
+ dbus/dbus-glib.h | 2 +
+ dbus/dbus-gobject.c | 293
+++++++++++++++++++++++++++++++++------
- test/core/my-object.c | 63 ++++++++-
- test/core/my-object.h | 5 +
- test/core/test-dbus-glib.c | 252 +++++++++++++++++++++++++++++++--
+ test/core/my-object.c | 63 ++++++++-
+ test/core/my-object.h | 5 +
+ test/core/test-dbus-glib.c | 252 +++++++++++++++++++++++++++++++--
test/core/test-service-glib.xml | 5 +
7 files changed, 601 insertions(+), 72 deletions(-)
commit f0668d71d63f97c1c429dad165a30d3aadbdfa0f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Mon Aug 9 11:25:19 2010 +0100
+Date: 2010-08-09 11:25:19 +0100
Consolidate LDADD variables in tests/examples and make them more
complete
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29274
Reviewed-by: Colin Walters <walters@verbum.org>
- dbus/examples/Makefile.am | 8 ++++----
+ dbus/examples/Makefile.am | 8 ++++----
dbus/examples/statemachine/Makefile.am | 6 ++++--
- test/core/Makefile.am | 32
+ test/core/Makefile.am | 32
+++++++++++++-------------------
- test/interfaces/Makefile.am | 8 ++++----
+ test/interfaces/Makefile.am | 8 ++++----
4 files changed, 25 insertions(+), 29 deletions(-)
commit ccf4a4d8c82b7309af7f3fb23144690acbf8e38c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Mon Aug 9 11:25:55 2010 +0100
+Date: 2010-08-09 11:25:55 +0100
Add various tests etc. to .gitignore
- .gitignore | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ .gitignore | 7 +++++++
+ 1 file changed, 7 insertions(+)
commit dcc9c8f2dede482614b885eace06f2dedaf2a736
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue Jul 27 17:16:33 2010 +0100
+Date: 2010-07-27 17:16:33 +0100
Add Libtool m4 to .gitignore
- .gitignore | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ .gitignore | 5 +++++
+ 1 file changed, 5 insertions(+)
commit 9440209e203cccef158904800ea623568637a71e
Merge: 0eec114 077d445
Author: Will Thompson <will.thompson@collabora.co.uk>
-Date: Thu Aug 5 10:09:08 2010 +0100
+Date: 2010-08-05 10:09:08 +0100
Merge remote branch 'danni/gvalue-to-gvariant'
commit 0eec114bb510a3bb30888b0020ca0dc11dc3497d
Author: Christian Dywan <christian@twotoasts.de>
-Date: Thu Jul 22 13:38:01 2010 +0200
+Date: 2010-07-22 13:38:01 +0200
Refer to dbus_g_connection_flush rather than the plain dbus call
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29214
- dbus/dbus-gproxy.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ dbus/dbus-gproxy.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
commit 077d445078663e3ee6f93beacc14d866504148bf
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
-Date: Wed Jul 14 15:43:11 2010 +1000
+Date: 2010-07-14 15:43:11 +1000
Support DBUS_TYPE_G_SIGNATURE
dbus/dbus-gtype-specialized.c | 2 ++
test/core/test-gvariant.c | 21 +++++++++++++++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
+ 2 files changed, 23 insertions(+)
commit 13f7c51344111ca5266e790d2f4863fab770bfd8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
-Date: Fri Jun 25 14:35:17 2010 +1000
+Date: 2010-06-25 14:35:17 +1000
Test test_g_variant_equivalent itself
test/core/test-gvariant.c | 144
+++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 144 insertions(+), 0 deletions(-)
+ 1 file changed, 144 insertions(+)
commit 90b5e06797f2c9c5ed8918d22de35d5093bc3bd1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
-Date: Fri Jun 25 14:11:40 2010 +1000
+Date: 2010-06-25 14:11:40 +1000
Write a recursive equivalence function for testing the equivalence
of GVariants
Makes up for the limitations of g_variant_equal()
test/core/test-gvariant.c | 114
- +++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 106 insertions(+), 8 deletions(-)
+ +++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 106 insertions(+), 8 deletions(-)
commit 5456dc1f10544505a61f2608f646256e28b0047a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
-Date: Thu Jun 24 22:10:48 2010 +1000
+Date: 2010-06-24 22:10:48 +1000
Tests for GValue-to-GVariant
- test/core/Makefile.am | 7 ++-
+ test/core/Makefile.am | 7 +-
test/core/test-gvariant.c | 191
+++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 197 insertions(+), 1 deletions(-)
+ 2 files changed, 197 insertions(+), 1 deletion(-)
commit 5cc0676c83ee678069886daad5fc5487f098686e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
-Date: Thu Jun 24 20:52:26 2010 +1000
+Date: 2010-06-24 20:52:26 +1000
fd.o #28715: Add dbus_g_value_build_g_variant()
- dbus/dbus-gtype-specialized.c | 127
+ dbus/dbus-gtype-specialized.c | 127
++++++++++++++++++++++++++++++++++
- dbus/dbus-gtype-specialized.h | 2 +
+ dbus/dbus-gtype-specialized.h | 2 +
doc/reference/dbus-glib-sections.txt | 1 +
- 3 files changed, 130 insertions(+), 0 deletions(-)
+ 3 files changed, 130 insertions(+)
commit 5ed147db0808e5f4ef50dfd6011419c44255ea6c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
-Date: Thu Jun 24 20:59:05 2010 +1000
+Date: 2010-06-24 20:59:05 +1000
Bumping required GLib to 2.24 for GVariant
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 7f054d7bce4b2ea74e5268f2cf65c467773ee14f
Author: Dan Williams <dcbw@redhat.com>
-Date: Tue Jun 29 21:19:25 2010 -0700
+Date: 2010-06-29 21:19:25 -0700
Fix lookup of regular properties when shadow properties are used
shadow property we free the uscore converted one and then return
it immediately after.
- dbus/dbus-gobject.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ dbus/dbus-gobject.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
commit e6b6e27dc2d6e3abae88d9a773a1e4c016e58aa3
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue May 4 12:39:51 2010 +0100
+Date: 2010-05-04 12:39:51 +0100
fd.o #27958: dbus_g_error_domain_register: rewrite the documentation
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
- dbus/dbus-gobject.c | 30 +++++++++++++++++++++++++-----
- 1 files changed, 25 insertions(+), 5 deletions(-)
+ dbus/dbus-gobject.c | 30 +++++++++++++++++++++++++-----
+ 1 file changed, 25 insertions(+), 5 deletions(-)
commit 451183c140f7d6b42fdff3a6c190ef93d860c5fc
Merge: 7db074f 499beb6
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue May 4 12:18:31 2010 +0100
+Date: 2010-05-04 12:18:31 +0100
Merge branch '14579-remove-before-cancel'
commit 7db074fead497c31041ebf417db26ae9a7ab565c
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
-Date: Mon Apr 26 18:51:49 2010 +0200
+Date: 2010-04-26 18:51:49 +0200
Put the G_OS_WIN32 check where it can be defined.
test/core/test-profile.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 3 insertions(+), 2 deletions(-)
commit fb7cb9f10e08eaf3887b2a63a7fa59510e40b5d2
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
-Date: Mon Apr 26 18:50:31 2010 +0200
+Date: 2010-04-26 18:50:31 +0200
Fix linking of tests. On windows, undefined symbols are not allowed
and symbol lookup is sequencial
- test/core/Makefile.am | 2 +-
- test/interfaces/Makefile.am | 2 +-
+ test/core/Makefile.am | 2 +-
+ test/interfaces/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit fadbedfbbf512d69611a80a0cd4698e3b5d579ea
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
-Date: Mon Apr 26 18:44:21 2010 +0200
+Date: 2010-04-26 18:44:21 +0200
Use EXEEXT so that we satisfy dependencies when cross-compiling
- test/core/Makefile.am | 6 +++---
- test/interfaces/Makefile.am | 20 ++++++++++----------
+ test/core/Makefile.am | 6 +++---
+ test/interfaces/Makefile.am | 20 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
commit f0abb1f78d4e4764119b57d2b6f3b5fa57d8fdfb
Author: Dan Williams <dcbw@redhat.com>
-Date: Thu Apr 22 13:26:44 2010 -0700
+Date: 2010-04-22 13:26:44 -0700
core: don't pass malformed error interface to dbus (rh#581794)
Signed-off-by: Colin Walters <walters@verbum.org>
- dbus/dbus-gobject.c | 17 +++++++++++------
- test/core/my-object.c | 12 ++++++++++++
- test/core/my-object.h | 1 +
- test/core/test-dbus-glib.c | 8 ++++++++
+ dbus/dbus-gobject.c | 17 +++++++++++------
+ test/core/my-object.c | 12 ++++++++++++
+ test/core/my-object.h | 1 +
+ test/core/test-dbus-glib.c | 8 ++++++++
test/core/test-service-glib.xml | 3 +++
5 files changed, 35 insertions(+), 6 deletions(-)
commit 47adc3b17f20a78230c5c34e635fc30bb7afbde2
Author: Colin Walters <walters@verbum.org>
-Date: Mon Apr 26 10:51:39 2010 -0400
+Date: 2010-04-26 10:51:39 -0400
Disable test-profile on win32 for now
It uses Unix sockets, and overall isn't very interesting anyways.
test/core/test-profile.c | 13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
+ 1 file changed, 11 insertions(+), 2 deletions(-)
commit 16deb341b52421695b81ebe8c91c81f47eb173f3
Author: Fridrich Strba <fridrich.strba@bluewin.ch>
-Date: Mon Apr 26 10:31:23 2010 -0400
+Date: 2010-04-26 10:31:23 -0400
Don't use the identifier "interface" in public headers
commit 354ed0897ae0e815e95a7eb931de6ba35325121c
Author: Fridrich Strba <fridrich.strba@bluewin.ch>
-Date: Mon Apr 26 10:29:41 2010 -0400
+Date: 2010-04-26 10:29:41 -0400
Use AC_CANONICAL_HOST, not _TARGET
explanation of the train wreck.
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit af0ec6795ea64d6498b83f30ecd94adc4e935e7e
Author: Astone Lin <astone.lin@mediatek.com>
-Date: Mon Apr 19 06:56:43 2010 -0400
+Date: 2010-04-19 06:56:43 -0400
Allow duplicate object path registrations for different connections
since it's perfectly valid to have the same one on two different
connections.
- dbus/dbus-gobject.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ dbus/dbus-gobject.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit fc7114a536571688d48ede025f1357c0e467c879
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Wed Apr 7 12:08:59 2010 +0200
+Date: 2010-04-07 12:08:59 +0200
add mising DBUS_TYPE_G_* to the doc
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
doc/reference/dbus-glib-sections.txt | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ 1 file changed, 9 insertions(+)
commit 8df3281e536557cfd6b4056a9c95102d57596179
Author: Colin Walters <walters@verbum.org>
-Date: Wed Mar 24 20:17:54 2010 -0400
+Date: 2010-03-24 20:17:54 -0400
[configure] Release 0.86
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 551d86f7fe0e7f2304f57baa7a406c935182b06a
Author: Dan Williams <dcbw@redhat.com>
-Date: Wed Mar 24 14:40:09 2010 -0700
+Date: 2010-03-24 14:40:09 -0700
core: performance optimization for object info lookup
- dbus/dbus-gobject.c | 31 ++++++++++++++++++-------------
- 1 files changed, 18 insertions(+), 13 deletions(-)
+ dbus/dbus-gobject.c | 31 ++++++++++++++++++-------------
+ 1 file changed, 18 insertions(+), 13 deletions(-)
commit ed73cb2f32c411a3306c6dfe2ae541aea249f200
Author: Dan Williams <dcbw@redhat.com>
-Date: Wed Mar 24 12:20:13 2010 -0700
+Date: 2010-03-24 12:20:13 -0700
core: allow duplicate property names on GInterfaces
the interface to register "shadow" properties on a per-interface
basis which redirect the lookup of the property name.
- dbus/dbus-glib.h | 4 +
- dbus/dbus-gobject.c | 160 ++++++++++++++++++++++++++---
- test/interfaces/Makefile.am | 24 ++++-
- test/interfaces/test-client.c | 186
+ dbus/dbus-glib.h | 4 +
+ dbus/dbus-gobject.c | 160 +++++++++++++++++++++++++----
+ test/interfaces/Makefile.am | 24 ++++-
+ test/interfaces/test-client.c | 186
+++++++++++++++++++++++++++++++++
- test/interfaces/test-dup-prop-a.xml | 6 +
- test/interfaces/test-dup-prop-b.xml | 6 +
- test/interfaces/test-dup-prop.c | 192
+ test/interfaces/test-dup-prop-a.xml | 6 ++
+ test/interfaces/test-dup-prop-b.xml | 6 ++
+ test/interfaces/test-dup-prop.c | 192
+++++++++++++++++++++++++++++++++++
- test/interfaces/test-dup-prop.h | 60 +++++++++++
- test/interfaces/test-server.c | 8 ++
+ test/interfaces/test-dup-prop.h | 60 +++++++++++
+ test/interfaces/test-server.c | 8 ++
9 files changed, 627 insertions(+), 19 deletions(-)
commit c1bbf6fb1b7c6e2a743c8a7353cddea52d42fa2d
Author: Colin Walters <walters@verbum.org>
-Date: Thu Mar 18 21:39:24 2010 -0400
+Date: 2010-03-18 21:39:24 -0400
[dbus-gobject.c] Trivial compiler warning fixes
- dbus/dbus-gobject.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ dbus/dbus-gobject.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
commit b52c16b495632bd945328ca858533d5660106bdf
Author: Colin Walters <walters@verbum.org>
-Date: Thu Mar 18 21:37:38 2010 -0400
+Date: 2010-03-18 21:37:38 -0400
Remove dbus-glib-undeclared.txt from git; it's a generated file
- 0 files changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
commit 7b029451dac1fdd14da4e558cc995fb7f5263d04
Author: Colin Walters <walters@verbum.org>
-Date: Thu Mar 18 21:37:05 2010 -0400
+Date: 2010-03-18 21:37:05 -0400
[configure.ac] Use AM_SILENT_RULES if available
configure.ac | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
commit db026859406ce768d71d4ccf850e8be56b52998c
Author: Will Thompson <will.thompson@collabora.co.uk>
-Date: Tue Mar 9 17:18:10 2010 +0000
+Date: 2010-03-09 17:18:10 +0000
Free errors returned by method implementations
https://bugs.freedesktop.org/show_bug.cgi?id=26981
- dbus/dbus-gobject.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ dbus/dbus-gobject.c | 4 ++++
+ 1 file changed, 4 insertions(+)
commit 3902ac5a13a7510b8411b1147d0cce5711cf4168
Author: Sven Herzberg <herzi@gnome-de.org>
-Date: Mon Mar 8 16:50:28 2010 +0100
+Date: 2010-03-08 16:50:28 +0100
turn the gtk-doc documentation into buildable shape
in
gtk-doc
- dbus/dbus-gobject.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ dbus/dbus-gobject.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
commit 3d69cfeab177e79b4ecfe1b4284a5bd840fd11e7
Author: Colin Walters <walters@verbum.org>
-Date: Thu Apr 2 14:01:05 2009 +0100
+Date: 2009-04-02 14:01:05 +0100
Fix hyphenated error codes correctly
Based on an original patch from Neil Roberts <neil@linux.intel.com>
- dbus/dbus-gobject.c | 21 ++++++++++++++++++---
- test/core/my-object.c | 13 +++++++++++++
- test/core/my-object.h | 4 +++-
- test/core/test-dbus-glib.c | 7 +++++++
+ dbus/dbus-gobject.c | 21 ++++++++++++++++++---
+ test/core/my-object.c | 13 +++++++++++++
+ test/core/my-object.h | 4 +++-
+ test/core/test-dbus-glib.c | 7 +++++++
test/core/test-service-glib.xml | 3 +++
5 files changed, 44 insertions(+), 4 deletions(-)
commit 4538adc1fe903d1ce71ca24590df9bdac7c4a50e
Author: Colin Walters <walters@verbum.org>
-Date: Tue Mar 2 12:12:18 2010 -0500
+Date: 2010-03-02 12:12:18 -0500
Revert "Squash underscores and dashes in errors when converting to
DBus errors"
This incorrectly uppercased the first character in error names:
https://bugzilla.redhat.com/show_bug.cgi?id=569631
- dbus/dbus-gobject.c | 13 ++-----------
- 1 files changed, 2 insertions(+), 11 deletions(-)
+ dbus/dbus-gobject.c | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
commit 2d85761286e96df3490426af1e20e7b553448092
Author: Colin Walters <walters@verbum.org>
-Date: Tue Mar 2 13:52:36 2010 -0500
+Date: 2010-03-02 13:52:36 -0500
Remove dbus-glib-undocumented.txt from git
doc/reference/dbus-glib-undocumented.txt | 60
------------------------------
- 1 files changed, 0 insertions(+), 60 deletions(-)
+ 1 file changed, 60 deletions(-)
commit 9637ed9f0c66982a06048b18ccf983881643e456
Author: Colin Walters <walters@verbum.org>
-Date: Mon Feb 1 10:09:53 2010 -0500
+Date: 2010-02-01 10:09:53 -0500
Squash underscores and dashes in errors when converting to DBus errors
We were just taking the enumeration nick and appending to the DBus
error name, but since these can contain '-' we need to squash.
- dbus/dbus-gobject.c | 13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
+ dbus/dbus-gobject.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
commit d039ca66f85955788e2d58294c249579bed9cc03
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jan 27 13:56:48 2010 -0500
+Date: 2010-01-27 13:56:48 -0500
Release 0.84
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit f1c3f7bf585d6010c84491372b0a6f0ae3b1432a
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jan 27 13:01:29 2010 -0500
+Date: 2010-01-27 13:01:29 -0500
Add GMainContext to dbus_g_bus_get_private, add a test case
Also, add a (very simple) test case which just uses a private
connection for the default main context.
- dbus/dbus-glib.h | 1 +
- dbus/dbus-gmain.c | 4 +++-
- test/core/test-dbus-glib.c | 21 +++++++++++++++++++++
- 3 files changed, 25 insertions(+), 1 deletions(-)
+ dbus/dbus-glib.h | 1 +
+ dbus/dbus-gmain.c | 4 +++-
+ test/core/test-dbus-glib.c | 21 +++++++++++++++++++++
+ 3 files changed, 25 insertions(+), 1 deletion(-)
commit 87c645ed17d6fef350e8c26e322ecde566a27d42
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jan 27 13:06:34 2010 -0500
+Date: 2010-01-27 13:06:34 -0500
Fix compilation of dbus-gvalue.c
commit c4a5653e0402f876a1824c33a19e69991ee46a27 was missing a "break;"
- dbus/dbus-gvalue.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ dbus/dbus-gvalue.c | 1 +
+ 1 file changed, 1 insertion(+)
commit e6cd65545ee5cd2eeb5ccc21d5bfe8e8ac286d95
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jan 27 11:40:07 2010 -0500
+Date: 2010-01-27 11:40:07 -0500
Add note about non-maintenance of NEWS
NEWS | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
commit c4a5653e0402f876a1824c33a19e69991ee46a27
Author: Andres Salomon <dilinger@collabora.co.uk>
-Date: Wed Aug 19 08:57:21 2009 -0400
+Date: 2009-08-19 08:57:21 -0400
dbus-gvalue: set an error when demarshal_basic doesn't recognize type
Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
- dbus/dbus-gvalue.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ dbus/dbus-gvalue.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
commit b976413f896f2d5a0be9449fc77a716f2e67cc96
Author: Jiří Klimeš <jklimes@redhat.com>
-Date: Wed Jan 27 10:36:57 2010 -0500
+Date: 2010-01-27 10:36:57 -0500
Fix bad NAME in dbus-binding-tool man page
doc/dbus-binding-tool.1 | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 34636b12c62523b9db789b0fbeb3a86782debf10
Author: Colin Walters <walters@verbum.org>
-Date: Fri Jan 15 12:23:30 2010 -0500
+Date: 2010-01-15 12:23:30 -0500
Import dbus-bus-introspect.xml upstream
capability
to update dbus-glib.
- Makefile.am | 1 +
- configure.ac | 12 -------
+ Makefile.am | 1 +
+ configure.ac | 12 --------
dbus-bus-introspect.xml | 77
+++++++++++++++++++++++++++++++++++++++++++++++
- tools/Makefile.am | 15 ++-------
+ tools/Makefile.am | 15 ++-------
4 files changed, 81 insertions(+), 24 deletions(-)
commit 9cefa4bae8d20beddf695380af00945790da0206
Merge: 5e5a1c1 15f4533
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Wed Nov 25 14:55:32 2009 +0000
+Date: 2009-11-25 14:55:32 +0000
Merge remote branch 'upstream/master'
commit 15f4533742ad6aeab85ebb723ac8fca99c00e939
Author: Will Thompson <will.thompson@collabora.co.uk>
-Date: Mon Nov 16 13:32:40 2009 +0000
+Date: 2009-11-16 13:32:40 +0000
Don't leak DBusGMethodInvocation for no-reply calls
https://bugs.freedesktop.org/show_bug.cgi?id=25119
- dbus/dbus-gobject.c | 17 ++++++++++-------
- 1 files changed, 10 insertions(+), 7 deletions(-)
+ dbus/dbus-gobject.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
commit 5e5a1c1930173dac0e331c2cb78a164c3565b0eb
Merge: 2a4396b 90e2199
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue Sep 29 14:22:07 2009 +0100
+Date: 2009-09-29 14:22:07 +0100
Merge remote branch 'wjt/duplicate-registrations'
commit 2a4396b523912c3bf4d2a1ef6d6fa930c0871c67
Merge: 980b468 e2007cf
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue Sep 29 14:07:11 2009 +0100
+Date: 2009-09-29 14:07:11 +0100
Merge branch '20936-fsf-address'
commit 980b46870aa0e44a04ad1191d7af1d0601577501
Author: Stian Skjelstad <stian@nixia.no>
-Date: Fri Sep 18 14:01:00 2009 -0400
+Date: 2009-09-18 14:01:00 -0400
Bug 19623 - Add dbus_g_bus_get_private
Signed-off-by: Colin Walters <walters@verbum.org>
- dbus/dbus-glib.h | 3 +++
+ dbus/dbus-glib.h | 3 +++
dbus/dbus-gmain.c | 41 +++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 44 insertions(+), 0 deletions(-)
+ 2 files changed, 44 insertions(+)
commit 90e2199ac99f5b8ab0cd5f45dcb398ecf9af03d9
Author: Will Thompson <will.thompson@collabora.co.uk>
-Date: Sat Sep 12 11:58:22 2009 +0100
+Date: 2009-09-12 11:58:22 +0100
Copy object registration list when unregistering.
of the
loop, 'iter' would point to a link which has been freed.
- dbus/dbus-gobject.c | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ dbus/dbus-gobject.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
commit 39e2642e41b2293de7556fa15c57872f78ffcdc8
Author: Will Thompson <will.thompson@collabora.co.uk>
-Date: Sat Sep 12 11:28:25 2009 +0100
+Date: 2009-09-12 11:28:25 +0100
Only re-set registration list if it's non-empty
- dbus/dbus-gobject.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ dbus/dbus-gobject.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
commit 0263b72669de710e0adda419a520ae9f123a1be9
Author: Colin Walters <walters@verbum.org>
-Date: Wed Aug 19 13:27:53 2009 -0400
+Date: 2009-08-19 13:27:53 -0400
Support duplicate object registrations
The primary change is that signals are now emitted once for each
registration path of an object, using the correct path.
- dbus/dbus-gobject.c | 159
+ dbus/dbus-gobject.c | 159
++++++++++++++++++++++++++++-------------
test/core/test-dbus-glib.c | 41 +++++++++++
- test/core/test-service-glib.c | 4 +
+ test/core/test-service-glib.c | 4 ++
3 files changed, 154 insertions(+), 50 deletions(-)
commit c993494ad463ffe55b8603e58aa5ecb6dd731144
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jul 16 14:09:18 2009 -0400
+Date: 2009-07-16 14:09:18 -0400
Release 0.82
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 65e03ccf0f2417a83fd187035b80d680e376fd32
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jul 16 13:51:57 2009 -0400
+Date: 2009-07-16 13:51:57 -0400
Test for git-log in Makefile.am should just be for git now
The combined tools are no longer in $PATH for modern git.
- Makefile.am | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
commit f5edb761202d3aff8f8bd0bc68dd57d3d32d2bd1
Author: Alban Crequy <alban.crequy@collabora.co.uk>
-Date: Thu Jul 16 13:39:08 2009 -0400
+Date: 2009-07-16 13:39:08 -0400
Bug 18294 - Be defensive about a possibly NULL property string
Signed-off-by: Colin Walters <walters@verbum.org>
- dbus/dbus-gobject.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ dbus/dbus-gobject.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 2508e687e7d7792a656c7af0aad1be851faa33bb
Author: Brian Cameron <brian.cameron@sun.com>
-Date: Thu Jul 16 13:15:38 2009 -0400
+Date: 2009-07-16 13:15:38 -0400
Bug 20343 - Add a man page for dbus-binding-tool
Signed-off-by: Colin Walters <walters@verbum.org>
- doc/Makefile.am | 6 +-
+ doc/Makefile.am | 6 +-
doc/dbus-binding-tool.1 | 294
+++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 299 insertions(+), 1 deletions(-)
+ 2 files changed, 299 insertions(+), 1 deletion(-)
commit 29513843b22dbd2aba1d3ba2930bb38e2c6631e5
Author: Marc-André Lureau <marcandre.lureau@gmail.com>
-Date: Sat May 9 18:13:49 2009 +0300
+Date: 2009-05-09 18:13:49 +0300
build: fix undefined macro: AM_PROG_LIBTOOL with recent libtool
configure.ac:206: warning: macro `AM_PROG_LIBTOOL' not found
in library
configure.ac:213: error: possibly undefined macro: AM_PROG_LIBTOOL
- If this token and others are legitimate, please use
- m4_pattern_allow.
- See the Autoconf documentation.
+ If this token and others are legitimate, please use
+ m4_pattern_allow.
+ See the Autoconf documentation.
autoreconf2.50: /usr/bin/autoconf failed with exit status: 1
(I am using libltdl-dev 2.2.6a-4 from Debian)
- Makefile.am | 1 +
- autogen.sh | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ Makefile.am | 1 +
+ autogen.sh | 1 +
+ 2 files changed, 2 insertions(+)
commit d66337bdf9fc8f5372d84b05ae68c818bb9c881b
Author: Luis Menina <liberforce@freeside.fr>
-Date: Thu Jul 16 10:55:39 2009 -0400
+Date: 2009-07-16 10:55:39 -0400
Bugg 22244 - Only include <glib.h>, not individual headers
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/dbus-glib-tool.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 67c289a60a4ac2ee9660f38a7168a238c1b3cffb
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jul 15 15:33:31 2009 -0400
+Date: 2009-07-15 15:33:31 -0400
Clean up some compilation warnings
- dbus/dbus-gloader-expat.c | 6 +++---
- dbus/dbus-gobject.c | 4 ++--
- test/core/test-dbus-glib.c | 2 +-
+ dbus/dbus-gloader-expat.c | 6 +++---
+ dbus/dbus-gobject.c | 4 ++--
+ test/core/test-dbus-glib.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
commit 5eea6af0d24780109dbbc15b8bfa4078df3a80a2
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jul 15 15:28:06 2009 -0400
+Date: 2009-07-15 15:28:06 -0400
Add missing prototype for dbus_g_connection_unregister_g_object
to be public, make it so.
dbus/dbus-glib.h | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
commit de68d2b2fc3012ae733212a704aa29a748f22f80
Author: Brian Tarricone <bjt23@cornell.edu>
-Date: Wed Jul 15 15:03:36 2009 -0400
+Date: 2009-07-15 15:03:36 -0400
Bug 21753 - Correctly initialize GValues in dbus-binding-tool
generated code
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/dbus-binding-tool-glib.c | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
+ 1 file changed, 8 insertions(+), 4 deletions(-)
commit af07e13e6afe09456588ddba4b72cba215bc7c93
Author: Jason Leach <jason@archlinux.us>
-Date: Wed Jul 1 15:41:04 2009 -0400
+Date: 2009-07-01 15:41:04 -0400
Bug 21362 - Remove use of deprecated symbols
The _set*_take_ownership are replaced by _take, and
use g_main_loop_run.
- dbus/dbus-binding-tool-glib.c | 6 +++---
- dbus/dbus-gvalue-utils.c | 14 +++++++-------
- dbus/dbus-gvalue.c | 16 ++++++++--------
- m4/gtk-doc.m4 | 2 +-
- test/core/test-dbus-glib.c | 2 +-
+ dbus/dbus-binding-tool-glib.c | 6 +++---
+ dbus/dbus-gvalue-utils.c | 14 +++++++-------
+ dbus/dbus-gvalue.c | 16 ++++++++--------
+ m4/gtk-doc.m4 | 2 +-
+ test/core/test-dbus-glib.c | 2 +-
test/core/test-thread-client.c | 2 +-
test/core/test-thread-server.c | 2 +-
7 files changed, 22 insertions(+), 22 deletions(-)
commit e2007cfc5822f057b975660bd369fee56a7f2eb6
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue Jun 9 16:22:46 2009 +0100
+Date: 2009-06-09 16:22:46 +0100
fd.o #20936: Fix another couple of instances of the old FSF address
`git grep 'Temple Place'` now returns nothing.
- dbus/dbus-bash-completion-helper.c | 2 +-
- dbus/dbus-gtool-test.h | 2 +-
- dbus/dbus-gtype-specialized-priv.h | 2 +-
+ dbus/dbus-bash-completion-helper.c | 2 +-
+ dbus/dbus-gtool-test.h | 2 +-
+ dbus/dbus-gtype-specialized-priv.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
commit cbe5250e553112221e1230301767ad1052790b0a
Author: Tobias Mueller <fdo-bugs@cryptobitch.de>
-Date: Wed Apr 15 21:37:05 2009 +0100
+Date: 2009-04-15 21:37:05 +0100
fd.o #20936: Update FSF address
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
- COPYING | 4 ++--
+ COPYING | 4 ++--
dbus/dbus-binding-tool-glib.c | 2 +-
dbus/dbus-binding-tool-glib.h | 2 +-
- dbus/dbus-gidl.c | 2 +-
- dbus/dbus-gidl.h | 2 +-
+ dbus/dbus-gidl.c | 2 +-
+ dbus/dbus-gidl.h | 2 +-
dbus/dbus-glib-lowlevel.h | 2 +-
- dbus/dbus-glib-tool.c | 2 +-
- dbus/dbus-glib-tool.h | 2 +-
- dbus/dbus-glib.c | 2 +-
- dbus/dbus-glib.h | 2 +-
+ dbus/dbus-glib-tool.c | 2 +-
+ dbus/dbus-glib-tool.h | 2 +-
+ dbus/dbus-glib.c | 2 +-
+ dbus/dbus-glib.h | 2 +-
dbus/dbus-gloader-expat.c | 2 +-
- dbus/dbus-gmain.c | 2 +-
- dbus/dbus-gobject.c | 2 +-
- dbus/dbus-gobject.h | 2 +-
- dbus/dbus-gparser.c | 2 +-
- dbus/dbus-gparser.h | 2 +-
- dbus/dbus-gproxy.c | 2 +-
+ dbus/dbus-gmain.c | 2 +-
+ dbus/dbus-gobject.c | 2 +-
+ dbus/dbus-gobject.h | 2 +-
+ dbus/dbus-gparser.c | 2 +-
+ dbus/dbus-gparser.h | 2 +-
+ dbus/dbus-gproxy.c | 2 +-
dbus/dbus-gsignature.c | 2 +-
dbus/dbus-gtest-main.c | 2 +-
- dbus/dbus-gtest.c | 2 +-
- dbus/dbus-gtest.h | 2 +-
- dbus/dbus-gthread.c | 2 +-
+ dbus/dbus-gtest.c | 2 +-
+ dbus/dbus-gtest.h | 2 +-
+ dbus/dbus-gthread.c | 2 +-
dbus/dbus-gtype-specialized.c | 2 +-
dbus/dbus-gtype-specialized.h | 2 +-
- dbus/dbus-gutils.c | 2 +-
- dbus/dbus-gutils.h | 2 +-
+ dbus/dbus-gutils.c | 2 +-
+ dbus/dbus-gutils.h | 2 +-
dbus/dbus-gvalue-utils.c | 2 +-
dbus/dbus-gvalue-utils.h | 2 +-
- dbus/dbus-gvalue.c | 2 +-
+ dbus/dbus-gvalue.c | 2 +-
test/core/test-profile.c | 2 +-
- test/decode-gcov.c | 2 +-
+ test/decode-gcov.c | 2 +-
31 files changed, 32 insertions(+), 32 deletions(-)
commit 499beb64a12cead99ccb09d7de01890aaa800ef2
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 16:04:57 2008 +0000
+Date: 2008-11-28 16:04:57 +0000
Bug 14579: remove pending call from hash table before cancelling it
after
the call is cancelled.
- dbus/dbus-gproxy.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ dbus/dbus-gproxy.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
commit b615918eef9723c00f03d30903181d9989dfd261
Merge: cb8a113 f550c49
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Tue Jun 9 16:15:49 2009 +0100
+Date: 2009-06-09 16:15:49 +0100
Merge branch '13908-autoinit'
commit f550c492a10922795099166db34d8ccf5dbe63a7
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu May 28 18:21:27 2009 +0100
+Date: 2009-05-28 18:21:27 +0100
fd.o #13908: silently initialize specialized types whenever required
API entry
points are themselves used inside the initialization.
- dbus/Makefile.am | 1 +
- dbus/dbus-gtype-specialized-priv.h | 48 +++++++++++++++++++++++++++
- dbus/dbus-gtype-specialized.c | 64
+ dbus/Makefile.am | 1 +
+ dbus/dbus-gtype-specialized-priv.h | 48 +++++++++++++++++++++++++++
+ dbus/dbus-gtype-specialized.c | 64
++++++++++++++++++++++++++----------
- dbus/dbus-gvalue-utils.c | 11 +++---
+ dbus/dbus-gvalue-utils.c | 11 ++++---
4 files changed, 101 insertions(+), 23 deletions(-)
commit cb8a113be8808fe2c88d3e7851e79115235f9e8c
Merge: 0d64d31 725e98f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu May 28 18:04:20 2009 +0100
+Date: 2009-05-28 18:04:20 +0100
Merge branch '20716-with-dbus-binding-tool'
commit 0d64d318397da26f224abd2d7ef1f27d14a544fa
Merge: 48abffb b93c2a1
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu May 28 18:02:44 2009 +0100
+Date: 2009-05-28 18:02:44 +0100
Merge branch '5688-survive-disconnection'
commit 48abffba4cd81c182901dd7c80987251ba05348e
Merge: 9a0c188 e869fda
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu May 28 18:01:54 2009 +0100
+Date: 2009-05-28 18:01:54 +0100
Merge part of branch '5688-survive-disconnection'
commit 9a0c188e2662809950738e92b963e5602dfbd8eb
Merge: 03de444 98087a3
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu May 7 15:33:15 2009 +0100
+Date: 2009-05-07 15:33:15 +0100
Merge branch '16776-make-dbus-errors-throwable'
commit 03de44461132ed610c3d52133d4b4760f20e4cb2
Merge: b6b3787 f363811
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Mon Apr 27 10:47:58 2009 +0100
+Date: 2009-04-27 10:47:58 +0100
Merge branch '20884-proxy-manager-replace-name-owner'
commit b6b37871960ee06d9cc589e031ec3d5d6a4a6b92
Merge: e11c0ac d275c2e
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Apr 16 19:25:02 2009 +0100
+Date: 2009-04-16 19:25:02 +0100
Merge branch '20886-configure-cleanup'
commit e11c0aced3b00733766207f15876fb300d63d442
Author: Colin Walters <walters@verbum.org>
-Date: Wed Feb 25 11:27:57 2009 -0500
+Date: 2009-02-25 11:27:57 -0500
Bug 19927 - Use const for GError * param we're not modifying
This makes it clearer we're not taking ownership of the error, and
interoperates more nicely with functions which provide const GError *.
- dbus/dbus-glib.h | 2 +-
- dbus/dbus-gobject.c | 2 +-
+ dbus/dbus-glib.h | 2 +-
+ dbus/dbus-gobject.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit a809ea3016a0eae166df13c757f3e917dea0c0f9
Author: Vincent Untz <vuntz@gnome.org>
-Date: Thu Apr 16 12:35:42 2009 -0400
+Date: 2009-04-16 12:35:42 -0400
Bug 20879 - Use --skip-source argument for glib-genmarshal
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/dbus-binding-tool-glib.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit b93c2a19f468930c6badf054f79597d99d86e76c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Apr 16 12:59:10 2009 +0100
+Date: 2009-04-16 12:59:10 +0100
fd.o #21219: regression test
- test/core/Makefile.am | 22 ++++++++++++++-
- test/core/run-test.sh | 1 +
+ test/core/Makefile.am | 22 ++++++++++++++-
+ test/core/run-test.sh | 1 +
test/core/unregister.c | 71
++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 93 insertions(+), 1 deletions(-)
+ 3 files changed, 93 insertions(+), 1 deletion(-)
commit e869fda44331e6f590f974ad779115a22f5af22e
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Apr 16 12:57:43 2009 +0100
+Date: 2009-04-16 12:57:43 +0100
dbus-gobject: save the ObjectRegistration on each object, not just
the path
- dbus/dbus-gobject.c | 20 +++++++++++++-------
- 1 files changed, 13 insertions(+), 7 deletions(-)
+ dbus/dbus-gobject.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
commit b4911558384de9919a231c29d75d9560f81fad0a
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Apr 16 12:58:32 2009 +0100
+Date: 2009-04-16 12:58:32 +0100
fd.o #21219: implement unregistration of objects
- dbus/dbus-gobject.c | 25 ++++++++++++++++++++++++-
+ dbus/dbus-gobject.c | 25 ++++++++++++++++++++++++-
doc/reference/dbus-glib-sections.txt | 1 +
- 2 files changed, 25 insertions(+), 1 deletions(-)
+ 2 files changed, 25 insertions(+), 1 deletion(-)
commit e42535c3c0dace3ede96c50f5a9b3cc315c80190
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Apr 16 12:11:15 2009 +0100
+Date: 2009-04-16 12:11:15 +0100
fd.o #5688: Add a regression test
+++++++++++++++++++++++++++++++++++++++++++++++++
test/core/Makefile.am | 13 +++++++-
test/core/run-test.sh | 1 +
- 3 files changed, 94 insertions(+), 1 deletions(-)
+ 3 files changed, 94 insertions(+), 1 deletion(-)
commit 6de1441865da2816c6bcd8cae842be93a8a96304
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Apr 16 12:06:26 2009 +0100
+Date: 2009-04-16 12:06:26 +0100
fd.o #5688: don't assert when exported object is destroyed *after*
D-Bus connection closes
use
the second object path, and leak memory).
- dbus/dbus-gobject.c | 111
+ dbus/dbus-gobject.c | 111
++++++++++++++++++++++++++++++++++++++++-----------
- 1 files changed, 88 insertions(+), 23 deletions(-)
+ 1 file changed, 88 insertions(+), 23 deletions(-)
commit 725e98ffa810d04baf38e5d5d3f62091334b0888
Author: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Wed Apr 15 21:29:09 2009 +0100
+Date: 2009-04-15 21:29:09 +0100
add --with-dbus-binding-tool option to use an external
dbus-binding-tool
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
- configure.ac | 5 +++++
- dbus/examples/Makefile.am | 4 ++--
+ configure.ac | 5 +++++
+ dbus/examples/Makefile.am | 4 ++--
dbus/examples/statemachine/Makefile.am | 4 ++--
- test/core/Makefile.am | 6 +++---
- test/interfaces/Makefile.am | 12 ++++++------
- tools/Makefile.am | 2 +-
+ test/core/Makefile.am | 6 +++---
+ test/interfaces/Makefile.am | 12 ++++++------
+ tools/Makefile.am | 2 +-
6 files changed, 19 insertions(+), 14 deletions(-)
commit a0124a5ecc829b73e2293cd7b23bf0cf0eb0a87c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Mar 26 18:06:53 2009 +0000
+Date: 2009-03-26 18:06:53 +0000
dbus_g_type_specialized_init: make some effort at being thread-safe
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
dbus/dbus-gtype-specialized.c | 21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
+ 1 file changed, 15 insertions(+), 6 deletions(-)
commit f36381131b6f410333a9a823a4fc131ac799394f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Thu Mar 26 18:00:16 2009 +0000
+Date: 2009-03-26 18:00:16 +0000
fd.o#20884: dbus_g_proxy_manager_replace_name_owner: don't leave
freed memory in the hash table if the name was the owner's first
The fix is to replace c with o in the owner_names hash table.
- dbus/dbus-gproxy.c | 13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
+ dbus/dbus-gproxy.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
commit d275c2e646f67a3929d9290c6bdb270d6346b83c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 17:14:47 2008 +0000
+Date: 2008-11-28 17:14:47 +0000
Remove all sorts of libdbus cruft from configure.ac
- configure.ac | 102
+ configure.ac | 102
------------------------------------------------------
test/Makefile.am | 1 -
- 2 files changed, 0 insertions(+), 103 deletions(-)
+ 2 files changed, 103 deletions(-)
commit 6791d09f72a63dcb72d57a187210bc133f463fcf
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 17:07:06 2008 +0000
+Date: 2008-11-28 17:07:06 +0000
Don't check for atomic integer ops
longer use the result of the check
configure.ac | 26 --------------------------
- 1 files changed, 0 insertions(+), 26 deletions(-)
+ 1 file changed, 26 deletions(-)
commit 6de33eb0a3e53d92e47a717849f144a0a313e923
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 17:06:29 2008 +0000
+Date: 2008-11-28 17:06:29 +0000
Don't check whether va_copy works
configure.ac | 75
----------------------------------------------------------
- 1 files changed, 0 insertions(+), 75 deletions(-)
+ 1 file changed, 75 deletions(-)
commit 7bf91463598fc1e6ad44096f33aa4b61bf58443f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 17:04:09 2008 +0000
+Date: 2008-11-28 17:04:09 +0000
configure.ac: Don't check endianness
`git grep ENDIAN` confirms that we no longer need it.
configure.ac | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ 1 file changed, 3 deletions(-)
commit dc93d2a6eaf75bd783d16d90f62d8abefd4e26a4
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 17:01:32 2008 +0000
+Date: 2008-11-28 17:01:32 +0000
Don't define DBUS_API_SUBJECT_TO_CHANGE
It isn't, and we need libdbus >= 1.1 in any case
configure.ac | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
commit 094f45d0097679e8d458431231bcb3c999568d60
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 17:00:06 2008 +0000
+Date: 2008-11-28 17:00:06 +0000
configure.ac: don't check the sizes of integers
configure.ac | 105
----------------------------------------------------------
- 1 files changed, 0 insertions(+), 105 deletions(-)
+ 1 file changed, 105 deletions(-)
commit d30b06afd0a8bb6dddeefd7ac4d978799df03a52
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 16:58:37 2008 +0000
+Date: 2008-11-28 16:58:37 +0000
Remove CXX cruft from configure.ac
compiler?
configure.ac | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ 1 file changed, 3 deletions(-)
commit 98087a3d62523b621a1bd2359661ffe24553c34e
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 17:22:59 2008 +0000
+Date: 2008-11-28 17:22:59 +0000
Bug #16776: add a regression test
- test/core/my-object.c | 11 +++++++++++
- test/core/my-object.h | 1 +
- test/core/test-dbus-glib.c | 13 +++++++++++++
+ test/core/my-object.c | 11 +++++++++++
+ test/core/my-object.h | 1 +
+ test/core/test-dbus-glib.c | 13 +++++++++++++
test/core/test-service-glib.xml | 3 +++
- 4 files changed, 28 insertions(+), 0 deletions(-)
+ 4 files changed, 28 insertions(+)
commit 20c474b8b8b356836e50af0e9bf3b32584d83ac4
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Fri Nov 28 16:23:43 2008 +0000
+Date: 2008-11-28 16:23:43 +0000
Bug 16776: teach dbus_g_method_return_error about DBUS_GERROR
This is clearly not true, and it would be nice to be able to raise the
"well-known" D-Bus errors from library user code.
- dbus/dbus-gobject.c | 69
- ++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 66 insertions(+), 3 deletions(-)
+ dbus/dbus-gobject.c | 69
+ ++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 66 insertions(+), 3 deletions(-)
commit e18f5dd13c562333bc580f3b5bdf3ecd8d7555ce
Author: Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com>
-Date: Fri Nov 28 15:58:43 2008 +0000
+Date: 2008-11-28 15:58:43 +0000
Bug 13908: make dbus_g_type_specialized_init() safe for library
users to call
dbus/dbus-gtype-specialized.c | 6 ++++++
- dbus/dbus-gvalue.c | 1 -
- 2 files changed, 6 insertions(+), 1 deletions(-)
+ dbus/dbus-gvalue.c | 1 -
+ 2 files changed, 6 insertions(+), 1 deletion(-)
commit bc474819fa638a0daf3c89e6d041949b73e9228e
Author: Sjoerd Simons <sjoerd@luon.net>
-Date: Tue Mar 17 11:21:56 2009 +0000
+Date: 2009-03-17 11:21:56 +0000
Use g_strdup instead of strdup in dbus_g_method_get_sender
- dbus/dbus-gobject.c | 6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
+ dbus/dbus-gobject.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
commit dfef72c61c050e7f57e1d2eb601701e0a27827cc
Author: Colin Walters <walters@verbum.org>
-Date: Thu Feb 5 11:17:15 2009 -0500
+Date: 2009-02-05 11:17:15 -0500
Bug 14183 - Listen to NameOwnerChanged using arg0 matching
process
when a process joins or leaves the bus.
- dbus/dbus-gproxy.c | 57
- ++++++++++++++++++++++++++-------------------------
- 1 files changed, 29 insertions(+), 28 deletions(-)
+ dbus/dbus-gproxy.c | 57
+ ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 29 insertions(+), 28 deletions(-)
commit 42b17678dec6d0100bcbc433441f6a75df747e5c
Author: Colin Walters <walters@verbum.org>
-Date: Thu Feb 5 10:59:15 2009 -0500
+Date: 2009-02-05 10:59:15 -0500
Use -fno-strict-aliasing by default
corresponds with http://bugs.freedesktop.org/show_bug.cgi?id=10599
configure.ac | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
+ 1 file changed, 8 insertions(+)
commit 56b9773dc5dd589638e22f48ec4222ae491c2bc1
Author: Frederic Crozat <fcrozat@mandriva.com>
-Date: Tue Feb 3 14:00:50 2009 +0100
+Date: 2009-02-03 14:00:50 +0100
Fix format-security warning
- dbus/dbus-gobject.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ dbus/dbus-gobject.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 300b4fd822b8f57802ca35f4c867464b881632e3
Author: Colin Walters <walters@verbum.org>
-Date: Mon Feb 2 19:40:51 2009 -0500
+Date: 2009-02-02 19:40:51 -0500
Bump configure for unstable cycle
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 49cad2ca523de6a85f12d22ade23046c548ea601
Author: Colin Walters <walters@verbum.org>
-Date: Mon Feb 2 19:40:29 2009 -0500
+Date: 2009-02-02 19:40:29 -0500
Release 0.80
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit b161082148a51f2a2d8a4ee85f5736791dedc276
Author: Colin Walters <walters@verbum.org>
-Date: Mon Feb 2 15:07:51 2009 -0500
+Date: 2009-02-02 15:07:51 -0500
Bug 19065 - handle nested nodes in dbus-binding-tool
function and
one for processing recursive nodes.
- dbus/dbus-binding-tool-glib.c | 108
+ dbus/dbus-binding-tool-glib.c | 108
++++++++++++++++++++++-----------------
- m4/gtk-doc.m4 | 2 +-
- test/Makefile.am | 5 ++
- test/core/Makefile.am | 6 +-
+ m4/gtk-doc.m4 | 2 +-
+ test/Makefile.am | 5 ++
+ test/core/Makefile.am | 6 +--
test/data/nested-introspect.xml | 10 ++++
- test/test-compile-nested.sh | 5 ++
+ test/test-compile-nested.sh | 5 ++
6 files changed, 85 insertions(+), 51 deletions(-)
commit 64ec55f59a9ebe699e240c2a3b4d82e85f2db4a0
Author: Doug Goldstein <cardoe@gentoo.org>
-Date: Fri Jan 30 17:38:19 2009 -0500
+Date: 2009-01-30 17:38:19 -0500
Bug 19325 - parallel build fix
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/Makefile.am | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
commit 299460549e92665e5ea09d459d3985fc85d8d73c
Author: Colin Walters <walters@verbum.org>
-Date: Fri Jan 30 16:03:11 2009 -0500
+Date: 2009-01-30 16:03:11 -0500
Bug 19259: Always use /etc/bash_completion.d
This looks like what bash upstream has standardized on.
dbus/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 78eb504bd9954918c363f357d0ab71ca85e3fc23
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jan 27 18:59:01 2009 -0500
+Date: 2009-01-27 18:59:01 -0500
Bug 19647: Move test-types inside run-test to avoid dep on existing
session bus
test/core/Makefile.am | 2 +-
test/core/run-test.sh | 1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
commit 3d25c1640d59e9770c33fafb1a12766feb6494e8
Merge: d92a441 8868486
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jan 27 18:43:50 2009 -0500
+Date: 2009-01-27 18:43:50 -0500
Merge branch 'master' of
ssh://walters@git.freedesktop.org/git/dbus/dbus-glib
commit d92a44109e3fdc766e34b53f7ec5329e98e13909
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jan 27 17:00:37 2009 -0500
+Date: 2009-01-27 17:00:37 -0500
Bug 19441: Don't send replies for messages explicitly not requesting
one
aside
from being inefficient.
- dbus/dbus-gobject.c | 67
- +++++++++++++++++++++++++++++++++++---------------
- 1 files changed, 47 insertions(+), 20 deletions(-)
+ dbus/dbus-gobject.c | 67
+ ++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 47 insertions(+), 20 deletions(-)
commit 88684866d06df99f89b30a07e4809369b4cb0453
Author: Colin Walters <walters@verbum.org>
-Date: Fri Dec 19 11:18:26 2008 -0500
+Date: 2008-12-19 11:18:26 -0500
Add new files missed from last commit
- test/core/my-object-subclass.c | 115
+ test/core/my-object-subclass.c | 115
++++++++++++++++++++++++++++++
- test/core/my-object-subclass.h | 33 +++++++++
- test/core/test-service-glib-subclass.xml | 8 ++
- 3 files changed, 156 insertions(+), 0 deletions(-)
+ test/core/my-object-subclass.h | 33 +++++++++
+ test/core/test-service-glib-subclass.xml | 8 +++
+ 3 files changed, 156 insertions(+)
commit d55ffa5bbccd027caf7f2e7376b555e397a7ac3c
Author: Dan Williams <dcbw@redhat.com>
-Date: Thu Dec 18 13:09:33 2008 -0500
+Date: 2008-12-18 13:09:33 -0500
Bug 19145: test cases for GetAll
Signed-off-by: Colin Walters <walters@verbum.org>
- test/core/Makefile.am | 11 ++-
- test/core/test-dbus-glib.c | 187
+ test/core/Makefile.am | 11 ++-
+ test/core/test-dbus-glib.c | 187
+++++++++++++++++++++++++++++++++++++++
- test/core/test-service-glib.c | 7 ++
+ test/core/test-service-glib.c | 7 ++
test/core/test-service-glib.xml | 2 +
4 files changed, 205 insertions(+), 2 deletions(-)
commit 94d68f00d9d244de3b1d66d3cf78bb5171552311
Author: Tambet Ingo <tambet@gmail.com>
-Date: Thu Dec 18 12:09:43 2008 +0200
+Date: 2008-12-18 12:09:43 +0200
Use the provided interface for org.freedesktop.DBus.Properties.GetAll
call.
- dbus/dbus-gobject.c | 82
+ dbus/dbus-gobject.c | 82
++++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 68 insertions(+), 14 deletions(-)
+ 1 file changed, 68 insertions(+), 14 deletions(-)
commit 1b150c32aa574b421161b63bb01eeeb5ad23bf3a
Author: Frederic Crozat <fcrozat@mandriva.com>
-Date: Fri Dec 5 11:16:46 2008 -0500
+Date: 2008-12-05 11:16:46 -0500
Fix linking order so -Wl,--as-needed works
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit f4a6c4755d7a82bb7ec0a8bf472bfe091c310ef0
Author: Colin Walters <walters@verbum.org>
-Date: Thu Dec 4 16:12:18 2008 -0500
+Date: 2008-12-04 16:12:18 -0500
Do NEWS for 0.78
Should have been in earlier commit, oops.
NEWS | 18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
+ 1 file changed, 18 insertions(+)
commit 3a713710a34d75d174eb632a6444e87dbf3923f4
Author: Colin Walters <walters@verbum.org>
-Date: Thu Dec 4 16:02:12 2008 -0500
+Date: 2008-12-04 16:02:12 -0500
Bump configure for unstable cycle
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit beaff4e7c8e6ef601a00c03a4bed533becd273be
Author: Colin Walters <walters@verbum.org>
-Date: Thu Dec 4 15:58:30 2008 -0500
+Date: 2008-12-04 15:58:30 -0500
Release 0.78.
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit d77506652b555b147e79889d6163208535e1cd74
Author: Colin Walters <walters@verbum.org>
-Date: Thu Dec 4 15:58:12 2008 -0500
+Date: 2008-12-04 15:58:12 -0500
Clean bash completion file
dbus/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 6ba71576f4417bab46ca666fa44dda52dee95e88
Author: David Zeuthen <davidz@redhat.com>
-Date: Thu Jul 31 12:28:07 2008 -0400
+Date: 2008-07-31 12:28:07 -0400
add bash completion for dbus-send(1)
Signed-off-by: Colin Walters <walters@verbum.org>
- configure.ac | 13 +
- dbus/Makefile.am | 17 ++-
+ configure.ac | 13 +
+ dbus/Makefile.am | 17 +-
dbus/dbus-bash-completion-helper.c | 513
++++++++++++++++++++++++++++++++++++
- dbus/dbus-bash-completion.sh.in | 21 ++
- 4 files changed, 563 insertions(+), 1 deletions(-)
+ dbus/dbus-bash-completion.sh.in | 21 ++
+ 4 files changed, 563 insertions(+), 1 deletion(-)
commit 48738e529dc7a0f27d185f2e79174b0e369fd0af
Author: Tomas Pelka <tpelka@redhat.com>
-Date: Thu Dec 4 15:46:31 2008 -0500
+Date: 2008-12-04 15:46:31 -0500
Bug 18497 - Correct type in test case
Signed-off-by: Colin Walters <walters@verbum.org>
test/core/test-thread-server.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit aebec4bd82c023502600786793ba0ce0c7323fbe
Author: Colin Walters <walters@verbum.org>
-Date: Thu Dec 4 15:42:08 2008 -0500
+Date: 2008-12-04 15:42:08 -0500
Bug 18698 - Use AC_SEARCH_LIBS to avoid unneeded dep on nsl
Also changed the socket search to be the same way.
configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit f10ee141185f9501c852acaf557b100abafc60fb
Author: Nick Welch <nick@incise.org>
-Date: Thu Dec 4 15:28:45 2008 -0500
+Date: 2008-12-04 15:28:45 -0500
Typo fix in docs
Signed-off-by: Colin Walters <walters@verbum.org>
- dbus/dbus-gobject.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ dbus/dbus-gobject.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit c0bba240c4beb6ecfd71aefa184011e8adc27f5f
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
-Date: Tue Sep 23 23:42:02 2008 +0300
+Date: 2008-09-23 23:42:02 +0300
Bug #17329: allow hash tables to contain complex types
instead, a false free function is provided to print a critical warning
for the developer in the case that memory would be leaked.
- dbus/dbus-gvalue-utils.c | 151
+ dbus/dbus-gvalue-utils.c | 151
+++++++++++++++++++++++++++++++++++++--
- test/core/test-dbus-glib.c | 37 ++++++----
+ test/core/test-dbus-glib.c | 37 ++++++----
test/core/test-service-glib.xml | 4 +-
3 files changed, 168 insertions(+), 24 deletions(-)
commit 143b09b42d73451dcc3b835f76f8d43da786342a
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
-Date: Mon Sep 22 21:40:48 2008 +0100
+Date: 2008-09-22 21:40:48 +0100
Bug #17798: add support for 'o', 'g' and 'as' in dictionaries
dictionaries
back immediately and compare the results.
- dbus/dbus-gvalue-utils.c | 29 ++++++++++++
- test/core/my-object.c | 16 +++++++
- test/core/my-object.h | 4 ++
- test/core/test-dbus-glib.c | 96
+ dbus/dbus-gvalue-utils.c | 29 ++++++++++++
+ test/core/my-object.c | 16 +++++++
+ test/core/my-object.h | 4 ++
+ test/core/test-dbus-glib.c | 96
+++++++++++++++++++++++++++++++++++++++
test/core/test-service-glib.xml | 12 +++++
- 5 files changed, 157 insertions(+), 0 deletions(-)
+ 5 files changed, 157 insertions(+)
commit e4c917189dc9478c261c94703b311e1579292f22
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
-Date: Sun Sep 14 21:16:10 2008 +0100
+Date: 2008-09-14 21:16:10 +0100
Bug #17797: add support for 'g' type, as a boxed char *
Adds DBUS_G_TYPE_SIGNATURE, which is a boxed type just like
DBUS_G_TYPE_OBJECT_PATH.
- dbus/dbus-binding-tool-glib.c | 4 ++
- dbus/dbus-glib.h | 3 +
- dbus/dbus-gmain.c | 5 ++-
- dbus/dbus-gsignature.c | 2 +
- dbus/dbus-gvalue.c | 82
+ dbus/dbus-binding-tool-glib.c | 4 ++
+ dbus/dbus-glib.h | 3 ++
+ dbus/dbus-gmain.c | 5 ++-
+ dbus/dbus-gsignature.c | 2 +
+ dbus/dbus-gvalue.c | 82
++++++++++++++++++++++++++++++++++++++-
- test/core/my-object.c | 7 +++
- test/core/my-object.h | 1 +
- test/core/test-dbus-glib.c | 19 +++++++++
- test/core/test-service-glib.xml | 5 ++
+ test/core/my-object.c | 7 ++++
+ test/core/my-object.h | 1 +
+ test/core/test-dbus-glib.c | 19 +++++++++
+ test/core/test-service-glib.xml | 5 +++
9 files changed, 126 insertions(+), 2 deletions(-)
commit f89b8de02f21891f430a2e370c391238b575403a
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
-Date: Tue Sep 23 23:45:14 2008 +0300
+Date: 2008-09-23 23:45:14 +0300
Bug #17795: depend on Glib 2.10 for hash unref consistency
it. People
can depend on the next version of dbus-glib if they rely on _unref.
- configure.ac | 2 +-
+ configure.ac | 2 +-
dbus/dbus-gvalue-utils.c | 4 ----
- 2 files changed, 1 insertions(+), 5 deletions(-)
+ 2 files changed, 1 insertion(+), 5 deletions(-)
commit 24b94fb83c0d22cf2803af692dd8ccbc485d890c
Author: Robert McQueen <robert.mcqueen@collabora.co.uk>
-Date: Mon Sep 22 21:25:03 2008 +0100
+Date: 2008-09-22 21:25:03 +0100
Bug #17794: make run-test.sh fail when die is called
tests were failing. Oops.
test/core/run-test.sh | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
commit 3ca014ea6b55cd843f1c80b04a4e0ec41af6210e
Author: Colin Walters <walters@verbum.org>
-Date: Mon Nov 17 18:30:32 2008 -0500
+Date: 2008-11-17 18:30:32 -0500
Bug 18573 - Fix race when service appears and disappears quickly
Correspondingly we need to cancel any inflight GetNameOwner call
when disassociating proxies to avoid leaking.
- dbus/dbus-gproxy.c | 11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
+ dbus/dbus-gproxy.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
commit 0a883a523f8d133f71271276b755162c56480021
Author: Philip Van Hoof <pvanhoof@gnome.org>
-Date: Thu Sep 18 18:22:59 2008 -0400
+Date: 2008-09-18 18:22:59 -0400
Bug 17614: Use g_slice for allocating temporary async call data
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/dbus-binding-tool-glib.c | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
+ 1 file changed, 8 insertions(+), 2 deletions(-)
commit 4c7e60e3ff4148a181a496f85b491e8cb39d7e46
Author: Colin Walters <walters@verbum.org>
-Date: Fri Jun 20 14:08:47 2008 -0400
+Date: 2008-06-20 14:08:47 -0400
Bug 10373: Use of deprecated API (was used incorrectly)
appropriately.
dbus/dbus-gvalue.c | 25 +++++++++++--------------
- 1 files changed, 11 insertions(+), 14 deletions(-)
+ 1 file changed, 11 insertions(+), 14 deletions(-)
commit 2514b84b3644223653018cd75d0d6e1459a7ab70
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 19 12:47:16 2008 -0400
+Date: 2008-06-19 12:47:16 -0400
Bug 16419: stack overflow demarshaling recursive variants
commit d1b80d803a0268bd4b3dd5b9a9522230461f2947
Author: Dan Williams <dcbw@redhat.com>
-Date: Thu Jun 5 17:57:53 2008 -0400
+Date: 2008-06-05 17:57:53 -0400
Bug 16114 [patch] wincaps-to-uscore property names for GetAll()
so that we actually find the right properties.
dbus/dbus-gobject.c | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
+ 1 file changed, 8 insertions(+), 2 deletions(-)
commit 8054025ae498cc586676fd0ed6573828dd0de4a0
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 16:05:39 2008 -0400
+Date: 2008-06-05 16:05:39 -0400
One final large HACKING update
HACKING | 32 +++++++++++++++++++++++++++++---
- 1 files changed, 29 insertions(+), 3 deletions(-)
+ 1 file changed, 29 insertions(+), 3 deletions(-)
commit d80bc7686a0e5cc7d45d940e8404ac4c8742b8f5
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 15:40:35 2008 -0400
+Date: 2008-06-05 15:40:35 -0400
Pacify gtk-doc by adding new files
* doc/reference/dbus-glib.types: New files
without which gtk-doc complains.
- 0 files changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
commit d91cf40b83f7900899fe89cc83a75c82cd4bf833
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 15:37:16 2008 -0400
+Date: 2008-06-05 15:37:16 -0400
Another HACKING tweak
HACKING | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
commit e4b73986d1b2d6f9badda4656e57023b2c921ff7
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 15:37:02 2008 -0400
+Date: 2008-06-05 15:37:02 -0400
Bump for development
commit 96f144d25c7f3d573684bd50f87d912990f3c589
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 15:09:02 2008 -0400
+Date: 2008-06-05 15:09:02 -0400
Release 0.76
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 1517f7f395527519402f8b37988de9d4ea24dbc5
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 15:08:40 2008 -0400
+Date: 2008-06-05 15:08:40 -0400
Document release process
HACKING | 23 ++++++++++++++++++++++-
- 1 files changed, 22 insertions(+), 1 deletions(-)
+ 1 file changed, 22 insertions(+), 1 deletion(-)
commit e0dcd92e33e566f9852df94036e74f48af795ea3
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 14:55:15 2008 -0400
+Date: 2008-06-05 14:55:15 -0400
Update HACKING
HACKING | 13 ++++++++++---
- 1 files changed, 10 insertions(+), 3 deletions(-)
+ 1 file changed, 10 insertions(+), 3 deletions(-)
commit 4f776e9db9f299dab96a12a00a6279b6977f6c32
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 14:48:18 2008 -0400
+Date: 2008-06-05 14:48:18 -0400
Update gtk-doc
doc/reference/dbus-glib-undocumented.txt | 20 +++++++++++++++++---
- 1 files changed, 17 insertions(+), 3 deletions(-)
+ 1 file changed, 17 insertions(+), 3 deletions(-)
commit fa46dc8d35de877b8bdcb53f9508252249138bd6
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 5 14:40:09 2008 -0400
+Date: 2008-06-05 14:40:09 -0400
Update NEWS
NEWS | 25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
+ 1 file changed, 25 insertions(+)
commit acd44d2ae3069667dbbb8b9c9c8b9c2afcad96d9
Author: Christian Persch <chpe@gnome.org>
-Date: Tue Jun 3 18:01:54 2008 -0400
+Date: 2008-06-03 18:01:54 -0400
Bug 16217: generated bindings don't build with
-DG_DISABLE_SINGLE_INCLUDES
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/dbus-binding-tool-glib.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
commit 1744bf88024756d17f867ab9b86aca25e2b77e64
Author: Colin Walters <walters@verbum.org>
-Date: Wed May 28 14:11:01 2008 -0400
+Date: 2008-05-28 14:11:01 -0400
Remove GConnection tests that assert, since we abort on those
test/core/test-types.c | 26 --------------------------
- 1 files changed, 0 insertions(+), 26 deletions(-)
+ 1 file changed, 26 deletions(-)
commit a94e11973467e1b2cc43ba1e77b7413655b1dff7
Author: Colin Walters <walters@verbum.org>
-Date: Wed May 28 00:25:57 2008 -0400
+Date: 2008-05-28 00:25:57 -0400
Bug 11671: Don't use well known name in /tmp
commit dceee795d0cdc5889701064ac38d3c64451b02ec
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 23:19:52 2008 -0400
+Date: 2008-05-27 23:19:52 -0400
From OpenSUSE: Add return statement in case assertions not enabled
dbus/dbus-gvalue-utils.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 681f3ae573b2e00dad5c1193a044a994fc50cf38
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 23:08:59 2008 -0400
+Date: 2008-05-27 23:08:59 -0400
Bug 13060: Remove NameOwnerChange matches on unref (Kimmo
Hämäläinen)
dbus/dbus-gproxy.c | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ 1 file changed, 14 insertions(+)
commit eef148bdc0f602b0fba09a851c1ca6b55b8bb71c
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 23:01:39 2008 -0400
+Date: 2008-05-27 23:01:39 -0400
Bug 15733: Cosmetic fix for removing redundant declarations
dbus/dbus-gtype-specialized.h | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
commit d043342c41535e610268b9bb2a45143bad0b597d
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 22:56:00 2008 -0400
+Date: 2008-05-27 22:56:00 -0400
Bug 12505: Avoid receiving duplicate NameOwnerChanged (Dan Williams)
dbus/dbus-gproxy.c | 13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
+ 1 file changed, 11 insertions(+), 2 deletions(-)
commit 43db9baa4cd0921d2ee830185ab46b4646b4e73b
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 16:49:26 2008 -0400
+Date: 2008-05-27 16:49:26 -0400
Bug 10834: Fix error handling path for dbus_g_proxy_end_call_internal
commit dc3bfd517a3bd0e28f4fc2d030ac38bdc848eb86
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 16:36:58 2008 -0400
+Date: 2008-05-27 16:36:58 -0400
Fix some test suite memory leaks
test/core/test-dbus-glib.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
commit 167ea555cf3a763d148a69d0af9453b83d70d107
Author: Julien Danjou <julien@danjou.info>
-Date: Thu Apr 24 14:03:42 2008 +0200
+Date: 2008-04-24 14:03:42 +0200
Fix typo in --help print strings
Signed-off-by: Colin Walters <walters@verbum.org>
dbus/dbus-glib-tool.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit c057283a86230904552d5c51623bbce5ab0c9770
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 15:15:35 2008 -0400
+Date: 2008-05-27 15:15:35 -0400
Bug 10244: Fix error handling case in parser (William Jon McCann)
We need to return FALSE when handling an error.
dbus/dbus-gparser.c | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
+ 1 file changed, 7 insertions(+), 4 deletions(-)
commit 361dc90eaa269325ddc5dae0003ca11e1d7b811e
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 14:57:20 2008 -0400
+Date: 2008-05-27 14:57:20 -0400
Bug 9867: Respect ACLOCAL_FLAGS (Kalle Vahlman)
autogen.sh | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit a8bf32ab8b0e30e0c74e07c58e9bc79a448683b2
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 14:31:58 2008 -0400
+Date: 2008-05-27 14:31:58 -0400
Bug 11396: Use g_hash_table_unref if available (Marco Barisione)
This lets users ref hashes with g_hash_table_ref.
dbus/dbus-gvalue-utils.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
commit ad35bf13f93d18b0b0e8f930ff79af9dcc1c8508
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 14:18:49 2008 -0400
+Date: 2008-05-27 14:18:49 -0400
Bug 12675: Handle disconnected connections in calls (Kimmo
Hämäläinen)
dbus/dbus-gproxy.c | 22 +++++++++++++++++++---
- 1 files changed, 19 insertions(+), 3 deletions(-)
+ 1 file changed, 19 insertions(+), 3 deletions(-)
commit f110cd3aa0532ab6cdfb1ee9a19f839700fe32e6
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 13:57:40 2008 -0400
+Date: 2008-05-27 13:57:40 -0400
Bug 12857: Balance va_start/va_end in error case (Kimmo Hämäläinen)
dbus/dbus-gparser.c | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
commit d20c90aab3b0eca8715deaa59877f35a7d4e345e
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 13:54:11 2008 -0400
+Date: 2008-05-27 13:54:11 -0400
Bug 12849: Fix use after free (Kimmo Hämäläinen)
dbus/dbus-gvalue.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
commit fde77bff42fac9ed95869a69acff4f9daab23e04
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 13:35:20 2008 -0400
+Date: 2008-05-27 13:35:20 -0400
Bug 16079: Return an error on unknown property
Previously we just asserted, not very useful.
- dbus/dbus-gobject.c | 6 ++++
+ dbus/dbus-gobject.c | 6 +++++
test/core/test-dbus-glib.c | 62
+++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 67 insertions(+), 1 deletions(-)
+ 2 files changed, 67 insertions(+), 1 deletion(-)
commit b26f1887f6907d4c9a1dac013649f28950c6b2d3
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 13:34:55 2008 -0400
+Date: 2008-05-27 13:34:55 -0400
Support for monitoring conversation during tests
test/core/run-test.sh | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
commit b783ce802db01a5370ce70514755e1885f6e6eb1
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 27 12:39:44 2008 -0400
+Date: 2008-05-27 12:39:44 -0400
Also make CRITICAL messages fatal in tests.
test/core/test-dbus-glib.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 8fe656de630e851bc512bbd7e7a6c18c53aecb61
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Mon Apr 14 12:56:43 2008 +0100
+Date: 2008-04-14 12:56:43 +0100
Freeze error ABI at the ABI used in Fedora 8 and Ubuntu gutsy.
dbus/dbus-glib.h | 34 ++++++++++++++++-
dbus/dbus-gobject.c | 72
++++++++++++++++++++++++++++++++++-
- dbus/make-dbus-glib-error-enum.sh | 25 +------------
+ dbus/make-dbus-glib-error-enum.sh | 25 +-----------
dbus/make-dbus-glib-error-switch.sh | 29 +-------------
4 files changed, 106 insertions(+), 54 deletions(-)
commit 7fccdc8386d97d8c7e963800b1fbedd47f72b66b
Author: Colin Walters <walters@space-ghost.verbum.private>
-Date: Mon Mar 31 11:23:29 2008 -0400
+Date: 2008-03-31 11:23:29 -0400
Add some docs to dbus_set_g_error.
dbus/dbus-gobject.c | 17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
+ 1 file changed, 16 insertions(+), 1 deletion(-)
commit 34042c4cf2fcf18e101d07e495f9fa5dda99aa58
Merge: df7c2b7 bd53ac9
Author: David Zeuthen <davidz@redhat.com>
-Date: Mon Mar 17 13:11:45 2008 -0400
+Date: 2008-03-17 13:11:45 -0400
Merge branch 'master' of
ssh://david@git.freedesktop.org/git/dbus/dbus-glib
commit df7c2b783ed92f33a1bedcba12a9c30fc34ba8d5
Author: David Zeuthen <davidz@redhat.com>
-Date: Mon Mar 17 13:10:47 2008 -0400
+Date: 2008-03-17 13:10:47 -0400
add some design advice to dbus_g_proxy_set_default_timeout()
... as requested on the mailing list.
dbus/dbus-gproxy.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
commit bd53ac9f7ef9a6c2c9d1d12af382b1a8a10e9dba
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Mon Mar 17 15:10:43 2008 +0100
+Date: 2008-03-17 15:10:43 +0100
allow namespaced extentions to introspection XML
commit cb732d38f78dfb7c1ef73179e798fa4f42fd962e
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Mon Mar 17 14:26:50 2008 +0100
+Date: 2008-03-17 14:26:50 +0100
bump version and dbus dependancy
Bumps version to 0.75. Bumps dbus dependany to 1.1.
configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 09b0fc5818812d0167243bae9fd52cdaf67f0af0
Author: David Zeuthen <davidz@redhat.com>
-Date: Sat Mar 15 16:51:48 2008 -0400
+Date: 2008-03-15 16:51:48 -0400
Export the recently added GetAll() method on org.fd.DBus.Properties
dbus/dbus-gobject.c | 220
+++++++++++++++++++++++++++++++++++++++++----------
- 1 files changed, 177 insertions(+), 43 deletions(-)
+ 1 file changed, 177 insertions(+), 43 deletions(-)
commit bf0c9b3d6adc95863d5b5a4ce6ca994fd7fdc137
Author: David Zeuthen <davidz@redhat.com>
-Date: Sat Mar 15 15:32:56 2008 -0400
+Date: 2008-03-15 15:32:56 -0400
Add new function to specify the default timeout for a proxy
Also add some missing _with_timeout functions on DBusGProxy to the gtk
docs.
- dbus/dbus-glib.h | 3 ++
+ dbus/dbus-glib.h | 3 +++
dbus/dbus-gproxy.c | 35
- ++++++++++++++++++++++++++++-
- doc/reference/dbus-glib-sections.txt | 3 ++
- doc/reference/dbus-glib-undocumented.txt | 15 +++++++++---
+ ++++++++++++++++++++++++++++--
+ doc/reference/dbus-glib-sections.txt | 3 +++
+ doc/reference/dbus-glib-undocumented.txt | 15 +++++++++----
4 files changed, 50 insertions(+), 6 deletions(-)
commit 1fa4129f67208e24f6ae5f9ab38a3ee26c521f87
Author: David Zeuthen <davidz@redhat.com>
-Date: Sat Mar 15 15:21:06 2008 -0400
+Date: 2008-03-15 15:21:06 -0400
Bump version to 0.75
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 1124256e1a87291101a6c287c1248c2f7276b993
Author: Ross Burton <ross@burtonini.com>
-Date: Wed Feb 27 14:27:49 2008 +0000
+Date: 2008-02-27 14:27:49 +0000
Fix incorrect assign in test suite
is bad.
test/core/test-types.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit eea8f7247e1cbeb8c00fe316a37520b98acd55dc
Author: Ross Burton <ross@burtonini.com>
-Date: Wed Feb 27 14:22:16 2008 +0000
+Date: 2008-02-27 14:22:16 +0000
Use dbus_watch_get_unix_fd not dbus_watch_get_fd
The latter is deprecated, so don't use it.
dbus/dbus-gmain.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 2cf62d7ff7d3a7bc450d0b60bb81a8365ffd310b
Author: Ross Burton <ross@burtonini.com>
-Date: Wed Feb 27 14:19:48 2008 +0000
+Date: 2008-02-27 14:19:48 +0000
Fix pending call cancelling in proxy dispose
DBusPendingCall (thanks Dafyd Harries).
dbus/dbus-gproxy.c | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
+ 1 file changed, 6 insertions(+), 5 deletions(-)
commit 8e024ae2252e6e948c28203f07aa416df3dac0b8
Author: Ross Burton <ross@burtonini.com>
-Date: Wed Feb 27 14:02:36 2008 +0000
+Date: 2008-02-27 14:02:36 +0000
Unref the connection and message on dbus_g_return_error
dbus/dbus-gobject.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
commit 98423ae4e6b85741ce15f097652620886a49c375
Author: Ross Burton <ross@burtonini.com>
-Date: Tue Nov 13 17:56:37 2007 +0000
+Date: 2007-11-13 17:56:37 +0000
Allow daemondir to be configured (#10668)
configure.ac | 9 +++++++++
tools/Makefile.am | 2 +-
- 2 files changed, 10 insertions(+), 1 deletions(-)
+ 2 files changed, 10 insertions(+), 1 deletion(-)
commit 33b7a7f05372baaaf95d0e1c2c3b758321e4b0c5
Author: Ross Burton <ross@burtonini.com>
-Date: Tue Sep 11 10:52:07 2007 +0100
+Date: 2007-09-11 10:52:07 +0100
Update ignores
Add the new tests and *~ to the ignore list.
.gitignore | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
commit 4b2cf9d75f6c315071adc925ec56e3bac3423730
Author: Ross Burton <ross@burtonini.com>
-Date: Tue Sep 11 10:49:49 2007 +0100
+Date: 2007-09-11 10:49:49 +0100
Fix bashism
"function" is a bashism, so don't use it.
tools/run-with-tmp-session-bus.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 3f6e2c0c76d3643a1823b5ea7c8f5486a6b448de
Author: Ross Burton <ross@burtonini.com>
-Date: Tue Sep 11 10:37:47 2007 +0100
+Date: 2007-09-11 10:37:47 +0100
Fix broken introspection XML
thanks William Jon McCann).
dbus/dbus-gobject.c | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ 1 file changed, 2 deletions(-)
commit c08a7f910c4c746ba790375be2d0f0682471cf06
Author: Ross Burton <ross@burtonini.com>
-Date: Tue Sep 11 10:34:07 2007 +0100
+Date: 2007-09-11 10:34:07 +0100
Fix build with non-gcc compilers
commit b2bcb0f3fdf8eaec9257f48dd0a0e2ca03220775
Author: Ross Burton <ross@burtonini.com>
-Date: Tue Sep 11 10:17:12 2007 +0100
+Date: 2007-09-11 10:17:12 +0100
Fix bashisms
commit 377831cc8496bf2b3f96e96a44ff4dfc1a6c690e
Author: Ross Burton <ross@burtonini.com>
-Date: Tue Sep 11 10:11:12 2007 +0100
+Date: 2007-09-11 10:11:12 +0100
Fix build with Glib 2.6
required (#11674, thanks Peter O'Gorman).
test/interfaces/test-interfaces.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 2929a9d676b9961abff6c6acb1b67431f7d62ab1
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Wed Jun 27 11:49:02 2007 +0100
+Date: 2007-06-27 11:49:02 +0100
Update version in configure.ac
Update version to 0.74 in configure.ac
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit de33a575aa58867642bcfd8bb8cb2efc631d9f1d
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Wed Jun 27 11:39:08 2007 +0100
+Date: 2007-06-27 11:39:08 +0100
Update NEWS
Update NEWS from git history.
NEWS | 20 ++++++++++++++------
- 1 files changed, 14 insertions(+), 6 deletions(-)
+ 1 file changed, 14 insertions(+), 6 deletions(-)
commit a732cbc211b562660c5a17c898ad032fb8c041fd
Author: Ross Burton <ross@burtonini.com>
-Date: Wed Jun 27 11:05:03 2007 +0100
+Date: 2007-06-27 11:05:03 +0100
Sleep after starting the peer server, before starting the peer client.
This fixes random failures due to the race.
test/core/run-peer-test.sh | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 4335b1204a483ffa5c5a72d58b585f77827d852d
Author: Ross Burton <ross@burtonini.com>
-Date: Wed Jun 27 10:58:03 2007 +0100
+Date: 2007-06-27 10:58:03 +0100
Update NEWS for pending release.
NEWS | 12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
+ 1 file changed, 12 insertions(+)
commit 0d77d83b7afd5837d4427b7cdc5940f54625b65c
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Jun 22 17:15:34 2007 +0100
+Date: 2007-06-22 17:15:34 +0100
make test/core/run-peer-test.sh executable
- 0 files changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
commit 0ba73bf7cf1a2770b7aac8d57e61e755aca45b4d
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 15:46:37 2007 +0100
+Date: 2007-06-22 15:46:37 +0100
Add missing include.
test/core/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit bf647c411b42064fe48877c30803cbe10d751204
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 15:45:57 2007 +0100
+Date: 2007-06-22 15:45:57 +0100
Install the type info before creating signals
initialises the types.
test/core/my-object.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
commit a3a6efda1117633cc8a5525811f6a3ba41f2d31b
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 15:28:48 2007 +0100
+Date: 2007-06-22 15:28:48 +0100
Init threading first to stop a warning from new GLib.
- test/core/peer-client.c | 2 +-
- test/core/peer-server.c | 2 +-
+ test/core/peer-client.c | 2 +-
+ test/core/peer-server.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 36ed523539074a84cd990a8513b5d02a6223c44c
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 15:27:18 2007 +0100
+Date: 2007-06-22 15:27:18 +0100
Make test script executable
- 0 files changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
commit 514fd82183c214e3afd4cca630a20ff24b62e482
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 15:25:14 2007 +0100
+Date: 2007-06-22 15:25:14 +0100
Remove unused variable.
test/core/run-peer-test.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit d428aa4edf426f662e89f2b08a377b0dd481f3ac
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 15:15:37 2007 +0100
+Date: 2007-06-22 15:15:37 +0100
Remove the XML documentation support in configure
It isn't used and is legacy from when this was part of dbus itself.
configure.ac | 34 +---------------------------------
- 1 files changed, 1 insertions(+), 33 deletions(-)
+ 1 file changed, 1 insertion(+), 33 deletions(-)
commit 1f385f6b10799cdd0bf57d69d5212ac16ac17266
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 15:02:24 2007 +0100
+Date: 2007-06-22 15:02:24 +0100
Fix typo in _dbus_gvalue_signals_error (#10837)
to Peter Kjellerstedt for noticing this.
dbus/dbus-gvalue-utils.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 68f03928aaac849dd12e38c01e448b569f578976
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Jun 22 14:41:36 2007 +0100
+Date: 2007-06-22 14:41:36 +0100
Update GLib requirement (#10889).
INSTALL | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 58cacc6872e1b8cf365ac056775498b9dede71b4
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Mon Apr 16 08:23:17 2007 -0700
+Date: 2007-04-16 08:23:17 -0700
Document dbus-gtype-specialized
commit 26d8584c04c05be29ae35acc3a2e8f573cc79206
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Mar 30 18:12:11 2007 +0100
+Date: 2007-03-30 18:12:11 +0100
Add simple test suite for peer objects.
test/core/Makefile.am | 26 +-
test/core/my-object.c | 737 ++++++++++++++++++++++++++++++++++++
- test/core/my-object.h | 104 +++++
+ test/core/my-object.h | 104 ++++++
test/core/peer-client.c | 127 +++++++
test/core/peer-server.c | 55 +++
test/core/run-peer-test.sh | 9 +
commit af91f5e0e2b5a20adf124707356b12da0c2f1e00
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Mar 30 18:05:40 2007 +0100
+Date: 2007-03-30 18:05:40 +0100
Support peer-to-peer proxies.
(#10233).
dbus/dbus-gproxy.c | 35 ++++++++++++++++++-----------------
- 1 files changed, 18 insertions(+), 17 deletions(-)
+ 1 file changed, 18 insertions(+), 17 deletions(-)
commit 25f056826336d4385b5488706f0f1ecc0843bf2f
Author: Ross Burton <ross@burtonini.com>
-Date: Fri Mar 30 17:54:58 2007 +0100
+Date: 2007-03-30 17:54:58 +0100
Add dbus_connection_get_g_connection.
commit 0c46ca1a20eb8ba676ea2f1e829d039d5e3c383d
Author: Ross Burton <ross@blackadder.(none)>
-Date: Thu Mar 22 15:04:14 2007 +0000
+Date: 2007-03-22 15:04:14 +0000
Stop compiler warnings (#10374).
dbus/dbus-gthread.c | 1 +
test/interfaces/test-server.c | 2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
+ 2 files changed, 3 insertions(+)
commit 72e9f061668a28cbbeae2400290e1993c5d60d3c
Author: Ross Burton <ross@burtonini.com>
-Date: Wed Mar 28 16:32:00 2007 +0100
+Date: 2007-03-28 16:32:00 +0100
Fix error handling
dbus/dbus-gproxy.c | 9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
+ 1 file changed, 4 insertions(+), 5 deletions(-)
commit 9ca04c94ed6ddc2ff7459ce2031740704ec67ff2
Author: Ross Burton <ross@burtonini.com>
-Date: Thu Mar 22 15:38:03 2007 +0000
+Date: 2007-03-22 15:38:03 +0000
Handle dbus errors which are not name has no owner
dbus/dbus-gproxy.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
commit 85b269cc7ca221ee4fe0235154e783b3640ee62d
Author: Ross Burton <ross@blackadder.(none)>
-Date: Thu Mar 22 15:05:02 2007 +0000
+Date: 2007-03-22 15:05:02 +0000
Update abstract socket test from dbus
the original copy in DBus.
configure.ac | 17 +++++++++--------
- 1 files changed, 9 insertions(+), 8 deletions(-)
+ 1 file changed, 9 insertions(+), 8 deletions(-)
commit a64b26cdde04e624b2bb42ccadd3fc252bf05667
Author: Ross Burton <ross@burtonini.com>
-Date: Thu Mar 22 15:10:47 2007 +0000
+Date: 2007-03-22 15:10:47 +0000
Rename the error quark.
The error quark was copied from GLib, renaming it to be unique.
dbus/dbus-glib.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 5ca3418e8e00f62e3e60578e3951b51cd158f8dc
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Thu Mar 29 12:44:01 2007 +0100
+Date: 2007-03-29 12:44:01 +0100
Update AUTHORS
here for quite some time.
AUTHORS | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
commit 7fbd3a1c49614e71a9ff2b3d6e43bf380527301b
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Thu Mar 29 12:32:46 2007 +0100
+Date: 2007-03-29 12:32:46 +0100
Update AUTHORS
this commit makesit current.
AUTHORS | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
commit f78b90659f32474b7ca56925ddebd88af7f06c86
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Thu Mar 29 12:20:30 2007 +0100
+Date: 2007-03-29 12:20:30 +0100
Update .gitignore
Ignore autoconf errors, autom4te.cache, some new generated files.
.gitignore | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ 1 file changed, 6 insertions(+), 1 deletion(-)
commit 138e4ce76ae53b86488e12c43db511a838be4fc9
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Tue Feb 13 14:16:22 2007 +0000
+Date: 2007-02-13 14:16:22 +0000
Do libtool versioning.
libtool versionsing appropriately for our added api.
configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit d19c5c0eac749704af70edffaa1fa0ac70eb9373
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Tue Feb 13 13:58:38 2007 +0000
+Date: 2007-02-13 13:58:38 +0000
Update NEWS
Releasing today..
NEWS | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit e368483363fc920cf2978180f3a9fe6687465807
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Mon Feb 12 04:23:42 2007 +0000
+Date: 2007-02-12 04:23:42 +0000
Update NEWS
Update NEWS, adding fix for bug #9769.
NEWS | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
commit 814b029d9291199bc9fdd2998c429ee15f243a93
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Mon Feb 12 04:21:50 2007 +0000
+Date: 2007-02-12 04:21:50 +0000
Add pkg-config support for uninstalled use.
configure.ac | 1 +
dbus-glib-1-uninstalled.pc.in | 12 ++++++++++++
- 2 files changed, 13 insertions(+), 0 deletions(-)
+ 2 files changed, 13 insertions(+)
commit 6bcb544eb6bc164e367a0e849b6c41274809401e
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 02:49:57 2007 +0000
+Date: 2007-02-09 02:49:57 +0000
Update version in configure.ac
Updates version 0.73 in configure.ac
configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit dba710006cb0b25454989f41babc53c12d3fc901
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 02:46:57 2007 +0000
+Date: 2007-02-09 02:46:57 +0000
Update NEWS ready for 0.73 release
Updates NEWS with all the changes for 0.73
NEWS | 26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
+ 1 file changed, 26 insertions(+)
commit 133bc8003657169f622d4340360a0e5b15a455de
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 02:21:20 2007 +0000
+Date: 2007-02-09 02:21:20 +0000
Allow passing of NULL to strv out arguments.
Fixes bug #8795.
dbus/dbus-gvalue.c | 20 +++++++++++++-------
- 1 files changed, 13 insertions(+), 7 deletions(-)
+ 1 file changed, 13 insertions(+), 7 deletions(-)
commit 5f70d7b59445b634f94469a8c12cf31f8f81fdae
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 02:13:40 2007 +0000
+Date: 2007-02-09 02:13:40 +0000
Make uscore_to_wincaps return NULL when passed NULL.
Fixes bug #8318.
dbus/dbus-gobject.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 678f8e5fdaf5c587547a96b173a5532f14337988
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 02:08:57 2007 +0000
+Date: 2007-02-09 02:08:57 +0000
Only respond to NameOwnerChanged if its one of our names.
Fixes bug #8235.
dbus/dbus-gproxy.c | 29 +++++++++++++++++++----------
- 1 files changed, 19 insertions(+), 10 deletions(-)
+ 1 file changed, 19 insertions(+), 10 deletions(-)
commit 1ce4d3e7324d92d797b7e41e869b1d0ff51f129a
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 01:51:55 2007 +0000
+Date: 2007-02-09 01:51:55 +0000
Fix dbus-binding-tool to generate headers usable from C++
Fixes bug #6358.
dbus/dbus-binding-tool-glib.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 6d61bad839512dedb62318fd82e2c0b20906d62f
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 01:26:48 2007 +0000
+Date: 2007-02-09 01:26:48 +0000
Only require --prefix for server side binding generation
Closes bug #4185
dbus/dbus-glib-tool.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 3 insertions(+), 2 deletions(-)
commit cb866d68e733e48bd6a6cea21fa4b5ca648d861e
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Fri Feb 9 00:04:13 2007 +0000
+Date: 2007-02-09 00:04:13 +0000
Clarify documentation for dbus_g_method_get_sender.
value.
dbus/dbus-gobject.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 3 insertions(+), 2 deletions(-)
commit 22bd9971b4ac95f926b577e416f54ec57bb16d2d
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Thu Feb 8 23:54:33 2007 +0000
+Date: 2007-02-08 23:54:33 +0000
Add new API for specifying the timeout in DBusGProxy calls.
commit b226873fdc2e7b98740afb93a7bae675952a29f0
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Thu Feb 8 23:17:40 2007 +0000
+Date: 2007-02-08 23:17:40 +0000
Dont check for libxml2 when expat not found.
this changes configure.ac to not check for libxml2, and error out
if expat isn't found.
- configure.ac | 43 ++++---------------------------------------
- 1 files changed, 4 insertions(+), 39 deletions(-)
+ configure.ac | 47 ++++++-----------------------------------------
+ 1 file changed, 6 insertions(+), 41 deletions(-)
commit c51ff16bc93b4741061c362de638ab5e8cace000
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Thu Feb 8 15:06:08 2007 +0000
+Date: 2007-02-08 15:06:08 +0000
Add configure flags --with-introspect-xml
configure.ac | 15 +++++++++++++++
tools/Makefile.am | 5 +++++
- 2 files changed, 20 insertions(+), 0 deletions(-)
+ 2 files changed, 20 insertions(+)
commit c5c0bed2166767162f599958270e92122da3ff2a
Author: Rob Taylor <rob.taylor@codethink.co.uk>
-Date: Thu Feb 8 15:00:17 2007 +0000
+Date: 2007-02-08 15:00:17 +0000
update doc/reference/dbus-glib-undocumented.txt
dbus_g_thread_init is now documented.
doc/reference/dbus-glib-undocumented.txt | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 4 deletions(-)
commit c807d408924e9a9bcc7b2eb67b411c25888090ee
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Mon Jan 8 08:41:11 2007 +0000
+Date: 2007-01-08 08:41:11 +0000
Use dbus_threads_init_default() rather than using own threading
primitives.
dbus/dbus-gthread.c | 143
+++------------------------------------------------
- 1 files changed, 7 insertions(+), 136 deletions(-)
+ 1 file changed, 7 insertions(+), 136 deletions(-)
commit 9bb928331e2ad602728320598698de90c9a246d6
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Mon Jan 8 08:39:22 2007 +0000
+Date: 2007-01-08 08:39:22 +0000
Reduce dependancy to dbus version 0.93, error out if correct version
not found.
Fixes #8793.
configure.ac | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ 1 file changed, 7 insertions(+), 2 deletions(-)
commit 79d115030d45fefd96d5ffc7853f80fc454c13b1
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Sun Jan 7 13:34:26 2007 +0000
+Date: 2007-01-07 13:34:26 +0000
Allow dbus and dbus-glib to live in different prefixes
Fixes #9384.
dbus-glib-1.pc.in | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 6de547af3bd7d2c8b77464435c45d22bba702cc7
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Thu Oct 26 10:22:26 2006 +0100
+Date: 2006-10-26 10:22:26 +0100
Correct spellings in NEWS
NEWS | 37 +++++++++++++++++++++++--------------
- 1 files changed, 23 insertions(+), 14 deletions(-)
+ 1 file changed, 23 insertions(+), 14 deletions(-)
commit 83f8ed0935c37b3b5668d1a512370a51f73ccc27
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 22:14:02 2006 +0100
+Date: 2006-10-25 22:14:02 +0100
Update NEWS for release.
NEWS | 36 ++++++++++++++++++++++++++++++++++++
- 1 files changed, 36 insertions(+), 0 deletions(-)
+ 1 file changed, 36 insertions(+)
commit c449668fd2b8b92fde03a83ba76a0eb8bb2a9326
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 21:12:03 2006 +0100
+Date: 2006-10-25 21:12:03 +0100
only use -Wfloat-equal if compiler supports it
Closes #7658. Thanks to Jens Granseuer <jensgr@gmx.net> for the patch.
configure.ac | 31 +++++++++++++++++++++++++++----
- 1 files changed, 27 insertions(+), 4 deletions(-)
+ 1 file changed, 27 insertions(+), 4 deletions(-)
commit 505e48a851e38664c45e482b8f75ebbfd27fe278
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 21:00:18 2006 +0100
+Date: 2006-10-25 21:00:18 +0100
return NULL from g_return_val_if_fail in dbus_g_proxy_begin_call
Closes #4159.
dbus/dbus-gproxy.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 62acdb49360dfbf994ef38c8e97d9190d30149f3
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 20:26:04 2006 +0100
+Date: 2006-10-25 20:26:04 +0100
Add dbus-gidl.h to IGNORE_HFILES for doxygen docs
doc/reference/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 0d9889a99241aebc863237faf8126663c97ae059
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 20:17:55 2006 +0100
+Date: 2006-10-25 20:17:55 +0100
Update tools/Makefile.am for new dbus-binding-tool behaviour
tools/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 0aa2db3f6f18bff7d5c62a00f052ca89e21b269f
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 20:03:31 2006 +0100
+Date: 2006-10-25 20:03:31 +0100
Remove bashism in make-dbus-glib-error-enum.sh
Closes #6700.
dbus/make-dbus-glib-error-enum.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 74bcfcfbc242325ca470d483817ae37fa8d41f25
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 19:37:12 2006 +0100
+Date: 2006-10-25 19:37:12 +0100
Fix introspection when object has exported properties.
dbus-gobject:write_interface was completely broken
Closes #8607.
dbus/dbus-gobject.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
commit 3647d0df5780967dd505d3c046ab37ada70529bf
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 19:14:50 2006 +0100
+Date: 2006-10-25 19:14:50 +0100
Require --prefix in dbus-binding-tool
Closes #4185.
dbus/dbus-glib-tool.c | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
commit 054c6476495a6f85ae708ed81b9053bf666897b7
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 18:34:49 2006 +0100
+Date: 2006-10-25 18:34:49 +0100
Dont shadow index.
Rename useage of index to index_. Thanks stdlib...
commit d3a494dced8e3f2de111f23ae3fbab6e32f4051a
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 18:27:20 2006 +0100
+Date: 2006-10-25 18:27:20 +0100
Fix small leak when marshal_table is destroyed
Closes #6870 with patch from Richard Hult <richard@imendio.com>
dbus/dbus-gobject.c | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ 1 file changed, 8 insertions(+), 1 deletion(-)
commit 9bfec032a72e7af5945336fecbb9b6e0b6f2de9e
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 18:24:53 2006 +0100
+Date: 2006-10-25 18:24:53 +0100
Fixes crash if disposing one DBusGProxy causes another for the
same service
dbus/dbus-gproxy.c | 14 ++++++++-
test/core/test-dbus-glib.c | 67
- ++++++++++++++++++++++++++++++++++++++++++-
+ ++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 78 insertions(+), 3 deletions(-)
commit 53bf71bd852810a271d13a73ba445622616c711c
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 16:41:38 2006 +0100
+Date: 2006-10-25 16:41:38 +0100
Bump version to 0.72
and use modern AC_INIT, AM_INIT_AUTOMAKE
configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 28a54df202f089a3e00930e36a787c175501be41
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 14:36:25 2006 +0100
+Date: 2006-10-25 14:36:25 +0100
Clean generated run-with-tmp-session-bus.conf on make clean
test/core/Makefile.am | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
commit bcf15d72892582c28755563ca63182c198ef8f64
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 14:35:25 2006 +0100
+Date: 2006-10-25 14:35:25 +0100
Actually run unit tests and checks when doing make distcheck
Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 7c21166ef7ce9b370448a39c6c6744813933abee
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 14:33:53 2006 +0100
+Date: 2006-10-25 14:33:53 +0100
Use TEST_CORE_SERVICE_BINARY path for core test service file
- .../data/valid-service-files/debug-glib.service.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ test/data/valid-service-files/debug-glib.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit d6980d9d59edcf14cc1ab5af3945bd740a3f2495
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 14:32:14 2006 +0100
+Date: 2006-10-25 14:32:14 +0100
Use dbus-daemon --introspect to generate DBus service introspect xml
tools/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 505f5486f055558934718672f1328b52fab6cd6e
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 25 14:30:23 2006 +0100
+Date: 2006-10-25 14:30:23 +0100
Actually make interfaces tests work
Working interfaces/Makefile.am
configure.ac | 6 ++-
test/interfaces/Makefile.am | 81
- ++++++++++++++++--------------------
+ +++++++++++++++++--------------------
test/interfaces/run-test.sh | 23 +----------
test/interfaces/test-client.c | 22 +++++-----
test/interfaces/test-goodbye.xml | 4 +-
commit 4a479fe9516b141d94e57489f7e624ea6b94cb94
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Oct 24 19:51:12 2006 +0100
+Date: 2006-10-24 19:51:12 +0100
Make interfaces tests work
Working interfaces/Makefile.am
Sanitise service/object namespace for interfaces tests
Remove accidentally added test/interfaces/.Makefile.am.swp
- .../valid-service-files/interfaces-test.service.in | 3 +++
- test/interfaces/.Makefile.am.swp | Bin 12288 ->
+ test/data/valid-service-files/interfaces-test.service.in | 3 +++
+ test/interfaces/.Makefile.am.swp | Bin 12288 ->
0 bytes
- 2 files changed, 3 insertions(+), 0 deletions(-)
+ 2 files changed, 3 insertions(+)
commit 4db00a26f0c67db96ff6185286658278678e23bd
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Oct 24 18:07:26 2006 +0100
+Date: 2006-10-24 18:07:26 +0100
Changes for test/interfaces
Changed configure.ac and test/Makefile.am
commit 4f6a75760f55eeb79113d09baa46ecdd09e100e6
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Oct 24 16:36:08 2006 +0100
+Date: 2006-10-24 16:36:08 +0100
Add tests for new interfaces functionaility
From bug #5173
test/interfaces/.Makefile.am.swp | Bin 0 -> 12288 bytes
- test/interfaces/.gitignore | 4 +
+ test/interfaces/.gitignore | 4 ++
test/interfaces/Makefile.am | 86 +++++++++++++++++++++++++
test/interfaces/run-test.sh | 38 +++++++++++
test/interfaces/test-client.c | 85 +++++++++++++++++++++++++
test/interfaces/test-interfaces.h | 48 ++++++++++++++
test/interfaces/test-objects.c | 73 +++++++++++++++++++++
test/interfaces/test-objects.h | 31 +++++++++
- test/interfaces/test-server.c | 56 ++++++++++++++++
+ test/interfaces/test-server.c | 56 +++++++++++++++++
test/interfaces/test-song.xml | 9 +++
- 13 files changed, 575 insertions(+), 0 deletions(-)
+ 13 files changed, 575 insertions(+)
commit 4467ffca15e4783b7e90f1349be18fca3807b6cb
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Oct 24 15:42:42 2006 +0100
+Date: 2006-10-24 15:42:42 +0100
Bump GLib dependancy to 2.6
Closes #4390.
configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 6ac144ff50d6c87795b470fb74cc1c0dd3e549a7
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Oct 17 17:06:48 2006 +0100
+Date: 2006-10-17 17:06:48 +0100
Add gobject-2.0 to dbus-glib-1.pc.in
glib bindings depend on gobject. Its amazing we've got this far with
noone noticiing this bug...
dbus-glib-1.pc.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 03e629cabe1100527c467fc5bf2a8aa4f7d3a6f5
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 4 19:30:46 2006 -0400
+Date: 2006-10-04 19:30:46 -0400
Remove accidentally added test/interfaces stuff in the autotools
commit 8e2c2ba5f8f0a25708bac86cafa46be02a1bdb78
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 4 19:16:35 2006 -0400
+Date: 2006-10-04 19:16:35 -0400
Fix up tests
Puts all exposed servies in the org.freedesktop.DBus.GLib namespace
test/core/test-dbus-glib.c | 142
++++++++++----------
test/core/test-profile.c | 6 +-
- test/core/test-service-glib.c | 16 +-
+ test/core/test-service-glib.c | 16 +--
test/core/test-service-glib.xml | 6 +-
test/core/test-thread-client.c | 4 +-
test/core/test-thread-server.c | 2 +-
commit c0bb50ca11675274464d91ed5651676449ce360d
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 4 19:13:34 2006 -0400
+Date: 2006-10-04 19:13:34 -0400
Update autofoo for new tests layout
commit 33412cde926a9fc6ce86618835661bbc48475177
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Oct 4 23:43:29 2006 +0100
+Date: 2006-10-04 23:43:29 +0100
Make autogen a bit more useful for maintainers
Adds default configure parameters - the ones you usually want ;)
autogen.sh | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
+ 1 file changed, 8 insertions(+), 4 deletions(-)
commit b47e9bca585b1104f6d7309b02da27b123015611
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Sep 27 14:12:26 2006 +0100
+Date: 2006-09-27 14:12:26 +0100
Update COPYING and HACKING to be correct for dbus-glib
commit 50541a23757d59d93918db52c9e9c65596d943c5
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Sep 27 14:04:19 2006 +0100
+Date: 2006-09-27 14:04:19 +0100
Autoconf changes from test/glib -> test/core move
commit 01024785e818e72c06ba44e8feea926e8aa8f7a8
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Sep 27 14:02:42 2006 +0100
+Date: 2006-09-27 14:02:42 +0100
add an .gitignore
.gitignore | 205
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 205 insertions(+), 0 deletions(-)
+ 1 file changed, 205 insertions(+)
commit 003840bd5f08802fb2a63b3c49f9d0685f6f292b
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Sep 27 13:56:39 2006 +0100
+Date: 2006-09-27 13:56:39 +0100
Move tests/glib to test/core
Move tests/glib to test/core in preparation for seperate functionality
commit de74dd48194f9aa3629d7b65dd89e0b1339f8654
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Wed Sep 27 13:39:24 2006 +0100
+Date: 2006-09-27 13:39:24 +0100
Rename configure.in to configure.ac for modernity
commit b17fc759d2d5422ce287706d276443fa338cbf5a
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Sun Sep 24 14:34:19 2006 +0100
+Date: 2006-09-24 14:34:19 +0100
Fix memleak in lookup_or_register_specialized.
Applies fix from Daniel d'Andrada Tenório de Carvalho, closing
bug #7352.
dbus/dbus-gtype-specialized.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
commit 4d6aa726814295cfabab95a51d2e320d02b72dde
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Sun Sep 24 14:32:52 2006 +0100
+Date: 2006-09-24 14:32:52 +0100
Add m4 directory
Add missing changes from last commit.
commit 1571d556aa5f087e52074e5fd7c5e5c29667c551
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Sun Sep 24 14:07:50 2006 +0100
+Date: 2006-09-24 14:07:50 +0100
Add m4 directory
Add an m4 directory and add gtk-doc.m4, which is installed in the
tree by gtkdocize.
m4/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit fcc2ccdb19bfa25db005494271dbd91a3205c3a6
Merge: 99e1085 3f978cf
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Thu Sep 21 03:44:22 2006 +0100
+Date: 2006-09-21 03:44:22 +0100
Merge branch 'master' of
git+ssh://git.freedesktop.org/git/dbus/dbus-glib
commit 3f978cf34b91e5404dc3ea559995a9648734a2da
Author: John (J5) Palmieri <johnp@remedyz.boston.redhat.com>
-Date: Fri Sep 8 10:56:06 2006 -0400
+Date: 2006-09-08 10:56:06 -0400
* tools/Makefile.am: Add tools/session.conf to EXTRA_DIST so make
check works
from tarballs
tools/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 99e10857c50a025fb37613c4dae720b5afc890f5
Merge: b193f2b 22ea91b
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Thu Aug 24 23:27:58 2006 +0100
+Date: 2006-08-24 23:27:58 +0100
Merge http://ms800.montefiore.ulg.ac.be/~frecinau/dbus-glib
commit 22ea91b33bff95cf480a4c992e4774b671f1534b
Author: Steve Frécinaux <steve@istique.net>
-Date: Tue Aug 22 22:57:44 2006 +0200
+Date: 2006-08-22 22:57:44 +0200
Fix compilation with -Werror
commit 368aaee38049dc599fb8d06d7096bcdbd04befab
Author: Steve Frécinaux <steve@istique.net>
-Date: Tue Aug 22 22:26:24 2006 +0200
+Date: 2006-08-22 22:26:24 +0200
Make test scripts run during out-of-tree compilation
commit b193f2b28472790ff66fc575d55d4e6d5a9d3e78
Author: Steve Frécinaux <steve@istique.net>
-Date: Tue Aug 22 19:36:44 2006 +0200
+Date: 2006-08-22 19:36:44 +0200
Fix out-of-tree compilation
(cherry picked from 4b85a9e92bcf21356f25c535b3550a330cb018a4 commit)
commit 4b85a9e92bcf21356f25c535b3550a330cb018a4
Author: Steve Frécinaux <steve@istique.net>
-Date: Tue Aug 22 19:36:44 2006 +0200
+Date: 2006-08-22 19:36:44 +0200
Fix out-of-tree compilation
commit 46e7e573203e354b676e031067b8607b4f2640df
Merge: 355ef78 3be8161
Author: Steve Frécinaux <steve@istique.net>
-Date: Tue Aug 22 19:07:59 2006 +0200
+Date: 2006-08-22 19:07:59 +0200
Merge branch 'master' of
git://anongit.freedesktop.org/git/dbus/dbus-glib
commit 3be816118dfc560955e5cd8e85203129087959ce
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Aug 22 12:25:39 2006 +0100
+Date: 2006-08-22 12:25:39 +0100
replace doxygen with gtk-doc in INSTALL
INSTALL | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 27e76bb78db2b467ce93fa0088c6c2407836e4ff
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Aug 22 12:25:13 2006 +0100
+Date: 2006-08-22 12:25:13 +0100
Combine .PHONY rules in toplevel Makefile.am
A .PHONY rule was added by the gtk-doc patch, this combines it with
the existsing .PHONY rule
Makefile.am | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
+ 1 file changed, 2 insertions(+), 3 deletions(-)
commit d49a2a2486cd60e22b360dda8ae5a50d25486667
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Aug 22 12:24:00 2006 +0100
+Date: 2006-08-22 12:24:00 +0100
Modifed autogen.sh to check for autotools an gtkdocize versions
autogen.sh now does a full check for all the correct versions of
autogen.sh | 143
++++++++++++++++++++++++++++++++++++++++++------------------
- 1 files changed, 101 insertions(+), 42 deletions(-)
+ 1 file changed, 101 insertions(+), 42 deletions(-)
commit 62419419257d6353c5f35001e1f538fca300f3c4
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Aug 22 11:44:42 2006 +0100
+Date: 2006-08-22 11:44:42 +0100
add missing doc/Makefile.am from gtk-doc update.
doc/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit f812d9044aa73b0c86f92dc0dcae03d26e23193a
Author: Rob Taylor <rob.taylor@collabora.co.uk>
-Date: Tue Aug 22 11:43:43 2006 +0100
+Date: 2006-08-22 11:43:43 +0100
Add missing m4/gtk-doc.m4 from gtk-doc patch.
m4/gtk-doc.m4 | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 2effafca679d6331201e7637b18888a70b958eb8
Author: Rob Taylor <robtaylor@lancastria.(none)>
-Date: Fri Aug 18 20:55:17 2006 +0100
+Date: 2006-08-18 20:55:17 +0100
Commit patch to switch to gtk-doc with gtype-specialized doc and
updates from
dbus/dbus-gidl.c | 2 +-
dbus/dbus-glib-tool.c | 2 +-
dbus/dbus-glib.c | 134 ++++++++++++++-------
- dbus/dbus-glib.h | 41 ++++--
- dbus/dbus-gmain.c | 46 +++----
+ dbus/dbus-glib.h | 41 ++++---
+ dbus/dbus-gmain.c | 46 ++++---
dbus/dbus-gobject.c | 140 +++++++++++++---------
dbus/dbus-gproxy.c | 193
- +++++++++++++++++------------
- dbus/dbus-gtype-specialized.c | 20 ++-
+ +++++++++++++++++-------------
+ dbus/dbus-gtype-specialized.c | 20 +++-
dbus/dbus-gutils.c | 2 +-
dbus/dbus-gvalue.c | 6 +-
doc/reference/Makefile.am | 94 +++++++++++++++
commit 355ef78d98d6fc65715845d56232199162cab12a
Author: Steve Frécinaux <steve@istique.net>
-Date: Thu Aug 17 11:48:20 2006 +0200
+Date: 2006-08-17 11:48:20 +0200
Interface support for bindings.
dbus/dbus-gobject.c | 286
+++++++++++++++++++++++++++++----------------------
- 1 files changed, 161 insertions(+), 125 deletions(-)
+ 1 file changed, 161 insertions(+), 125 deletions(-)
commit e6c7815f9457757d7364463759766c85981ce207
Author: John (J5) Palmieri <johnp@remedyz.boston.redhat.com>
-Date: Mon Jul 24 14:44:36 2006 -0400
+Date: 2006-07-24 14:44:36 -0400
* Released 0.71
commit 3f720d5a5028d2b4075b474ba17fb9b7508093ac
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Fri Jul 21 16:25:35 2006 -0400
+Date: 2006-07-21 16:25:35 -0400
* Various Makefile cleanups
commit 05cb3fd6e2c139e61d1461443660badfbdf94a83
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Mon Jul 17 16:36:02 2006 -0400
+Date: 2006-07-17 16:36:02 -0400
* Released 0.70
* Add NEWS to the dist
Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit d59c4a541397033b69d575c8cc495d0f3ba13ee3
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Mon Jul 17 16:28:45 2006 -0400
+Date: 2006-07-17 16:28:45 -0400
* Added a NEWS entry for this release
NEWS | 18 ++++++++++++++++++
- 1 files changed, 18 insertions(+), 0 deletions(-)
+ 1 file changed, 18 insertions(+)
commit 990802d9f01a7c5aa1ae582aad21963fe20b601e
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Mon Jul 17 16:06:52 2006 -0400
+Date: 2006-07-17 16:06:52 -0400
* remove ChangeLog because this will now be generated during dist
- 0 files changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
commit 6a68e96e69cb17a981c801d8e7480c5bb4d51a6c
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Mon Jul 17 15:52:26 2006 -0400
+Date: 2006-07-17 15:52:26 -0400
* add the Doxyfile.in file
Doxyfile.in | 180
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 180 insertions(+), 0 deletions(-)
+ 1 file changed, 180 insertions(+)
commit 89a2a3b5b5795434900f1ca41fc73162b7bb09f2
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jul 6 19:16:07 2006 -0400
+Date: 2006-07-06 19:16:07 -0400
- distcheck cleanups
dbus/Makefile.am | 2 +-
tools/Makefile.am | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletions(-)
+ 2 files changed, 7 insertions(+), 1 deletion(-)
commit 46ea5dc1aa64ca906d28119e2d9eed3a48e6adfc
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jul 6 19:05:44 2006 -0400
+Date: 2006-07-06 19:05:44 -0400
- Renabled another test
dbus/Makefile.am | 20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
+ 1 file changed, 10 insertions(+), 10 deletions(-)
commit ae743d6feca5e24541124148a53a475f6f27e2a9
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jul 6 18:52:50 2006 -0400
+Date: 2006-07-06 18:52:50 -0400
- add gcov source
test/decode-gcov.c | 2652
++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 2652 insertions(+), 0 deletions(-)
+ 1 file changed, 2652 insertions(+)
commit ae90f4bab7a98d89a85e8e6c11b4af72bb9a2525
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jul 6 18:52:16 2006 -0400
+Date: 2006-07-06 18:52:16 -0400
- Adding placeholder HACKING file
- 0 files changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
commit 5f47ecc191cae12930652b708d3c52d293eba4da
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jul 6 18:05:37 2006 -0400
+Date: 2006-07-06 18:05:37 -0400
- Add back the Doxygen doc generation
Makefile.am | 2 +-
configure.in | 1 +
doc/api/README | 3 +++
- 3 files changed, 5 insertions(+), 1 deletions(-)
+ 3 files changed, 5 insertions(+), 1 deletion(-)
commit fdb8aaaab032ab4eb63aa80dbef7de91a3de346a
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jul 6 17:40:30 2006 -0400
+Date: 2006-07-06 17:40:30 -0400
- Add back tests to the glib bindings
commit 24e982d596036202850c679aa0460b729840e45d
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jul 6 14:40:14 2006 -0400
+Date: 2006-07-06 14:40:14 -0400
- Fix up docs
INSTALL | 78
- +-------------------------------------------------------------
+ ++-------------------------------------------------------------
README | 71 ---------------------------------------------------------
2 files changed, 2 insertions(+), 147 deletions(-)
commit 6aa2aba0a64ea19e504118dc56a1f9e559568f90
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jun 29 12:05:05 2006 -0400
+Date: 2006-06-29 12:05:05 -0400
- Really commit the glib to dbus move and build fixes
commit 6a9ac47cc9143ee899455c576f557818dab1f7d2
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Thu Jun 29 11:26:07 2006 -0400
+Date: 2006-06-29 11:26:07 -0400
- Created empty NEWS file
- renamed glib dir to dbus so include paths stay the same in the
commit 7fa1f1471e5b878253695da46a89a3186fb2a0d1
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Wed Jun 28 14:39:18 2006 -0400
+Date: 2006-06-28 14:39:18 -0400
- Take out comment in a literal
configure.in | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ 1 file changed, 1 deletion(-)
commit 1a7d56d33f83dde917871f8b2d5af19f25786449
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Wed Jun 28 14:24:40 2006 -0400
+Date: 2006-06-28 14:24:40 -0400
- Have autogen.sh point to dbus-glib
autogen.sh | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 24ec6aba3281c460f64bbe9d5bb2dd265d453cce
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Wed Jun 28 14:22:25 2006 -0400
+Date: 2006-06-28 14:22:25 -0400
- Add files missed in the split
glib/dbus-glib.h | 256
+++++++++++++++++++++++++++++++++++++
glib/make-dbus-glib-error-enum.sh | 25 ++++
- 3 files changed, 353 insertions(+), 0 deletions(-)
+ 3 files changed, 353 insertions(+)
commit b8b86555280694d85d64b68d0f9131868598161a
Author: John (J5) Palmieri <quinticent@phuket.(none)>
-Date: Wed Jun 28 14:21:26 2006 -0400
+Date: 2006-06-28 14:21:26 -0400
- Add boilerplate build files
COPYING | 551 +++++++++++++++++++++++++++++++++
INSTALL | 294 ++++++++++++++++++
Makefile.am | 57 ++++
- README | 101 ++++++
+ README | 101 +++++++
autogen.sh | 93 ++++++
configure.in | 870
+++++++++++++++++++++++++++++++++++++++++++++++++++++
dbus-glib-1.pc.in | 12 +
- 8 files changed, 1994 insertions(+), 0 deletions(-)
+ 8 files changed, 1994 insertions(+)
commit 698177269a46c2cb80fbb2c471f5ad6314bd106b
Author: Ross Burton <ross@openedhand.com>
-Date: Wed Jun 14 16:49:37 2006 +0000
+Date: 2006-06-14 16:49:37 +0000
2006-06-14 Ross Burton <ross@openedhand.com>
Free a leaking GArray (surely not!) in dbus_g_method_return.
glib/dbus-gobject.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 0b305ffe12e7273640226e323074f2cb7d7387cc
Author: Ross Burton <ross@openedhand.com>
-Date: Mon Jun 12 14:22:48 2006 +0000
+Date: 2006-06-12 14:22:48 +0000
2006-06-12 Ross Burton <ross@openedhand.com>
review).
glib/dbus-gproxy.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
commit 66e5632e14760bbd396afbc4d474cbbed22f37f7
Author: Robert McQueen <robot101@debian.org>
-Date: Wed Jun 7 00:31:01 2006 +0000
+Date: 2006-06-07 00:31:01 +0000
2005-05-06 Robert McQueen <robot101@debian.org>
call to dbus_g_type_get_struct.
glib/dbus-gtype-specialized.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ 1 file changed, 7 insertions(+), 2 deletions(-)
commit 9b151fd7a396463aa3f7c6ac0a14df444c78a6b1
Author: Robert McQueen <robot101@debian.org>
-Date: Wed Jun 7 00:03:57 2006 +0000
+Date: 2006-06-07 00:03:57 +0000
2005-05-06 Robert McQueen <robot101@debian.org>
set_static.
glib/dbus-gvalue-utils.c | 24 ++++++++++++++----------
- 1 files changed, 14 insertions(+), 10 deletions(-)
+ 1 file changed, 14 insertions(+), 10 deletions(-)
commit 5559e67b90b3c186bf0002253587013264ce9dc0
Author: Robert McQueen <robot101@debian.org>
-Date: Tue Jun 6 23:07:04 2006 +0000
+Date: 2006-06-06 23:07:04 +0000
2005-05-06 Robert McQueen <robot101@debian.org>
nobody uses this code yet.
glib/dbus-gvalue-utils.c | 101
- ++++++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 89 insertions(+), 12 deletions(-)
+ ++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 89 insertions(+), 12 deletions(-)
commit 7ca236d43bc91778e90ac59500aeb1d68c8acd6f
Author: Robert McQueen <robot101@debian.org>
-Date: Tue Jun 6 19:45:39 2006 +0000
+Date: 2006-06-06 19:45:39 +0000
2005-05-06 Robert McQueen <robot101@debian.org>
glib/dbus-gvalue-utils.c | 91
++++++++--------------------------------------
- 1 files changed, 16 insertions(+), 75 deletions(-)
+ 1 file changed, 16 insertions(+), 75 deletions(-)
commit 8896d43457634c4c10d9909907d0d9082b520a07
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun May 21 05:33:52 2006 +0000
+Date: 2006-05-21 05:33:52 +0000
2006-05-21 Havoc Pennington <hp@redhat.com>
will fix them...
glib/dbus-gvalue-utils.c | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
+ 1 file changed, 15 insertions(+)
commit 4da76dd7d5845f05efd553037750ddeffd7d1962
Author: Robert McQueen <robot101@debian.org>
-Date: Fri Apr 28 21:11:28 2006 +0000
+Date: 2006-04-28 21:11:28 +0000
2005-04-28 Robert McQueen <robot101@debian.org>
object.
glib/dbus-gproxy.c | 29 ++++++++++++++++++++++-------
- 1 files changed, 22 insertions(+), 7 deletions(-)
+ 1 file changed, 22 insertions(+), 7 deletions(-)
commit 08cd19641ff8c6fcb1f8e5821e6c9dc81f11cd6f
Author: Robert McQueen <robot101@debian.org>
-Date: Fri Apr 28 21:02:16 2006 +0000
+Date: 2006-04-28 21:02:16 +0000
2005-04-28 Robert McQueen <robot101@debian.org>
of memory from within pointer arrays and lists. Fixes bug #6300.
glib/dbus-gvalue-utils.c | 62
- +++++++++++++++++++++++++++++++++++++++++----
- 1 files changed, 56 insertions(+), 6 deletions(-)
+ +++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 56 insertions(+), 6 deletions(-)
commit 96fb792c6a5661afeef76ece3cd7defc9ffc8db8
Author: Robert McQueen <robot101@debian.org>
-Date: Fri Apr 28 20:36:56 2006 +0000
+Date: 2006-04-28 20:36:56 +0000
2005-04-28 Robert McQueen <robot101@debian.org>
generating struct signatures. Fixes bug #6083.
glib/dbus-gvalue.c | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
+ 1 file changed, 6 insertions(+), 3 deletions(-)
commit 636fe6ed1b321cd05b72ca39d414ecd1c2cb4b4f
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Feb 26 01:06:33 2006 +0000
+Date: 2006-02-26 01:06:33 +0000
2006-02-25 Havoc Pennington <hp@redhat.com>
should make this thing use the new glib options parser
glib/dbus-glib-tool.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 844b4184483ac979eff27319f144e8f330858062
Author: Robert McQueen <robot101@debian.org>
-Date: Thu Feb 16 00:43:41 2006 +0000
+Date: 2006-02-16 00:43:41 +0000
2006-02-16 Robert McQueen <robot101@debian.org>
patches, this new test fails.
glib/dbus-gvalue.c | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
+ 1 file changed, 4 insertions(+), 3 deletions(-)
commit 7b33862bac766c00c12f5cb400af06200ae004c4
Author: Robert McQueen <robot101@debian.org>
-Date: Wed Feb 15 23:45:48 2006 +0000
+Date: 2006-02-15 23:45:48 +0000
2006-02-16 Robert McQueen <robot101@debian.org>
to Jakub Stachowski for reporting this and testing the fix.
glib/dbus-gmain.c | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
commit 8d98ce884210745d7070e4438167ece2be0e357b
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Wed Feb 15 21:42:54 2006 +0000
+Date: 2006-02-15 21:42:54 +0000
2006-02-15 John (J5) Palmieri <johnp@redhat.com>
* ChangeLog: checkin last entry which doesn't seem to be commited
glib/dbus-gmain.c | 37 +++++++++++++++++++++++++++++++++++++
- 1 files changed, 37 insertions(+), 0 deletions(-)
+ 1 file changed, 37 insertions(+)
commit 6fd3dffe4561b37bc75c13f6296e91b65224ce4d
Author: Robert McQueen <robot101@debian.org>
-Date: Mon Feb 13 22:30:11 2006 +0000
+Date: 2006-02-13 22:30:11 +0000
2006-02-13 Robert McQueen <robot101@debian.org>
commit eef27dfbd6dc73baa13c78220f98297881071368
Author: Robert McQueen <robot101@debian.org>
-Date: Fri Jan 27 16:40:53 2006 +0000
+Date: 2006-01-27 16:40:53 +0000
2006-01-27 Robert McQueen <robot101@debian.org>
CSymbol which broke everything horribly. My apologies.
glib/dbus-binding-tool-glib.c | 45
- ++++++++++++++++------------------------
+ +++++++++++++++++------------------------
glib/dbus-binding-tool-glib.h | 1 +
2 files changed, 19 insertions(+), 27 deletions(-)
commit 879e2b697e2a0fd439a38ea4d4422cd8c01fefb5
Author: Robert McQueen <robot101@debian.org>
-Date: Fri Jan 27 15:40:36 2006 +0000
+Date: 2006-01-27 15:40:36 +0000
2006-01-27 Robert McQueen <robot101@debian.org>
repeatedly.
glib/dbus-gtype-specialized.c | 33 ++++++++++++++++++++++++++-
- glib/dbus-gtype-specialized.h | 4 ++-
+ glib/dbus-gtype-specialized.h | 4 +++-
glib/dbus-gvalue-utils.c | 50
- ++++++++++++++++++++++++++++++++++------
+ ++++++++++++++++++++++++++++++++++-------
3 files changed, 77 insertions(+), 10 deletions(-)
commit f467138770f3b5b771e772e7f59780a502540cb6
Author: Robert McQueen <robot101@debian.org>
-Date: Fri Jan 27 15:15:16 2006 +0000
+Date: 2006-01-27 15:15:16 +0000
2006-01-27 Robert McQueen <robot101@debian.org>
g_free ().
glib/dbus-gvalue.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 0c87b127b878d41d8a134fd5dee5d41a2434ef41
Author: Robert McQueen <robot101@debian.org>
-Date: Fri Jan 27 15:06:54 2006 +0000
+Date: 2006-01-27 15:06:54 +0000
2006-01-27 Iain Holmes <iain@openedhand.com>
method from being called multiple times.
glib/dbus-gproxy.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
commit 5ad59f0f48a27d35d58e86c2cf2aa8c7d025248b
Author: Robert McQueen <robot101@debian.org>
-Date: Thu Jan 19 02:54:07 2006 +0000
+Date: 2006-01-19 02:54:07 +0000
2006-01-19 Robert McQueen <robot101@debian.org>
size-variable things, such as strings, objects, structs, etc).
glib/dbus-binding-tool-glib.c | 32 ++++++++++++++++++++++++++------
- 1 files changed, 26 insertions(+), 6 deletions(-)
+ 1 file changed, 26 insertions(+), 6 deletions(-)
commit 0dffd5ab28874cc6453e8907f1f4cb95785748cb
Author: Robert McQueen <robot101@debian.org>
-Date: Thu Jan 5 20:22:06 2006 +0000
+Date: 2006-01-05 20:22:06 +0000
2006-01-05 Robert McQueen <robot101@debian.org>
glib/dbus-gproxy.c | 327
+++++++++++++++++++++++++++++++---------------------
- 1 files changed, 196 insertions(+), 131 deletions(-)
+ 1 file changed, 196 insertions(+), 131 deletions(-)
commit b356f998530ffe9762b4b0f5fd7f236eceb044db
Author: Robert McQueen <robot101@debian.org>
-Date: Thu Jan 5 20:03:38 2006 +0000
+Date: 2006-01-05 20:03:38 +0000
2006-01-05 Robert McQueen <robot101@debian.org>
annotations when generating glib client bindings.
glib/dbus-binding-tool-glib.c | 42
- ++++++++++++++++++++++++++++++++++++----
- 1 files changed, 37 insertions(+), 5 deletions(-)
+ ++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 37 insertions(+), 5 deletions(-)
commit 8029bd07868baa11810b0b3ee56a8daefc0588da
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Wed Nov 30 19:32:25 2005 +0000
+Date: 2005-11-30 19:32:25 +0000
* dbus/dbus-auth.c, dbus/dbus-connection.c, dbus/dbus-keyring.c,
dbus/dbus-server-debug-pipe.c, glib/dbus-binding-tool-glib.c
commit c5753442aaccba39a3e0948aa77e523eb3fe866b
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Wed Nov 30 18:48:09 2005 +0000
+Date: 2005-11-30 18:48:09 +0000
* glib/dbus-gmain.c (connection_setup_add_watch): plugged a leak
(patch from Carlos Garnacho Parro <carlosg at gnome.org>
glib/dbus-gmain.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 5d3c9bd0cd7e98df0be8351e3c210a38a978f52a
Author: Robert McQueen <robot101@debian.org>
-Date: Sun Nov 27 16:55:09 2005 +0000
+Date: 2005-11-27 16:55:09 +0000
2005-11-27 Carlos Garcia Campos <carlosgc@gnome.org>
commit 9f2aae9a744e45c0646b36396e846031ec4ffe7f
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Tue Nov 22 20:37:00 2005 +0000
+Date: 2005-11-22 20:37:00 +0000
* configure.in: Add test/name-test/Makefile to the generated
Makefile list
queueing system
glib/dbus-gobject.c | 28
- +++++++++++++++++++--
+ +++++++++++++++++++---
glib/examples/example-service.c | 2 +-
glib/examples/example-signal-emitter.c | 2 +-
glib/examples/statemachine/statemachine-server.c | 2 +-
commit 57b6ef4e8648c0c7f9b059690c4a35e73932669f
Author: Robert McQueen <robot101@debian.org>
-Date: Tue Nov 15 19:34:32 2005 +0000
+Date: 2005-11-15 19:34:32 +0000
2005-11-15 Robert McQueen <robot101@debian.org>
other applications.
glib/dbus-gobject.c | 34 ++++++++++++++++++++++++++++++++++
- 1 files changed, 34 insertions(+), 0 deletions(-)
+ 1 file changed, 34 insertions(+)
commit cf87837198ac181b16965dcc8fb3f65bc2efa8bd
Author: Robert McQueen <robot101@debian.org>
-Date: Sat Oct 29 17:02:58 2005 +0000
+Date: 2005-10-29 17:02:58 +0000
2005-10-29 Robert McQueen <robot101@debian.org>
commit 3a8319b792df4ce260f8cf1e0f95fadd76942d75
Author: Ross Burton <ross@openedhand.com>
-Date: Thu Oct 27 16:35:43 2005 +0000
+Date: 2005-10-27 16:35:43 +0000
Cleanups
glib/dbus-gobject.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 29f0ea31b256784b4e75cdedcb822f30fe804dd3
Author: Ross Burton <ross@openedhand.com>
-Date: Tue Oct 25 15:57:13 2005 +0000
+Date: 2005-10-25 15:57:13 +0000
Add const keywords
commit f4b2bdf28c5e589d9161e27bf89e636c8226169f
Author: Ross Burton <ross@openedhand.com>
-Date: Tue Oct 25 08:54:57 2005 +0000
+Date: 2005-10-25 08:54:57 +0000
Add a NoReply annotation
glib/dbus-binding-tool-glib.c | 53
- ++++++++++++++++++++++++++++------------
- glib/dbus-binding-tool-glib.h | 3 +-
+ ++++++++++++++++++++++++++++-------------
+ glib/dbus-binding-tool-glib.h | 3 ++-
2 files changed, 39 insertions(+), 17 deletions(-)
commit adc1cd1de84b057cc858b1226522d2fde96871a0
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Tue Oct 18 04:38:04 2005 +0000
+Date: 2005-10-18 04:38:04 +0000
* glib/dbus-gvalue-utils.c (hash_free_from_gtype): handle gdouble
glib/dbus-gvalue-utils.c | 17 +++++++++++++++++
glib/dbus-gvalue.c | 4 +++-
- 2 files changed, 20 insertions(+), 1 deletions(-)
+ 2 files changed, 20 insertions(+), 1 deletion(-)
commit 8c16af02c159982b451289945835a86ff56805c2
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Wed Oct 5 20:43:46 2005 +0000
+Date: 2005-10-05 20:43:46 +0000
* glib/dbus-gvalue.c (marshal_variant): call _dbus_gvalue_marshal
instead of marshal basic so we can handle recursive types in a variant
communications.
glib/dbus-gvalue.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit b489f57506320ba3e29088dc612e27112c6a1854
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Mon Sep 26 22:26:38 2005 +0000
+Date: 2005-09-26 22:26:38 +0000
* glib/dbus-glib-tool.c: removed extra comma at the end of the
DBusBindingOutputMode enum which was causing a warning. #include
<time.h> so using time_t is explicitly defined
glib/dbus-glib-tool.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
commit a32ca0058020e7e23d72d9ad69fe881ba8b98e93
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Tue Sep 6 22:38:54 2005 +0000
+Date: 2005-09-06 22:38:54 +0000
* Released 0.50
* python/__init__.py: Sync version with libdbus to (0,50,0)
glib/Makefile.am | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
commit 23fb630c1e907187c8d7aa5539b30a34e7cc9632
Author: Colin Walters <walters@verbum.org>
-Date: Fri Aug 26 02:00:37 2005 +0000
+Date: 2005-08-26 02:00:37 +0000
2005-08-25 Colin Walters <walters@verbum.org>
to Ryan Lortie for the suggestion.
glib/dbus-gproxy.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ 1 file changed, 2 insertions(+), 1 deletion(-)
commit 8e13d06500c5b4df219891fc4b5b8242cb9f5cae
Author: Ross Burton <ross@openedhand.com>
-Date: Wed Aug 17 17:30:45 2005 +0000
+Date: 2005-08-17 17:30:45 +0000
Unref message and protect against NULL
glib/dbus-gproxy.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
commit 03dc49be2e41245f107e71194ebef428d4d4ccf7
Author: Colin Walters <walters@verbum.org>
-Date: Tue Aug 16 21:26:12 2005 +0000
+Date: 2005-08-16 21:26:12 +0000
2005-08-16 Colin Walters <walters@verbum.org>
DBusError message is NULL.
glib/dbus-gobject.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 20ab99c264aa730de304f637a7e4eacec3e1686d
Author: Colin Walters <walters@verbum.org>
-Date: Thu Aug 4 15:49:30 2005 +0000
+Date: 2005-08-04 15:49:30 +0000
2005-08-04 Colin Walters <walters@verbum.org>
glib/dbus-binding-tool-glib.c | 36 ++++---
glib/dbus-gmain.c | 23 ++--
glib/dbus-gobject.c | 35 +++---
- glib/dbus-gproxy.c | 13 ++-
+ glib/dbus-gproxy.c | 13 +--
glib/dbus-gsignature.c | 189 ++++++++++++++++++++++++++++++++
glib/dbus-gsignature.h | 19 ++++
glib/dbus-gvalue-utils.c | 46 ++++----
- glib/dbus-gvalue-utils.h | 28 +++---
+ glib/dbus-gvalue-utils.h | 28 ++---
glib/dbus-gvalue.c | 237
+++++++----------------------------------
- glib/dbus-gvalue.h | 21 +---
+ glib/dbus-gvalue.h | 21 ++--
11 files changed, 350 insertions(+), 302 deletions(-)
commit f19bb3b8b599f006e51a1ff81447ac6470c249fc
Author: Colin Walters <walters@verbum.org>
-Date: Wed Aug 3 23:21:49 2005 +0000
+Date: 2005-08-03 23:21:49 +0000
2005-08-03 Colin Walters <walters@verbum.org>
glib/dbus-gobject.c | 150
+++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 150 insertions(+), 0 deletions(-)
+ 1 file changed, 150 insertions(+)
commit f902eead6b209181f7a26b4cb1a967661ac86117
Author: Colin Walters <walters@verbum.org>
-Date: Mon Aug 1 16:12:53 2005 +0000
+Date: 2005-08-01 16:12:53 +0000
2005-08-01 Colin Walters <walters@verbum.org>
use-after-free.
glib/dbus-gidl.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit db1be2d67b4239496940080f44c7e05eed42a610
Author: Colin Walters <walters@verbum.org>
-Date: Mon Aug 1 16:07:19 2005 +0000
+Date: 2005-08-01 16:07:19 +0000
2005-08-01 Colin Walters <walters@verbum.org>
commit 04045b587a62e4b5cafbad0b81e18761c28a41e5
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jul 31 02:09:15 2005 +0000
+Date: 2005-07-31 02:09:15 +0000
2005-07-30 Havoc Pennington <hp@redhat.com>
commit f91e8613d913ee943afa5bbb6cdafb2ce062c6ef
Author: Ross Burton <ross@openedhand.com>
-Date: Mon Jul 25 19:16:22 2005 +0000
+Date: 2005-07-25 19:16:22 +0000
Remove matchers when all proxies are removed
glib/dbus-gproxy.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
commit 2c755e157a9b41451efd5fd88e74c37501e21127
Author: Colin Walters <walters@verbum.org>
-Date: Sun Jul 24 18:04:23 2005 +0000
+Date: 2005-07-24 18:04:23 +0000
2005-07-24 Colin Walters <walters@verbum.org>
* test/glib/test-service-glib.xml: Add recursive arrays tests.
glib/dbus-gvalue.c | 5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
+ 1 file changed, 5 deletions(-)
commit 6bf40ec5a63f7703070f951130d8e78cb044ec66
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Fri Jul 15 20:28:05 2005 +0000
+Date: 2005-07-15 20:28:05 +0000
* glib/Makefile.am: Add make-dbus-glib-error-switch.sh to EXTRA_DIST
so distcheck doesn't fail
commit a447f257bd0b557b661be74f2d63ba0d31366a46
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Fri Jul 15 19:15:05 2005 +0000
+Date: 2005-07-15 19:15:05 +0000
* glib/example/Makefile.am: Fix a typo which cause make distcheck
to fail
glib/examples/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit ce277d89860aaf05064d11eb24878cbf41326ff2
Author: Ross Burton <ross@openedhand.com>
-Date: Fri Jul 15 13:25:48 2005 +0000
+Date: 2005-07-15 13:25:48 +0000
Don't leak messages when calling methods
glib/dbus-gproxy.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 877add82e329e1de4ab7b4d99084362e250fa34c
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jul 12 17:57:04 2005 +0000
+Date: 2005-07-12 17:57:04 +0000
2005-07-12 Colin Walters <walters@verbum.org>
commit 31ca9e74c599c17f802698ad8184f9ae654983c5
Author: Colin Walters <walters@verbum.org>
-Date: Mon Jul 11 16:12:49 2005 +0000
+Date: 2005-07-11 16:12:49 +0000
2005-07-11 Colin Walters <walters@verbum.org>
commit 5c39fa43d8eb87284abe7d009349523ad5398db0
Author: Colin Walters <walters@verbum.org>
-Date: Sun Jul 10 22:54:18 2005 +0000
+Date: 2005-07-10 22:54:18 +0000
2005-07-10 Colin Walters <walters@verbum.org>
glib/dbus-binding-tool-glib.c | 324
++++++++++++++++++++++-----------
glib/dbus-binding-tool-glib.h | 1 +
- glib/dbus-gobject.c | 242 +++++++++++++++++++------
+ glib/dbus-gobject.c | 242 ++++++++++++++++++------
glib/dbus-gvalue-utils.c | 54 ++++++
glib/dbus-gvalue-utils.h | 4 +
glib/examples/statemachine/.cvsignore | 1 +
commit 00de44640de45aa6068ca9d1b42deb801b430320
Author: Colin Walters <walters@verbum.org>
-Date: Sat Jul 9 18:54:45 2005 +0000
+Date: 2005-07-09 18:54:45 +0000
2005-07-09 Colin Walters <walters@verbum.org>
* glib/dbus-binding-tool-glib.c (generate_glue): Barf on const
annotation on input args.
- glib/dbus-binding-tool-glib.c | 17 +++++++++++-
- glib/dbus-glib-tool.h | 3 +-
+ glib/dbus-binding-tool-glib.c | 17 +++++++++++--
+ glib/dbus-glib-tool.h | 3 ++-
glib/dbus-gobject.c | 54
- ++++++++++++++++++++++++----------------
- glib/dbus-gparser.c | 7 ++---
+ ++++++++++++++++++++++++-----------------
+ glib/dbus-gparser.c | 7 +++---
4 files changed, 52 insertions(+), 29 deletions(-)
commit 91dc6d18c4ccc69fef3c12e6f628f7458c1d4511
Author: Colin Walters <walters@verbum.org>
-Date: Sat Jul 9 17:52:51 2005 +0000
+Date: 2005-07-09 17:52:51 +0000
2005-07-09 Colin Walters <walters@verbum.org>
* test/glib/test-service-glib.c: Update to make some methods
const.
- glib/dbus-binding-tool-glib.c | 6 +++++
+ glib/dbus-binding-tool-glib.c | 6 ++++++
glib/dbus-binding-tool-glib.h | 1 +
- glib/dbus-gidl.c | 30 +++++++++++++++++++++++++
+ glib/dbus-gidl.c | 30 ++++++++++++++++++++++++++
glib/dbus-gidl.h | 7 ++++++
glib/dbus-gobject.c | 48
+++++++++++++++++++++++++++++++++++------
- glib/dbus-gparser.c | 5 +++-
+ glib/dbus-gparser.c | 5 ++++-
6 files changed, 89 insertions(+), 8 deletions(-)
commit 52438e8f3f67fa96ffd9607bad34968875d90226
Author: Colin Walters <walters@verbum.org>
-Date: Sat Jul 9 01:46:51 2005 +0000
+Date: 2005-07-09 01:46:51 +0000
2005-07-08 Colin Walters <walters@verbum.org>
+++++++++++-----------
glib/examples/statemachine/statemachine-client.c | 192 +++++++++--
glib/examples/statemachine/statemachine-server.c | 27 ++
- glib/examples/statemachine/statemachine.c | 44 ++--
+ glib/examples/statemachine/statemachine.c | 44 +--
9 files changed, 555 insertions(+), 259 deletions(-)
commit 6758d07f4dd3bee533488381c8cf236d9d99a5f0
Author: Ross Burton <ross@openedhand.com>
-Date: Fri Jul 8 17:02:42 2005 +0000
+Date: 2005-07-08 17:02:42 +0000
Make async bindings work again
glib/dbus-binding-tool-glib.c | 31 +++++++++++++------------------
- 1 files changed, 13 insertions(+), 18 deletions(-)
+ 1 file changed, 13 insertions(+), 18 deletions(-)
commit 8068477b92f2ee5ca19623e033e335d4b16d8de5
Author: Colin Walters <walters@verbum.org>
-Date: Fri Jul 8 16:25:28 2005 +0000
+Date: 2005-07-08 16:25:28 +0000
2005-07-08 Colin Walters <walters@verbum.org>
glib/dbus-gproxy.c | 31 +-
glib/dbus-gtest.c | 7 +
glib/dbus-gtest.h | 1 +
- glib/dbus-gtype-specialized.c | 44 ++-
+ glib/dbus-gtype-specialized.c | 44 +-
glib/dbus-gtype-specialized.h | 32 +-
glib/dbus-gvalue-utils.c | 261 +++++++++-
glib/dbus-gvalue-utils.h | 1 -
- glib/dbus-gvalue.c | 388 ++++++++++++--
+ glib/dbus-gvalue.c | 388 +++++++++++---
glib/dbus-gvalue.h | 4 +-
glib/examples/Makefile.am | 2 +
glib/examples/example-service.c | 4 +-
commit 8b39e9d32cb505d4f9550ca24627020e5edd9681
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jul 6 21:27:45 2005 +0000
+Date: 2005-07-06 21:27:45 +0000
2005-07-06 Colin Walters <walters@verbum.org>
glib/dbus-binding-tool-glib.c | 2 +
glib/dbus-glib.c | 140 -----------
- glib/dbus-gobject.c | 44 ++---
+ glib/dbus-gobject.c | 44 ++--
glib/dbus-gparser.c | 2 +-
glib/dbus-gproxy.c | 555
+++++++++++++++++++++++++++--------------
commit 462a36e4898da053ba749857511f2d634dbea665
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jul 5 16:39:56 2005 +0000
+Date: 2005-07-05 16:39:56 +0000
2005-07-05 Colin Walters <walters@verbum.org>
of prepending to value array directly.
glib/dbus-gproxy.c | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 4 deletions(-)
commit d80b7960d7d189d7c33e6d230fdbbf8b69546f60
Author: Colin Walters <walters@verbum.org>
-Date: Sat Jul 2 06:05:23 2005 +0000
+Date: 2005-07-02 06:05:23 +0000
2005-07-02 Colin Walters <walters@verbum.org>
* glib/dbus-gmain.c (_dbus_gmain_test): Fix test.
glib/dbus-gmain.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit c7f14e3c337601053b08dc07a186be81063fc005
Author: Colin Walters <walters@verbum.org>
-Date: Fri Jul 1 15:44:12 2005 +0000
+Date: 2005-07-01 15:44:12 +0000
2005-07-01 Colin Walters <walters@verbum.org>
and G_TYPE_FLOAT as DBUS_TYPE_DOUBLE.
glib/dbus-gvalue.c | 33 +++++++++++++++++++++++++++++++--
- 1 files changed, 31 insertions(+), 2 deletions(-)
+ 1 file changed, 31 insertions(+), 2 deletions(-)
commit 5c82c5ce0eba4ec3bbb0454f3987f56de968bf95
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 30 18:22:09 2005 +0000
+Date: 2005-06-30 18:22:09 +0000
2005-06-30 Colin Walters <walters@verbum.org>
glib/dbus-gobject.c | 127
++++++++++++++++++++++++++++++++++++++++++++++++++-
glib/dbus-gparser.c | 3 +-
- glib/dbus-gproxy.c | 6 +-
+ glib/dbus-gproxy.c | 6 +--
5 files changed, 134 insertions(+), 50 deletions(-)
commit f879e3e832d76a7b3b02cc7d25a3e5b9ef195f42
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jun 29 23:52:35 2005 +0000
+Date: 2005-06-29 23:52:35 +0000
2005-06-29 Colin Walters <walters@verbum.org>
commit 1f87d5d3363d1e23208c993eabb3cb1f0341b4d9
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jun 29 17:02:33 2005 +0000
+Date: 2005-06-29 17:02:33 +0000
2005-06-29 Colin Walters <walters@verbum.org>
value in all cases, not only in async case.
glib/dbus-gobject.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 49fce903db4124277de6aba92f7c03f24d84e598
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jun 29 16:58:59 2005 +0000
+Date: 2005-06-29 16:58:59 +0000
2005-06-29 Colin Walters <walters@verbum.org>
commit f2f505e8027bd4ef84b051ad9cd84ab86524b530
Author: Colin Walters <walters@verbum.org>
-Date: Mon Jun 27 18:20:20 2005 +0000
+Date: 2005-06-27 18:20:20 +0000
2005-06-27 Colin Walters <walters@verbum.org>
(dbus_g_object_register_marshaller_array): Convert to fundamental.
glib/dbus-gobject.c | 28 +++++++++++++++++++++-------
- 1 files changed, 21 insertions(+), 7 deletions(-)
+ 1 file changed, 21 insertions(+), 7 deletions(-)
commit f0480850590afa233d7e1ad2b0c8250621c2bb9f
Author: Colin Walters <walters@verbum.org>
-Date: Sun Jun 26 17:02:09 2005 +0000
+Date: 2005-06-26 17:02:09 +0000
2005-06-26 Colin Walters <walters@verbum.org>
glib/.cvsignore | 1 +
glib/Makefile.am | 8 +++
glib/dbus-glib.c | 109
- ++++++++++++++++++++++++++++++----
+ ++++++++++++++++++++++++++++++-----
glib/dbus-gmain.c | 2 +-
- glib/dbus-gobject.c | 15 ++++-
+ glib/dbus-gobject.c | 15 +++--
glib/dbus-gparser.c | 2 +-
glib/dbus-gproxy.c | 6 +-
- glib/make-dbus-glib-error-switch.sh | 29 +++++++++
+ glib/make-dbus-glib-error-switch.sh | 29 ++++++++++
8 files changed, 150 insertions(+), 22 deletions(-)
commit ce03d4c9e9be4724a3255085b5ab5e51d9b9c196
Author: Colin Walters <walters@verbum.org>
-Date: Wed Jun 22 23:35:32 2005 +0000
+Date: 2005-06-22 23:35:32 +0000
2005-06-22 Colin Walters <walters@verbum.org>
* glib/dbus-gobject.c (dbus_g_method_return): Free out_sig.
glib/dbus-gobject.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 6d152f08fa90bdc14d75b9091cccd5422faf3f11
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jun 21 01:18:25 2005 +0000
+Date: 2005-06-21 01:18:25 +0000
2005-06-20 Colin Walters <walters@verbum.org>
glib/Makefile.am | 2 +
glib/examples/.cvsignore | 17 ++++
- glib/examples/Makefile.am | 34 +++++++
+ glib/examples/Makefile.am | 34 ++++++++
glib/examples/example-client.c | 107 +++++++++++++++++++++++
glib/examples/example-service.c | 138
++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++
glib/examples/example-signal-emitter.xml | 13 +++
glib/examples/example-signal-recipient.c | 103 ++++++++++++++++++++++
- 9 files changed, 565 insertions(+), 0 deletions(-)
+ 9 files changed, 565 insertions(+)
commit ad05d7aa3b298fdc6c214550944e9aa1464a1e43
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jun 21 00:30:20 2005 +0000
+Date: 2005-06-21 00:30:20 +0000
2005-06-20 Colin Walters <walters@verbum.org>
commit 17ba4df65fdf4a7b65eedd2a4f10e616dd1b186c
Author: Colin Walters <walters@verbum.org>
-Date: Mon Jun 20 19:54:21 2005 +0000
+Date: 2005-06-20 19:54:21 +0000
2005-06-20 Colin Walters <walters@verbum.org>
so.
glib/dbus-gobject.c | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
commit 01b89e61b5b98ad983babb506c9856aeadef2562
Author: Murray Cumming <murrayc@murrayc.com>
-Date: Sun Jun 19 15:31:25 2005 +0000
+Date: 2005-06-19 15:31:25 +0000
2005-06-18 Murray Cumming <murrayc@murrayc.com>
commit da18702f63a9f33d4f929113b6361062a86443a6
Author: Colin Walters <walters@verbum.org>
-Date: Fri Jun 17 14:29:48 2005 +0000
+Date: 2005-06-17 14:29:48 +0000
2005-06-17 Colin Walters <walters@verbum.org>
* doc/TODO: Remove two GLib TODO items fixed by this
patch.
- glib/dbus-binding-tool-glib.c | 88 ++++++--
+ glib/dbus-binding-tool-glib.c | 88 +++++--
glib/dbus-gobject.c | 547
++++++++++++++++++++++++-----------------
glib/dbus-gproxy.c | 3 +
commit 5c64ac1e7abcb7013c640d8aa6621319341f228d
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 16 19:50:24 2005 +0000
+Date: 2005-06-16 19:50:24 +0000
2005-06-16 Colin Walters <walters@verbum.org>
glib/dbus-binding-tool-glib.c | 1 +
glib/dbus-gobject.c | 1 +
glib/dbus-gproxy.c | 1 +
- 3 files changed, 3 insertions(+), 0 deletions(-)
+ 3 files changed, 3 insertions(+)
commit 87556105e7b984f8e56fc75d5c5ede8a69d63d12
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 16 19:45:49 2005 +0000
+Date: 2005-06-16 19:45:49 +0000
2005-06-16 Colin Walters <walters@verbum.org>
Patch based on a patch from Ryan Gammon.
glib/dbus-gobject.c | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
+ 1 file changed, 6 insertions(+), 5 deletions(-)
commit b274594d1f15e23be62d3ae2693524652ff58752
Author: Colin Walters <walters@verbum.org>
-Date: Thu Jun 16 04:38:11 2005 +0000
+Date: 2005-06-16 04:38:11 +0000
2005-06-16 Colin Walters <walters@verbum.org>
values as the empty string (#2948).
glib/dbus-gvalue.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
commit 702f09f4f45225f603a6d17ae77c3360c428855a
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jun 14 15:55:10 2005 +0000
+Date: 2005-06-14 15:55:10 +0000
2005-06-14 Colin Walters <walters@verbum.org>
* glib/dbus-gobject.c:
* glib/dbus-gvalue.c: Fix indentation and brace style.
- glib/dbus-binding-tool-glib.c | 74 +++++++++-------
+ glib/dbus-binding-tool-glib.c | 74 ++++++++--------
glib/dbus-gobject.c | 190
+++++++++++++++++++++--------------------
- glib/dbus-gvalue.c | 11 ++-
+ glib/dbus-gvalue.c | 11 +--
3 files changed, 145 insertions(+), 130 deletions(-)
commit ceb44c57e8ebc78ef420597bae484f7713c2e8bf
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jun 14 15:49:43 2005 +0000
+Date: 2005-06-14 15:49:43 +0000
2005-06-14 Ross Burton <ross@burtonini.com>.
commit 72b52186a73aac9f4d0ae1868fe1dedcedf3a6e6
Author: Colin Walters <walters@verbum.org>
-Date: Tue Jun 14 14:23:56 2005 +0000
+Date: 2005-06-14 14:23:56 +0000
2005-06-14 Colin Walters <walters@verbum.org>
Add missing return statements, noticed by Ross Burton.
glib/dbus-gobject.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
commit 40617899dc08750ab5a8cd0fb176dc2111a95420
Author: Colin Walters <walters@verbum.org>
-Date: Mon Jun 13 15:36:31 2005 +0000
+Date: 2005-06-13 15:36:31 +0000
2005-06-13 Ross Burton <ross@burtonini.com>.
commit fc23d39a292cee7d4f9ee9a1df0c0141c69d0942
Author: Colin Walters <walters@verbum.org>
-Date: Mon Jun 13 15:34:05 2005 +0000
+Date: 2005-06-13 15:34:05 +0000
2005-06-13 Colin Walters <walters@verbum.org>
* glib/Makefile.am: Fix thinko in last patch.
glib/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit 7c42065c67e99716130a5dec4e493bce3ccc9aaa
Author: Colin Walters <walters@verbum.org>
-Date: Mon Jun 13 14:56:51 2005 +0000
+Date: 2005-06-13 14:56:51 +0000
2005-06-13 Colin Walters <walters@verbum.org>
install them.
glib/Makefile.am | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
commit 8bcbafe775d6bc63290c5c73f138c1511b104c70
Author: Colin Walters <walters@verbum.org>
-Date: Mon Jun 13 03:01:17 2005 +0000
+Date: 2005-06-13 03:01:17 +0000
2005-06-12 Colin Walters <walters@verbum.org>
glib/dbus-binding-tool-glib.c | 642 +++++++++++++++---
glib/dbus-binding-tool-glib.h | 1 +
glib/dbus-gmain.c | 29 +
- glib/dbus-gobject.c | 599 ++++++++++++++---
+ glib/dbus-gobject.c | 599 +++++++++++++---
glib/dbus-gobject.h | 10 +-
- glib/dbus-gproxy.c | 789 ++++++++++++----------
+ glib/dbus-gproxy.c | 789 +++++++++++----------
glib/dbus-gtype-specialized.c | 441 ++++++++++++
glib/dbus-gtype-specialized.h | 104 +++
glib/dbus-gvalue-utils.c | 715 +++++++++++++++++++
glib/dbus-gvalue-utils.h | 70 ++
glib/dbus-gvalue.c | 1508
- +++++++++++++++++++++++++++++++++++-----
+ +++++++++++++++++++++++++++++++++++------
glib/dbus-gvalue.h | 55 +-
13 files changed, 4185 insertions(+), 784 deletions(-)
commit 4bc350fedd536bc187768a7bfa2455aae7474f74
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Mon May 16 21:27:03 2005 +0000
+Date: 2005-05-16 21:27:03 +0000
* glib/dbus-gmain.c (io_handler_dispatch): fix deadlock when using
recursive g_main_loops
networking framework to integrate dbus.
glib/dbus-gmain.c | 8 +-------
- 1 files changed, 1 insertions(+), 7 deletions(-)
+ 1 file changed, 1 insertion(+), 7 deletions(-)
commit 3c7dcbf8f47d3061fccdc315716c90a0b69a470f
Author: Colin Walters <walters@verbum.org>
-Date: Wed May 11 19:02:31 2005 +0000
+Date: 2005-05-11 19:02:31 +0000
2005-05-11 Ross Burton <ross@burtonini.com>
commit 55263b490f4dba73b1590939be2b087856487054
Author: Colin Walters <walters@verbum.org>
-Date: Tue May 3 17:45:29 2005 +0000
+Date: 2005-05-03 17:45:29 +0000
2005-05-03 Ross Burton <ross@burtonini.com>
(unregister_gobject): New function.
glib/dbus-gobject.c | 18 ++++++++++++++----
- 1 files changed, 14 insertions(+), 4 deletions(-)
+ 1 file changed, 14 insertions(+), 4 deletions(-)
commit 260e1fecf1690bb12c5bf7d5ddf793d79a1efed5
Author: David Zeuthen <david@fubar.dk>
-Date: Tue Apr 19 03:35:19 2005 +0000
+Date: 2005-04-19 03:35:19 +0000
2005-04-18 David Zeuthen <davidz@redhat.com>
Also unref the source to avoid memory leaks.
glib/dbus-gmain.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
commit 56288b6e3a9e5f8bd8920c5f7dac2a2b64842b15
Author: Havoc Pennington <hp@redhat.com>
-Date: Wed Apr 13 14:10:21 2005 +0000
+Date: 2005-04-13 14:10:21 +0000
2005-04-13 Havoc Pennington <hp@redhat.com>
#2953 from Benjamin Otte
glib/dbus-gmain.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
commit ca2ab9616ed7c6e936e495e64303f77956cb6b82
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Apr 9 23:50:58 2005 +0000
+Date: 2005-04-09 23:50:58 +0000
2005-04-09 Havoc Pennington <hp@redhat.com>
glib/dbus-binding-tool-glib.c | 3 +++
glib/dbus-glib-tool.c | 1 +
- 2 files changed, 4 insertions(+), 0 deletions(-)
+ 2 files changed, 4 insertions(+)
commit b34961c0e5a75ff9f70e0ba439a96d993456ef92
Author: David Zeuthen <david@fubar.dk>
-Date: Wed Apr 6 17:36:47 2005 +0000
+Date: 2005-04-06 17:36:47 +0000
2005-04-05 David Zeuthen <davidz@redhat.com>
from the list synchronously
glib/dbus-gmain.c | 14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
+ 1 file changed, 6 insertions(+), 8 deletions(-)
commit 681e7deee9a01c1f315b0066b87204e0da207d99
Author: Colin Walters <walters@verbum.org>
-Date: Thu Mar 17 17:48:29 2005 +0000
+Date: 2005-03-17 17:48:29 +0000
2005-03-17 Colin Walters <walters@verbum.org>
glib/.cvsignore | 1 -
glib/Makefile.am | 8 --------
- 2 files changed, 0 insertions(+), 9 deletions(-)
+ 2 files changed, 9 deletions(-)
commit 1cc2659deb9f108f449ad3ca8f18bff743a4cd81
Author: Colin Walters <walters@verbum.org>
-Date: Sat Mar 12 20:07:21 2005 +0000
+Date: 2005-03-12 20:07:21 +0000
2005-03-12 Colin Walters <walters@verbum.org>
glib/Makefile.am | 2 +-
glib/dbus-binding-tool-glib.c | 64
- +++++++++++++++++++++++++++++++++++-----
+ +++++++++++++++++++++++++++++++++++------
glib/dbus-binding-tool-glib.h | 2 +-
glib/dbus-glib-tool.c | 6 +++-
4 files changed, 63 insertions(+), 11 deletions(-)
commit c5247484ea45ef9b6b3449a71e3ea80b86de03ad
Author: Colin Walters <walters@verbum.org>
-Date: Sat Mar 12 16:33:00 2005 +0000
+Date: 2005-03-12 16:33:00 +0000
2005-03-11 Colin Walters <walters@verbum.org>
glib/.cvsignore | 1 +
glib/Makefile.am | 8 ++++++++
- 2 files changed, 9 insertions(+), 0 deletions(-)
+ 2 files changed, 9 insertions(+)
commit 10dc75239d071c49622972d061ff7546ed169bc5
Author: Colin Walters <walters@verbum.org>
-Date: Wed Mar 9 17:09:11 2005 +0000
+Date: 2005-03-09 17:09:11 +0000
2005-03-09 Colin Walters <walters@verbum.org>
* glib/dbus-gvalue.h: Remove dbus_gvalue_binding_type_from_type,
add dbus_gvalue_store.
- glib/dbus-binding-tool-glib.c | 73 +++++++-----
+ glib/dbus-binding-tool-glib.c | 73 ++++++------
glib/dbus-gproxy.c | 205 +++++++++++++++++++++++++++++++++
glib/dbus-gvalue.c | 254
+++++++++++++++++++++++------------------
commit 61b05621beeb5a929bf68b95fdb9cb63516c1c7e
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Mon Mar 7 21:10:46 2005 +0000
+Date: 2005-03-07 21:10:46 +0000
* NEWS: Update for 0.31
* glib/Makefile.am: soname bump for libdbus-glib
glib/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit be6ef9488ddc1b9fd3fc303cccf6e6618450be89
Author: Colin Walters <walters@verbum.org>
-Date: Sun Feb 27 17:38:12 2005 +0000
+Date: 2005-02-27 17:38:12 +0000
2005-02-27 Colin Walters <walters@verbum.org>
introspection format.
glib/dbus-binding-tool-glib.c | 20 ++++++------
- glib/dbus-gidl.c | 18 ++++++----
- glib/dbus-gidl.h | 8 ++--
- glib/dbus-glib-tool.c | 8 ++--
+ glib/dbus-gidl.c | 18 ++++++-----
+ glib/dbus-gidl.h | 8 ++---
+ glib/dbus-glib-tool.c | 8 ++---
glib/dbus-gobject.c | 69
++++++++-------------------------------
glib/dbus-gparser.c | 72
- +++++++++-------------------------------
+ +++++++++--------------------------------
glib/dbus-gutils.c | 42 ------------------------
glib/dbus-gutils.h | 1 -
glib/dbus-gvalue.c | 71
commit 662755210c931da87972398ded13d4651e3d3fec
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Thu Feb 24 22:01:34 2005 +0000
+Date: 2005-02-24 22:01:34 +0000
glib/Makefile.am: added dbus-gobject.h to sources list
so distcheck doesn't fail
glib/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit 0573676ce932874b07780036eaeaa42a6f3e1628
Author: Colin Walters <walters@verbum.org>
-Date: Sat Feb 19 23:25:41 2005 +0000
+Date: 2005-02-19 23:25:41 +0000
2005-02-19 Colin Walters <walters@verbum.org>
commit 7ff788981218b324d0eeec16fa4b7bb9ec97d694
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Feb 19 16:17:29 2005 +0000
+Date: 2005-02-19 16:17:29 +0000
2005-02-19 Havoc Pennington <hp@redhat.com>
commit 03186401718758948242881cf429bdbb48eb8474
Author: Colin Walters <walters@verbum.org>
-Date: Fri Feb 18 03:14:33 2005 +0000
+Date: 2005-02-18 03:14:33 +0000
2005-02-17 Colin Walters <walters@verbum.org>
commit a6e8deb82f6202628fcb3b9b3a616d0a98598474
Author: Colin Walters <walters@verbum.org>
-Date: Thu Feb 17 21:19:48 2005 +0000
+Date: 2005-02-17 21:19:48 +0000
2005-02-17 Colin Walters <walters@verbum.org>
commit b085dcd0556e82c8fe347cc4bedd2e5b9b876a95
Author: Colin Walters <walters@verbum.org>
-Date: Thu Feb 17 21:11:18 2005 +0000
+Date: 2005-02-17 21:11:18 +0000
2005-02-17 Colin Walters <walters@verbum.org>
* test/glib/test-service-glib.xml: Make validate against new DTD.
- glib/dbus-binding-tool-glib.c | 10 ++--
+ glib/dbus-binding-tool-glib.c | 10 ++---
glib/dbus-binding-tool-glib.h | 2 +
glib/dbus-gidl.c | 60 ++++++++++++++--------------
- glib/dbus-gidl.h | 24 ++++++------
+ glib/dbus-gidl.h | 24 +++++------
glib/dbus-glib-tool.c | 30 +++++++-------
glib/dbus-gparser.c | 88
- ++++++++++++++++++++++++++++++++++++----
+ ++++++++++++++++++++++++++++++++++++-----
6 files changed, 143 insertions(+), 71 deletions(-)
commit 87e81b87d7b443142302ecb48e46191a443ae02a
Author: Colin Walters <walters@verbum.org>
-Date: Thu Feb 17 17:41:24 2005 +0000
+Date: 2005-02-17 17:41:24 +0000
2005-02-17 Colin Walters <walters@verbum.org>
glib/dbus-gutils.c | 28 ++
glib/dbus-gutils.h | 1 +
glib/dbus-gvalue.c | 171 ++++++++-
- glib/dbus-gvalue.h | 28 ++-
+ glib/dbus-gvalue.h | 28 +-
15 files changed, 1889 insertions(+), 122 deletions(-)
commit dd22216537d98b06366ade81eb6f63621d4c6379
Author: Havoc Pennington <hp@redhat.com>
-Date: Wed Feb 16 04:37:27 2005 +0000
+Date: 2005-02-16 04:37:27 +0000
2005-02-15 Havoc Pennington <hp@redhat.com>
with this
glib/dbus-gproxy.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ 1 file changed, 4 insertions(+), 1 deletion(-)
commit 3ce5325735aae6b1d4e6a28b45465a586710d23e
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Feb 12 20:27:45 2005 +0000
+Date: 2005-02-12 20:27:45 +0000
2005-02-12 Havoc Pennington <hp@redhat.com>
glib/dbus-gidl.c | 12 ++++++++++++
glib/dbus-gidl.h | 2 ++
glib/dbus-gparser.c | 13 ++++++++++++-
- 3 files changed, 26 insertions(+), 1 deletions(-)
+ 3 files changed, 26 insertions(+), 1 deletion(-)
commit 89113d257f1f75cea5d0f39bbca4785afc784bf2
Author: Havoc Pennington <hp@redhat.com>
-Date: Thu Feb 10 23:47:54 2005 +0000
+Date: 2005-02-10 23:47:54 +0000
2005-02-10 Havoc Pennington <hp@redhat.com>
have no_update so we can find this bug quickly in future
glib/dbus-gthread.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
commit 116d931394d42412595e64185cd9cb97444cd653
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Feb 5 04:15:57 2005 +0000
+Date: 2005-02-05 04:15:57 +0000
2005-02-04 Havoc Pennington <hp@redhat.com>
g_return_if_fail() checks
glib/dbus-gproxy.c | 59
- ++++++++++++++++++++++++++++++++++++++++-----------
- 1 files changed, 46 insertions(+), 13 deletions(-)
+ ++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 46 insertions(+), 13 deletions(-)
commit 1fdc099a4ed729871597c501a9015ec2855bebc2
Author: Havoc Pennington <hp@redhat.com>
-Date: Mon Jan 31 23:17:18 2005 +0000
+Date: 2005-01-31 23:17:18 +0000
2005-01-31 Havoc Pennington <hp@redhat.com>
glib/dbus-gproxy.c | 334
++++++++++++++++++++++++++++++----------------------
- 1 files changed, 194 insertions(+), 140 deletions(-)
+ 1 file changed, 194 insertions(+), 140 deletions(-)
commit 463fb506e9661849d9838aedbdf4b7febe8e132e
Author: Havoc Pennington <hp@redhat.com>
-Date: Mon Jan 31 02:55:12 2005 +0000
+Date: 2005-01-31 02:55:12 +0000
2005-01-30 Havoc Pennington <hp@redhat.com>
commit c39a68d373c1f73a3bb7d0f45287cee1cd8eff55
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jan 30 23:06:32 2005 +0000
+Date: 2005-01-30 23:06:32 +0000
2005-01-30 Havoc Pennington <hp@redhat.com>
glib/dbus-glib.c | 335
++++++++++++++++++++++++++++++++++++++++++++++++++++
glib/dbus-gmain.c | 172 ---------------------------
- glib/dbus-gproxy.c | 32 +-----
+ glib/dbus-gproxy.c | 32 +----
3 files changed, 338 insertions(+), 201 deletions(-)
commit 967f6acd6c220b0be691edd18d9a636f4d16fbaf
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jan 30 20:06:52 2005 +0000
+Date: 2005-01-30 20:06:52 +0000
2005-01-30 Havoc Pennington <hp@redhat.com>
glib/dbus-gmain.c | 93
+++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 files changed, 86 insertions(+), 7 deletions(-)
+ 1 file changed, 86 insertions(+), 7 deletions(-)
commit af3c2731c74f014c0713a52d66027a9428c1ddaf
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jan 30 19:33:29 2005 +0000
+Date: 2005-01-30 19:33:29 +0000
2005-01-30 Havoc Pennington <hp@redhat.com>
custom source, seems to be a lot easier to understand and work
better.
- glib/dbus-gmain.c | 657
+ glib/dbus-gmain.c | 653
+++++++++++++++++++++++++----------------------------
- 1 files changed, 315 insertions(+), 342 deletions(-)
+ 1 file changed, 313 insertions(+), 340 deletions(-)
commit 32587c38401f16a9477f7ea7868120645d072462
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jan 30 18:25:14 2005 +0000
+Date: 2005-01-30 18:25:14 +0000
2005-01-30 Havoc Pennington <hp@redhat.com>
finalize handlers that remove all the watches.
glib/dbus-gmain.c | 90
- +++++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 74 insertions(+), 16 deletions(-)
+ +++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 74 insertions(+), 16 deletions(-)
commit 4b7acbbfacaa37ce399df1ce616920c09750ae60
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jan 30 07:44:08 2005 +0000
+Date: 2005-01-30 07:44:08 +0000
2005-01-30 Havoc Pennington <hp@redhat.com>
commit 71181795196712bbb64d721464f42432997c7d0c
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jan 30 05:18:44 2005 +0000
+Date: 2005-01-30 05:18:44 +0000
2005-01-30 Havoc Pennington <hp@redhat.com>
(dbus_g_pending_call_unref): add
glib/dbus-gidl.c | 14 ++++++++++
- glib/dbus-gidl.h | 3 ++
+ glib/dbus-gidl.h | 3 +++
glib/dbus-gloader-expat.c | 4 +++
- glib/dbus-gobject.c | 16 ++++++-----
+ glib/dbus-gobject.c | 16 +++++++-----
glib/dbus-gproxy.c | 62
- +++++++++++++++++++++++++++++++++++++++-----
- glib/dbus-gutils.c | 20 +++++++++-----
+ ++++++++++++++++++++++++++++++++++++++++-----
+ glib/dbus-gutils.c | 20 ++++++++++-----
6 files changed, 98 insertions(+), 21 deletions(-)
commit 3593b814632b482b541ccf3adb2b31887028b234
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Jan 29 20:12:21 2005 +0000
+Date: 2005-01-29 20:12:21 +0000
2005-01-29 Havoc Pennington <hp@redhat.com>
Get/Set a property
glib/dbus-gobject.c | 28 ++++++++++++++++++++++++++--
- 1 files changed, 26 insertions(+), 2 deletions(-)
+ 1 file changed, 26 insertions(+), 2 deletions(-)
commit 426cf6b944282d16db0d88b230627793df52f1ad
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Jan 29 19:52:19 2005 +0000
+Date: 2005-01-29 19:52:19 +0000
2005-01-29 Havoc Pennington <hp@redhat.com>
commit 54c56014a0d2dab88f1fa3bd17a7c1fd2768c4e9
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri Jan 28 03:06:55 2005 +0000
+Date: 2005-01-28 03:06:55 +0000
2005-01-27 Havoc Pennington <hp@redhat.com>
commit 459e046b1ca4bdd06d85458fd4f213354833d1ed
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri Jan 21 05:06:10 2005 +0000
+Date: 2005-01-21 05:06:10 +0000
2005-01-21 Havoc Pennington <hp@redhat.com>
* dbus/dbus.h: note that libdbus is the low-level API
glib/dbus-gmain.c | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
+ 1 file changed, 7 insertions(+), 5 deletions(-)
commit 8cecb5bad77434129fc751c2ace45c389f46ef0d
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Jan 18 20:42:15 2005 +0000
+Date: 2005-01-18 20:42:15 +0000
2005-01-18 Havoc Pennington <hp@redhat.com>
glib/dbus-gproxy.c | 171
+++++++++++++++++++++++++++-------------------------
- 1 files changed, 88 insertions(+), 83 deletions(-)
+ 1 file changed, 88 insertions(+), 83 deletions(-)
commit 40c882bcb60faeee24e3e887f3503e9ecb878166
Author: Havoc Pennington <hp@redhat.com>
-Date: Mon Jan 17 19:49:52 2005 +0000
+Date: 2005-01-17 19:49:52 +0000
2005-01-17 Havoc Pennington <hp@redhat.com>
are marshaling/unmarshaling a boolean.
glib/dbus-gvalue.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
commit c8c3d8a243f6b284b3aa46352afb9fb913f09f78
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jan 16 15:51:55 2005 +0000
+Date: 2005-01-16 15:51:55 +0000
2005-01-16 Havoc Pennington <hp@redhat.com>
commit e116119209a507a5ba305e890f897d31e5b626e1
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Jan 15 07:15:38 2005 +0000
+Date: 2005-01-15 07:15:38 +0000
2005-01-15 Havoc Pennington <hp@redhat.com>
commit 62f29fd0fea8e1eaa3e61db44ddd1eeba765f153
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Nov 13 07:07:46 2004 +0000
+Date: 2004-11-13 07:07:46 +0000
2004-11-13 Havoc Pennington <hp@redhat.com>
tests and so forth
glib/dbus-gmain.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 0ab857b2916731f92be856c6821d5c9950716f89
Author: Olivier Andrieu <oliv__a@users.sourceforge.net>
-Date: Thu Oct 7 09:56:01 2004 +0000
+Date: 2004-10-07 09:56:01 +0000
* dbus/dbus-sysdeps.c (_dbus_file_get_contents): fix an incorrect
format string.
(bug #1540, Leonardo Boiko).
glib/dbus-gmain.c | 9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
+ 1 file changed, 4 insertions(+), 5 deletions(-)
commit 4b50c510605d5dda629c9d493a61611bb382a55d
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Aug 10 03:06:59 2004 +0000
+Date: 2004-08-10 03:06:59 +0000
2004-08-09 Havoc Pennington <hp@redhat.com>
commit 301a3547a2efd9784fa3ab253373fa689c9bd1c3
Author: Olivier Andrieu <oliv__a@users.sourceforge.net>
-Date: Thu Jul 29 08:00:45 2004 +0000
+Date: 2004-07-29 08:00:45 +0000
* bus/config-loader-libxml.c: complete the implementation of libxml
Hämäläinen.
glib/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit ef7e145899ce58a5df564127783f014d8bed233f
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jun 20 15:28:14 2004 +0000
+Date: 2004-06-20 15:28:14 +0000
2004-06-20 Havoc Pennington <hp@redhat.com>
glib/dbus-glib-tool.c | 2 +-
glib/dbus-glib.c | 67 ++++++++++++++
glib/dbus-glib.h | 159 --------------------------------
- glib/dbus-gmain.c | 121 +++++++++++++++++++++++--
+ glib/dbus-gmain.c | 121 ++++++++++++++++++++++--
glib/dbus-gobject.c | 17 ++--
glib/dbus-gproxy.c | 237
+++++++++++++++++++++++++-----------------------
commit 9426e419227a721a8b7b04661ec133cb93c389e5
Author: Olivier Andrieu <oliv__a@users.sourceforge.net>
-Date: Sat Jun 5 16:32:00 2004 +0000
+Date: 2004-06-05 16:32:00 +0000
2004-06-05 Olivier Andrieu <oliv__a@users.sourceforge.net>
* glib/dbus-gobject.c, test/test-service.c: update accordingly.
glib/dbus-gobject.c | 16 +++-------------
- 1 files changed, 3 insertions(+), 13 deletions(-)
+ 1 file changed, 3 insertions(+), 13 deletions(-)
commit b2a4e237f907acd5127f85d0e2110b32d8a7ea86
Author: Kristian Hogsberg <krh@redhat.com>
-Date: Wed Jun 2 13:13:14 2004 +0000
+Date: 2004-06-02 13:13:14 +0000
2004-06-02 Kristian Hÿÿgsberg <krh@redhat.com>
commit 05a2332400f9e23d84e7376b9908f19a59868d5d
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Jun 1 03:02:26 2004 +0000
+Date: 2004-06-01 03:02:26 +0000
2004-05-31 Havoc Pennington <hp@redhat.com>
commit c02ba470d7a212d7c51777c467eae808dd954f2f
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri May 28 22:30:04 2004 +0000
+Date: 2004-05-28 22:30:04 +0000
2004-05-28 Havoc Pennington <hp@redhat.com>
whether error_name passed in is a valid error name.
glib/dbus-gidl.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 1400b16528f4d0d8f6a60b199e5799eadb0ff0ea
Author: Michael Meeks <michael@ximian.com>
-Date: Fri May 28 13:10:35 2004 +0000
+Date: 2004-05-28 13:10:35 +0000
2004-05-28 Michael Meeks <michael@ximian.com>
(_dbus_marshal_basic_type, _dbus_marshal_basic_type_array): impl.
glib/dbus-gvalue.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
commit 7866137fa3b028e7a8e22f03998754c0967e1501
Author: Olivier Andrieu <oliv__a@users.sourceforge.net>
-Date: Thu Apr 15 22:08:04 2004 +0000
+Date: 2004-04-15 22:08:04 +0000
2004-04-15 Olivier Andrieu <oliv__a@users.sourceforge.net>
glib/dbus-gproxy.c | 55
++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 55 insertions(+), 0 deletions(-)
+ 1 file changed, 55 insertions(+)
commit e03a715a21237d70233d40a393958ec7d3d4027d
Author: Michael Meeks <michael@ximian.com>
-Date: Tue Apr 13 11:47:17 2004 +0000
+Date: 2004-04-13 11:47:17 +0000
2004-04-13 Michael Meeks <michael@ximian.com>
glib/dbus-gobject.c | 123
++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 82 insertions(+), 41 deletions(-)
+ 1 file changed, 82 insertions(+), 41 deletions(-)
commit e7e5d9377e54b9d26a59402197d26bb575c15976
Author: Michael Meeks <michael@ximian.com>
-Date: Mon Mar 29 13:24:50 2004 +0000
+Date: 2004-03-29 13:24:50 +0000
2004-03-29 Michael Meeks <michael@ximian.com>
glib/Makefile.am | 4 +-
glib/dbus-gobject.c | 187
- ++------------------------------------------------
+ +++------------------------------------------------
glib/dbus-gvalue.c | 115 +++++++++++++++++++++++++++++++
glib/dbus-gvalue.h | 16 +++++
4 files changed, 142 insertions(+), 180 deletions(-)
commit 82d9c846687c428fde8e517ca38d69642de9a66a
Author: Richard Hult <richard@imendio.com>
-Date: Tue Dec 2 10:44:21 2003 +0000
+Date: 2003-12-02 10:44:21 +0000
2003-12-02 Richard Hult <richard@imendio.com>
commit 64858892747bea931226f39dad9e063475bf3c89
Author: Mikael Hallendal <micke@imendio.com>
-Date: Thu Nov 27 01:25:49 2003 +0000
+Date: 2003-11-27 01:25:49 +0000
2003-11-26 Mikael Hallendal <micke@imendio.com>
commit f130073ef0a107d0b57695720f5a94d0e17ce38f
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Oct 21 05:46:51 2003 +0000
+Date: 2003-10-21 05:46:51 +0000
2003-10-20 Havoc Pennington <hp@redhat.com>
commit 756f88a96232ae730faca81feeb30fcd07458df9
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri Oct 17 16:23:19 2003 +0000
+Date: 2003-10-17 16:23:19 +0000
2003-10-16 Havoc Pennington <hp@redhat.com>
(coverage-report.txt): don't move the .da and .bbg files around
glib/dbus-gtest-main.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
commit aa0c367ff5214ddbb2578e5b290cfae6aa472a0d
Author: Havoc Pennington <hp@redhat.com>
-Date: Thu Oct 16 06:34:50 2003 +0000
+Date: 2003-10-16 06:34:50 +0000
2003-10-16 Havoc Pennington <hp@redhat.com>
instead of .conf.in again.
glib/dbus-gproxy.c | 26 ++++++++++++++++++++------
- 1 files changed, 20 insertions(+), 6 deletions(-)
+ 1 file changed, 20 insertions(+), 6 deletions(-)
commit 33689cc9f76ff14f77ba9b9d6e17094991fc2ba1
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Oct 12 05:59:39 2003 +0000
+Date: 2003-10-12 05:59:39 +0000
2003-10-12 Havoc Pennington <hp@pobox.com>
commit 6741526f3dedd835d9f0d7ae4beaa097016b0b9e
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri Oct 3 03:55:35 2003 +0000
+Date: 2003-10-03 03:55:35 +0000
2003-10-02 Havoc Pennington <hp@pobox.com>
than once on the same args
(dbus_bus_get_with_g_main): new function
- glib/dbus-glib.h | 14 ++++---
+ glib/dbus-glib.h | 14 ++++----
glib/dbus-gmain.c | 99
- ++++++++++++++++++++++++++++++++++++++++++++-------
- glib/dbus-gproxy.c | 8 ++--
+ ++++++++++++++++++++++++++++++++++++++++++++--------
+ glib/dbus-gproxy.c | 8 ++---
3 files changed, 97 insertions(+), 24 deletions(-)
commit b05fc993d8d813ca93fa2c49e4c8b7345613c8e0
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Sep 30 02:32:48 2003 +0000
+Date: 2003-09-30 02:32:48 +0000
2003-09-29 Havoc Pennington <hp@pobox.com>
glib/dbus-gidl.c | 524 +++++++++++++++++++
glib/dbus-gidl.h | 120 +++++
glib/dbus-glib-tool.c | 77 +++
- glib/dbus-glib.h | 121 +++++-
+ glib/dbus-glib.h | 121 ++++-
glib/dbus-gloader-expat.c | 262 ++++++++++
- glib/dbus-gmain.c | 100 ++++-
+ glib/dbus-gmain.c | 100 +++-
glib/dbus-gobject.c | 790 ++++++++++++++++++++++++++++
glib/dbus-gparser.c | 670 ++++++++++++++++++++++++
glib/dbus-gparser.h | 65 +++
commit c6510f49417e04522d9cc6a6c51331bef252aba0
Author: Anders Carlsson <andersca@gnome.org>
-Date: Tue Aug 5 13:57:20 2003 +0000
+Date: 2003-08-05 13:57:20 +0000
2003-08-05 Anders Carlsson <andersca@codefactory.se>
Refcount fds, fixes some reentrancy issues.
glib/dbus-gmain.c | 116
- +++++++++++++++++++++++++++++++++++-----------------
- 1 files changed, 78 insertions(+), 38 deletions(-)
+ +++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 78 insertions(+), 38 deletions(-)
commit a3c695d62bcfc46bd12f4165610649a604ed6166
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Jun 22 19:39:46 2003 +0000
+Date: 2003-06-22 19:39:46 +0000
2003-06-22 Havoc Pennington <hp@pobox.com>
commit 1284fea96df990975632f0a5d8d982ec5c974161
Author: Anders Carlsson <andersca@gnome.org>
-Date: Thu Jun 19 22:19:56 2003 +0000
+Date: 2003-06-19 22:19:56 +0000
2003-06-19 Anders Carlsson <andersca@codefactory.se>
from C++ (Patch by Miloslav Trmac).
glib/dbus-glib.h | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
commit 375ff8ffbed8683c1a46fab9c537ccb9e603e1d7
Author: Anders Carlsson <andersca@gnome.org>
-Date: Wed Jun 18 10:48:07 2003 +0000
+Date: 2003-06-18 10:48:07 +0000
Add .cvsignore files
glib/.cvsignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
commit b4dd1b2cb3e226ece5055bc2f24ef819db7d1b08
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat May 17 17:53:16 2003 +0000
+Date: 2003-05-17 17:53:16 +0000
2003-05-17 Havoc Pennington <hp@pobox.com>
together
glib/test-profile.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit ae655688473fc5e5d6a279b3e764a713fc73b8ca
Author: Havoc Pennington <hp@redhat.com>
-Date: Mon May 12 02:44:44 2003 +0000
+Date: 2003-05-12 02:44:44 +0000
2003-05-11 Havoc Pennington <hp@pobox.com>
(_dbus_string_init_preallocated): new function
glib/test-profile.c | 16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
+ 1 file changed, 12 insertions(+), 4 deletions(-)
commit b36dd8b35d932d01407b88e948c5196b49e31aa0
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun May 11 07:59:08 2003 +0000
+Date: 2003-05-11 07:59:08 +0000
2003-05-11 Havoc Pennington <hp@pobox.com>
commit 6f4b867ddd6cef070d65149a4d935b4a964987f1
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Apr 29 22:57:13 2003 +0000
+Date: 2003-04-29 22:57:13 +0000
2003-04-29 Havoc Pennington <hp@redhat.com>
public API docs section
glib/dbus-gmain.c | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
commit 7d22e9a86a21e337a31ee42ccdb851ada88c0b40
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri Apr 25 20:41:49 2003 +0000
+Date: 2003-04-25 20:41:49 +0000
2003-04-25 Havoc Pennington <hp@redhat.com>
were toggled without add/remove, fix from Anders Gustafsson
glib/dbus-gmain.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
commit 36a6a6bc4edb1b3280e405b0addb9113dc09de5c
Author: Havoc Pennington <hp@redhat.com>
-Date: Thu Apr 24 19:18:22 2003 +0000
+Date: 2003-04-24 19:18:22 +0000
2003-04-24 Havoc Pennington <hp@redhat.com>
commit eb553e370e7651a3104038cbba7ebb7a502118e7
Author: James Willcox <jwillcox@gnome.org>
-Date: Thu Apr 24 02:22:49 2003 +0000
+Date: 2003-04-24 02:22:49 +0000
2003-04-23 James Willcox <jwillcox@gnome.org>
commit 62cc9827dee1d9fa052a11ce259acc7d1d2dcb9d
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri Apr 18 04:18:57 2003 +0000
+Date: 2003-04-18 04:18:57 +0000
2003-04-18 Havoc Pennington <hp@pobox.com>
etc.
glib/dbus-gmain.c | 9 ++-------
- 1 files changed, 2 insertions(+), 7 deletions(-)
+ 1 file changed, 2 insertions(+), 7 deletions(-)
commit 723f9251ee8892f05f4c94a9b0cfa864c5e56bae
Author: Alex Larsson <alexl@redhat.com>
-Date: Thu Apr 10 12:09:00 2003 +0000
+Date: 2003-04-10 12:09:00 +0000
2003-04-10 Alexander Larsson <alexl@redhat.com>
More tests.
glib/.cvsignore | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
commit f8c607ec8949388bd09136d0a6635190910a3e9a
Author: Alex Larsson <alexl@redhat.com>
-Date: Tue Apr 8 15:52:50 2003 +0000
+Date: 2003-04-08 15:52:50 +0000
2003-04-08 Alexander Larsson <alexl@redhat.com>
commit 4612ff9267417cf8860c233a59fe8ec249ee4a62
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Mar 25 04:37:07 2003 +0000
+Date: 2003-03-25 04:37:07 +0000
2003-03-24 Havoc Pennington <hp@redhat.com>
commit 9eb162678713477754e9d88eb68c156d336c80ab
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Mar 16 20:16:46 2003 +0000
+Date: 2003-03-16 20:16:46 +0000
2003-03-16 Havoc Pennington <hp@pobox.com>
dbus_connection_dispatch_message
glib/dbus-gmain.c | 64
- ++++++++++++++++++++++++++--------------------------
- 1 files changed, 32 insertions(+), 32 deletions(-)
+ ++++++++++++++++++++++++++---------------------------
+ 1 file changed, 32 insertions(+), 32 deletions(-)
commit 457dd574d5eda1286571f7070860c6feb56f184e
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Mar 15 20:47:16 2003 +0000
+Date: 2003-03-15 20:47:16 +0000
2003-03-15 Havoc Pennington <hp@pobox.com>
* glib/dbus-gmain.c: adapt to enable/disable watches and timeouts
glib/dbus-gmain.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 42 insertions(+), 2 deletions(-)
+ 1 file changed, 42 insertions(+), 2 deletions(-)
commit 0f748f23b6fd40ab314bdc4d18e631cde958c1d2
Author: Havoc Pennington <hp@redhat.com>
-Date: Sat Mar 15 02:19:01 2003 +0000
+Date: 2003-03-15 02:19:01 +0000
2003-03-14 Havoc Pennington <hp@redhat.com>
not quite passing yet
glib/dbus-gmain.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit a15287bc97819cca7b61cc18d6d69232bb05117d
Author: Havoc Pennington <hp@redhat.com>
-Date: Fri Mar 14 01:27:58 2003 +0000
+Date: 2003-03-14 01:27:58 +0000
2003-03-13 Havoc Pennington <hp@redhat.com>
didn't finish
glib/dbus-gmain.c | 28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
+ 1 file changed, 17 insertions(+), 11 deletions(-)
commit e0a3fe2914f611ef4d74bbc1ca39794f0f7ae575
Author: Havoc Pennington <hp@redhat.com>
-Date: Thu Mar 13 00:56:43 2003 +0000
+Date: 2003-03-13 00:56:43 +0000
2003-03-12 Havoc Pennington <hp@redhat.com>
commit 284daff1f103a303178243ca3e2dee960651fec0
Author: Alex Larsson <alexl@redhat.com>
-Date: Thu Feb 27 14:22:36 2003 +0000
+Date: 2003-02-27 14:22:36 +0000
2003-02-27 Alexander Larsson <alexl@redhat.com>
its not found.
glib/Makefile.am | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
+ 1 file changed, 7 insertions(+), 1 deletion(-)
commit b9589e9908d368cb064d1614e5c52239394414f4
Author: Alex Larsson <alexl@redhat.com>
-Date: Wed Feb 26 15:52:25 2003 +0000
+Date: 2003-02-26 15:52:25 +0000
2003-02-26 Alexander Larsson <alexl@redhat.com>
* glib/test-thread.h:
Initial cut at some thread test code. Not really done yet.
- glib/Makefile.am | 16 +++-
+ glib/Makefile.am | 16 ++-
glib/dbus-gmain.c | 13 ++-
glib/test-thread-client.c | 89 ++++++++++++++++
glib/test-thread-server.c | 246
commit c79213c6d3b041ce00bb00f24d4824e4a77f63ef
Author: Havoc Pennington <hp@redhat.com>
-Date: Wed Feb 26 06:42:57 2003 +0000
+Date: 2003-02-26 06:42:57 +0000
2003-02-26 Havoc Pennington <hp@pobox.com>
commit ebace7f90ea6b3d85a9140be3671ea527c3a5727
Author: Joe Shaw <joe@novell.com>
-Date: Tue Feb 18 22:51:35 2003 +0000
+Date: 2003-02-18 22:51:35 +0000
2003-02-18 Joe Shaw <joe@assbarn.com>
can fallback to a secondary auth mechanism if the first fails.
glib/test-dbus-glib.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
commit 2655a78cdf1114a686d3c2ee28025db133b287c3
Author: Anders Carlsson <andersca@gnome.org>
-Date: Sun Feb 16 12:57:26 2003 +0000
+Date: 2003-02-16 12:57:26 +0000
2003-02-16 Anders Carlsson <andersca@codefactory.se>
Make sure to remove the GSource when the connection is finalized.
glib/dbus-gmain.c | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
+ 1 file changed, 15 insertions(+)
commit 4fbaec0ff143d92f96fb60c585282b5cb03bdc76
Author: Havoc Pennington <hp@redhat.com>
-Date: Sun Feb 16 07:20:54 2003 +0000
+Date: 2003-02-16 07:20:54 +0000
2003-02-16 Havoc Pennington <hp@pobox.com>
we've been asked not to
glib/.cvsignore | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
commit 69a436d7913c1681eea397e768687fab736f9d7c
Author: Alex Larsson <alexl@redhat.com>
-Date: Sat Feb 15 16:25:08 2003 +0000
+Date: 2003-02-15 16:25:08 +0000
2003-02-15 Alexander Larsson <alexl@redhat.com>
commit 530cf7689515707b5430b3207da225320cf244c4
Author: Anders Carlsson <andersca@gnome.org>
-Date: Thu Feb 13 21:37:58 2003 +0000
+Date: 2003-02-13 21:37:58 +0000
2003-02-13 Anders Carlsson <andersca@codefactory.se>
Fix tyop.
glib/test-dbus-glib.c | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ 1 file changed, 3 deletions(-)
commit 044f4c6ed2170170d833d402079b90277893cd05
Author: Anders Carlsson <andersca@gnome.org>
-Date: Thu Feb 13 20:37:07 2003 +0000
+Date: 2003-02-13 20:37:07 +0000
2003-02-13 Anders Carlsson <andersca@codefactory.se>
Implement support for timeouts in dbus-glib.
glib/dbus-gmain.c | 22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ 1 file changed, 22 insertions(+)
commit 12d8e0d2d6aeb5f29ff8b51cdd4aae857d35d13f
Author: Alex Larsson <alexl@redhat.com>
-Date: Sat Feb 1 22:02:27 2003 +0000
+Date: 2003-02-01 22:02:27 +0000
2003-02-02 Alexander Larsson <alexl@redhat.com>
Makes qt code build again
glib/dbus-gmain.c | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
+ 1 file changed, 1 insertion(+), 4 deletions(-)
commit bb581faf87398e807a828f2686474869cd23757d
Author: Richard Hult <rhult@codefactory.de>
-Date: Sun Jan 26 00:06:30 2003 +0000
+Date: 2003-01-26 00:06:30 +0000
2003-01-26 Richard Hult <rhult@codefactory.se>
the file descriptor list, since it can change under us.
glib/dbus-gmain.c | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
+ 1 file changed, 8 insertions(+), 4 deletions(-)
commit 74cef08b5e2f2596cade4fc1027933d763cd13ae
Author: Anders Carlsson <andersca@gnome.org>
-Date: Sat Jan 25 21:22:57 2003 +0000
+Date: 2003-01-25 21:22:57 +0000
2003-01-25 Anders Carlsson <andersca@codefactory.se>
glib/dbus-gmain.c | 193
+++++++++++++++++++++++++++++++++++------------------
- 1 files changed, 128 insertions(+), 65 deletions(-)
+ 1 file changed, 128 insertions(+), 65 deletions(-)
commit 6f062c93ca19a73b34688488e76ec055d2bab2a0
Author: Anders Carlsson <andersca@gnome.org>
-Date: Fri Jan 24 23:51:58 2003 +0000
+Date: 2003-01-24 23:51:58 +0000
2003-01-25 Anders Carlsson <andersca@codefactory.se>
commit ea868ce1cd9328ffa31cd9419e23498771f8feb2
Author: Anders Carlsson <andersca@gnome.org>
-Date: Tue Jan 21 09:23:18 2003 +0000
+Date: 2003-01-21 09:23:18 +0000
2003-01-21 Anders Carlsson <andersca@codefactory.se>
commit f8a3cb6d30e74be85b583ce9ff3482f91cd26b9a
Author: Anders Carlsson <andersca@gnome.org>
-Date: Tue Jan 7 20:18:23 2003 +0000
+Date: 2003-01-07 20:18:23 +0000
2003-01-07 Anders Carlsson <andersca@codefactory.se>
Make messages sendable and receivable for real.
glib/test-dbus-glib.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
commit 9784f2653287c62f32a637f869ad0029412ebfae
Author: Anders Carlsson <andersca@gnome.org>
-Date: Fri Dec 27 08:26:26 2002 +0000
+Date: 2002-12-27 08:26:26 +0000
Ssh
glib/.cvsignore | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
commit c27a1609f595a75be3910c5185f7312cb93575c7
Author: Havoc Pennington <hp@redhat.com>
-Date: Tue Dec 24 06:37:32 2002 +0000
+Date: 2002-12-24 06:37:32 +0000
2002-12-24 Havoc Pennington <hp@pobox.com>
commit 723dc26c4880ae66688ff707588797e7c83b4fe4
Author: Anders Carlsson <andersca@gnome.org>
-Date: Mon Dec 16 01:43:52 2002 +0000
+Date: 2002-12-16 01:43:52 +0000
Doh
glib/dbus-glib.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
commit a2c39755d2c9749d22f547e9b92125509e95aae6
Author: Anders Carlsson <andersca@gnome.org>
-Date: Mon Dec 16 00:56:23 2002 +0000
+Date: 2002-12-16 00:56:23 +0000
2002-12-16 Anders Carlsson <andersca@codefactory.se>
commit 03900e96a260048f23176319003671c17b6a0013
Author: Anders Carlsson <andersca@gnome.org>
-Date: Mon Dec 16 00:26:05 2002 +0000
+Date: 2002-12-16 00:26:05 +0000
2002-12-16 Anders Carlsson <andersca@codefactory.se>
+++++++++++++++++++++++++++++++++++++++++++++++++
glib/dbus-gthread.c | 84 +++++++++++++++++++++
glib/test-dbus-glib.c | 60 +++++++++++++++
- 5 files changed, 404 insertions(+), 0 deletions(-)
+ 5 files changed, 404 insertions(+)
commit 7c0c11bfa019cd4be3f7a62fe936aaf2573fa51e
Author: John (J5) Palmieri <johnp@redhat.com>
-Date: Wed Jun 28 08:14:04 2006 -0400
+Date: 2006-06-28 08:14:04 -0400
Initial commit of module dbus-glib
- 0 files changed, 0 insertions(+), 0 deletions(-)
+ 0 files changed
+++ /dev/null
-# Doxyfile 0.1
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = D-BUS GLib Bindings
-PROJECT_NUMBER = @VERSION@
-OUTPUT_DIRECTORY = doc/api
-OUTPUT_LANGUAGE = English
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ALWAYS_DETAILED_SEC = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-INTERNAL_DOCS = NO
-STRIP_CODE_COMMENTS = YES
-CASE_SENSE_NAMES = YES
-SHORT_NAMES = NO
-HIDE_SCOPE_NAMES = NO
-VERBATIM_HEADERS = YES
-SHOW_INCLUDE_FILES = YES
-JAVADOC_AUTOBRIEF = YES
-INHERIT_DOCS = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 8
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-ALIASES =
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-OPTIMIZE_OUTPUT_FOR_C = YES
-SHOW_USED_FILES = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_FORMAT =
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = dbus
-FILE_PATTERNS = *.c *.h
-RECURSIVE = YES
-#EXCLUDE = test
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-
-EXCLUDE_PATTERNS = Makefile.* ChangeLog CHANGES CHANGES.* README \
- README.* *.png AUTHORS DESIGN DESIGN.* *.desktop \
- DESKTOP* COMMENTS HOWTO magic NOTES TODO THANKS
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT =
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT =
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT =
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = YES
-MAN_OUTPUT = man
-MAN_EXTENSION = .3dbus
-MAN_LINKS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = YES
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED = "DBUS_BEGIN_DECLS=" \
- "DBUS_END_DECLS=" \
- "DOXYGEN_SHOULD_SKIP_THIS" \
- "_DBUS_DEFINE_GLOBAL_LOCK(name)=" \
- "_DBUS_GNUC_PRINTF(from,to)="
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-PERL_PATH =
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-TEMPLATE_RELATIONS = YES
-HIDE_UNDOC_RELATIONS = YES
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-GRAPHICAL_HIERARCHY = YES
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 640
-MAX_DOT_GRAPH_HEIGHT = 1024
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
To make a release (please replace use of 0.76 with the new version)
-* Review git log, update NEWS file (this step may go away once someone writes a tool)
-* git commit NEWS
* make
* make distcheck
* edit configure.ac, change version to even (e.g. 0.75 -> 0.76)
+* also in configure.ac, update LT_CURRENT, LT_REVISION and LT_AGE
* ./autogen.sh
* make
* make distcheck
+* sign the tarball (or use: make dbus-glib-0.76.tar.gz.asc)
+* make maintainer-upload-release
* git commit -m "Release"
* git tag -a dbus-glib_0.76
-* scp resulting tarball to ssh://gabe.freedesktop.org/srv/dbus.freedesktop.org/releases/dbus-glib
* edit configure.ac, change version to odd (e.g. 0.76 -> 0.77)
* git commit -m "Bump version for development"
* Update the wiki: http://www.freedesktop.org/wiki/Software/DBusBindings
-* Announce the release on the mailing list
+* Announce the release on the mailing list, summarizing notable changes.
+
+NEWS is unmaintained.
EXTRA_DIST += ChangeLog
ChangeLog:
-$(srcdir)/ChangeLog: FORCE
+$(srcdir)/ChangeLog:
@if test -d "$(srcdir)/.git"; then \
(cd "$(srcdir)" && \
./missing --run git log --stat) | fmt --split-only > $@.tmp \
echo A git checkout and git-log are required to generate this file >> $@); \
fi
-all-local: Doxyfile
+%.tar.gz.asc: %.tar.gz
+ $(AM_V_GEN)gpg --detach-sign --armor $@
-if DBUS_GCOV_ENABLED
-clean-gcov:
- find -name "*.da" -o -name "*.gcov" | xargs rm || true
-
-clean-bbg:
- find -name "*.bbg" -o -name "*.bb" | xargs rm || true
-
-GCOV_DIRS=$(GLIB_SUBDIR)
-
-coverage-report.txt: FORCE
- BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg" -o -name "*.gcno"` ; \
- C_FILES= ; \
- for F in $$BBG_FILES ; do \
- F_nolibs=`echo $$F | sed -e 's/.libs\///g'` ; \
- C=`echo $$F_nolibs | sed -e 's/.bbg/.c/g' | sed -e 's/.gcno/.c/g'` ; \
- B=`basename $$F .bbg` ; \
- D=`dirname $$F` ; \
- DA=`echo $$F | sed -e 's/.bbg/.da/g'` ; \
- DA_libs=`echo $$D/.libs/$$B/.da` ; \
- if test -e $$DA || test -e $$DA_libs; then \
- C_FILES="$$C_FILES $$C" ; \
- fi ; \
- done ; \
- echo $$C_FILES ; \
- $(top_builddir)/test/decode-gcov --report $$C_FILES > coverage-report.txt
-
-check-coverage: clean-gcov all check coverage-report.txt
- cat coverage-report.txt
-
-else
-coverage-report.txt:
- echo "Need to reconfigure with --enable-gcov"
-
-check-coverage:
- echo "Need to reconfigure with --enable-gcov"
-
-endif
-
-FORCE:
+maintainer-upload-release:
+ test -f @PACKAGE@-@VERSION@.tar.gz
+ test -f @PACKAGE@-@VERSION@.tar.gz.asc
+ gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc
+ rsync -vzP @PACKAGE@-@VERSION@.tar.gz dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
+ rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc
+ rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(srcdir)/docs/reference/html/ \
+ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/@PACKAGE@/
+include tools/lcov.am
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
+# Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+#
+# Licensed under the Academic Free License version 2.1
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Alternatively, at your option, you can redistribute and/or modify
+# this single file under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1 of
+# that license, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Doxyfile.in \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(srcdir)/dbus-glib-1-uninstalled.pc.in \
- $(srcdir)/dbus-glib-1.pc.in $(top_srcdir)/configure \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/dbus-glib-1-uninstalled.pc.in \
+ $(srcdir)/dbus-glib-1.pc.in $(srcdir)/tools/lcov.am \
+ $(top_srcdir)/configure \
$(top_srcdir)/test/data/valid-service-files/debug-echo.service.in \
$(top_srcdir)/test/data/valid-service-files/debug-glib.service.in \
$(top_srcdir)/test/data/valid-service-files/interfaces-test.service.in \
AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
depcomp install-sh ltmain.sh missing
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
CONFIG_CLEAN_FILES = test/data/valid-service-files/debug-glib.service \
test/data/valid-service-files/debug-echo.service \
test/data/valid-service-files/interfaces-test.service \
- dbus-glib-1.pc dbus-glib-1-uninstalled.pc Doxyfile
+ dbus-glib-1.pc dbus-glib-1-uninstalled.pc
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
DATA = $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
ACLOCAL = @ACLOCAL@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
# Creating ChangeLog from git log:
MAINTAINERCLEANFILES = ChangeLog
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-checks --enable-tests
-@DBUS_GCOV_ENABLED_TRUE@GCOV_DIRS = $(GLIB_SUBDIR)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
+am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/tools/lcov.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
+$(srcdir)/tools/lcov.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status $@
dbus-glib-1-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/dbus-glib-1-uninstalled.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
-rm -f libtool config.lt
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__remove_distdir)
dist-lzma: distdir
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile $(DATA) config.h all-local
+all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
ctags-recursive install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am all-local am--refresh check check-am clean \
- clean-generic clean-libtool ctags ctags-recursive dist \
- dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-generic \
- distclean-hdr distclean-libtool distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-pkgconfigDATA \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-pkgconfigDATA
ChangeLog:
-$(srcdir)/ChangeLog: FORCE
+$(srcdir)/ChangeLog:
@if test -d "$(srcdir)/.git"; then \
(cd "$(srcdir)" && \
./missing --run git log --stat) | fmt --split-only > $@.tmp \
echo A git checkout and git-log are required to generate this file >> $@); \
fi
-all-local: Doxyfile
-
-@DBUS_GCOV_ENABLED_TRUE@clean-gcov:
-@DBUS_GCOV_ENABLED_TRUE@ find -name "*.da" -o -name "*.gcov" | xargs rm || true
-
-@DBUS_GCOV_ENABLED_TRUE@clean-bbg:
-@DBUS_GCOV_ENABLED_TRUE@ find -name "*.bbg" -o -name "*.bb" | xargs rm || true
-
-@DBUS_GCOV_ENABLED_TRUE@coverage-report.txt: FORCE
-@DBUS_GCOV_ENABLED_TRUE@ BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg" -o -name "*.gcno"` ; \
-@DBUS_GCOV_ENABLED_TRUE@ C_FILES= ; \
-@DBUS_GCOV_ENABLED_TRUE@ for F in $$BBG_FILES ; do \
-@DBUS_GCOV_ENABLED_TRUE@ F_nolibs=`echo $$F | sed -e 's/.libs\///g'` ; \
-@DBUS_GCOV_ENABLED_TRUE@ C=`echo $$F_nolibs | sed -e 's/.bbg/.c/g' | sed -e 's/.gcno/.c/g'` ; \
-@DBUS_GCOV_ENABLED_TRUE@ B=`basename $$F .bbg` ; \
-@DBUS_GCOV_ENABLED_TRUE@ D=`dirname $$F` ; \
-@DBUS_GCOV_ENABLED_TRUE@ DA=`echo $$F | sed -e 's/.bbg/.da/g'` ; \
-@DBUS_GCOV_ENABLED_TRUE@ DA_libs=`echo $$D/.libs/$$B/.da` ; \
-@DBUS_GCOV_ENABLED_TRUE@ if test -e $$DA || test -e $$DA_libs; then \
-@DBUS_GCOV_ENABLED_TRUE@ C_FILES="$$C_FILES $$C" ; \
-@DBUS_GCOV_ENABLED_TRUE@ fi ; \
-@DBUS_GCOV_ENABLED_TRUE@ done ; \
-@DBUS_GCOV_ENABLED_TRUE@ echo $$C_FILES ; \
-@DBUS_GCOV_ENABLED_TRUE@ $(top_builddir)/test/decode-gcov --report $$C_FILES > coverage-report.txt
-
-@DBUS_GCOV_ENABLED_TRUE@check-coverage: clean-gcov all check coverage-report.txt
-@DBUS_GCOV_ENABLED_TRUE@ cat coverage-report.txt
-
-@DBUS_GCOV_ENABLED_FALSE@coverage-report.txt:
-@DBUS_GCOV_ENABLED_FALSE@ echo "Need to reconfigure with --enable-gcov"
-
-@DBUS_GCOV_ENABLED_FALSE@check-coverage:
-@DBUS_GCOV_ENABLED_FALSE@ echo "Need to reconfigure with --enable-gcov"
-
-FORCE:
+%.tar.gz.asc: %.tar.gz
+ $(AM_V_GEN)gpg --detach-sign --armor $@
+
+maintainer-upload-release:
+ test -f @PACKAGE@-@VERSION@.tar.gz
+ test -f @PACKAGE@-@VERSION@.tar.gz.asc
+ gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc
+ rsync -vzP @PACKAGE@-@VERSION@.tar.gz dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
+ rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc
+ rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(srcdir)/docs/reference/html/ \
+ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/@PACKAGE@/
+
+lcov-reset:
+ lcov --directory @top_srcdir@ --zerocounters
+
+lcov-report:
+ lcov --directory @top_srcdir@ --capture \
+ --output-file @top_builddir@/lcov.info.tmp
+ lcov --directory @top_srcdir@ --output-file @top_builddir@/lcov.info \
+ --remove @top_builddir@/lcov.info.tmp '*-scan.c'
+ rm @top_builddir@/lcov.info.tmp
+ $(mkdir_p) @top_builddir@/lcov.html
+ git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\
+ genhtml --title "@PACKAGE_STRING@ $$git_commit" \
+ --output-directory @top_builddir@/lcov.html lcov.info
+ @echo
+ @echo 'lcov report can be found in:'
+ @echo 'file://@abs_top_builddir@/lcov.html/index.html'
+ @echo
+
+lcov-check:
+ $(MAKE) lcov-reset
+ $(MAKE) check $(LCOV_CHECK_ARGS)
+ $(MAKE) lcov-report
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--enable-asserts include assertion checks
--enable-checks include sanity checks on public API
--enable-xml-docs build XML documentation (requires xmlto)
- --enable-doxygen-docs build DOXYGEN documentation (requires Doxygen)
--enable-gcov compile with coverage profiling instrumentation (gcc only)
--with-xml=libxml/expat XML library to use
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
-[m4_warning([this file was generated for autoconf 2.66.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License. As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl.
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
- [AC_CHECK_HEADERS([locale.h])
- if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
-
- gt_cv_have_gettext=no
-
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
-
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
-
- #
- # First check in libc
- #
- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !ngettext ("","", 1)],
- gt_cv_func_ngettext_libc=yes,
- gt_cv_func_ngettext_libc=no)
- ])
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !dgettext ("","")],
- gt_cv_func_dgettext_libc=yes,
- gt_cv_func_dgettext_libc=no)
- ])
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
-
- #
- # If we don't have everything we want, check in libintl
- #
- if test "$gt_cv_func_dgettext_libc" != "yes" \
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
- AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
- AC_MSG_RESULT([])
- AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dcgettext,
- [gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv],
- :,-liconv)],
- :,-liconv)
- fi
-
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
- # and both have dgettext and ngettext
- #
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
- else
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
- gt_cv_func_dgettext_libintl=no
- fi
- fi
- fi
- fi
-
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
- gt_cv_have_gettext=yes
- fi
-
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs"
- fi
-
- if test "$gt_cv_have_gettext" = "yes"; then
- AC_DEFINE(HAVE_GETTEXT,1,
- [Define if the GNU gettext() function is already present or preinstalled.])
- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
- AC_CHECK_FUNCS(dcgettext)
- MSGFMT_OPTS=
- AC_MSG_CHECKING([if msgfmt accepts -c])
- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo@bar.xx>\n"
-"Language-Team: C <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
- AC_SUBST(MSGFMT_OPTS)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share and
- dnl and CATOBJEXT=.gmo in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
- DATADIRNAME=lib])
- ;;
- *)
- CATOBJEXT=.mo
- DATADIRNAME=lib
- ;;
- esac])
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
- gt_cv_have_gettext=no
- fi
- fi
- ])
-
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
- fi
-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
-
- # We need to process the po/ directory.
- POSUB=po
-
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
-
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.ac.
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
- AC_SUBST(CATOBJEXT)
- AC_SUBST(DATADIRNAME)
- AC_SUBST(GMOFILES)
- AC_SUBST(INSTOBJEXT)
- AC_SUBST(INTLLIBS)
- AC_SUBST(PO_IN_DATADIR_TRUE)
- AC_SUBST(PO_IN_DATADIR_FALSE)
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
-
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
- ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
-else
- localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
- [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_ac,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-#
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN([GLIB_RUN_PROG],
-[cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG([$1 conftest.foo]); then
- m4_ifval([$3], [$3], [:])
-m4_ifvaln([$4], [else $4])dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-
-
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])
+_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
+# serial 12
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
[disable], [m4_define([am_maintainer_other], [enable])],
[m4_define([am_maintainer_other], [enable])
m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
+# serial 5
# _AM_MANGLE_OPTION(NAME)
# -----------------------
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
+# serial 2
# AM_SILENT_RULES([DEFAULT])
# --------------------------
no) AM_DEFAULT_VERBOSITY=1;;
*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using `$V' instead of `$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
AM_BACKSLASH='\'
AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# serial 1
+
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
+# serial 3
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2011-05-11'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
- case ${UNAME_MACHINE} in
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
LIBC=gnu
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-tilera-linux-gnu
+ exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
echo x86_64-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
- exit ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
/* Support a verbose mode */
#undef DBUS_ENABLE_VERBOSE_MODE
-/* Defined if gcov is enabled to force a rebuild due to config.h changing */
+/* Defined to the gcc version if gcov is enabled, to force a rebuild due to
+ config.h changing */
#undef DBUS_GCOV_ENABLED
-/* Defined if we have gcc 3.3 and thus the new gcov format */
-#undef DBUS_HAVE_GCC33_GCOV
-
/* Where to put test sockets */
#undef DBUS_TEST_SOCKET_DIR
-/* always defined to indicate that i18n is enabled */
-#undef ENABLE_NLS
-
-/* The name of the gettext domain */
-#undef GETTEXT_PACKAGE
-
/* Disable GLib assertion macros */
#undef G_DISABLE_ASSERT
/* Have abstract socket namespace */
#undef HAVE_ABSTRACT_SOCKETS
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#undef HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Define to 1 if you have the `dcgettext' function. */
-#undef HAVE_DCGETTEXT
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <expat.h> header file. */
#undef HAVE_EXPAT_H
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the <locale.h> header file. */
-#undef HAVE_LOCALE_H
-
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2011-03-23'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
os=
basic_machine=$1
;;
- -bluegene*)
- os=-cnk
+ -bluegene*)
+ os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
| moxie \
| mt \
| msp430 \
+ | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| rx \
| score \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| mmix-* \
| mt-* \
| msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile-* | tilegx-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
basic_machine=powerpc-ibm
os=-cnk
;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
+ cegcc)
basic_machine=arm-unknown
os=-cegcc
;;
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
np1)
basic_machine=np1-gould
;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
;;
power) basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
basic_machine=t90-cray
os=-unicos
;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
+ # This must be matched before tile*.
+ tilegx*)
+ basic_machine=tilegx-unknown
+ os=-linux-gnu
;;
tile*)
basic_machine=tile-unknown
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
+ -auroraux)
+ os=-auroraux
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
-dicos*)
os=-dicos
;;
+ -nacl*)
+ ;;
-none)
;;
*)
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for dbus-glib 0.88.
+# Generated by GNU Autoconf 2.69 for dbus-glib 0.100.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>.
+# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=dbus
+$0: https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Identity of this package.
PACKAGE_NAME='dbus-glib'
PACKAGE_TARNAME='dbus-glib'
-PACKAGE_VERSION='0.88'
-PACKAGE_STRING='dbus-glib 0.88'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus'
+PACKAGE_VERSION='0.100'
+PACKAGE_STRING='dbus-glib 0.100'
+PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib'
PACKAGE_URL=''
# Factoring default headers for most tests.
EXPANDED_BINDIR
EXPANDED_SYSCONFDIR
EXPANDED_LOCALSTATEDIR
-DBUS_DOXYGEN_DOCS_ENABLED_FALSE
-DBUS_DOXYGEN_DOCS_ENABLED_TRUE
-DOXYGEN
GTK_DOC_USE_REBASE_FALSE
GTK_DOC_USE_REBASE_TRUE
GTK_DOC_USE_LIBTOOL_FALSE
GTK_DOC_BUILD_HTML_TRUE
ENABLE_GTK_DOC_FALSE
ENABLE_GTK_DOC_TRUE
+GTKDOC_DEPS_LIBS
+GTKDOC_DEPS_CFLAGS
HTML_DIR
GTKDOC_MKPDF
GTKDOC_REBASE
GLIB_GENMARSHAL
HAVE_GLIB_THREADS_FALSE
HAVE_GLIB_THREADS_TRUE
-HAVE_GLIB_FALSE
-HAVE_GLIB_TRUE
DBUS_GLIB_THREADS_LIBS
DBUS_GLIB_THREADS_CFLAGS
DBUS_GLIB_LIBS
DBUS_GLIB_CFLAGS
-DBUS_DAEMONDIR
-DBUS_INCLUDEDIR
-HAVE_DBUS_FALSE
-HAVE_DBUS_TRUE
DBUS_LIBS
DBUS_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
-MKINSTALLDIRS
-POSUB
-POFILES
-PO_IN_DATADIR_FALSE
-PO_IN_DATADIR_TRUE
-INTLLIBS
-INSTOBJEXT
-GMOFILES
-DATADIRNAME
-CATOBJEXT
-CATALOGS
-XGETTEXT
-GMSGFMT
-MSGFMT_OPTS
-MSGFMT
-USE_NLS
DBUS_PATH_OR_ABSTRACT
-DBUS_GCOV_ENABLED_FALSE
-DBUS_GCOV_ENABLED_TRUE
OTOOL64
OTOOL
LIPO
NMEDIT
DSYMUTIL
+MANIFEST_TOOL
RANLIB
+ac_ct_AR
AR
+DLLTOOL
OBJDUMP
LN_S
NM
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
LT_CURRENT
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
-GETTEXT_PACKAGE
am__untar
am__tar
AMTAR
enable_verbose_mode
enable_asserts
enable_checks
-enable_doxygen_docs
enable_gcov
enable_bash_completion
with_test_socket_dir
with_pic
enable_fast_install
with_gnu_ld
+with_sysroot
enable_libtool_lock
with_html_dir
enable_gtk_doc
DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS
DBUS_GLIB_THREADS_CFLAGS
-DBUS_GLIB_THREADS_LIBS'
+DBUS_GLIB_THREADS_LIBS
+GTKDOC_DEPS_CFLAGS
+GTKDOC_DEPS_LIBS'
# Initialize some variables set by options.
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dbus-glib 0.88 to adapt to many kinds of systems.
+\`configure' configures dbus-glib 0.100 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dbus-glib 0.88:";;
+ short | recursive ) echo "Configuration of dbus-glib 0.100:";;
esac
cat <<\_ACEOF
--enable-verbose-mode support verbose debug mode
--enable-asserts include assertion checks
--enable-checks include sanity checks on public API
- --enable-doxygen-docs build DOXYGEN documentation (requires Doxygen)
--enable-gcov compile with coverage profiling instrumentation (gcc
only)
--enable-bash-completion
use instead of querying the installed dbus daemon
--with-dbus-binding-tool=filename
Use external dbus-binding-tool program
- --with-pic try to use only PIC/non-PIC objects [default=use
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-sysroot=DIR Search for dependent libraries within DIR
+ (or the compiler's sysroot if not specified).
--with-html-dir=PATH path to installed docs
Some influential environment variables:
C compiler flags for DBUS_GLIB_THREADS, overriding pkg-config
DBUS_GLIB_THREADS_LIBS
linker flags for DBUS_GLIB_THREADS, overriding pkg-config
+ GTKDOC_DEPS_CFLAGS
+ C compiler flags for GTKDOC_DEPS, overriding pkg-config
+ GTKDOC_DEPS_LIBS
+ linker flags for GTKDOC_DEPS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>.
+Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib>.
_ACEOF
ac_status=$?
fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dbus-glib configure 0.88
-generated by GNU Autoconf 2.66
+dbus-glib configure 0.100
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval "test \"\${$3+set}\"" = set; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=dbus ##
-## ---------------------------------------------------------------------- ##"
+( $as_echo "## ------------------------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib ##
+## ------------------------------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_mongrel
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dbus-glib $as_me 0.88, which was
-generated by GNU Autoconf 2.66. Invocation command line was
+It was created by dbus-glib $as_me 0.100, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then :
+ if ${ac_cv_path_mkdir+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
# Define the identity of the package.
PACKAGE='dbus-glib'
- VERSION='0.88'
+ VERSION='0.100'
cat >>confdefs.h <<_ACEOF
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-GETTEXT_PACKAGE=dbus-glib-1
-
-
-cat >>confdefs.h <<_ACEOF
-#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
-_ACEOF
-
-
## must come before we use the $USE_MAINTAINER_MODE variable later
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
no) AM_DEFAULT_VERBOSITY=1;;
*) AM_DEFAULT_VERBOSITY=0;;
esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
AM_BACKSLASH='\'
#
## increment if the interface has additions, changes, removals.
-LT_CURRENT=3
+LT_CURRENT=4
## increment any time the source changes; set to
## 0 if you increment CURRENT
-LT_REVISION=0
+LT_REVISION=2
## increment if any interfaces have been added; set to 0
## if any interfaces have been changed or removed. removal has
## precedence over adding, so set to 0 if both happened.
-LT_AGE=1
+LT_AGE=2
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then :
+ if ${ac_cv_search_strerror+:} false; then :
break
fi
done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
else
ac_cv_search_strerror=no
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
enable_checks=yes
fi
-# Check whether --enable-doxygen-docs was given.
-if test "${enable_doxygen_docs+set}" = set; then :
- enableval=$enable_doxygen_docs; enable_doxygen_docs=$enableval
-else
- enable_doxygen_docs=auto
-fi
-
# Check whether --enable-gcov was given.
if test "${enable_gcov+set}" = set; then :
enableval=$enable_gcov; enable_gcov=$enableval
-macro_version='2.2.10'
-macro_revision='1.3175'
+macro_version='2.4.2'
+macro_revision='1.3337'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
$as_echo_n "checking how to print strings... " >&6; }
# Test print first, because it will be a builtin if present.
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
ECHO='print -r --'
elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
case `"$ac_path_SED" --version 2>&1` in
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
for ac_prog in fgrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
case `"$ac_path_FGREP" --version 2>&1` in
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
+if ${lt_cv_path_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
+if ${lt_cv_nm_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
lt_cv_sys_max_cmd_len=196608
;;
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,b/c, \
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+ ;;
+ esac
+ ;;
+ *-*-cygwin* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+ ;;
+ esac
+ ;;
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+if ${lt_cv_ld_reload_flag+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+if ${lt_cv_deplibs_check_method+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh
+ # decide which to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+ for ac_prog in ar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
fi
+ test -n "$AR" && break
+ done
fi
-if test -z "$ac_cv_prog_AR"; then
+if test -z "$AR"; then
ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+ for ac_prog in ar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
$as_echo "no" >&6; }
fi
+
+ test -n "$ac_ct_AR" && break
+done
+
if test "x$ac_ct_AR" = x; then
AR="false"
else
esac
AR=$ac_ct_AR
fi
-else
- AR="$ac_cv_prog_AR"
fi
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ar_at_file=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ # Ensure the archiver fails upon bogus file names.
+ rm -f conftest.$ac_objext libconftest.a
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-const struct {
+LT_DLSYM_CONST struct {
const char *name;
void *address;
}
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
else
echo "cannot find nm_test_func in $nlist" >&5
fi
$as_echo "ok" >&6; }
fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
- enableval=$enable_libtool_lock;
-fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+ withval=$with_sysroot;
+else
+ with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+ ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+ enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+if ${lt_cv_cc_needs_belf+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
CFLAGS="$SAVE_CFLAGS"
fi
;;
-sparc*-*solaris*)
+*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
need_locks="$enable_libtool_lock"
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$MANIFEST_TOOL"; then
+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+ # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
+ MANIFEST_TOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+ fi
+else
+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&5
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+fi
+
+
+
+
+
case $host_os in
rhapsody* | darwin*)
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy ${ac_tool_prefix}lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_LIPO="lipo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy ${ac_tool_prefix}otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL="otool"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy ${ac_tool_prefix}otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_OTOOL64="otool64"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # If there is a non-empty error log, and "single_module"
+ # appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+ cat conftest.err >&5
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
$as_echo_n "checking for -force_load linker flag... " >&6; }
-if test "${lt_cv_ld_force_load+set}" = set; then :
+if ${lt_cv_ld_force_load+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_force_load=no
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
_lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&5
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then :
- withval=$with_pic; pic_mode="$withval"
+ withval=$with_pic; lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
else
pic_mode=default
fi
+
+
+
+
test -z "$LN_S" && LN_S="ln -s"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
lt_prog_compiler_pic=
lt_prog_compiler_static=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
lt_prog_compiler_wl='-Xlinker '
- lt_prog_compiler_pic='-Xcompiler -fPIC'
+ if test -n "$lt_prog_compiler_pic"; then
+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+ fi
;;
esac
else
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Qoption ld '
+ ;;
*Sun\ C*)
# Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
lt_prog_compiler_wl='-Wl,'
;;
+ *Intel*\ [CF]*Compiler*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ *Portland\ Group*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
esac
;;
esac
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
#
# Check to make sure the PIC flag actually works.
if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
+
+
+
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
hardcode_direct=no
hardcode_direct_absolute=no
hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=
+ tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ file_list_spec='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ enable_shared_with_static_runtimes=yes
+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ old_postinstall_cmds='chmod 644 $oldlib'
+ postlink_cmds='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ enable_shared_with_static_runtimes=yes
+ ;;
+ esac
;;
darwin* | rhapsody*)
hardcode_shlibpath_var=unsupported
if test "$lt_cv_ld_force_load" = "yes"; then
whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
else
whole_archive_flag_spec=''
fi
hardcode_shlibpath_var=no
;;
- freebsd1*)
- ld_shlibs=no
- ;;
-
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
hpux10*)
if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld='+b $libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
# (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
$as_echo_n "checking if $CC understands -b... " >&6; }
-if test "${lt_cv_prog_compiler__b+set}" = set; then :
+if ${lt_cv_prog_compiler__b+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler__b=no
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # This should be the same for all languages, so no per-tag cache variable.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int foo(void) {}
+int foo (void) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+ lt_cv_irix_exported_symbol=yes
+else
+ lt_cv_irix_exported_symbol=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+ if test "$lt_cv_irix_exported_symbol" = yes; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ fi
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
$as_echo_n "(cached) " >&6
else
$RM conftest*
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
case $host_os in
aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
;;
aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
;;
bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
esac
;;
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
;;
interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
dynamic_linker=no
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_overrides_runpath=no
# Some binutils ld are patched to set DT_RUNPATH
- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_shlibpath_overrides_runpath=no
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
dynamic_linker='GNU/Linux ld.so'
;;
-netbsd*)
- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
need_lib_prefix=no
need_version=no
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
;;
newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
;;
sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
sysv4*MP*)
if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
;;
uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
lt_cv_dlopen="shl_load"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
lt_cv_dlopen="dlopen"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
/* When -fvisbility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
-void fnord () { int i=42; }
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
/* When -fvisbility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
-void fnord () { int i=42; }
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+
+
ac_config_commands="$ac_config_commands libtool"
CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/ +/ /g'`
if test x$enable_gcov = xyes; then
- ## so that config.h changes when you toggle gcov support
+ # so that config.h changes when you toggle gcov support
cat >>confdefs.h <<_ACEOF
-#define DBUS_GCOV_ENABLED 1
+#define DBUS_GCOV_ENABLED __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__
_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc 3.3 version of gcov file format" >&5
-$as_echo_n "checking for gcc 3.3 version of gcov file format... " >&6; }
- have_gcc33_gcov=no
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
- if (__GNUC__ >=3 && __GNUC_MINOR__ >= 3) exit (0); else exit (1);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- have_gcc33_gcov=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- if test x$have_gcc33_gcov = xyes ; then
-
-cat >>confdefs.h <<_ACEOF
-#define DBUS_HAVE_GCC33_GCOV 1
-_ACEOF
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc33_gcov" >&5
-$as_echo "$have_gcc33_gcov" >&6; }
-fi
- if test x$enable_gcov = xyes; then
- DBUS_GCOV_ENABLED_TRUE=
- DBUS_GCOV_ENABLED_FALSE='#'
-else
- DBUS_GCOV_ENABLED_TRUE='#'
- DBUS_GCOV_ENABLED_FALSE=
fi
-
-
#### Various functions
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
$as_echo_n "checking for library containing socket... " >&6; }
-if test "${ac_cv_search_socket+set}" = set; then :
+if ${ac_cv_search_socket+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_socket+set}" = set; then :
+ if ${ac_cv_search_socket+:} false; then :
break
fi
done
-if test "${ac_cv_search_socket+set}" = set; then :
+if ${ac_cv_search_socket+:} false; then :
else
ac_cv_search_socket=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking abstract socket namespace" >&5
$as_echo_n "checking abstract socket namespace... " >&6; }
-if test "${ac_cv_have_abstract_sockets+set}" = set; then :
+if ${ac_cv_have_abstract_sockets+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
# unix:path=/foo or unix:abstract=/foo
-#### Sort out gettext
-
-# this makes us require GLib to run autoconf, but not at runtime
-ALL_LINGUAS=""
-
- for ac_header in locale.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LOCALE_H 1
-_ACEOF
-
-fi
-
-done
-
- if test $ac_cv_header_locale_h = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
-$as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- am_cv_val_LC_MESSAGES=yes
-else
- am_cv_val_LC_MESSAGES=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
- if test $am_cv_val_LC_MESSAGES = yes; then
-
-$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-
- fi
- fi
- USE_NLS=yes
-
-
- gt_cv_have_gettext=no
-
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
-
- ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
- gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
-
- #
- # First check in libc
- #
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
-$as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <libintl.h>
-
-int
-main ()
-{
-return !ngettext ("","", 1)
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_ngettext_libc=yes
-else
- gt_cv_func_ngettext_libc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
-$as_echo "$gt_cv_func_ngettext_libc" >&6; }
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
-$as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <libintl.h>
-
-int
-main ()
-{
-return !dgettext ("","")
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_dgettext_libc=yes
-else
- gt_cv_func_dgettext_libc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- for ac_func in bind_textdomain_codeset
-do :
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-_ACEOF
-
-fi
-done
-
- fi
-
- #
- # If we don't have everything we want, check in libintl
- #
- if test "$gt_cv_func_dgettext_libc" != "yes" \
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bindtextdomain ();
-int
-main ()
-{
-return bindtextdomain ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_bindtextdomain=yes
-else
- ac_cv_lib_intl_bindtextdomain=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ngettext ();
-int
-main ()
-{
-return ngettext ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
-else
- ac_cv_lib_intl_ngettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
-$as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dgettext ();
-int
-main ()
-{
-return dgettext ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dgettext=yes
-else
- ac_cv_lib_intl_dgettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
-$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
-fi
-
-fi
-
-fi
-
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
-$as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ngettext ();
-int
-main ()
-{
-return ngettext ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
-else
- ac_cv_lib_intl_ngettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
-$as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl -liconv $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dcgettext ();
-int
-main ()
-{
-return dcgettext ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dcgettext=yes
-else
- ac_cv_lib_intl_dcgettext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
-else
- :
-fi
-
-else
- :
-fi
-
- fi
-
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
- # and both have dgettext and ngettext
- #
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
- for ac_func in bind_textdomain_codeset
-do :
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-_ACEOF
-
-fi
-done
-
- LIBS="$glib_save_LIBS"
-
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
- else
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
- gt_cv_func_dgettext_libintl=no
- fi
- fi
- fi
- fi
-
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
- gt_cv_have_gettext=yes
- fi
-
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs"
- fi
-
- if test "$gt_cv_have_gettext" = "yes"; then
-
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case "$MSGFMT" in
- /*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
- ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
- for ac_func in dcgettext
-do :
- ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
-
-fi
-done
-
- MSGFMT_OPTS=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
-$as_echo_n "checking if msgfmt accepts -c... " >&6; }
- cat >conftest.foo <<_ACEOF
-
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <foo@bar.xx>\n"
-"Language-Team: C <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-_ACEOF
-if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-echo "$as_me: failed input was:" >&5
-sed 's/^/| /' conftest.foo >&5
-fi
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $GMSGFMT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case "$XGETTEXT" in
- /*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- CATOBJEXT=.gmo
- DATADIRNAME=share
-else
- case $host in
- *-*-solaris*)
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- CATOBJEXT=.gmo
- DATADIRNAME=share
-else
- CATOBJEXT=.mo
- DATADIRNAME=lib
-fi
-
- ;;
- *)
- CATOBJEXT=.mo
- DATADIRNAME=lib
- ;;
- esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
- gt_cv_have_gettext=no
- fi
- fi
-
-fi
-
-
-
- if test "$gt_cv_have_gettext" = "yes" ; then
-
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
- fi
-
- if test "$XGETTEXT" != ":"; then
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
- fi
-
- # We need to process the po/ directory.
- POSUB=po
-
- ac_config_commands="$ac_config_commands default-1"
-
-
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-
-
-
-
-
-
-
-
-
-
-
-
-
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
-$as_echo_n "checking for catalogs to be installed... " >&6; }
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
-$as_echo "$LINGUAS" >&6; }
- fi
-
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
-
-
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
-
-
-# INTLLIBS is now set
-
-# (if someone wants to go through and make internationalization
-# conditional with #ifdef ENABLE_NLS then go crazy and send us a patch,
-# but right now we won't build without gettext)
-if test "$gt_cv_have_gettext" != "yes" ; then
- as_fn_error $? "
-*** You must have either have gettext support in your C library, or use the
-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
-" "$LINENO" 5
-fi
-
#### Sort out XML library
# see what we have
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate_MM in -lexpat" >&5
$as_echo_n "checking for XML_ParserCreate_MM in -lexpat... " >&6; }
-if test "${ac_cv_lib_expat_XML_ParserCreate_MM+set}" = set; then :
+if ${ac_cv_lib_expat_XML_ParserCreate_MM+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate_MM" >&5
$as_echo "$ac_cv_lib_expat_XML_ParserCreate_MM" >&6; }
-if test "x$ac_cv_lib_expat_XML_ParserCreate_MM" = x""yes; then :
+if test "x$ac_cv_lib_expat_XML_ParserCreate_MM" = xyes; then :
for ac_header in expat.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
-if test "x$ac_cv_header_expat_h" = x""yes; then :
+if test "x$ac_cv_header_expat_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_EXPAT_H 1
_ACEOF
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.2.16") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.1" 2>/dev/null`
+ pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.2.16" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
pkg_cv_DBUS_LIBS="$DBUS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.2.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.2.16") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.1" 2>/dev/null`
+ pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.2.16" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.1" 2>&1`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.2.16" 2>&1`
else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.1" 2>&1`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.2.16" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
- have_dbus=no
+ as_fn_error $? "Package requirements (dbus-1 >= 1.2.16) were not met:
+
+$DBUS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DBUS_CFLAGS
+and DBUS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- have_dbus=no
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DBUS_CFLAGS
+and DBUS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- have_dbus=yes
-fi
-if test x$have_dbus = xno ; then
- as_fn_error $? "DBus development libraries not found" "$LINENO" 5
-fi
- if test x$have_dbus = xyes; then
- HAVE_DBUS_TRUE=
- HAVE_DBUS_FALSE='#'
-else
- HAVE_DBUS_TRUE='#'
- HAVE_DBUS_FALSE=
fi
-
-
-DBUS_INCLUDEDIR=`pkg-config dbus-1 --variable=includedir`
-
-DBUS_DAEMONDIR=`pkg-config dbus-1 --variable=daemondir`
-if test x"$DBUS_DAEMONDIR" != "x"; then
- # Add slash, so that if the D-Bus pkgconfig file does not
- # specify daemondir, the tools/Makefile.am file will look
- # in the PATH for the daemon, as was previous behavior.
- #
- DBUS_DAEMONDIR="$DBUS_DAEMONDIR/"
-fi
-
-
# Glib detection
pkg_failed=no
pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.24\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.24") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.26, gio-2.0 >= 2.26\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.26, gio-2.0 >= 2.26") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.24" 2>/dev/null`
+ pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.26, gio-2.0 >= 2.26" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.24\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.24") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= 2.26, gio-2.0 >= 2.26\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= 2.26, gio-2.0 >= 2.26") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.24" 2>/dev/null`
+ pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.26, gio-2.0 >= 2.26" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= 2.24" 2>&1`
+ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 >= 2.26, gio-2.0 >= 2.26" 2>&1`
else
- DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= 2.24" 2>&1`
+ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 >= 2.26, gio-2.0 >= 2.26" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_GLIB_PKG_ERRORS" >&5
- have_glib=no
+ as_fn_error $? "Package requirements (gobject-2.0 >= 2.26, gio-2.0 >= 2.26) were not met:
+
+$DBUS_GLIB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
+and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- have_glib=no
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
+and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- have_glib=yes
+
fi
pkg_failed=no
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DBUS_GLIB_THREADS_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.6" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DBUS_GLIB_THREADS_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.6" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_GLIB_THREADS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0 >= 2.6" 2>&1`
+ DBUS_GLIB_THREADS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.6" 2>&1`
else
- DBUS_GLIB_THREADS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0 >= 2.6" 2>&1`
+ DBUS_GLIB_THREADS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.6" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_GLIB_THREADS_PKG_ERRORS" >&5
have_glib_threads=yes
fi
-if test x$have_glib = xno ; then
- as_fn_error $? "GLib development libraries not found" "$LINENO" 5
-fi
-
- if test x$have_glib = xyes; then
- HAVE_GLIB_TRUE=
- HAVE_GLIB_FALSE='#'
-else
- HAVE_GLIB_TRUE='#'
- HAVE_GLIB_FALSE=
-fi
-
if test x$have_glib_threads = xyes; then
HAVE_GLIB_THREADS_TRUE=
HAVE_GLIB_THREADS_FALSE='#'
DBUS_GLIB_TOOL_CFLAGS=$XML_CFLAGS
-DBUS_GLIB_TOOL_LIBS="$XML_LIBS $INTLLIBS"
+DBUS_GLIB_TOOL_LIBS="$XML_LIBS"
### gtk-doc Documentation
+
# Extract the first word of "gtkdoc-check", so it can be a program name with args.
set dummy gtkdoc-check; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
+if ${ac_cv_path_GTKDOC_REBASE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
set dummy gtkdoc-mkpdf; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
+if ${ac_cv_path_GTKDOC_MKPDF+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
else
as_fn_error $? "You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" "$LINENO" 5
fi
+ if test "x$PACKAGE_NAME" != "xglib"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
+$as_echo_n "checking for GTKDOC_DEPS... " >&6; }
+
+if test -n "$GTKDOC_DEPS_CFLAGS"; then
+ pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTKDOC_DEPS_LIBS"; then
+ pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
+ else
+ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met:
+
+$GTKDOC_DEPS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
+and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
+and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
+ GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-### Doxygen Documentation
-
-# Extract the first word of "doxygen", so it can be a program name with args.
-set dummy doxygen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DOXYGEN+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $DOXYGEN in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_DOXYGEN" && ac_cv_path_DOXYGEN="no"
- ;;
-esac
-fi
-DOXYGEN=$ac_cv_path_DOXYGEN
-if test -n "$DOXYGEN"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
-$as_echo "$DOXYGEN" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Doxygen documentation" >&5
-$as_echo_n "checking whether to build Doxygen documentation... " >&6; }
-
-if test x$DOXYGEN = xno ; then
- have_doxygen=no
-else
- have_doxygen=yes
-fi
-
-if test x$enable_doxygen_docs = xauto ; then
- if test x$have_doxygen = xno ; then
- enable_doxygen_docs=no
- else
- enable_doxygen_docs=yes
- fi
-fi
-
-if test x$enable_doxygen_docs = xyes; then
- if test x$have_doxygen = xno; then
- as_fn_error $? "Building Doxygen docs explicitly required, but Doxygen not found" "$LINENO" 5
- fi
-fi
-
- if test x$enable_doxygen_docs = xyes; then
- DBUS_DOXYGEN_DOCS_ENABLED_TRUE=
- DBUS_DOXYGEN_DOCS_ENABLED_FALSE='#'
-else
- DBUS_DOXYGEN_DOCS_ENABLED_TRUE='#'
- DBUS_DOXYGEN_DOCS_ENABLED_FALSE=
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
#### Have to go $localstatedir->$prefix/var->/usr/local/var
#### someone please fix this a better way...
_ACEOF
-ac_config_files="$ac_config_files Makefile m4/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml dbus/Makefile dbus/examples/Makefile dbus/examples/statemachine/Makefile test/Makefile test/core/Makefile test/interfaces/Makefile test/data/valid-service-files/debug-glib.service test/data/valid-service-files/debug-echo.service test/data/valid-service-files/interfaces-test.service tools/Makefile dbus-glib-1.pc dbus-glib-1-uninstalled.pc Doxyfile"
+ac_config_files="$ac_config_files Makefile m4/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml dbus/Makefile dbus/examples/Makefile dbus/examples/statemachine/Makefile test/Makefile test/core/Makefile test/interfaces/Makefile test/data/valid-service-files/debug-glib.service test/data/valid-service-files/debug-echo.service test/data/valid-service-files/interfaces-test.service test/lib/Makefile test/manual/Makefile tools/Makefile dbus-glib-1.pc dbus-glib-1-uninstalled.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
as_fn_error $? "conditional \"DBUS_BUILD_TESTS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${DBUS_GCOV_ENABLED_TRUE}" && test -z "${DBUS_GCOV_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"DBUS_GCOV_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_DBUS_TRUE}" && test -z "${HAVE_DBUS_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_DBUS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GLIB_TRUE}" && test -z "${HAVE_GLIB_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_GLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_GLIB_THREADS_TRUE}" && test -z "${HAVE_GLIB_THREADS_FALSE}"; then
as_fn_error $? "conditional \"HAVE_GLIB_THREADS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${DBUS_DOXYGEN_DOCS_ENABLED_TRUE}" && test -z "${DBUS_DOXYGEN_DOCS_ENABLED_FALSE}"; then
- as_fn_error $? "conditional \"DBUS_DOXYGEN_DOCS_ENABLED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dbus-glib $as_me 0.88, which was
-generated by GNU Autoconf 2.66. Invocation command line was
+This file was extended by dbus-glib $as_me 0.100, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
Configuration commands:
$config_commands
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>."
+Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dbus-glib config.status 0.88
-configured by $0, generated by GNU Autoconf 2.66,
+dbus-glib config.status 0.100
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
# Quote evaled strings.
for var in SHELL \
ECHO \
+PATH_SEPARATOR \
SED \
GREP \
EGREP \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
AR \
AR_FLAGS \
+archiver_list_spec \
STRIP \
RANLIB \
CC \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+nm_file_list_spec \
lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
lt_prog_compiler_pic \
+lt_prog_compiler_wl \
lt_prog_compiler_static \
lt_cv_prog_compiler_c_o \
need_locks \
+MANIFEST_TOOL \
DSYMUTIL \
NMEDIT \
LIPO \
allow_undefined_flag \
no_undefined_flag \
hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
-fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
+postlink_cmds \
postinstall_cmds \
postuninstall_cmds \
finish_cmds \
-
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"test/data/valid-service-files/debug-glib.service") CONFIG_FILES="$CONFIG_FILES test/data/valid-service-files/debug-glib.service" ;;
"test/data/valid-service-files/debug-echo.service") CONFIG_FILES="$CONFIG_FILES test/data/valid-service-files/debug-echo.service" ;;
"test/data/valid-service-files/interfaces-test.service") CONFIG_FILES="$CONFIG_FILES test/data/valid-service-files/interfaces-test.service" ;;
+ "test/lib/Makefile") CONFIG_FILES="$CONFIG_FILES test/lib/Makefile" ;;
+ "test/manual/Makefile") CONFIG_FILES="$CONFIG_FILES test/manual/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"dbus-glib-1.pc") CONFIG_FILES="$CONFIG_FILES dbus-glib-1.pc" ;;
"dbus-glib-1-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES dbus-glib-1-uninstalled.pc" ;;
- "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = "\a"
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
+ mv "$ac_tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
# An echo program that protects backslashes.
ECHO=$lt_ECHO
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
# The host system.
host_alias=$host_alias
host=$host
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
file_magic_cmd=$lt_file_magic_cmd
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
# The archiver.
AR=$lt_AR
+
+# Flags to create an archive.
AR_FLAGS=$lt_AR_FLAGS
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
# A symbol stripping program.
STRIP=$lt_STRIP
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
# The name of the directory that contains temporary libtool files.
objdir=$objdir
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
# Additional compiler flags for building library objects.
pic_flag=$lt_lt_prog_compiler_pic
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
# This must work even if \$libdir does not exist
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1+=\$2"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1=\$$1\$2"
-}
-
-_LT_EOF
- ;;
- esac
-
-
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" ||
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ if test x"$xsi_shell" = xyes; then
+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\ case ${1} in\
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
+\ * ) func_dirname_result="${3}" ;;\
+\ esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\ func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\ case ${1} in\
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
+\ * ) func_dirname_result="${3}" ;;\
+\ esac\
+\ func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\ # positional parameters, so assign one to ordinary parameter first.\
+\ func_stripname_result=${3}\
+\ func_stripname_result=${func_stripname_result#"${1}"}\
+\ func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\ func_split_long_opt_name=${1%%=*}\
+\ func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\ func_split_short_opt_arg=${1#??}\
+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\ case ${1} in\
+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\ *) func_lo2o_result=${1} ;;\
+\ esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+ func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+ func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+ func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+ sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+ eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\ func_quote_for_eval "${2}"\
+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ # Save a `func_append' function call where possible by direct use of '+='
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+else
+ # Save a `func_append' function call even when '+=' is not available
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
;;
- "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac ;;
esac
done # for ac_tag
compiler: ${CC}
cflags: ${CFLAGS}
cppflags: ${CPPFLAGS}
- Doxygen: ${DOXYGEN}"
+"
echo "
Maintainer mode: ${USE_MAINTAINER_MODE}
Building verbose mode: ${enable_verbose_mode}
Building assertions: ${enable_asserts}
Building checks: ${enable_checks}
- Building Doxygen docs: ${enable_doxygen_docs}
Building Gtk-doc docs: ${enable_gtk_doc}
Bash Completion: ${enable_bash_completion}
- Gettext libs (empty OK): ${INTLLIBS}
Using XML parser: ${with_xml}
'make check' socket dir: ${TEST_SOCKET_DIR}
"
dnl -*- mode: m4 -*-
AC_PREREQ(2.52)
-AC_INIT(dbus-glib, 0.88, [https://bugs.freedesktop.org/enter_bug.cgi?product=dbus])
+AC_INIT([dbus-glib], [0.100],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib])
AC_CANONICAL_HOST
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
AC_CONFIG_MACRO_DIR(m4)
-GETTEXT_PACKAGE=dbus-glib-1
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
-
## must come before we use the $USE_MAINTAINER_MODE variable later
AM_MAINTAINER_MODE
#
## increment if the interface has additions, changes, removals.
-LT_CURRENT=3
+LT_CURRENT=4
## increment any time the source changes; set to
## 0 if you increment CURRENT
-LT_REVISION=0
+LT_REVISION=2
## increment if any interfaces have been added; set to 0
## if any interfaces have been changed or removed. removal has
## precedence over adding, so set to 0 if both happened.
-LT_AGE=1
+LT_AGE=2
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes)
-AC_ARG_ENABLE(doxygen-docs, AS_HELP_STRING([--enable-doxygen-docs],[build DOXYGEN documentation (requires Doxygen)]),enable_doxygen_docs=$enableval,enable_doxygen_docs=auto)
AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no)
AC_ARG_ENABLE(bash-completion, AS_HELP_STRING([--enable-bash-completion],[install bash completion scripts]),enable_bash_completion=$enableval,enable_bash_completion=yes)
AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check]))
changequote([,])dnl
if test x$enable_gcov = xyes; then
- ## so that config.h changes when you toggle gcov support
- AC_DEFINE_UNQUOTED(DBUS_GCOV_ENABLED, 1, [Defined if gcov is enabled to force a rebuild due to config.h changing])
-
- AC_MSG_CHECKING([for gcc 3.3 version of gcov file format])
- have_gcc33_gcov=no
- AC_RUN_IFELSE( [AC_LANG_PROGRAM( , [[ if (__GNUC__ >=3 && __GNUC_MINOR__ >= 3) exit (0); else exit (1); ]])],
- have_gcc33_gcov=yes)
- if test x$have_gcc33_gcov = xyes ; then
- AC_DEFINE_UNQUOTED(DBUS_HAVE_GCC33_GCOV, 1, [Defined if we have gcc 3.3 and thus the new gcov format])
- fi
- AC_MSG_RESULT($have_gcc33_gcov)
+ # so that config.h changes when you toggle gcov support
+ AC_DEFINE_UNQUOTED([DBUS_GCOV_ENABLED],
+ [__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__],
+ [Defined to the gcc version if gcov is enabled, to force a rebuild due to config.h changing])
fi
-AM_CONDITIONAL(DBUS_GCOV_ENABLED, test x$enable_gcov = xyes)
-
#### Various functions
AC_SEARCH_LIBS([socket], [socket])
# unix:path=/foo or unix:abstract=/foo
AC_SUBST(DBUS_PATH_OR_ABSTRACT)
-#### Sort out gettext
-
-# this makes us require GLib to run autoconf, but not at runtime
-ALL_LINGUAS=""
-AM_GLIB_GNU_GETTEXT
-
-# INTLLIBS is now set
-
-# (if someone wants to go through and make internationalization
-# conditional with #ifdef ENABLE_NLS then go crazy and send us a patch,
-# but right now we won't build without gettext)
-if test "$gt_cv_have_gettext" != "yes" ; then
- AC_MSG_ERROR([
-*** You must have either have gettext support in your C library, or use the
-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
-])
-fi
-
#### Sort out XML library
# see what we have
#### Set up final flags
-PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1, have_dbus=yes, have_dbus=no)
-
-if test x$have_dbus = xno ; then
- AC_MSG_ERROR([DBus development libraries not found])
-fi
-AM_CONDITIONAL(HAVE_DBUS, test x$have_dbus = xyes)
-
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-DBUS_INCLUDEDIR=`pkg-config dbus-1 --variable=includedir`
-AC_SUBST(DBUS_INCLUDEDIR)
-DBUS_DAEMONDIR=`pkg-config dbus-1 --variable=daemondir`
-if test x"$DBUS_DAEMONDIR" != "x"; then
- # Add slash, so that if the D-Bus pkgconfig file does not
- # specify daemondir, the tools/Makefile.am file will look
- # in the PATH for the daemon, as was previous behavior.
- #
- DBUS_DAEMONDIR="$DBUS_DAEMONDIR/"
-fi
-AC_SUBST(DBUS_DAEMONDIR)
+PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
+AC_SUBST([DBUS_CFLAGS])
+AC_SUBST([DBUS_LIBS])
# Glib detection
-PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0 >= 2.24, have_glib=yes, have_glib=no)
+PKG_CHECK_MODULES([DBUS_GLIB], [gobject-2.0 >= 2.26, gio-2.0 >= 2.26])
PKG_CHECK_MODULES(DBUS_GLIB_THREADS, gthread-2.0 >= 2.6, have_glib_threads=yes, have_glib_threads=no)
-if test x$have_glib = xno ; then
- AC_MSG_ERROR([GLib development libraries not found])
-fi
-
-AM_CONDITIONAL(HAVE_GLIB, test x$have_glib = xyes)
AM_CONDITIONAL(HAVE_GLIB_THREADS, test x$have_glib_threads = xyes)
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(DBUS_GLIB_THREADS_LIBS)
DBUS_GLIB_TOOL_CFLAGS=$XML_CFLAGS
-DBUS_GLIB_TOOL_LIBS="$XML_LIBS $INTLLIBS"
+DBUS_GLIB_TOOL_LIBS="$XML_LIBS"
AC_SUBST(DBUS_GLIB_TOOL_CFLAGS)
AC_SUBST(DBUS_GLIB_TOOL_LIBS)
### gtk-doc Documentation
GTK_DOC_CHECK(1.4)
-### Doxygen Documentation
-
-AC_PATH_PROG(DOXYGEN, doxygen, no)
-
-AC_MSG_CHECKING([whether to build Doxygen documentation])
-
-if test x$DOXYGEN = xno ; then
- have_doxygen=no
-else
- have_doxygen=yes
-fi
-
-if test x$enable_doxygen_docs = xauto ; then
- if test x$have_doxygen = xno ; then
- enable_doxygen_docs=no
- else
- enable_doxygen_docs=yes
- fi
-fi
-
-if test x$enable_doxygen_docs = xyes; then
- if test x$have_doxygen = xno; then
- AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found])
- fi
-fi
-
-AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
-AC_MSG_RESULT(yes)
-
#### Have to go $localstatedir->$prefix/var->/usr/local/var
#### someone please fix this a better way...
test/data/valid-service-files/debug-glib.service
test/data/valid-service-files/debug-echo.service
test/data/valid-service-files/interfaces-test.service
+test/lib/Makefile
+test/manual/Makefile
tools/Makefile
dbus-glib-1.pc
dbus-glib-1-uninstalled.pc
-Doxyfile
])
dnl ==========================================================================
compiler: ${CC}
cflags: ${CFLAGS}
cppflags: ${CPPFLAGS}
- Doxygen: ${DOXYGEN}"
+"
echo "
Maintainer mode: ${USE_MAINTAINER_MODE}
Building verbose mode: ${enable_verbose_mode}
Building assertions: ${enable_asserts}
Building checks: ${enable_checks}
- Building Doxygen docs: ${enable_doxygen_docs}
Building Gtk-doc docs: ${enable_gtk_doc}
Bash Completion: ${enable_bash_completion}
- Gettext libs (empty OK): ${INTLLIBS}
Using XML parser: ${with_xml}
'make check' socket dir: ${TEST_SOCKET_DIR}
"
lib_LTLIBRARIES=libdbus-glib-1.la
-dbus-glib-error-enum.h: make-dbus-glib-error-enum.sh
- $(srcdir)/make-dbus-glib-error-enum.sh $(DBUS_INCLUDEDIR)/dbus-1.0/dbus/dbus-protocol.h $@
-
-dbus-glib-error-switch.h: make-dbus-glib-error-switch.sh
- $(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(DBUS_INCLUDEDIR)/dbus-1.0/dbus/dbus-protocol.h $@
-
-BUILT_SOURCES = \
- dbus-glib-error-switch.h \
- dbus-glib-error-enum.h
-
CLEANFILES = $(BUILT_SOURCES)
DBUS_GLIB_INTERNALS = \
dbus-gvalue-utils.h
libdbus_glib_1_la_SOURCES = \
- dbus-glib-error-switch.h \
dbus-glib.c \
dbus-gmain.c \
dbus-gmarshal.c \
dbus-gtest.h \
dbus-gvalue.c \
dbus-gvalue.h \
+ dbus-gvalue-parse-variant.c \
dbus-gthread.c \
$(DBUS_GLIB_INTERNALS)
libdbus_glib_HEADERS = \
dbus-gtype-specialized.h \
+ dbus-gvalue-parse-variant.h \
dbus-glib.h \
- dbus-glib-lowlevel.h \
- dbus-glib-error-enum.h
+ dbus-glib-lowlevel.h
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
## convincing automake/make to do this properly
regenerate-built-sources:
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
- echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c && \
+ echo '#include <config.h>' > dbus-gmarshal.c && \
+ echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c && \
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
dbus_bash_completion_helper_SOURCES = \
dbus-bash-completion-helper.c
-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la
+dbus_bash_completion_helper_LDADD=$(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS)
+
+EXTRA_DIST=dbus-gmarshal.list dbus-bash-completion.sh.in
-EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
+Android.mk: Makefile.am
+ androgenizer -:PROJECT dbus-glib -:SHARED libdbus-glib-1 -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libdbus_glib_1_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+ -:LDFLAGS $(libdbus_glib_1_la_LIBADD) $(libdbus_glib_1_la_LDFLAGS) \
+ > $@
if DBUS_BUILD_TESTS
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(completiondir)" \
"$(DESTDIR)$(libdbus_glibdir)"
dbus-gsignature.lo dbus-gvalue-utils.lo
am_libdbus_glib_1_la_OBJECTS = dbus-glib.lo dbus-gmain.lo \
dbus-gmarshal.lo dbus-gobject.lo dbus-gproxy.lo dbus-gtest.lo \
- dbus-gvalue.lo dbus-gthread.lo $(am__objects_1)
+ dbus-gvalue.lo dbus-gvalue-parse-variant.lo dbus-gthread.lo \
+ $(am__objects_1)
libdbus_glib_1_la_OBJECTS = $(am_libdbus_glib_1_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
libdbus_glib_1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
dbus-bash-completion-helper.$(OBJEXT)
dbus_bash_completion_helper_OBJECTS = \
$(am_dbus_bash_completion_helper_OBJECTS)
-dbus_bash_completion_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(builddir)/libdbus-gtool.la \
- $(builddir)/libdbus-glib-1.la
+dbus_bash_completion_helper_DEPENDENCIES = \
+ $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_dbus_binding_tool_OBJECTS = dbus-binding-tool-glib.$(OBJEXT) \
dbus-glib-tool.$(OBJEXT)
dbus_binding_tool_OBJECTS = $(am_dbus_binding_tool_OBJECTS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(libdbus_glib_1_la_SOURCES) $(libdbus_gtool_la_SOURCES) \
$(dbus_bash_completion_helper_SOURCES) \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(libdbus_glib_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
lib_LTLIBRARIES = libdbus-glib-1.la
-BUILT_SOURCES = \
- dbus-glib-error-switch.h \
- dbus-glib-error-enum.h
-
CLEANFILES = $(BUILT_SOURCES) dbus-bash-completion.sh
DBUS_GLIB_INTERNALS = \
dbus-gtype-specialized.c \
dbus-gvalue-utils.h
libdbus_glib_1_la_SOURCES = \
- dbus-glib-error-switch.h \
dbus-glib.c \
dbus-gmain.c \
dbus-gmarshal.c \
dbus-gtest.h \
dbus-gvalue.c \
dbus-gvalue.h \
+ dbus-gvalue-parse-variant.c \
dbus-gthread.c \
$(DBUS_GLIB_INTERNALS)
libdbus_glib_HEADERS = \
dbus-gtype-specialized.h \
+ dbus-gvalue-parse-variant.h \
dbus-glib.h \
- dbus-glib-lowlevel.h \
- dbus-glib-error-enum.h
+ dbus-glib-lowlevel.h
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
libdbus_glib_1_la_LIBADD = $(DBUS_LIBS) $(DBUS_GLIB_LIBS)
dbus_bash_completion_helper_SOURCES = \
dbus-bash-completion-helper.c
-dbus_bash_completion_helper_LDADD = $(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la
-EXTRA_DIST = dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
+dbus_bash_completion_helper_LDADD = $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS)
+EXTRA_DIST = dbus-gmarshal.list dbus-bash-completion.sh.in
@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
@DBUS_BUILD_TESTS_TRUE@dbus_glib_test_SOURCES = \
@DBUS_BUILD_TESTS_TRUE@ dbus-gtest-main.c
@DBUS_BUILD_TESTS_TRUE@dbus_glib_test_LDADD = $(builddir)/libdbus-glib-1.la
-all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libdbus-glib-1.la: $(libdbus_glib_1_la_OBJECTS) $(libdbus_glib_1_la_DEPENDENCIES)
+libdbus-glib-1.la: $(libdbus_glib_1_la_OBJECTS) $(libdbus_glib_1_la_DEPENDENCIES) $(EXTRA_libdbus_glib_1_la_DEPENDENCIES)
$(AM_V_CCLD)$(libdbus_glib_1_la_LINK) -rpath $(libdir) $(libdbus_glib_1_la_OBJECTS) $(libdbus_glib_1_la_LIBADD) $(LIBS)
-libdbus-gtool.la: $(libdbus_gtool_la_OBJECTS) $(libdbus_gtool_la_DEPENDENCIES)
+libdbus-gtool.la: $(libdbus_gtool_la_OBJECTS) $(libdbus_gtool_la_DEPENDENCIES) $(EXTRA_libdbus_gtool_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libdbus_gtool_la_OBJECTS) $(libdbus_gtool_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p || test -f $$p1; \
rm -f $$list
install-libexecPROGRAMS: $(libexec_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p || test -f $$p1; \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-dbus-bash-completion-helper$(EXEEXT): $(dbus_bash_completion_helper_OBJECTS) $(dbus_bash_completion_helper_DEPENDENCIES)
+dbus-bash-completion-helper$(EXEEXT): $(dbus_bash_completion_helper_OBJECTS) $(dbus_bash_completion_helper_DEPENDENCIES) $(EXTRA_dbus_bash_completion_helper_DEPENDENCIES)
@rm -f dbus-bash-completion-helper$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dbus_bash_completion_helper_OBJECTS) $(dbus_bash_completion_helper_LDADD) $(LIBS)
-dbus-binding-tool$(EXEEXT): $(dbus_binding_tool_OBJECTS) $(dbus_binding_tool_DEPENDENCIES)
+dbus-binding-tool$(EXEEXT): $(dbus_binding_tool_OBJECTS) $(dbus_binding_tool_DEPENDENCIES) $(EXTRA_dbus_binding_tool_DEPENDENCIES)
@rm -f dbus-binding-tool$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dbus_binding_tool_OBJECTS) $(dbus_binding_tool_LDADD) $(LIBS)
-dbus-glib-test$(EXEEXT): $(dbus_glib_test_OBJECTS) $(dbus_glib_test_DEPENDENCIES)
+dbus-glib-test$(EXEEXT): $(dbus_glib_test_OBJECTS) $(dbus_glib_test_DEPENDENCIES) $(EXTRA_dbus_glib_test_DEPENDENCIES)
@rm -f dbus-glib-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dbus_glib_test_OBJECTS) $(dbus_glib_test_LDADD) $(LIBS)
install-completionSCRIPTS: $(completion_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(completiondir)" || $(MKDIR_P) "$(DESTDIR)$(completiondir)"
@list='$(completion_SCRIPTS)'; test -n "$(completiondir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(completiondir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(completiondir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@list='$(completion_SCRIPTS)'; test -n "$(completiondir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(completiondir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(completiondir)" && rm -f $$files
+ dir='$(DESTDIR)$(completiondir)'; $(am__uninstall_files_from_dir)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-gthread.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-gtype-specialized.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-gutils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-gvalue-parse-variant.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-gvalue-utils.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-gvalue.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
-rm -rf .libs _libs
install-libdbus_glibHEADERS: $(libdbus_glib_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libdbus_glibdir)" || $(MKDIR_P) "$(DESTDIR)$(libdbus_glibdir)"
@list='$(libdbus_glib_HEADERS)'; test -n "$(libdbus_glibdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdbus_glibdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdbus_glibdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@$(NORMAL_UNINSTALL)
@list='$(libdbus_glib_HEADERS)'; test -n "$(libdbus_glibdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(libdbus_glibdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(libdbus_glibdir)" && rm -f $$files
+ dir='$(DESTDIR)$(libdbus_glibdir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
+ col="$$grn"; \
else \
- echo "$$red$$dashes"; \
+ col="$$red"; \
fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
test "$$failed" -eq 0; \
else :; fi
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
done
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-recursive
+check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
install-binPROGRAMS: install-libLTLIBRARIES
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(completiondir)" "$(DESTDIR)$(libdbus_glibdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-recursive
+install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
uninstall-libLTLIBRARIES uninstall-libdbus_glibHEADERS \
uninstall-libexecPROGRAMS
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
- check-am ctags-recursive install install-am install-strip \
- tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
+ ctags-recursive install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-TESTS check-am clean clean-binPROGRAMS \
uninstall-libexecPROGRAMS
-dbus-glib-error-enum.h: make-dbus-glib-error-enum.sh
- $(srcdir)/make-dbus-glib-error-enum.sh $(DBUS_INCLUDEDIR)/dbus-1.0/dbus/dbus-protocol.h $@
-
-dbus-glib-error-switch.h: make-dbus-glib-error-switch.sh
- $(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(DBUS_INCLUDEDIR)/dbus-1.0/dbus/dbus-protocol.h $@
-
regenerate-built-sources:
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
- echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c && \
+ echo '#include <config.h>' > dbus-gmarshal.c && \
+ echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c && \
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
dbus-bash-completion.sh : dbus-bash-completion.sh.in
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+Android.mk: Makefile.am
+ androgenizer -:PROJECT dbus-glib -:SHARED libdbus-glib-1 -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ -:SOURCES $(libdbus_glib_1_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
+ -:LDFLAGS $(libdbus_glib_1_la_LIBADD) $(libdbus_glib_1_la_LDFLAGS) \
+ > $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
char **tokens;
int num_tokens;
const char *cur;
- const char *prev;
gboolean have_system;
gboolean have_session;
gboolean have_print_reply;
tokens = g_strsplit (str, " ", 0);
num_tokens = g_strv_length (tokens);
- if (num_tokens >= 2) {
+ if (num_tokens >= 1) {
cur = tokens[num_tokens - 1];
- prev = tokens[num_tokens - 2];
- } else if (num_tokens == 1) {
- cur = tokens[num_tokens - 1];
- prev = "";
} else {
cur = "";
- prev = "";
}
have_system = have_option (tokens, "--system");
#include "dbus-gvalue-utils.h"
#include "dbus-glib-tool.h"
#include "dbus-binding-tool-glib.h"
-#include <glib/gi18n.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
g_set_error (error,
DBUS_BINDING_TOOL_ERROR,
DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION,
- _("Unsupported conversion from D-BUS type %s to glib-genmarshal type"),
+ "Unsupported conversion from D-BUS type %s to glib-genmarshal type",
arg_type);
return FALSE;
}
gboolean async = FALSE;
GSList *args;
gboolean found_retval = FALSE;
+ guint found_out_args = 0;
method = (MethodInfo *) tmp->data;
method_c_name = g_strdup (method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_C_SYMBOL));
if (!write_printf_to_iochannel (" { (GCallback) %s, ", channel, error,
method_c_name))
- goto io_lose;
+ {
+ g_free (method_c_name);
+ goto io_lose;
+ }
+ g_free (method_c_name);
marshaller_name = compute_marshaller_name (method, data->prefix, error);
if (!marshaller_name)
break;
case ARG_OUT:
direction = 'O';
+ found_out_args++;
break;
case ARG_INVALID:
default:
interface_info_get_name (interface));
return FALSE;
}
+
+ if (found_out_args != 1)
+ {
+ g_set_error (error,
+ DBUS_BINDING_TOOL_ERROR,
+ DBUS_BINDING_TOOL_ERROR_INVALID_ANNOTATION,
+ "An output <arg> after the first cannot have the ReturnVal annotation, in argument \"%s\" of method \"%s\" of interface \"%s\"\n",
+ arg_info_get_name (arg),
+ method_info_get_name (method),
+ interface_info_get_name (interface));
+ return FALSE;
+ }
+
if (!strcmp ("", returnval_annotation))
g_string_append_c (object_introspection_data_blob, 'R');
else if (!strcmp ("error", returnval_annotation))
g_set_error (error,
DBUS_BINDING_TOOL_ERROR,
DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION,
- _("Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\""),
+ "Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\"",
arg_info_get_type (arg),
method_info_get_name (method),
interface_info_get_name (iface));
write_args_for_direction (InterfaceInfo *iface, MethodInfo *method, GIOChannel *channel, int direction, GError **error)
{
GSList *args;
+ char *type_lookup = NULL;
for (args = method_info_get_args (method); args; args = args->next)
{
ArgInfo *arg;
GType gtype;
- char *type_lookup;
arg = args->data;
return TRUE;
io_lose:
+ g_free (type_lookup);
return FALSE;
}
g_set_error (error,
DBUS_BINDING_TOOL_ERROR,
DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION,
- _("Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\""),
+ "Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\"",
arg_info_get_type (arg),
method_info_get_name (method),
interface_info_get_name (iface));
g_set_error (error,
DBUS_BINDING_TOOL_ERROR,
DBUS_BINDING_TOOL_ERROR_UNSUPPORTED_CONVERSION,
- _("Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\""),
+ "Unsupported conversion from D-BUS type signature \"%s\" to glib C type in method \"%s\" of interface \"%s\"",
arg_info_get_type (arg),
method_info_get_name (method),
interface_info_get_name (iface));
static gboolean
write_typed_args_for_direction (InterfaceInfo *iface, MethodInfo *method, GIOChannel *channel, const int direction, GError **error)
- {
+{
GSList *args;
+ char *type_lookup = NULL;
for (args = method_info_get_args (method); args; args = args->next)
{
ArgInfo *arg;
int dir;
GType gtype;
- const char *type_lookup;
arg = args->data;
type_lookup = dbus_g_type_get_lookup_function (gtype);
if (!write_printf_to_iochannel ("%s, &%s_%s, ", channel, error, type_lookup, direction == ARG_IN ? "IN" : "OUT", arg_info_get_name (arg)))
- goto io_lose;
+ goto io_lose;
+ g_free (type_lookup);
}
return TRUE;
io_lose:
+ g_free (type_lookup);
return FALSE;
}
static gboolean
generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error)
{
+ char *iface_prefix;
+ char *method_c_name;
+ iface_prefix = NULL;
+ method_c_name = NULL;
+
if (base_info_get_type (base) == INFO_TYPE_NODE)
{
if (!generate_client_glue_list (node_info_get_nodes ((NodeInfo *) base),
- data, error))
- return FALSE;
+ data, error))
+ return FALSE;
if (!generate_client_glue_list (node_info_get_interfaces ((NodeInfo *) base),
- data, error))
- return FALSE;
+ data, error))
+ return FALSE;
}
else
{
InterfaceInfo *interface;
GSList *methods;
GSList *tmp;
- char *iface_prefix;
const char *interface_c_name;
channel = data->channel;
}
if (!write_printf_to_iochannel ("#ifndef DBUS_GLIB_CLIENT_WRAPPERS_%s\n"
- "#define DBUS_GLIB_CLIENT_WRAPPERS_%s\n\n",
- channel, error,
- iface_prefix, iface_prefix))
- {
- g_free (iface_prefix);
- goto io_lose;
- }
+ "#define DBUS_GLIB_CLIENT_WRAPPERS_%s\n\n",
+ channel, error,
+ iface_prefix, iface_prefix))
+ goto io_lose;
for (tmp = methods; tmp != NULL; tmp = g_slist_next (tmp))
{
- MethodInfo *method;
- char *method_c_name;
- gboolean is_noreply;
+ MethodInfo *method;
+ gboolean is_noreply;
method = (MethodInfo *) tmp->data;
- method_c_name = g_strdup (method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_CLIENT_C_SYMBOL));
+ method_c_name = g_strdup (method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_CLIENT_C_SYMBOL));
if (method_c_name == NULL)
- {
+ {
method_c_name = compute_client_method_name (interface_c_name, method);
}
- is_noreply = method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_NOREPLY) != NULL;
+ is_noreply = method_info_get_annotation (method, DBUS_GLIB_ANNOTATION_NOREPLY) != NULL;
- if (data->ignore_unsupported && !check_supported_parameters (method))
- {
- g_warning ("Ignoring unsupported signature in method \"%s\" of interface \"%s\"\n",
- method_info_get_name (method),
- interface_info_get_name (interface));
- continue;
- }
+ if (data->ignore_unsupported && !check_supported_parameters (method))
+ {
+ g_warning ("Ignoring unsupported signature in method \"%s\" of interface \"%s\"\n",
+ method_info_get_name (method),
+ interface_info_get_name (interface));
+ g_free (method_c_name);
+ method_c_name = NULL;
+ continue;
+ }
- WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\ngboolean\n");
- if (!write_printf_to_iochannel ("%s (DBusGProxy *proxy", channel, error,
- method_c_name))
- goto io_lose;
- g_free (method_c_name);
+ WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\ngboolean\n");
+ if (!write_printf_to_iochannel ("%s (DBusGProxy *proxy", channel, error,
+ method_c_name))
+ goto io_lose;
+ g_free (method_c_name);
+ method_c_name = NULL;
- if (!write_formal_parameters (interface, method, channel, error))
- goto io_lose;
+ if (!write_formal_parameters (interface, method, channel, error))
+ goto io_lose;
- WRITE_OR_LOSE (", GError **error)\n\n");
-
- WRITE_OR_LOSE ("{\n");
+ WRITE_OR_LOSE (", GError **error)\n\n");
- if (is_noreply) {
- if (!write_printf_to_iochannel (" dbus_g_proxy_call_no_reply (proxy, \"%s\", ", channel, error,
- method_info_get_name (method)))
- goto io_lose;
-
- if (!write_args_for_direction (interface, method, channel, ARG_IN, error))
- goto io_lose;
-
- WRITE_OR_LOSE ("G_TYPE_INVALID, ");
-
- if (!write_args_for_direction (interface, method, channel, ARG_OUT, error))
- goto io_lose;
-
- WRITE_OR_LOSE ("G_TYPE_INVALID);\n");
-
- WRITE_OR_LOSE (" return TRUE;\n}\n\n");
- } else {
- if (!write_printf_to_iochannel (" return dbus_g_proxy_call (proxy, \"%s\", ", channel, error,
- method_info_get_name (method)))
- goto io_lose;
-
- WRITE_OR_LOSE ("error, ");
-
- if (!write_args_for_direction (interface, method, channel, ARG_IN, error))
- goto io_lose;
-
- WRITE_OR_LOSE ("G_TYPE_INVALID, ");
-
- if (!write_args_for_direction (interface, method, channel, ARG_OUT, error))
- goto io_lose;
-
- WRITE_OR_LOSE ("G_TYPE_INVALID);\n}\n\n");
- }
+ WRITE_OR_LOSE ("{\n");
- write_async_method_client (channel, interface, method, error);
- }
+ if (is_noreply) {
+ if (!write_printf_to_iochannel (" dbus_g_proxy_call_no_reply (proxy, \"%s\", ", channel, error,
+ method_info_get_name (method)))
+ goto io_lose;
+
+ if (!write_args_for_direction (interface, method, channel, ARG_IN, error))
+ goto io_lose;
+
+ WRITE_OR_LOSE ("G_TYPE_INVALID, ");
+
+ if (!write_args_for_direction (interface, method, channel, ARG_OUT, error))
+ goto io_lose;
+
+ WRITE_OR_LOSE ("G_TYPE_INVALID);\n");
+
+ WRITE_OR_LOSE (" return TRUE;\n}\n\n");
+ } else {
+ if (!write_printf_to_iochannel (" return dbus_g_proxy_call (proxy, \"%s\", ", channel, error,
+ method_info_get_name (method)))
+ goto io_lose;
+
+ WRITE_OR_LOSE ("error, ");
+
+ if (!write_args_for_direction (interface, method, channel, ARG_IN, error))
+ goto io_lose;
+
+ WRITE_OR_LOSE ("G_TYPE_INVALID, ");
+
+ if (!write_args_for_direction (interface, method, channel, ARG_OUT, error))
+ goto io_lose;
+
+ WRITE_OR_LOSE ("G_TYPE_INVALID);\n}\n\n");
+ }
+
+ write_async_method_client (channel, interface, method, error);
+ }
if (!write_printf_to_iochannel ("#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_%s */\n\n", channel, error, iface_prefix))
- {
- g_free (iface_prefix);
- goto io_lose;
- }
+ goto io_lose;
g_free (iface_prefix);
}
return TRUE;
io_lose:
+ g_free (method_c_name);
+ g_free (iface_prefix);
return FALSE;
}
*
*/
-#include "dbus-gidl.h"
+#include <config.h>
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
+#include "dbus-gidl.h"
struct BaseInfo
{
g_strdup (name),
g_strdup (value));
}
-
-
-#ifdef DBUS_BUILD_TESTS
-
-/**
- * @ingroup DBusGIDL
- * Unit test for GLib IDL internals
- * Returns: #TRUE on success.
- */
-gboolean
-_dbus_gidl_test (void)
-{
-
- return TRUE;
-}
-
-#endif /* DBUS_BUILD_TESTS */
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
#ifndef DBUS_GLIB_IDL_H
#define DBUS_GLIB_IDL_H
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-
#include <dbus/dbus.h>
#include <glib-object.h>
G_END_DECLS
#endif /* DBUS_GLIB_IDL_H */
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+++ /dev/null
-#error This header makes no sense - see bugs.freedesktop.org 15430
+++ /dev/null
-#error This header makes no sense - see bugs.freedesktop.org 15430
#define DBUS_TYPE_CONNECTION (dbus_connection_get_g_type ())
#define DBUS_TYPE_MESSAGE (dbus_message_get_g_type ())
-#define DBUS_TYPE_PENDING_CALL (dbus_pending_call_get_g_type ())
GType dbus_connection_get_g_type (void) G_GNUC_CONST;
GType dbus_message_get_g_type (void) G_GNUC_CONST;
-GType dbus_pending_call_get_g_type (void) G_GNUC_CONST;
void dbus_connection_setup_with_g_main (DBusConnection *connection,
GMainContext *context);
DBusGConnection* dbus_connection_get_g_connection (DBusConnection *connection);
DBusMessage* dbus_g_message_get_message (DBusGMessage *gmessage);
-/* dbus_g_pending_call_get_pending_call() deliberately skipped for now;
- * not sure it makes sense to use any of the DBusPendingCall functions
- * on the wrapped pending call (once we have the right exported
- * g-functions anyhow)
- */
-
gchar* dbus_g_method_get_sender (DBusGMethodInvocation *context);
DBusMessage* dbus_g_method_get_reply (DBusGMethodInvocation *context);
#include "dbus-gutils.h"
#include "dbus-glib-tool.h"
#include "dbus-binding-tool-glib.h"
-#include <locale.h>
-#include <libintl.h>
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) x
+#include <glib/gstdio.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h>
#include <time.h>
-#ifdef DBUS_BUILD_TESTS
-static void run_all_tests (const char *test_data_dir);
-#endif
-
typedef enum {
DBUS_BINDING_OUTPUT_NONE,
DBUS_BINDING_OUTPUT_PRETTY,
NodeInfo *n = (NodeInfo*) base;
if (name == NULL)
- printf (_("<anonymous node> {\n"));
+ printf ("<anonymous node> {\n");
else
- printf (_("node \"%s\" {\n"), name);
+ printf ("node \"%s\" {\n", name);
pretty_print_list (node_info_get_interfaces (n), depth + 1);
pretty_print_list (node_info_get_nodes (n), depth + 1);
g_assert (name != NULL);
- printf (_("interface \"%s\" {\n"), name);
+ printf ("interface \"%s\" {\n", name);
annotations = interface_info_get_annotations (i);
for (elt = annotations; elt; elt = elt->next)
const char *name = elt->data;
const char *value = interface_info_get_annotation (i, name);
- printf (_(" (binding \"%s\": \"%s\") "),
+ printf (" (binding \"%s\": \"%s\") ",
name, value);
}
g_slist_free (annotations);
g_assert (name != NULL);
annotations = method_info_get_annotations (m);
- printf (_("method \"%s\""), name);
+ printf ("method \"%s\" (\n", name);
for (elt = annotations; elt; elt = elt->next)
{
const char *name = elt->data;
const char *value = method_info_get_annotation (m, name);
- printf (_(" (annotation \"%s\": \"%s\") "),
+ printf (" (annotation \"%s\": \"%s\") ",
name, value);
}
g_slist_free (annotations);
g_assert (name != NULL);
- printf (_("signal \"%s\" (\n"), name);
+ printf ("signal \"%s\" (\n", name);
pretty_print_list (signal_info_get_args (s), depth + 1);
return quark;
}
-static void lose (const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2);
-static void lose_gerror (const char *prefix, GError *error) G_GNUC_NORETURN;
+static void warn (const char *fmt, ...) G_GNUC_PRINTF (1, 2);
+static void warn_gerror (const char *prefix, GError *error);
static void
-lose (const char *str, ...)
+warn (const char *str, ...)
{
va_list args;
fputc ('\n', stderr);
va_end (args);
-
- exit (1);
}
static void
-lose_gerror (const char *prefix, GError *error)
+warn_gerror (const char *prefix, GError *error)
{
- lose ("%s: %s", prefix, error->message);
+ warn ("%s: %s", prefix, error->message);
}
static void
{
const char *output_file;
const char *prefix;
- char *output_file_tmp;
+ char *output_file_tmp = NULL;
int i;
GSList *files;
DBusBindingOutputMode outputmode;
gboolean end_of_args;
GSList *tmp;
- GIOChannel *channel;
+ GIOChannel *channel = NULL;
GError *error;
time_t newest_src;
struct stat srcbuf;
gboolean ignore_unsupported;
gboolean has_prefix = FALSE;
- setlocale (LC_ALL, "");
- bindtextdomain (GETTEXT_PACKAGE, DBUS_LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
g_type_init ();
outputmode = DBUS_BINDING_OUTPUT_NONE;
version ();
else if (strcmp (arg, "--force") == 0)
force = TRUE;
-#ifdef DBUS_BUILD_TESTS
- else if (strcmp (arg, "--self-test") == 0)
- run_all_tests (NULL);
-#endif /* DBUS_BUILD_TESTS */
else if (strncmp (arg, "--mode=", 7) == 0)
{
const char *mode = arg + 7;
filename = tmp->data;
if (stat (filename, &srcbuf) < 0)
- lose ("Couldn't stat %s: %s", filename, g_strerror (errno));
+ {
+ warn ("Couldn't stat %s: %s", filename, g_strerror (errno));
+ goto lose;
+ }
if (srcbuf.st_mtime > newest_src)
newest_src = srcbuf.st_mtime;
output_file_tmp = g_strconcat (output_file, ".tmp", NULL);
if (!(channel = g_io_channel_new_file (output_file_tmp, "w", &error)))
- lose_gerror (_("Couldn't open temporary file"), error);
+ {
+ warn_gerror ("Couldn't open temporary file", error);
+ goto lose;
+ }
}
else
{
channel = g_io_channel_unix_new (fileno (stdout));
- output_file_tmp = NULL; /* silence gcc */
}
+
if (!g_io_channel_set_encoding (channel, NULL, &error))
- lose_gerror (_("Couldn't set channel encoding to NULL"), error);
+ {
+ warn_gerror ("Couldn't set channel encoding to NULL", error);
+ goto lose;
+ }
for (tmp = files; tmp != NULL; tmp = tmp->next)
&error);
if (node == NULL)
{
- lose (_("Unable to load \"%s\": %s"), filename, error->message);
+ warn ("Unable to load \"%s\": %s", filename, error->message);
+ goto lose;
}
else
{
break;
case DBUS_BINDING_OUTPUT_GLIB_SERVER:
if (!dbus_binding_tool_output_glib_server ((BaseInfo *) node, channel, prefix, &error))
- lose_gerror (_("Compilation failed"), error);
+ {
+ warn_gerror ("Compilation failed", error);
+ node_info_unref (node);
+ goto lose;
+ }
break;
case DBUS_BINDING_OUTPUT_GLIB_CLIENT:
if (!dbus_binding_tool_output_glib_client ((BaseInfo *) node, channel, ignore_unsupported, &error))
- lose_gerror (_("Compilation failed"), error);
+ {
+ warn_gerror ("Compilation failed", error);
+ node_info_unref (node);
+ goto lose;
+ }
break;
case DBUS_BINDING_OUTPUT_NONE:
break;
}
if (g_io_channel_shutdown (channel, TRUE, &error) != G_IO_STATUS_NORMAL)
- lose_gerror (_("Failed to shutdown IO channel"), error);
+ {
+ warn_gerror ("Failed to shutdown IO channel", error);
+ goto lose;
+ }
+
g_io_channel_unref (channel);
+ channel = NULL;
if (output_file)
{
if (rename (output_file_tmp, output_file) < 0)
- lose ("Failed to rename %s to %s: %s", output_file_tmp, output_file,
- g_strerror (errno));
+ {
+ warn ("Failed to rename %s to %s: %s", output_file_tmp, output_file,
+ g_strerror (errno));
+ goto lose;
+ }
g_free (output_file_tmp);
}
return 0;
-}
-
-#ifdef DBUS_BUILD_TESTS
-static void
-test_die (const char *failure)
-{
- lose ("Unit test failed: %s", failure);
-}
-
-/**
- * @ingroup DBusGTool
- * Unit test for GLib utility tool
- * Returns: #TRUE on success.
- */
-static gboolean
-_dbus_gtool_test (const char *test_data_dir)
-{
-
- return TRUE;
-}
-
-static void
-run_all_tests (const char *test_data_dir)
-{
- if (test_data_dir == NULL)
- test_data_dir = g_getenv ("DBUS_TEST_DATA");
-
- if (test_data_dir != NULL)
- printf ("Test data in %s\n", test_data_dir);
- else
- printf ("No test data!\n");
+lose:
+ /* ignore errors, we're already handling an error */
+ if (channel != NULL)
+ {
+ (void) g_io_channel_shutdown (channel, FALSE, NULL);
+ g_io_channel_unref (channel);
+ }
- printf ("%s: running binding tests\n", "dbus-binding-tool");
- if (!_dbus_gtool_test (test_data_dir))
- test_die ("gtool");
+ if (output_file_tmp != NULL)
+ (void) g_remove (output_file_tmp);
- printf ("%s: completed successfully\n", "dbus-binding-tool");
+ g_free (output_file_tmp);
+ return 1;
}
-
-#endif /* DBUS_BUILD_TESTS */
#include "dbus-gobject.h"
#include <string.h>
-#include <libintl.h>
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) x
-
-
/**
* SECTION:dbus-gconnection
* @short_description: DBus Connection
*/
/**
+ * DBusGConnection:
+ *
+ * A #DBusGConnection is a boxed type abstracting a DBusConnection from
+ * libdbus.
+ */
+
+/**
* dbus_g_connection_flush:
* @connection: the #DBusGConnection to flush
*
/**
* dbus_g_connection_ref:
- * @gconnection the #DBusGConnection to ref
+ * @connection: the #DBusGConnection to ref
*
* Increment refcount on a #DBusGConnection
*
* Returns: the connection that was ref'd
*/
DBusGConnection*
-dbus_g_connection_ref (DBusGConnection *gconnection)
+dbus_g_connection_ref (DBusGConnection *connection)
{
DBusConnection *c;
- c = DBUS_CONNECTION_FROM_G_CONNECTION (gconnection);
+ c = DBUS_CONNECTION_FROM_G_CONNECTION (connection);
dbus_connection_ref (c);
- return gconnection;
+ return connection;
}
/**
* dbus_g_connection_unref:
- * @gconnection: the connection to unref
+ * @connection: the connection to unref
*
* Decrement refcount on a #DBusGConnection
*/
void
-dbus_g_connection_unref (DBusGConnection *gconnection)
+dbus_g_connection_unref (DBusGConnection *connection)
{
DBusConnection *c;
- c = DBUS_CONNECTION_FROM_G_CONNECTION (gconnection);
+ c = DBUS_CONNECTION_FROM_G_CONNECTION (connection);
dbus_connection_unref (c);
}
* @see_also: #DBusMessage
* @stability: Stable
*
- * A #DBusGConnection is a boxed type abstracting a DBusMessage.
+ * A #DBusGMessage is a boxed type abstracting a DBusMessage.
+ */
+
+/**
+ * DBusGMessage:
+ *
+ * A #DBusGMessage is a boxed type abstracting a DBusMessage from
+ * libdbus.
*/
/**
* dbus_g_message_ref:
- * @gmessage: the message to ref
+ * @message: the message to ref
*
* Increment refcount on a #DBusGMessage
*
* Returns: the message that was ref'd
*/
DBusGMessage*
-dbus_g_message_ref (DBusGMessage *gmessage)
+dbus_g_message_ref (DBusGMessage *message)
{
DBusMessage *c;
- c = DBUS_MESSAGE_FROM_G_MESSAGE (gmessage);
+ c = DBUS_MESSAGE_FROM_G_MESSAGE (message);
dbus_message_ref (c);
- return gmessage;
+ return message;
}
/**
* dbus_g_message_unref:
- * @gmessage: the message to unref
+ * @message: the message to unref
*
* Decrement refcount on a #DBusGMessage
*/
void
-dbus_g_message_unref (DBusGMessage *gmessage)
+dbus_g_message_unref (DBusGMessage *message)
{
DBusMessage *c;
- c = DBUS_MESSAGE_FROM_G_MESSAGE (gmessage);
+ c = DBUS_MESSAGE_FROM_G_MESSAGE (message);
dbus_message_unref (c);
}
*/
/**
- * dbus_g_error_quark:
+ * DBusGError:
*
- * The implementation of #DBUS_GERROR error domain. See documentation
- * for #GError in GLib reference manual.
+ * A #GError enumeration for the domain %DBUS_GERROR. The values' meanings
+ * can be found by looking at the comments for the corresponding constants
+ * in dbus-protocol.h.
+ */
+
+/**
+ * DBUS_GERROR:
*
- * Returns: the error domain quark for use with #GError
+ * Expands to a function call returning the error domain quark for #DBusGError,
+ * for use with #GError.
*/
GQuark
dbus_g_error_quark (void)
* dbus_g_error_has_name:
* @error: the GError given from the remote method
* @name: the D-BUS error name
- * @msg: the D-BUS error detailed message
*
* Determine whether D-BUS error name for a remote exception matches
* the given name. This function is intended to be invoked on a
- * GError returned from an invocation of a remote method, e.g. via
- * dbus_g_proxy_end_call. It will silently return FALSE for errors
+ * #GError returned from an invocation of a remote method, e.g. via
+ * dbus_g_proxy_end_call(). It will silently return %FALSE for errors
* which are not remote D-BUS exceptions (i.e. with a domain other
- * than DBUS_GERROR or a code other than
- * DBUS_GERROR_REMOTE_EXCEPTION).
+ * than %DBUS_GERROR or a code other than
+ * %DBUS_GERROR_REMOTE_EXCEPTION).
*
- * Returns: TRUE iff the remote error has the given name
+ * Returns: %TRUE if and only if the remote error has the given name
*/
gboolean
dbus_g_error_has_name (GError *error, const char *name)
/**
* dbus_g_error_get_name:
* @error: the #GError given from the remote method
- * @name: the D-BUS error name
- * @msg: the D-BUS error detailed message
*
* This function may only be invoked on a #GError returned from an
- * invocation of a remote method, e.g. via dbus_g_proxy_end_call.
- * Moreover, you must ensure that the error's domain is #DBUS_GERROR,
- * and the code is #DBUS_GERROR_REMOTE_EXCEPTION.
+ * invocation of a remote method, e.g. via dbus_g_proxy_end_call().
+ * Moreover, you must ensure that the error's domain is %DBUS_GERROR,
+ * and the code is %DBUS_GERROR_REMOTE_EXCEPTION.
*
* Returns: the D-BUS name for a remote exception.
*/
}
/**
- * dbus_connection_get_g_type:
- * Get the GLib type ID for a #DBusConnection boxed type.
+ * DBUS_TYPE_CONNECTION:
+ *
+ * Expands to a function call returning a boxed #GType representing a
+ * #DBusConnection pointer from libdbus. Not to be confused with
+ * %DBUS_TYPE_G_CONNECTION, which you should usually use instead.
*
* Returns: the GLib type
*/
}
/**
- * dbus_message_get_g_type:
- * Get the GLib type ID for a #DBusMessage boxed type.
+ * DBUS_TYPE_MESSAGE:
+ *
+ * Expands to a function call returning a boxed #GType representing a
+ * #DBusMessage pointer from libdbus. Not to be confused with
+ * %DBUS_TYPE_G_MESSAGE, which you should usually use instead.
+ *
*
* Returns: the GLib type
*/
}
/**
- * dbus_g_connection_get_g_type:
- * Get the GLib type ID for a DBusGConnection boxed type.
+ * DBUS_TYPE_G_CONNECTION:
+ *
+ * Expands to a function call returning the boxed #GType of a #DBusGConnection.
*
* Returns: the GLib type
*/
}
/**
- * dbus_g_message_get_g_type:
- * Get the GLib type ID for a #DBusGMessage boxed type.
+ * DBUS_TYPE_G_MESSAGE:
+ *
+ * Expands to a function call returning the boxed #GType of a #DBusGConnection.
*
* Returns: the GLib type
*/
#ifdef DBUS_BUILD_TESTS
-/**
- * @ingroup DBusGLibInternals
+/*
* Unit test for general glib stuff
- * Returns: #TRUE on success.
+ * Returns: %TRUE on success.
*/
gboolean
_dbus_glib_test (const char *test_data_dir)
#define DBUS_INSIDE_DBUS_GLIB_H 1
-/**
+/*
* Convert to DBusConnection with dbus_g_connection_get_connection() in dbus-glib-lowlevel.h
*/
typedef struct _DBusGConnection DBusGConnection;
-/**
+/*
* Convert to DBusMessage with dbus_g_message_get_message() in dbus-glib-lowlevel.h
*/
typedef struct _DBusGMessage DBusGMessage;
void dbus_g_object_type_install_info (GType object_type,
const DBusGObjectInfo *info);
-void dbus_g_object_type_register_shadow_property (GType object_type,
+void dbus_g_object_type_register_shadow_property (GType iface_type,
const char *dbus_prop_name,
const char *shadow_prop_name);
#define DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
+typedef gchar DBusGObjectPath;
GType dbus_g_object_path_get_g_type (void) G_GNUC_CONST;
#define DBUS_TYPE_G_OBJECT_PATH (dbus_g_object_path_get_g_type ())
+typedef gchar DBusGSignature;
GType dbus_g_signature_get_g_type (void) G_GNUC_CONST;
#define DBUS_TYPE_G_SIGNATURE (dbus_g_signature_get_g_type ())
struct _DBusGProxy
{
+ /*< private >*/
GObject parent;
};
struct _DBusGProxyClass
{
+ /*< private >*/
GObjectClass parent_class; /**< Parent class */
};
GError **error);
DBusGProxy* dbus_g_proxy_new_from_proxy (DBusGProxy *proxy,
const char *iface,
- const char *path_name);
+ const char *path);
DBusGProxy* dbus_g_proxy_new_for_peer (DBusGConnection *connection,
- const char *path_name,
- const char *interface_name);
+ const char *path,
+ const char *iface);
void dbus_g_proxy_set_interface (DBusGProxy *proxy,
const char *interface_name);
DBusGProxyCall * dbus_g_proxy_begin_call (DBusGProxy *proxy,
const char *method,
DBusGProxyCallNotify notify,
- gpointer data,
+ gpointer user_data,
GDestroyNotify destroy,
GType first_arg_type,
...);
#undef DBUS_INSIDE_DBUS_GLIB_H
+#include <dbus/dbus-gvalue-parse-variant.h>
+
G_END_DECLS
#endif /* DBUS_GLIB_H */
*
*/
+#include <config.h>
+
#include "dbus-gparser.h"
#include <expat.h>
#include <string.h>
g_free
};
-/**
+/*
* Context for Expat parser for introspection data.
*/
typedef struct
#include "dbus-gsignature.h"
#include <string.h>
-#include <libintl.h>
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) x
-
-/**
- * @defgroup DBusGLibInternals GLib bindings implementation details
- * @ingroup DBusInternals
- * @brief Implementation details of GLib bindings
- *
- * @{
- */
-
-/**
+/*
* DBusGMessageQueue:
+ *
* A GSource subclass for dispatching DBusConnection messages.
* We need this on top of the IO handlers, because sometimes
* there are messages to dispatch queued up but no IO pending.
return TRUE;
}
+/* Attach the connection setup to the given watch, removing any
+ * previously-attached connection setup.
+ */
static void
connection_setup_add_watch (ConnectionSetup *cs,
DBusWatch *watch)
if (!dbus_watch_get_enabled (watch))
return;
- g_assert (dbus_watch_get_data (watch) == NULL);
-
flags = dbus_watch_get_flags (watch);
condition = G_IO_ERR | G_IO_HUP;
handler = dbus_watch_get_data (watch);
- if (handler == NULL)
+ if (handler == NULL || handler->cs != cs)
return;
io_handler_destroy_source (handler);
connection_setup_new_from_old (GMainContext *context,
ConnectionSetup *old)
{
- GSList *tmp;
ConnectionSetup *cs;
g_assert (old->context != context);
cs = connection_setup_new (context, old->connection);
- tmp = old->ios;
- while (tmp != NULL)
+ while (old->ios != NULL)
{
- IOHandler *handler = tmp->data;
+ IOHandler *handler = old->ios->data;
connection_setup_add_watch (cs, handler->watch);
-
- tmp = tmp->next;
+ /* The old handler will be removed from old->ios as a side-effect */
}
- tmp = old->timeouts;
- while (tmp != NULL)
+ while (old->timeouts != NULL)
{
- TimeoutHandler *handler = tmp->data;
+ TimeoutHandler *handler = old->timeouts->data;
connection_setup_add_timeout (cs, handler->timeout);
-
- tmp = tmp->next;
}
return cs;
}
-/** @} */ /* End of GLib bindings internals */
-
-/** @addtogroup DBusGLib
- * @{
- */
-
/**
* dbus_connection_setup_with_g_main:
* @connection: the connection
- * @context: the #GMainContext or #NULL for default context
+ * @context: the #GMainContext or %NULL for default context
*
* Sets the watch and timeout functions of a #DBusConnection
* to integrate the connection with the GLib main loop.
- * Pass in #NULL for the #GMainContext unless you're
+ * Pass in %NULL for the #GMainContext unless you're
* doing something specialized.
*
* If called twice for the same context, does nothing the second
/**
* dbus_server_setup_with_g_main:
* @server: the server
- * @context: the #GMainContext or #NULL for default
+ * @context: the #GMainContext or %NULL for default
*
* Sets the watch and timeout functions of a #DBusServer
* to integrate the server with the GLib main loop.
- * In most cases the context argument should be #NULL.
+ * In most cases the context argument should be %NULL.
*
* If called twice for the same context, does nothing the second
* time. If called once with context A and once with context B,
cs = connection_setup_new_from_old (context, old_setup);
/* Nuke the old setup */
- dbus_server_set_data (server, server_slot, NULL, NULL);
+ if (!dbus_server_set_data (server, server_slot, NULL, NULL))
+ goto nomem;
old_setup = NULL;
}
return DBUS_G_CONNECTION_FROM_CONNECTION (connection);
}
-/** @} */ /* end of public API */
-
#ifdef DBUS_BUILD_TESTS
-/**
- * @ingroup DBusGLibInternals
+/*
* Unit test for GLib main loop integration
- * Returns: #TRUE on success.
+ * Returns: %TRUE on success.
*/
gboolean
_dbus_gmain_test (const char *test_data_dir)
+#include <config.h>
#include "dbus-gmarshal.h"
#include <glib-object.h>
#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
#define g_marshal_value_peek_object(v) g_value_get_object (v)
+#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
#else /* !G_ENABLE_DEBUG */
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
* Do not access GValues directly in your code. Instead, use the
#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
/* NONE:STRING,STRING,STRING (dbus-gmarshal.list:1) */
void
_dbus_g_marshal_VOID__STRING_STRING_STRING (GClosure *closure,
- GValue *return_value,
+ GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
- gpointer invocation_hint,
+ gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1,
#include "dbus-gvalue-utils.h"
#include <string.h>
+#include <gio/gio.h>
+
+G_GNUC_NORETURN static void
+oom (const gchar *explanation)
+{
+ g_error ("%s", explanation == NULL ? "Out of memory" : explanation);
+ g_assert_not_reached ();
+}
+
+static DBusMessage *
+reply_or_die (DBusMessage *in_reply_to)
+{
+ DBusMessage *reply;
+
+ g_return_val_if_fail (in_reply_to != NULL, NULL);
+
+ reply = dbus_message_new_method_return (in_reply_to);
+
+ if (reply == NULL)
+ oom ("dbus_message_new_method_return failed: out of memory?");
+
+ return reply;
+}
+
+static DBusMessage *
+error_or_die (DBusMessage *in_reply_to,
+ const gchar *error_name,
+ const gchar *error_message)
+{
+ DBusMessage *reply;
+
+ g_return_val_if_fail (in_reply_to != NULL, NULL);
+ /* error names are syntactically the same as interface names */
+ g_return_val_if_fail (g_dbus_is_interface_name (error_name), NULL);
+ g_return_val_if_fail (g_utf8_validate (error_message, -1, NULL), NULL);
+
+ reply = dbus_message_new_error (in_reply_to, error_name, error_message);
+
+ if (reply == NULL)
+ oom ("dbus_message_new_error failed: out of memory?");
+
+ return reply;
+}
+
+static void
+connection_send_or_die (DBusConnection *connection,
+ DBusMessage *message)
+{
+ g_return_if_fail (connection != NULL);
+ g_return_if_fail (message != NULL);
+
+ if (!dbus_connection_send (connection, message, NULL))
+ oom ("dbus_connection_send failed: out of memory?");
+}
+
static char *lookup_property_name (GObject *object,
const char *wincaps_propiface,
const char *requested_propname);
static char*
uscore_to_wincaps_full (const char *uscore,
- gboolean uppercase_first)
+ gboolean uppercase_first,
+ gboolean strip_underscores)
{
const char *p;
GString *str;
p = uscore;
while (p && *p)
{
- if (*p == '-' || *p == '_')
+ if (*p == '-' || (strip_underscores && *p == '_'))
{
last_was_uscore = TRUE;
}
static char *
uscore_to_wincaps (const char *uscore)
{
- return uscore_to_wincaps_full (uscore, TRUE);
+ return uscore_to_wincaps_full (uscore, TRUE, TRUE);
}
static const char *
RETVAL_ERROR
} RetvalType;
+/*
+ * arg_iterate:
+ * @data: a pointer to the beginning of an argument entry in a string table
+ * @name: (out) (allow-none): used to return the name of the next argument
+ * @in: (out) (allow-none): used to return %TRUE for an "in" argument or
+ * %FALSE for an "out" argument
+ * @constval: (out) (allow-none): used to return %TRUE if the argument is
+ * an "out" argument and has the "C" (const) flag indicating that it
+ * should not be freed after it is returned; normally, "out" arguments
+ * are freed
+ * @retval: (out) (allow-none): used to return %RETVAL_NONE if this
+ * D-Bus argument is not an "out" argument or is obtained like a C "out"
+ * parameter, %RETVAL_ERROR if this argument is obtained from the C
+ * return value and is also used to signal errors, or %RETVAL_NOERROR
+ * if this argument is obtained from the C return value and the method
+ * can never raise an error
+ * @type: (out) (allow-none): used to return the D-Bus signature of this
+ * argument
+ *
+ * The data format is:
+ *
+ * argument name
+ * \0
+ * direction: I or O
+ * \0
+ * if direction == "O":
+ * freeable? F or C
+ * \0
+ * retval? N, E or R
+ * \0
+ * signature
+ * \0
+ *
+ * If none of the arguments has @retval != %RETVAL_NONE, the method is
+ * assumed to return a gboolean, which behaves like %RETVAL_ERROR but is
+ * not sent over D-Bus at all.
+ *
+ * Returns: the value of @data to use for the next call, or a pointer to '\0'
+ * if this function must not be called again
+ */
static const char *
arg_iterate (const char *data,
const char **name,
}
typedef struct {
+ /* owned */
+ GSList *registrations;
+ /* weak ref, or NULL if the object has been disposed */
+ GObject *object;
+} ObjectExport;
+
+typedef struct {
+ /* pseudo-weak ref, never NULL */
DBusGConnection *connection;
+ /* owned, never NULL */
gchar *object_path;
- GObject *object;
+ /* borrowed pointer to parent, never NULL */
+ ObjectExport *export;
} ObjectRegistration;
-static void object_registration_object_died (gpointer user_data, GObject *dead);
+static void object_export_object_died (gpointer user_data, GObject *dead);
+
+static void
+object_export_unregister_all (ObjectExport *oe)
+{
+ while (oe->registrations != NULL)
+ {
+ GSList *old = oe->registrations;
+ ObjectRegistration *o = oe->registrations->data;
+
+ dbus_connection_unregister_object_path (
+ DBUS_CONNECTION_FROM_G_CONNECTION (o->connection), o->object_path);
+
+ /* the link should have been removed by doing that */
+ g_assert (oe->registrations != old);
+ }
+}
+
+static void
+object_export_free (ObjectExport *oe)
+{
+ g_slice_free (ObjectExport, oe);
+}
+
+static ObjectExport *
+object_export_new (void)
+{
+ return g_slice_new0 (ObjectExport);
+}
static ObjectRegistration *
object_registration_new (DBusGConnection *connection,
const gchar *object_path,
- GObject *object)
+ ObjectExport *export)
{
ObjectRegistration *o = g_slice_new0 (ObjectRegistration);
o->connection = connection;
o->object_path = g_strdup (object_path);
- o->object = object;
-
- g_object_weak_ref (o->object, object_registration_object_died, o);
+ o->export = export;
return o;
}
static void
object_registration_free (ObjectRegistration *o)
{
- if (o->object != NULL)
- {
- GSList *registrations;
-
- /* Ok, the object is still around; clear out this particular registration
- * from the registrations list.
- */
- registrations = g_object_steal_data (o->object, "dbus_glib_object_registrations");
- registrations = g_slist_remove (registrations, o);
-
- if (registrations != NULL)
- g_object_set_data (o->object, "dbus_glib_object_registrations", registrations);
-
- g_object_weak_unref (o->object, object_registration_object_died, o);
- }
+ g_assert (o->export != NULL);
+ o->export->registrations = g_slist_remove (o->export->registrations, o);
g_free (o->object_path);
for (i = 0; i < info->n_method_infos; i++)
{
- const char *method_name;
const char *method_interface;
- const char *method_args;
const DBusGMethodInfo *method;
method = &(info->method_infos[i]);
method_interface = method_interface_from_object_info (info, method);
- method_name = method_name_from_object_info (info, method);
- method_args = method_arg_info_from_object_info (info, method);
values = lookup_values (interfaces, method_interface);
values->methods = g_slist_prepend (values->methods, (gpointer) method);
if (!dbus_connection_list_registered (connection,
dbus_message_get_path (message),
&children))
- g_error ("Out of memory");
+ oom (NULL);
xml = g_string_new (NULL);
/* Close the XML, and send it to the requesting app */
g_string_append (xml, "</node>\n");
- ret = dbus_message_new_method_return (message);
- if (ret == NULL)
- g_error ("Out of memory");
+ ret = reply_or_die (message);
dbus_message_append_args (ret,
DBUS_TYPE_STRING, &xml->str,
DBUS_TYPE_INVALID);
- dbus_connection_send (connection, ret, NULL);
+ connection_send_or_die (connection, ret);
dbus_message_unref (ret);
g_string_free (xml, TRUE);
g_value_unset (&value);
- ret = dbus_message_new_method_return (message);
- if (ret == NULL)
- g_error ("out of memory");
+ ret = reply_or_die (message);
}
else
{
- ret = dbus_message_new_error (message,
- DBUS_ERROR_INVALID_ARGS,
- "Argument's D-BUS type can't be converted to a GType");
- if (ret == NULL)
- g_error ("out of memory");
+ ret = error_or_die (message,
+ DBUS_ERROR_INVALID_ARGS,
+ "Argument's D-BUS type can't be converted to a GType");
}
return ret;
}
+/*
+ * @pspec: the paramspec for a D-Bus-exported property
+ *
+ * Returns: a reply for the Get() D-Bus method, either successful or error
+ */
static DBusMessage*
get_object_property (DBusConnection *connection,
DBusMessage *message,
gchar *variant_sig;
DBusMessage *ret;
DBusMessageIter iter, subiter;
+ gchar *error_message = NULL;
- ret = dbus_message_new_method_return (message);
- if (ret == NULL)
- g_error ("out of memory");
-
+ ret = reply_or_die (message);
g_value_init (&value, pspec->value_type);
g_object_get_property (object, pspec->name, &value);
if (variant_sig == NULL)
{
value_gtype = G_VALUE_TYPE (&value);
- g_warning ("Cannot marshal type \"%s\" in variant", g_type_name (value_gtype));
- g_value_unset (&value);
- return ret;
+ error_message = g_strdup_printf (
+ "Internal error: cannot marshal type \"%s\" in variant",
+ g_type_name (value_gtype));
+ goto out;
}
dbus_message_iter_init_append (ret, &iter);
variant_sig,
&subiter))
{
- g_free (variant_sig);
- g_value_unset (&value);
- return ret;
+ error_message = g_strdup_printf (
+ "Internal error: cannot open variant container for signature %s",
+ variant_sig);
+ goto out;
}
if (!_dbus_gvalue_marshal (&subiter, &value))
{
- dbus_message_unref (ret);
- ret = dbus_message_new_error (message,
- DBUS_ERROR_UNKNOWN_METHOD,
- "Can't convert GType of object property to a D-BUS type");
+ dbus_message_iter_abandon_container (&iter, &subiter);
+ error_message = g_strdup_printf (
+ "Internal error: could not marshal type \"%s\" in variant",
+ G_VALUE_TYPE_NAME (&value));
+ goto out;
}
dbus_message_iter_close_container (&iter, &subiter);
+out:
g_value_unset (&value);
g_free (variant_sig);
+ if (error_message != NULL)
+ {
+ dbus_message_unref (ret);
+ ret = error_or_die (message, DBUS_ERROR_FAILED, error_message);
+ g_critical ("%s", error_message);
+ g_free (error_message);
+ }
+
return ret;
}
const char *p;
char *uscore_propname;
- ret = dbus_message_new_method_return (message);
- if (ret == NULL)
- goto oom;
+ ret = reply_or_die (message);
dbus_message_iter_init_append (ret, &iter_ret);
+ /* the types are all hard-coded, so this can only fail via OOM */
if (!dbus_message_iter_open_container (&iter_ret,
DBUS_TYPE_ARRAY,
DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
&iter_dict))
- goto oom;
+ oom (NULL);
p = object_info->exported_properties;
while (p != NULL && *p != '\0')
p = property_iterate (p, object_info->format_version, &prop_ifname, &prop_name, &prop_uscored, &access_flags);
+ /* Conventionally, property names are valid member names, but dbus-glib
+ * doesn't enforce this, and some dbus-glib services use GObject-style
+ * property names (e.g. "foo-bar"). */
+ if (!g_utf8_validate (prop_name, -1, NULL))
+ {
+ g_critical ("property name isn't UTF-8: %s", prop_name);
+ continue;
+ }
+
uscore_propname = lookup_property_name (object, wincaps_propiface, prop_name);
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object), uscore_propname);
continue;
}
+ /* a signature returned by _dbus_gvalue_to_signature had better be
+ * valid */
+ g_assert (g_variant_is_signature (variant_sig));
+
+ /* type is hard-coded, so this can't fail except by OOM */
if (!dbus_message_iter_open_container (&iter_dict,
DBUS_TYPE_DICT_ENTRY,
NULL,
&iter_dict_entry))
- goto oom;
+ oom (NULL);
+
+ /* prop_name is valid UTF-8, so this can't fail except by OOM; no point
+ * in abandoning @iter_dict_entry since we're about to crash out */
if (!dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING, &prop_name))
- goto oom;
+ oom (NULL);
+ /* variant_sig has been asserted to be valid, so this can't fail
+ * except by OOM */
if (!dbus_message_iter_open_container (&iter_dict_entry,
DBUS_TYPE_VARIANT,
variant_sig,
&iter_dict_value))
- goto oom;
+ oom (NULL);
+ g_free (variant_sig);
+
+ /* this can fail via programming error: the GObject property was
+ * malformed (non-UTF8 string or something) */
if (!_dbus_gvalue_marshal (&iter_dict_value, &value))
- goto oom;
+ {
+ gchar *contents = g_strdup_value_contents (&value);
+ gchar *error_message = g_strdup_printf (
+ "cannot GetAll(%s): failed to serialize %s value of type %s: %s",
+ wincaps_propiface, prop_name, G_VALUE_TYPE_NAME (&value),
+ contents);
+
+ g_critical ("%s", error_message);
+
+ /* abandon ship! */
+ dbus_message_iter_abandon_container (&iter_dict_entry,
+ &iter_dict_value);
+ dbus_message_iter_abandon_container (&iter_dict, &iter_dict_entry);
+ dbus_message_unref (ret);
+ ret = error_or_die (message, DBUS_ERROR_FAILED, error_message);
+
+ g_free (contents);
+ g_free (error_message);
+ g_value_unset (&value);
+ return ret;
+ }
+ /* these shouldn't fail except by OOM now that we were successful */
if (!dbus_message_iter_close_container (&iter_dict_entry,
&iter_dict_value))
- goto oom;
+ oom (NULL);
if (!dbus_message_iter_close_container (&iter_dict, &iter_dict_entry))
- goto oom;
+ oom (NULL);
g_value_unset (&value);
- g_free (variant_sig);
}
if (!dbus_message_iter_close_container (&iter_ret, &iter_dict))
- goto oom;
+ oom (NULL);
return ret;
-
- oom:
- g_error ("out of memory");
}
static gboolean
g_type_class_unref (klass);
domain_str = info->default_iface;
- code_str = value->value_nick;
+ if (value)
+ {
+ code_str = value->value_nick;
+ }
+ else
+ {
+ g_warning ("Error code %d out of range for GError domain %s",
+ code, g_quark_to_string (domain));
+ code_str = NULL;
+ }
}
}
g_free (uscored);
}
- g_string_append_printf (dbus_error_name, "Code%d", code);
+ /* Map -1 to (unsigned) -1 to avoid "-", which is not valid */
+ g_string_append_printf (dbus_error_name, "Code%u", (unsigned) code);
}
else
{
* reasons; if someone had a lowercase enumeration value,
* previously we'd just send it across unaltered.
*/
- code_str_wincaps = uscore_to_wincaps_full (code_str, FALSE);
+ code_str_wincaps = uscore_to_wincaps_full (code_str, FALSE, FALSE);
g_string_append (dbus_error_name, code_str_wincaps);
g_free (code_str_wincaps);
}
char *error_msg;
error_msg = g_strdup_printf ("Method invoked for %s returned FALSE but did not set error", dbus_message_get_member (message));
- reply = dbus_message_new_error (message, "org.freedesktop.DBus.GLib.ErrorError", error_msg);
+ reply = error_or_die (message, "org.freedesktop.DBus.GLib.ErrorError", error_msg);
g_free (error_msg);
}
else
break;
}
- reply = dbus_message_new_error (message, name, error->message);
+ reply = error_or_die (message, name, error->message);
}
else
{
error_name = gerror_domaincode_to_dbus_error_name (object_info,
dbus_message_get_interface (message),
error->domain, error->code);
- reply = dbus_message_new_error (message, error_name, error->message);
- g_free (error_name);
- }
+ reply = error_or_die (message, error_name, error->message);
+ g_free (error_name);
+ }
}
+
return reply;
}
*/
/**
+ * DBusGMethodInvocation:
+ *
* The context of an asynchronous method call. See dbus_g_method_return() and
* dbus_g_method_return_error().
*/
GValueArray *out_param_gvalues = NULL;
int out_param_count;
int out_param_pos, out_param_gvalue_pos;
- DBusHandlerResult result;
DBusMessage *reply = NULL;
gboolean have_retval;
gboolean retval_signals_error;
{
g_free (in_signature);
g_array_free (types_array, TRUE);
- reply = dbus_message_new_error (message, "org.freedesktop.DBus.GLib.ErrorError", error->message);
- dbus_connection_send (connection, reply, NULL);
+ reply = error_or_die (message, "org.freedesktop.DBus.GLib.ErrorError", error->message);
+ connection_send_or_die (connection, reply);
dbus_message_unref (reply);
g_error_free (error);
return DBUS_HANDLER_RESULT_HANDLED;
NULL, method->function);
if (is_async)
{
- result = DBUS_HANDLER_RESULT_HANDLED;
goto done;
}
+
if (retval_signals_error)
had_error = _dbus_gvalue_signals_error (&return_value);
else
*/
if (send_reply)
{
- reply = dbus_message_new_method_return (message);
- if (reply == NULL)
- goto nomem;
+ reply = reply_or_die (message);
/* Append output arguments to reply */
dbus_message_iter_init_append (reply, &iter);
/* First, append the return value, unless it's synthetic */
if (have_retval && !retval_is_synthetic)
- {
- if (send_reply && !_dbus_gvalue_marshal (&iter, &return_value))
- goto nomem;
+ {
+ if (reply != NULL && !_dbus_gvalue_marshal (&iter, &return_value))
+ {
+ gchar *desc = g_strdup_value_contents (&return_value);
+
+ g_critical ("unable to append retval of type %s for %s: %s",
+ G_VALUE_TYPE_NAME (&return_value),
+ method_name_from_object_info (object_info, method),
+ desc);
+ g_free (desc);
+ /* the reply is now unusable but we still need to free
+ * everything */
+ dbus_message_unref (reply);
+ reply = NULL;
+ }
+
if (!retval_is_constant)
g_value_unset (&return_value);
}
g_value_set_static_boxed (&gvalue, out_param_gvalues->values + out_param_gvalue_pos);
out_param_gvalue_pos++;
}
-
- if (send_reply && !_dbus_gvalue_marshal (&iter, &gvalue))
- goto nomem;
+
+ if (reply && !_dbus_gvalue_marshal (&iter, &gvalue))
+ {
+ gchar *desc = g_strdup_value_contents (&gvalue);
+
+ g_critical ("unable to append OUT arg of type %s for %s: %s",
+ G_VALUE_TYPE_NAME (&gvalue),
+ method_name_from_object_info (object_info, method),
+ desc);
+ g_free (desc);
+ /* the reply is now unusable but we still need to free
+ * everything */
+ dbus_message_unref (reply);
+ reply = NULL;
+ }
+
/* Here we actually free the allocated value; we
* took ownership of it with _dbus_gvalue_take, unless
* an annotation has specified this value as constant.
if (reply)
{
- dbus_connection_send (connection, reply, NULL);
+ connection_send_or_die (connection, reply);
dbus_message_unref (reply);
}
- result = DBUS_HANDLER_RESULT_HANDLED;
- done:
+done:
g_free (in_signature);
+
if (!is_async)
{
g_array_free (out_param_values, TRUE);
g_clear_error (&gerror);
g_value_array_free (value_array);
- return result;
- nomem:
- result = DBUS_HANDLER_RESULT_NEED_MEMORY;
- goto done;
+ return DBUS_HANDLER_RESULT_HANDLED;
}
+/*
+ * @wincaps_propiface: the D-Bus interface name, conventionally WindowsCaps
+ * @requested_propname: the D-Bus property name, conventionally WindowsCaps
+ * @uscore_propname: the GObject property name, conventionally
+ * words_with_underscores or words-with-dashes
+ * @is_set: %TRUE if we're going to set the property, %FALSE if we're going
+ * to get it
+ *
+ * Check that the requested property exists and the requested access is
+ * allowed. If not, reply with a D-Bus AccessDenied error message.
+ *
+ * Returns: %TRUE if property access can continue, or %FALSE if an error
+ * reply has been sent
+ */
static gboolean
check_property_access (DBusConnection *connection,
DBusMessage *message,
const DBusGObjectInfo *object_info;
const char *access_type;
DBusMessage *ret;
+ gchar *error_message;
if (!is_set && !disable_legacy_property_access)
return TRUE;
object_info = lookup_object_info_by_iface (object, wincaps_propiface, TRUE, NULL);
if (!object_info)
{
- ret = dbus_message_new_error_printf (message,
- DBUS_ERROR_ACCESS_DENIED,
- "Interface \"%s\" isn't exported (or may not exist), can't access property \"%s\"",
- wincaps_propiface,
- requested_propname);
- dbus_connection_send (connection, ret, NULL);
- dbus_message_unref (ret);
- return FALSE;
+ error_message = g_strdup_printf (
+ "Interface \"%s\" isn't exported (or may not exist), can't access property \"%s\"",
+ wincaps_propiface, requested_propname);
+
+ goto error;
}
/* Try both forms of property names: "foo_bar" or "FooBar"; for historical
&& !(property_info_from_object_info (object_info, wincaps_propiface, requested_propname, &access_type)
|| property_info_from_object_info (object_info, wincaps_propiface, uscore_propname, &access_type)))
{
- ret = dbus_message_new_error_printf (message,
- DBUS_ERROR_ACCESS_DENIED,
- "Property \"%s\" of interface \"%s\" isn't exported (or may not exist)",
- requested_propname,
- wincaps_propiface);
- dbus_connection_send (connection, ret, NULL);
- dbus_message_unref (ret);
- return FALSE;
+ error_message = g_strdup_printf (
+ "Property \"%s\" of interface \"%s\" isn't exported (or may not exist)",
+ requested_propname, wincaps_propiface);
+
+ goto error;
}
if (strcmp (access_type, "readwrite") == 0)
return TRUE;
- else if (is_set ? strcmp (access_type, "read") == 0
+
+ if (is_set ? strcmp (access_type, "read") == 0
: strcmp (access_type, "write") == 0)
{
- ret = dbus_message_new_error_printf (message,
- DBUS_ERROR_ACCESS_DENIED,
- "Property \"%s\" of interface \"%s\" is not %s",
- requested_propname,
- wincaps_propiface,
- is_set ? "settable" : "readable");
- dbus_connection_send (connection, ret, NULL);
- dbus_message_unref (ret);
- return FALSE;
+ error_message = g_strdup_printf (
+ "Property \"%s\" of interface \"%s\" is not %s",
+ requested_propname,
+ wincaps_propiface,
+ is_set ? "settable" : "readable");
+
+ goto error;
}
+
return TRUE;
+
+error:
+ ret = error_or_die (message, DBUS_ERROR_ACCESS_DENIED, error_message);
+ g_free (error_message);
+
+ connection_send_or_die (connection, ret);
+ dbus_message_unref (ret);
+ return FALSE;
}
static DBusHandlerResult
ObjectRegistration *o;
o = user_data;
- object = G_OBJECT (o->object);
+ /* export is always non-NULL. If the object has been disposed, the weak-ref
+ * callback removes all registrations from the DBusConnection, so this
+ * should never be reached with object = NULL. */
+ object = G_OBJECT (o->export->object);
+ g_assert (object != NULL);
if (dbus_message_is_method_call (message,
DBUS_INTERFACE_INTROSPECTABLE,
if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
{
- g_warning ("Property get or set does not have an interface string as first arg\n");
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ ret = error_or_die (message, DBUS_ERROR_INVALID_ARGS,
+ "First argument to Get(), GetAll() or Set() must be an interface string");
+ goto out;
}
dbus_message_iter_get_basic (&iter, &wincaps_propiface);
else
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
- else if (getter || setter)
+ else
{
+ g_assert (getter || setter);
+
if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
{
- g_warning ("Property get or set does not have a property name string as second arg\n");
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ ret = error_or_die (message, DBUS_ERROR_INVALID_ARGS,
+ "Second argument to Get() or Set() must be a property name string");
+ goto out;
}
+
dbus_message_iter_get_basic (&iter, &requested_propname);
dbus_message_iter_next (&iter);
{
if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_VARIANT)
{
- g_warning ("Property set does not have a variant value as third arg\n");
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ ret = error_or_die (message, DBUS_ERROR_INVALID_ARGS,
+ "Third argument to Set() must be a variant");
+ goto out;
}
ret = set_object_property (connection, message, &iter,
object, pspec);
dbus_message_iter_next (&iter);
}
- else if (getter)
+ else
{
+ g_assert (getter);
ret = get_object_property (connection, message,
object, pspec);
}
- else
- {
- g_assert_not_reached ();
- ret = NULL;
- }
}
else
{
- ret = dbus_message_new_error_printf (message,
- DBUS_ERROR_INVALID_ARGS,
- "No such property %s", requested_propname);
+ gchar *error_message = g_strdup_printf ("No such property %s",
+ requested_propname);
+
+ ret = error_or_die (message, DBUS_ERROR_INVALID_ARGS, error_message);
+ g_free (error_message);
}
}
g_assert (ret != NULL);
+ /* FIXME: this should be returned as a D-Bus error, not spammed out
+ * as a warning. This is too late to do that, though - we've already
+ * had any side-effects we were going to have - and it would break
+ * anything that's relying on ability to give us too many arguments. */
if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INVALID)
g_warning ("Property get, set or set all had too many arguments\n");
- dbus_connection_send (connection, ret, NULL);
+out:
+ connection_send_or_die (connection, ret);
dbus_message_unref (ret);
return DBUS_HANDLER_RESULT_HANDLED;
}
} DBusGSignalClosure;
static GClosure *
-dbus_g_signal_closure_new (DBusGConnection *connection,
- GObject *object,
+dbus_g_signal_closure_new (GObject *object,
const char *signame,
const char *sigiface)
{
closure = (DBusGSignalClosure*) g_closure_new_simple (sizeof (DBusGSignalClosure), NULL);
- closure->connection = dbus_g_connection_ref (connection);
closure->object = object;
closure->signame = signame;
closure->sigiface = sigiface;
}
static void
-dbus_g_signal_closure_finalize (gpointer data,
- GClosure *closure)
-{
- DBusGSignalClosure *sigclosure = (DBusGSignalClosure *) closure;
-
- dbus_g_connection_unref (sigclosure->connection);
-}
-
-static void
emit_signal_for_registration (ObjectRegistration *o,
DBusGSignalClosure *sigclosure,
GValue *retval,
DBusMessageIter iter;
guint i;
+ g_assert (g_variant_is_object_path (o->object_path));
+ g_assert (g_dbus_is_interface_name (sigclosure->sigiface));
+ g_assert (g_dbus_is_member_name (sigclosure->signame));
+
signal = dbus_message_new_signal (o->object_path,
sigclosure->sigiface,
sigclosure->signame);
if (!signal)
- {
- g_error ("out of memory");
- return;
- }
+ oom (NULL);
dbus_message_iter_init_append (signal, &iter);
goto out;
}
}
- dbus_connection_send (DBUS_CONNECTION_FROM_G_CONNECTION (sigclosure->connection),
- signal, NULL);
+
+ connection_send_or_die (DBUS_CONNECTION_FROM_G_CONNECTION (o->connection),
+ signal);
out:
dbus_message_unref (signal);
}
gpointer marshal_data)
{
DBusGSignalClosure *sigclosure;
- GSList *registrations, *iter;
+ const ObjectExport *oe;
+ const GSList *iter;
sigclosure = (DBusGSignalClosure *) closure;
g_assert (retval == NULL);
- registrations = g_object_get_data (sigclosure->object, "dbus_glib_object_registrations");
+ oe = g_object_get_data (sigclosure->object, "dbus_glib_object_registrations");
+ /* If the object has ever been exported, this should exist; it persists until
+ * the object is actually freed. */
+ g_assert (oe != NULL);
- for (iter = registrations; iter; iter = iter->next)
+ for (iter = oe->registrations; iter; iter = iter->next)
{
ObjectRegistration *o = iter->data;
}
static void
-export_signals (DBusGConnection *connection, const GList *info_list, GObject *object)
+export_signals (const GList *info_list, GObject *object)
{
GType gtype;
const char *sigdata;
sigdata = signal_iterate (sigdata, &iface, &signame);
+ if (!g_dbus_is_interface_name (iface))
+ {
+ g_critical ("invalid interface name found in %s: %s",
+ g_type_name (gtype), iface);
+ continue;
+ }
+
+ if (!g_dbus_is_member_name (signame))
+ {
+ g_critical ("invalid signal name found in %s: %s",
+ g_type_name (gtype), signame);
+ continue;
+ }
+
s = _dbus_gutils_wincaps_to_uscore (signame);
id = g_signal_lookup (s, gtype);
continue; /* FIXME: these could be listed as methods ? */
}
- closure = dbus_g_signal_closure_new (connection, object, signame, (char*) iface);
+ closure = dbus_g_signal_closure_new (object, signame, (char*) iface);
g_closure_set_marshal (closure, signal_emitter_marshaller);
g_signal_connect_closure_by_id (object,
closure,
FALSE);
- g_closure_add_finalize_notifier (closure, NULL,
- dbus_g_signal_closure_finalize);
g_free (s);
}
}
/**
* dbus_set_g_error:
* @gerror: an error
- * @error: a #DBusError
+ * @derror: a #DBusError
*
* Store the information from a DBus method error return into a
* GError. For the normal case of an arbitrary remote process,
*/
void
dbus_set_g_error (GError **gerror,
- DBusError *error)
+ DBusError *derror)
{
int code;
- code = dbus_error_to_gerror_code (error->name);
+ g_return_if_fail (derror != NULL);
+ g_return_if_fail (dbus_error_is_set (derror));
+ g_return_if_fail (gerror == NULL || *gerror == NULL);
+
+ code = dbus_error_to_gerror_code (derror->name);
if (code != DBUS_GERROR_REMOTE_EXCEPTION)
g_set_error (gerror, DBUS_GERROR,
code,
"%s",
- error->message);
+ derror->message);
else
g_set_error (gerror, DBUS_GERROR,
code,
"%s%c%s",
- error->message ? error->message : "",
+ derror->message ? derror->message : "",
'\0',
- error->name);
+ derror->name);
}
static void
* class_init() for the object class.
*
* Once introspection information has been installed, instances of the
- * object registered with #dbus_g_connection_register_g_object() can have
+ * object registered with dbus_g_connection_register_g_object() can have
* their methods invoked remotely.
*/
void
/* Called when the object is destroyed */
static void
-object_registration_object_died (gpointer user_data, GObject *dead)
+object_export_object_died (gpointer user_data, GObject *dead)
{
- ObjectRegistration *o = user_data;
+ ObjectExport *oe = user_data;
- g_assert (dead == o->object);
+ g_assert (dead == oe->object);
/* this prevents the weak unref from taking place, which would cause an
* assertion failure since the object has already gone... */
- o->object = NULL;
+ oe->object = NULL;
- /* ... while this results in a call to object_registration_unregistered */
- dbus_connection_unregister_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (o->connection), o->object_path);
+ /* ... while this results in a call to object_registration_unregistered
+ * for each contained registration */
+ object_export_unregister_all (oe);
+
+ /* We deliberately don't remove the ObjectExport yet, in case the object is
+ * resurrected and re-registered: if that happens, we wouldn't want to call
+ * export_signals() again. */
}
/**
* @connection: the D-BUS connection
* @object: the object
*
- * Removes @object from the bus. Properties, methods, and signals
+ * Removes @object from any object paths at which it is exported on
+ * @connection. Properties, methods, and signals
* of the object can no longer be accessed remotely.
*/
void
dbus_g_connection_unregister_g_object (DBusGConnection *connection,
GObject *object)
{
- GList *registrations, *iter;
+ ObjectExport *oe;
+ GSList *registrations;
+
+ g_return_if_fail (connection != NULL);
+ g_return_if_fail (G_IS_OBJECT (object));
+
+ oe = g_object_get_data (object, "dbus_glib_object_registrations");
+
+ g_return_if_fail (oe != NULL);
+ g_return_if_fail (oe->registrations != NULL);
/* Copy the list before iterating it: it will be modified in
* object_registration_free() each time an object path is unregistered.
*/
- registrations = g_list_copy (g_object_get_data (object, "dbus_glib_object_registrations"));
+ for (registrations = g_slist_copy (oe->registrations);
+ registrations != NULL;
+ registrations = g_slist_delete_link (registrations, registrations))
+ {
+ ObjectRegistration *o = registrations->data;
- g_return_if_fail (registrations != NULL);
+ if (o->connection != connection)
+ continue;
- for (iter = registrations; iter; iter = iter->next)
- {
- ObjectRegistration *o = iter->data;
dbus_connection_unregister_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (o->connection),
o->object_path);
}
-
- g_list_free (registrations);
- g_assert (g_object_get_data (object, "dbus_glib_object_registrations") == NULL);
}
/**
const char *at_path,
GObject *object)
{
- GList *info_list;
- GSList *registrations, *iter;
+ ObjectExport *oe;
+ GSList *iter;
ObjectRegistration *o;
- gboolean is_first_registration;
+ DBusError error;
g_return_if_fail (connection != NULL);
- g_return_if_fail (at_path != NULL);
+ g_return_if_fail (g_variant_is_object_path (at_path));
g_return_if_fail (G_IS_OBJECT (object));
- /* This is a GSList of ObjectRegistration* */
- registrations = g_object_steal_data (object, "dbus_glib_object_registrations");
+ oe = g_object_get_data (object, "dbus_glib_object_registrations");
- for (iter = registrations; iter; iter = iter->next)
+ if (oe == NULL)
{
- o = iter->data;
-
- /* Silently ignore duplicate registrations */
- if (strcmp (o->object_path, at_path) == 0 && o->connection == connection)
- return;
- }
-
- is_first_registration = registrations == NULL;
+ GList *info_list = lookup_object_info (object);
- /* This is used to hook up signals below, but we do this check
- * before trying to register the object to make sure we have
- * introspection data for it.
- */
- if (is_first_registration)
- {
- info_list = lookup_object_info (object);
if (info_list == NULL)
{
g_warning ("No introspection data registered for object class \"%s\"",
g_type_name (G_TYPE_FROM_INSTANCE (object)));
return;
}
+
+ /* This adds a hook into every signal for the object. Only do this
+ * on the first registration, because inside the signal marshaller
+ * we emit a signal for each registration.
+ */
+ export_signals (info_list, object);
+ g_list_free (info_list);
+
+ oe = object_export_new ();
+ g_object_set_data_full (object, "dbus_glib_object_registrations", oe,
+ (GDestroyNotify) object_export_free);
}
- else
- info_list = NULL;
- o = object_registration_new (connection, at_path, object);
+ if (oe->object == NULL)
+ {
+ /* Either the ObjectExport is newly-created, or it already existed but
+ * the object was disposed and resurrected, causing the weak ref to
+ * fall off */
+ oe->object = object;
+ g_object_weak_ref (object, object_export_object_died, oe);
+ }
- if (!dbus_connection_register_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (connection),
- at_path,
- &gobject_dbus_vtable,
- o))
+ for (iter = oe->registrations; iter; iter = iter->next)
{
- g_error ("Failed to register GObject with DBusConnection");
- object_registration_free (o);
- g_list_free (info_list);
- return;
+ o = iter->data;
+
+ /* Silently ignore duplicate registrations */
+ if (strcmp (o->object_path, at_path) == 0 && o->connection == connection)
+ return;
}
- if (is_first_registration)
+ o = object_registration_new (connection, at_path, oe);
+
+ dbus_error_init (&error);
+ if (!dbus_connection_try_register_object_path (DBUS_CONNECTION_FROM_G_CONNECTION (connection),
+ at_path,
+ &gobject_dbus_vtable,
+ o,
+ &error))
{
- /* This adds a hook into every signal for the object. Only do this
- * on the first registration, because inside the signal marshaller
- * we emit a signal for each registration.
- */
- export_signals (connection, info_list, object);
- g_list_free (info_list);
+ g_error ("Failed to register GObject with DBusConnection: %s %s",
+ error.name, error.message);
+ dbus_error_free (&error);
+ object_registration_free (o);
+ return;
}
- registrations = g_slist_append (registrations, o);
- g_object_set_data (object, "dbus_glib_object_registrations", registrations);
+ oe->registrations = g_slist_append (oe->registrations, o);
}
/**
gpointer p;
ObjectRegistration *o;
+ g_return_val_if_fail (connection != NULL, NULL);
+ g_return_val_if_fail (g_variant_is_object_path (at_path), NULL);
+
if (!dbus_connection_get_object_path_data (DBUS_CONNECTION_FROM_G_CONNECTION (connection), at_path, &p))
return NULL;
return NULL;
o = p;
- return G_OBJECT (o->object);
+
+ if (o->export->object == NULL)
+ return NULL;
+
+ return G_OBJECT (o->export->object);
}
typedef struct {
* dbus_g_object_register_marshaller:
* @marshaller: a GClosureMarshal to be used for invocation
* @rettype: a GType for the return type of the function
- * @:... The parameter #GTypes, followed by %G_TYPE_INVALID
+ * @...: The parameter #GTypes, followed by %G_TYPE_INVALID
*
* Register a #GClosureMarshal to be used for signal invocations,
* giving its return type and a list of parameter types,
* @types: a C array of GTypes values
*
* Register a #GClosureMarshal to be used for signal invocations.
- * @see_also #dbus_g_object_register_marshaller
+ * @see_also dbus_g_object_register_marshaller()
*/
void
dbus_g_object_register_marshaller_array (GClosureMarshal marshaller,
{
const gchar *sender;
+ g_return_val_if_fail (context != NULL, NULL);
+
sender = dbus_message_get_sender (dbus_g_message_get_message (context->message));
return g_strdup (sender);
}
DBusMessage *
dbus_g_method_get_reply (DBusGMethodInvocation *context)
{
- return dbus_message_new_method_return (dbus_g_message_get_message (context->message));
+ g_return_val_if_fail (context != NULL, NULL);
+
+ return reply_or_die (dbus_g_message_get_message (context->message));
}
/**
* dbus_g_method_send_reply:
- * Send a manually created reply message
* @context: the method context
* @reply: the reply message, will be unreffed
*
+ * Send a manually created reply message.
+ *
* Used as a sidedoor when you can't generate dbus values
* of the correct type due to glib binding limitations
*/
void
dbus_g_method_send_reply (DBusGMethodInvocation *context, DBusMessage *reply)
{
- dbus_connection_send (dbus_g_connection_get_connection (context->connection), reply, NULL);
+ g_return_if_fail (context != NULL);
+ g_return_if_fail (reply != NULL);
+
+ connection_send_or_die (dbus_g_connection_get_connection (context->connection),
+ reply);
dbus_message_unref (reply);
dbus_g_connection_unref (context->connection);
/**
* dbus_g_method_return:
* @context: the method context
+ * @...: zero or more values to return from the method, with their number
+ * and types given by its #DBusGObjectInfo
*
* Send a return message for a given method invocation, with arguments.
* This function also frees the sending context.
char *out_sig;
GArray *argsig;
guint i;
-
+
+ g_return_if_fail (context != NULL);
+
/* This field was initialized inside invoke_object_method; we
* carry it over through the async invocation to here.
*/
if (!context->send_reply)
goto out;
- reply = dbus_message_new_method_return (dbus_g_message_get_message (context->message));
+ reply = dbus_g_method_get_reply (context);
out_sig = method_output_signature_from_object_info (context->object, context->method);
argsig = _dbus_gtypes_from_arg_signature (out_sig, FALSE);
g_warning("%s", error);
g_free (error);
}
- _dbus_gvalue_marshal (&iter, &value);
+ else
+ {
+ if (!_dbus_gvalue_marshal (&iter, &value))
+ g_warning ("failed to marshal parameter %d for method %s",
+ i, dbus_message_get_member (
+ dbus_g_message_get_message (context->message)));
+ }
}
va_end (args);
- dbus_connection_send (dbus_g_connection_get_connection (context->connection), reply, NULL);
+ connection_send_or_die (dbus_g_connection_get_connection (context->connection),
+ reply);
dbus_message_unref (reply);
g_free (out_sig);
{
DBusMessage *reply;
+ g_return_if_fail (context != NULL);
+ g_return_if_fail (error != NULL);
+
/* See comment in dbus_g_method_return */
if (!context->send_reply)
goto out;
reply = gerror_to_dbus_error_message (context->object, dbus_g_message_get_message (context->message), error);
- dbus_connection_send (dbus_g_connection_get_connection (context->connection), reply, NULL);
+ connection_send_or_die (
+ dbus_g_connection_get_connection (context->connection), reply);
dbus_message_unref (reply);
out:
const char *
_dbus_gobject_get_path (GObject *obj)
{
- GSList *registrations;
+ ObjectExport *oe;
ObjectRegistration *o;
- registrations = g_object_get_data (obj, "dbus_glib_object_registrations");
+ oe = g_object_get_data (obj, "dbus_glib_object_registrations");
- if (registrations == NULL)
+ if (oe == NULL || oe->registrations == NULL)
return NULL;
/* First one to have been registered wins */
- o = registrations->data;
+ o = oe->registrations->data;
return o->object_path;
}
};
-/**
- * @ingroup DBusGLibInternals
+/*
* Unit test for GLib GObject integration ("skeletons")
- * Returns: #TRUE on success.
+ * Returns: %TRUE on success.
*/
gboolean
_dbus_gobject_test (const char *test_data_dir)
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+
+#include <config.h>
+
#include "dbus-gparser.h"
#include "dbus/dbus-glib-lowlevel.h"
#include "dbus-gidl.h"
#include "dbus/dbus-signature.h"
#include <string.h>
-#include <libintl.h>
-#define _(x) gettext ((x))
-#define N_(x) x
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-
#define ELEMENT_IS(name) (strcmp (element_name, (name)) == 0)
typedef struct
va_end (args);
- if (!retval)
- return retval;
-
i = 0;
while (attribute_names[i])
{
g_set_error (error,
G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Attribute \"%s\" repeated twice on the same <%s> element"),
+ "Attribute \"%s\" repeated twice on the same <%s> element",
attrs[j].name, element_name);
retval = FALSE;
goto out;
g_set_error (error,
G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Attribute \"%s\" is invalid on <%s> element in this context"),
+ "Attribute \"%s\" is invalid on <%s> element in this context",
attribute_names[i], element_name);
retval = FALSE;
goto out;
g_set_error (error,
G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Attribute \"%s\" is invalid on <%s> element in this context"),
+ "Attribute \"%s\" is invalid on <%s> element in this context",
attribute_names[0], element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Can't put <%s> element here"),
+ "Can't put <%s> element here",
element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"name", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute on <%s> element must be an absolute object path, \"%s\" not OK"),
+ "\"%s\" attribute on <%s> element must be an absolute object path, \"%s\" not OK",
"name", element_name, name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute on <%s> element must not be an absolute object path, \"%s\" starts with /"),
+ "\"%s\" attribute on <%s> element must not be an absolute object path, \"%s\" starts with /",
"name", element_name, name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Can't put <%s> element here"),
+ "Can't put <%s> element here",
element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"name", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Can't put <%s> element here"),
+ "Can't put <%s> element here",
element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"name", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Can't put <%s> element here"),
+ "Can't put <%s> element here",
element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"name", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Can't put <%s> element here"),
+ "Can't put <%s> element here",
element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"name", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"access", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"type", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("access=\"%s\" must have value readwrite, read, or write on %s\n"),
+ "access=\"%s\" must have value readwrite, read, or write on %s\n",
access, element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Can't put <%s> element here"),
+ "Can't put <%s> element here",
element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"type", element_name);
return FALSE;
}
if (parser->signal)
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Signals must have direction=\"out\" (just omit the direction attribute)"));
+ "Signals must have direction=\"out\" (just omit the direction attribute)");
else
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute on <%s> has value \"in\" or \"out\""),
+ "\"%s\" attribute on <%s> has value \"in\" or \"out\"",
"direction", element_name);
return FALSE;
}
const char *name;
const char *value;
- if (!(parser->method || parser->interface || parser->arg) ||
+ if (!(parser->method || parser->interface || parser->arg ||
+ parser->property || parser->signal) ||
parser->node_stack == NULL ||
- parser->signal ||
- parser->property ||
parser->in_annotation)
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Can't put <%s> element here"),
+ "Can't put <%s> element here",
element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"name", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("\"%s\" attribute required on <%s> element "),
+ "\"%s\" attribute required on <%s> element ",
"value", element_name);
return FALSE;
}
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_PARSE,
- _("Element <%s> not recognized"),
+ "Element <%s> not recognized",
element_name);
return FALSE;
}
{
return parser->result;
}
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
+
+#include <config.h>
+
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus-signature.h>
#include "dbus-gvalue-utils.h"
#include "dbus-gobject.h"
#include <string.h>
-#include <glib/gi18n.h>
#include <gobject/gvaluecollector.h>
+#include <gio/gio.h>
#define DBUS_G_PROXY_CALL_TO_ID(x) (GPOINTER_TO_UINT(x))
#define DBUS_G_PROXY_ID_TO_CALL(x) (GUINT_TO_POINTER(x))
#define DBUS_G_PROXY_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUS_TYPE_G_PROXY, DBusGProxyPrivate))
-
-/**
- * @addtogroup DBusGLibInternals
- *
- * @{
- */
-
-/**
- * DBusGProxyManager typedef
- */
+static void oom (void) G_GNUC_NORETURN;
+static void
+oom (void)
+{
+ g_error ("no memory");
+}
typedef struct _DBusGProxyManager DBusGProxyManager;
typedef struct _DBusGProxyPrivate DBusGProxyPrivate;
-/**
- * Internals of DBusGProxy
- */
struct _DBusGProxyPrivate
{
DBusGProxyManager *manager; /**< Proxy manager */
GType first_arg_type,
va_list args);
-/**
+/*
* A list of proxies with a given name+path+interface, used to
* route incoming signals.
*/
} DBusGProxyList;
-/**
+/*
* DBusGProxyManager's primary task is to route signals to the proxies
* those signals are emitted on. In order to do this it also has to
* track the owners of the names proxies are bound to.
GHashTable *proxy_lists; /**< Hash used to route incoming signals
* and iterate over proxies
+ * tristring -> DBusGProxyList
+ */
+ GHashTable *owner_match_rules; /**< Hash to keep track of match rules of
+ * NameOwnerChanged.
+ * gchar *name -> guint *refcount
*/
GHashTable *owner_names; /**< Hash to keep track of mapping from
+ * char * -> GSList of DBusGProxyNameOwnerInfo
* base name -> [name,name,...] for proxies which
* are for names.
*/
}
+ if (manager->owner_match_rules)
+ {
+ /* Since we destroyed all proxies, none can be tracking
+ * name owners
+ */
+ g_assert (g_hash_table_size (manager->owner_match_rules) == 0);
+ g_hash_table_destroy (manager->owner_match_rules);
+ manager->owner_match_rules = NULL;
+ }
+
if (manager->owner_names)
{
/* Since we destroyed all proxies, none can be tracking
}
static char *
-g_proxy_get_owner_match_rule (DBusGProxy *proxy)
+get_owner_match_rule (const gchar *name)
{
- DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
- if (priv->name)
- {
return g_strdup_printf ("type='signal',sender='" DBUS_SERVICE_DBUS
"',path='" DBUS_PATH_DBUS
"',interface='" DBUS_INTERFACE_DBUS
"',member='NameOwnerChanged'"
- ",arg0='%s'", priv->name);
- }
- return NULL;
+ ",arg0='%s'", name);
}
typedef struct
manager = priv->manager;
- if (!strcmp (priv->name, name))
+ if (priv->name != NULL && !strcmp (priv->name, name))
{
if (!priv->for_owner)
{
static void
+guint_slice_free (gpointer data)
+{
+ g_slice_free (guint, data);
+}
+
+
+static void
dbus_g_proxy_manager_register (DBusGProxyManager *manager,
DBusGProxy *proxy)
{
if (manager->proxy_lists == NULL)
{
g_assert (manager->owner_names == NULL);
+ g_assert (manager->owner_match_rules == NULL);
list = NULL;
manager->proxy_lists = g_hash_table_new_full (tristring_hash,
g_str_equal,
g_free,
NULL);
+ manager->owner_match_rules = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ guint_slice_free);
}
else
{
* but only if the server is a message bus,
* not if it's a peer.
*/
- char *rule;
-
- rule = g_proxy_get_signal_match_rule (proxy);
- /* We don't check for errors; it's not like anyone would handle them, and
- * we don't want a round trip here.
- */
- dbus_bus_add_match (manager->connection,
- rule, NULL);
- g_free (rule);
+ char *rule;
+ guint *refcount;
+
+ rule = g_proxy_get_signal_match_rule (proxy);
+ /* We don't check for errors; it's not like anyone would handle them, and
+ * we don't want a round trip here.
+ */
+ dbus_bus_add_match (manager->connection, rule, NULL);
+ g_free (rule);
- rule = g_proxy_get_owner_match_rule (proxy);
- if (rule)
- dbus_bus_add_match (manager->connection,
- rule, NULL);
- g_free (rule);
+ refcount = g_hash_table_lookup (manager->owner_match_rules, priv->name);
+
+ if (refcount != NULL)
+ {
+ g_assert (*refcount != 0);
+ g_assert (*refcount < G_MAXUINT);
+ (*refcount)++;
+ }
+ else
+ {
+ char *rule;
+ rule = get_owner_match_rule (priv->name);
+ dbus_bus_add_match (manager->connection,
+ rule, NULL);
+ g_free (rule);
+
+ refcount = g_slice_new (guint);
+ *refcount = 1;
+ g_hash_table_insert (manager->owner_match_rules,
+ g_strdup (priv->name), refcount);
+ }
}
g_assert (g_slist_find (list->proxies, proxy) == NULL);
}
else
{
- link = g_slist_find (manager->unassociated_proxies, proxy);
- g_assert (link != NULL);
-
- manager->unassociated_proxies = g_slist_delete_link (manager->unassociated_proxies, link);
+ link = g_slist_find (manager->unassociated_proxies, proxy);
+ if (link != NULL)
+ {
+ manager->unassociated_proxies = g_slist_delete_link (
+ manager->unassociated_proxies, link);
+ }
}
}
else
char *rule;
g_hash_table_remove (manager->proxy_lists,
tri);
- list = NULL;
rule = g_proxy_get_signal_match_rule (proxy);
dbus_bus_remove_match (manager->connection,
rule, NULL);
g_free (rule);
- rule = g_proxy_get_owner_match_rule (proxy);
- if (rule)
- dbus_bus_remove_match (manager->connection,
- rule, NULL);
- g_free (rule);
+
+ if (priv->name)
+ {
+ guint *refcount;
+ refcount = g_hash_table_lookup (manager->owner_match_rules, priv->name);
+ (*refcount)--;
+
+ if (*refcount == 0)
+ {
+ rule = get_owner_match_rule (priv->name);
+ dbus_bus_remove_match (manager->connection,
+ rule, NULL);
+ g_free (rule);
+ g_hash_table_remove (manager->owner_match_rules, priv->name);
+ }
+ }
}
if (g_hash_table_size (manager->proxy_lists) == 0)
manager->proxy_lists = NULL;
}
+ if (manager->owner_match_rules != NULL &&
+ g_hash_table_size (manager->owner_match_rules) == 0)
+ {
+ g_hash_table_destroy (manager->owner_match_rules);
+ manager->owner_match_rules = NULL;
+ }
+
g_free (tri);
UNLOCK_MANAGER (manager);
goto out;
}
+/**
+ * DBusGProxyCallNotify:
+ * @proxy: the proxy on which the method was called
+ * @call_id: the call in progress
+ * @user_data: data passed to dbus_g_proxy_begin_call() or similar
+ *
+ * Called when a reply to the call represented by @call_id arrives.
+ * Use dbus_g_proxy_end_call() to see whether @call_id succeeded or
+ * failed, and get the arguments returned (if any) on success.
+ */
+
typedef struct
{
DBusGProxy *proxy;
g_free (closure);
}
-
+
#define DBUS_G_VALUE_ARRAY_COLLECT_ALL(VALARRAY, FIRST_ARG_TYPE, ARGS) \
-do { \
+G_STMT_START { \
GType valtype; \
- int i = 0; \
+ guint i = 0; \
+ \
VALARRAY = g_value_array_new (6); \
valtype = FIRST_ARG_TYPE; \
+ \
while (valtype != G_TYPE_INVALID) \
{ \
- const char *collect_err; \
+ gchar *collect_err; \
GValue *val; \
+ \
g_value_array_append (VALARRAY, NULL); \
val = g_value_array_get_nth (VALARRAY, i); \
g_value_init (val, valtype); \
collect_err = NULL; \
G_VALUE_COLLECT (val, ARGS, G_VALUE_NOCOPY_CONTENTS, &collect_err); \
+ \
+ if (collect_err) \
+ { \
+ g_critical ("%s: unable to collect argument %u: %s", \
+ G_STRFUNC, i, collect_err); \
+ g_free (collect_err); \
+ g_value_array_free (VALARRAY); \
+ VALARRAY = NULL; \
+ break; \
+ } \
+ \
valtype = va_arg (ARGS, GType); \
i++; \
} \
-} while (0)
+} G_STMT_END
DBusGProxyCall *
manager_begin_bus_call (DBusGProxyManager *manager,
GType first_arg_type,
...)
{
- DBusGProxyCall *call;
+ guint call_id = 0;
DBusGProxyPrivate *priv;
va_list args;
GValueArray *arg_values;
}
DBUS_G_VALUE_ARRAY_COLLECT_ALL (arg_values, first_arg_type, args);
-
- call = DBUS_G_PROXY_ID_TO_CALL (dbus_g_proxy_begin_call_internal (manager->bus_proxy, method, notify, user_data, destroy, arg_values,-1));
- g_value_array_free (arg_values);
+ if (arg_values != NULL)
+ {
+ call_id = dbus_g_proxy_begin_call_internal (manager->bus_proxy, method,
+ notify, user_data, destroy, arg_values, -1);
+
+ g_value_array_free (arg_values);
+ }
va_end (args);
- return call;
+ return DBUS_G_PROXY_ID_TO_CALL (call_id);
}
-/** @} End of DBusGLibInternals */
-
-/** @addtogroup DBusGLib
- * @{
- */
-
/**
* SECTION:dbus-gproxy
* @short_description: DBus Proxy
- * @see_also: #DBusProxy
+ * @see_also: #DBusGProxy
* @stability: Stable
*
- * A #DBusGProxy is a boxed type abstracting a #DBusProxy.
+ * A #DBusGProxy is a #GObject representing a remote object in a D-Bus
+ * service.
*/
/**
+ * DBusGProxy:
+ *
+ * A #GObject representing a remote object in a D-Bus service.
+ */
+
+/**
+ * DBusGProxyCall:
+ *
+ * An opaque pointer representing an asynchronous call in progress.
+ */
+
+/*
* dbus_g_proxy_get_type:
* Standard GObject get_type() function for DBusGProxy.
*
* dbus_g_proxy_new_for_name:
* @connection: the connection to the remote bus
* @name: any name on the message bus
- * @path_name: name of the object instance to call methods on
- * @interface_name: name of the interface to call methods on
+ * @path: name of the object instance to call methods on
+ * @iface: name of the interface to call methods on
*
* Creates a new proxy for a remote interface exported by a connection
* on a message bus. Method calls and signal connections over this
DBusGProxy*
dbus_g_proxy_new_for_name (DBusGConnection *connection,
const char *name,
- const char *path_name,
- const char *interface_name)
+ const char *path,
+ const char *iface)
{
g_return_val_if_fail (connection != NULL, NULL);
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (path_name != NULL, NULL);
- g_return_val_if_fail (interface_name != NULL, NULL);
+ g_return_val_if_fail (g_dbus_is_name (name), NULL);
+ g_return_val_if_fail (g_variant_is_object_path (path), NULL);
+ g_return_val_if_fail (g_dbus_is_interface_name (iface), NULL);
- return dbus_g_proxy_new (connection, name,
- path_name, interface_name);
+ return dbus_g_proxy_new (connection, name, path, iface);
}
/**
* dbus_g_proxy_new_for_name_owner:
* @connection: the connection to the remote bus
* @name: any name on the message bus
- * @path_name: name of the object inside the service to call methods on
- * @interface_name: name of the interface to call methods on
+ * @path: name of the object inside the service to call methods on
+ * @iface: name of the interface to call methods on
* @error: return location for an error
*
* Similar to dbus_g_proxy_new_for_name(), but makes a round-trip
* dbus_g_proxy_new_for_name_owner() will bind to the unique name
* of that owner rather than the generic name.
*
- * Returns: new proxy object, or #NULL on error
+ * Returns: new proxy object, or %NULL on error
*/
DBusGProxy*
dbus_g_proxy_new_for_name_owner (DBusGConnection *connection,
const char *name,
- const char *path_name,
- const char *interface_name,
+ const char *path,
+ const char *iface,
GError **error)
{
DBusGProxy *proxy;
char *unique_name;
g_return_val_if_fail (connection != NULL, NULL);
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (path_name != NULL, NULL);
- g_return_val_if_fail (interface_name != NULL, NULL);
+ g_return_val_if_fail (g_dbus_is_name (name), NULL);
+ g_return_val_if_fail (g_variant_is_object_path (path), NULL);
+ g_return_val_if_fail (g_dbus_is_interface_name (iface), NULL);
if (!(unique_name = get_name_owner (DBUS_CONNECTION_FROM_G_CONNECTION (connection), name, error)))
return NULL;
- proxy = dbus_g_proxy_new (connection, unique_name,
- path_name, interface_name);
+ proxy = dbus_g_proxy_new (connection, unique_name, path, iface);
g_free (unique_name);
return proxy;
}
/**
* dbus_g_proxy_new_from_proxy:
* @proxy: the proxy to use as a template
+ * @iface: name of the interface to call methods on
* @path: of the object inside the peer to call methods on
- * @interface: name of the interface to call methods on
*
* Creates a proxy using an existing proxy as a template, substituting
* the specified interface and path. Either or both may be NULL.
*/
DBusGProxy*
dbus_g_proxy_new_from_proxy (DBusGProxy *proxy,
- const char *interface,
+ const char *iface,
const char *path)
{
DBusGProxyPrivate *priv;
- g_return_val_if_fail (proxy != NULL, NULL);
+ g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), NULL);
+ g_return_val_if_fail (path == NULL || g_variant_is_object_path (path), NULL);
+ g_return_val_if_fail (iface == NULL ||
+ g_dbus_is_interface_name (iface), NULL);
priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
- if (interface == NULL)
- interface = priv->interface;
+ if (iface == NULL)
+ iface = priv->interface;
if (path == NULL)
path = priv->path;
return dbus_g_proxy_new (DBUS_G_CONNECTION_FROM_CONNECTION (priv->manager->connection),
priv->name,
- path, interface);
+ path, iface);
}
/**
* dbus_g_proxy_new_for_peer:
* @connection: the connection to the peer
- * @path_name: name of the object inside the peer to call methods on
- * @interface_name: name of the interface to call methods on
+ * @path: name of the object inside the peer to call methods on
+ * @iface: name of the interface to call methods on
*
* Creates a proxy for an object in peer application (one
* we're directly connected to). That is, this function is
*/
DBusGProxy*
dbus_g_proxy_new_for_peer (DBusGConnection *connection,
- const char *path_name,
- const char *interface_name)
+ const char *path,
+ const char *iface)
{
DBusGProxy *proxy;
g_return_val_if_fail (connection != NULL, NULL);
- g_return_val_if_fail (path_name != NULL, NULL);
- g_return_val_if_fail (interface_name != NULL, NULL);
+ g_return_val_if_fail (g_variant_is_object_path (path), NULL);
+ g_return_val_if_fail (g_dbus_is_interface_name (iface), NULL);
- proxy = dbus_g_proxy_new (connection, NULL,
- path_name, interface_name);
+ proxy = dbus_g_proxy_new (connection, NULL, path, iface);
return proxy;
}
* dbus_g_proxy_get_bus_name:
* @proxy: the proxy
*
- * Gets the bus name a proxy is bound to (may be #NULL in some cases).
+ * Gets the bus name a proxy is bound to (may be %NULL in some cases).
* If you created the proxy with dbus_g_proxy_new_for_name(), then
* the name you passed to that will be returned.
* If you created it with dbus_g_proxy_new_for_name_owner(), then the
* unique connection name will be returned. If you created it
- * with dbus_g_proxy_new_for_peer() then #NULL will be returned.
+ * with dbus_g_proxy_new_for_peer() then %NULL will be returned.
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*
* Returns: the bus name the proxy sends messages to
*/
* dbus_g_proxy_get_interface:
* @proxy: the proxy
*
- * Gets the object interface proxy is bound to (may be #NULL in some cases).
+ * Gets the object interface proxy is bound to (may be %NULL in some cases).
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*
* Returns: an object interface
*/
* @interface_name: an object interface
*
* Sets the object interface proxy is bound to
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*/
void
dbus_g_proxy_set_interface (DBusGProxy *proxy,
const char *interface_name)
{
DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
+
+ g_return_if_fail (DBUS_IS_G_PROXY (proxy));
+ g_return_if_fail (!DBUS_G_PROXY_DESTROYED (proxy));
+ g_return_if_fail (g_dbus_is_interface_name (interface_name));
+
/* FIXME - need to unregister when we switch interface for now
* later should support idea of unset interface
*/
/**
* dbus_g_proxy_get_path:
- * Gets the path this proxy is bound to
* @proxy: the proxy
*
+ * Gets the path this proxy is bound to
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
+ *
* Returns: an object path
*/
const char*
priv->interface,
method);
if (message == NULL)
- goto oom;
+ return NULL;
dbus_message_iter_init_append (message, &msgiter);
for (i = 0; i < args->n_values; i++)
gvalue = g_value_array_get_nth (args, i);
if (!_dbus_gvalue_marshal (&msgiter, gvalue))
- g_assert_not_reached ();
+ {
+ /* This is a programming error by the caller, most likely */
+ gchar *contents = g_strdup_value_contents (gvalue);
+
+ g_critical ("Could not marshal argument %u for %s: type %s, value %s",
+ i, method, G_VALUE_TYPE_NAME (gvalue), contents);
+ g_free (contents);
+ dbus_message_unref (message);
+ return NULL;
+ }
}
+
return message;
- oom:
- return NULL;
}
static guint
pending = NULL;
message = dbus_g_proxy_marshal_args_to_message (proxy, method, args);
+
+ /* can only happen on a programming error or OOM; we already critical'd */
if (!message)
- goto oom;
+ return 0;
if (!dbus_connection_send_with_reply (priv->manager->connection,
message,
&pending,
timeout))
- goto oom;
+ oom ();
+
dbus_message_unref (message);
/* If we got a NULL pending, that means the connection was disconnected,
g_hash_table_insert (priv->pending_calls, GUINT_TO_POINTER (call_id), pending);
return call_id;
- oom:
- g_error ("Out of memory");
- return 0;
}
static gboolean
DBusPendingCall *pending;
DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
+ if (call_id == 0)
+ {
+ /* Being disconnected is the only reason this can happen, except
+ * for programmer error; if it was programmer error, we already
+ * emitted a critical warning. */
+ g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED,
+ "Disconnected from D-Bus (or argument error during call)");
+ return FALSE;
+ }
+
reply = NULL;
ret = FALSE;
n_retvals_processed = 0;
{
g_set_error (error, DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Too few arguments in reply"));
+ "Too few arguments in reply");
goto out;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Couldn't convert argument, expected \"%s\""),
+ "Couldn't convert argument, expected \"%s\"",
g_type_name (valtype));
goto out;
}
{
g_set_error (error, DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Too many arguments in reply; expected %d, got %d"),
+ "Too many arguments in reply; expected %d, got %d",
n_retvals_processed, over);
goto out;
}
* @notify: callback to be invoked when method returns
* @user_data: user data passed to callback
* @destroy: function called to destroy user_data
- * @first_arg_type: type of the first argument
+ * @first_arg_type: type of the first argument, or %G_TYPE_INVALID if there
+ * are no arguments
+ * @...: first argument, followed by any further type/value pairs, followed
+ * by %G_TYPE_INVALID
*
* Asynchronously invokes a method on a remote interface. The method
* call will not be sent over the wire until the application returns
* will be invoked; you can then collect the results of the call
* (which may be an error, or a reply), use dbus_g_proxy_end_call().
*
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
+ *
* TODO this particular function shouldn't die on out of memory,
* since you should be able to do a call with large arguments.
*
GType first_arg_type,
...)
{
- guint call_id;
+ guint call_id = 0;
va_list args;
GValueArray *arg_values;
DBusGProxyPrivate *priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), NULL);
g_return_val_if_fail (!DBUS_G_PROXY_DESTROYED (proxy), NULL);
+ g_return_val_if_fail (g_dbus_is_member_name (method), NULL);
va_start (args, first_arg_type);
DBUS_G_VALUE_ARRAY_COLLECT_ALL (arg_values, first_arg_type, args);
-
- call_id = dbus_g_proxy_begin_call_internal (proxy, method, notify, user_data, destroy, arg_values, priv->default_timeout);
- g_value_array_free (arg_values);
+ if (arg_values != NULL)
+ {
+ call_id = dbus_g_proxy_begin_call_internal (proxy, method, notify,
+ user_data, destroy, arg_values, priv->default_timeout);
+
+ g_value_array_free (arg_values);
+ }
va_end (args);
* @notify: callback to be invoked when method returns
* @user_data: user data passed to callback
* @destroy: function called to destroy user_data
- * @timeout: specify the timeout in milliseconds
- * @first_arg_type: type of the first argument
+ * @timeout: the timeout in milliseconds, or -1 to use a default
+ * @first_arg_type: type of the first argument, or %G_TYPE_INVALID if there
+ * are no arguments
+ * @...: first argument, followed by any further type/value pairs, followed
+ * by %G_TYPE_INVALID
*
* Asynchronously invokes a method on a remote interface. The method
* call will not be sent over the wire until the application returns
* will be invoked; you can then collect the results of the call
* (which may be an error, or a reply), use dbus_g_proxy_end_call().
*
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
+ *
* TODO this particular function shouldn't die on out of memory,
* since you should be able to do a call with large arguments.
*
GType first_arg_type,
...)
{
- guint call_id;
+ guint call_id = 0;
va_list args;
GValueArray *arg_values;
g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), NULL);
g_return_val_if_fail (!DBUS_G_PROXY_DESTROYED (proxy), NULL);
+ g_return_val_if_fail (g_dbus_is_member_name (method), NULL);
+ g_return_val_if_fail (timeout >= 0 || timeout == -1, NULL);
va_start (args, first_arg_type);
DBUS_G_VALUE_ARRAY_COLLECT_ALL (arg_values, first_arg_type, args);
- call_id = dbus_g_proxy_begin_call_internal (proxy, method, notify, user_data, destroy, arg_values,timeout);
+ if (arg_values != NULL)
+ {
+ call_id = dbus_g_proxy_begin_call_internal (proxy, method, notify,
+ user_data, destroy, arg_values, timeout);
- g_value_array_free (arg_values);
+ g_value_array_free (arg_values);
+ }
va_end (args);
* @proxy: a proxy for a remote interface
* @call: the pending call ID from dbus_g_proxy_begin_call()
* @error: return location for an error
- * @first_arg_type: type of first "out" argument
+ * @first_arg_type: type of first "out" argument, or %G_TYPE_INVALID if
+ * there are no "out" arguments
+ * @...: return location for first "out" argument, followed by any further
+ * type/location pairs, followed by %G_TYPE_INVALID
*
* Collects the results of a method call. The method call was normally
* initiated with dbus_g_proxy_end_call(). You may use this function
* case this function will block if the results haven't yet been
* received.
*
- * If the call results in an error, the error is set as normal for
- * GError and the function returns #FALSE.
+ * All D-Bus method calls can fail with a remote error. If this occurs,
+ * the @error will be set and this function will return %FALSE.
*
* Otherwise, the "out" parameters and return value of the
* method are stored in the provided varargs list.
* The list should be terminated with G_TYPE_INVALID.
*
- * Returns: #FALSE if an error is set.
+ * Returns: %TRUE on success
*/
gboolean
dbus_g_proxy_end_call (DBusGProxy *proxy,
gboolean ret;
va_list args;
+ g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), FALSE);
+
va_start (args, first_arg_type);
ret = dbus_g_proxy_end_call_internal (proxy, GPOINTER_TO_UINT (call), error, first_arg_type, args);
* @proxy: a proxy for a remote interface
* @method: method to invoke
* @error: return location for an error
- * @first_arg_type: type of first "in" argument
+ * @first_arg_type: type of first "in" argument, or %G_TYPE_INVALID if none
+ * @...: value of first "in" argument, any further type/value pairs,
+ * %G_TYPE_INVALID, type/location pairs for "out" arguments,
+ * and %G_TYPE_INVALID again
*
* Function for synchronously invoking a method and receiving reply
* values. This function is equivalent to dbus_g_proxy_begin_call
* output values, followed by a second G_TYPE_INVALID. Note that
* this means you must always specify G_TYPE_INVALID twice.
*
- * Returns: #FALSE if an error is set, #TRUE otherwise.
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
+ *
+ * Returns: %TRUE if the method succeeds, %FALSE if it fails
*/
gboolean
dbus_g_proxy_call (DBusGProxy *proxy,
...)
{
gboolean ret;
- guint call_id;
+ guint call_id = 0;
va_list args;
GValueArray *in_args;
DBusGProxyPrivate *priv;
DBUS_G_VALUE_ARRAY_COLLECT_ALL (in_args, first_arg_type, args);
- call_id = dbus_g_proxy_begin_call_internal (proxy, method, NULL, NULL, NULL, in_args, priv->default_timeout);
-
- g_value_array_free (in_args);
-
- if (call_id > 0)
+ if (in_args != NULL)
{
- first_arg_type = va_arg (args, GType);
- ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
- }
- else
- {
- g_set_error (error, DBUS_GERROR,
- DBUS_GERROR_FAILED,
- _("Disconnection or out-of-memory"));
- ret = FALSE;
+ call_id = dbus_g_proxy_begin_call_internal (proxy, method, NULL, NULL,
+ NULL, in_args, priv->default_timeout);
+
+ g_value_array_free (in_args);
}
+ first_arg_type = va_arg (args, GType);
+ ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type,
+ args);
+
va_end (args);
return ret;
* dbus_g_proxy_call_with_timeout:
* @proxy: a proxy for a remote interface
* @method: method to invoke
- * @timeout: specify the timeout in milliseconds
+ * @timeout: the timeout in milliseconds, or -1 to use a default
* @error: return location for an error
* @first_arg_type: type of first "in" argument
+ * @...: as for dbus_g_proxy_call()
*
* Function for synchronously invoking a method and receiving reply
* values. This function is equivalent to dbus_g_proxy_begin_call
* output values, followed by a second G_TYPE_INVALID. Note that
* this means you must always specify G_TYPE_INVALID twice.
*
- * Returns: #FALSE if an error is set, #TRUE otherwise.
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
+ *
+ * Returns: %TRUE if the method succeeds, %FALSE if it fails
*/
gboolean
dbus_g_proxy_call_with_timeout (DBusGProxy *proxy,
...)
{
gboolean ret;
- guint call_id;
+ guint call_id = 0;
va_list args;
GValueArray *in_args;
g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), FALSE);
g_return_val_if_fail (!DBUS_G_PROXY_DESTROYED (proxy), FALSE);
+ g_return_val_if_fail (g_dbus_is_member_name (method), FALSE);
+ g_return_val_if_fail (timeout >= 0 || timeout == -1, FALSE);
va_start (args, first_arg_type);
DBUS_G_VALUE_ARRAY_COLLECT_ALL (in_args, first_arg_type, args);
- call_id = dbus_g_proxy_begin_call_internal (proxy, method, NULL, NULL, NULL, in_args,timeout);
+ if (in_args != NULL)
+ {
+ call_id = dbus_g_proxy_begin_call_internal (proxy, method, NULL, NULL,
+ NULL, in_args, timeout);
- g_value_array_free (in_args);
+ g_value_array_free (in_args);
+ }
first_arg_type = va_arg (args, GType);
- ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
+ ret = dbus_g_proxy_end_call_internal (proxy, call_id, error,
+ first_arg_type, args);
va_end (args);
* dbus_g_proxy_call_no_reply:
* @proxy: a proxy for a remote interface
* @method: the name of the method to invoke
- * @first_arg_type: type of the first argument
+ * @first_arg_type: type of the first argument, or %G_TYPE_INVALID to call
+ * the method without arguments
+ * @...: the first argument and any remaining type/argument pairs, followed by
+ * %G_TYPE_INVALID to terminate the list
*
* Sends a method call message as with dbus_g_proxy_begin_call(), but
* does not ask for a reply or allow you to receive one.
*
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
+ *
* TODO: this particular function shouldn't die on out of memory,
* since you should be able to do a call with large arguments.
*/
GType first_arg_type,
...)
{
- DBusMessage *message;
+ DBusMessage *message = NULL;
va_list args;
GValueArray *in_args;
DBusGProxyPrivate *priv;
g_return_if_fail (DBUS_IS_G_PROXY (proxy));
+ g_return_if_fail (g_dbus_is_member_name (method));
g_return_if_fail (!DBUS_G_PROXY_DESTROYED (proxy));
priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
va_start (args, first_arg_type);
DBUS_G_VALUE_ARRAY_COLLECT_ALL (in_args, first_arg_type, args);
- message = dbus_g_proxy_marshal_args_to_message (proxy, method, in_args);
+ if (in_args != NULL)
+ {
+ message = dbus_g_proxy_marshal_args_to_message (proxy, method, in_args);
+
+ g_value_array_free (in_args);
+ }
- g_value_array_free (in_args);
va_end (args);
+ /* can only happen on a programming error or OOM; we already critical'd */
if (!message)
- goto oom;
+ return;
dbus_message_set_no_reply (message, TRUE);
if (!dbus_connection_send (priv->manager->connection,
message,
NULL))
- goto oom;
+ oom ();
+
dbus_message_unref (message);
- return;
-
- oom:
- g_error ("Out of memory");
}
/**
* initiated with dbus_g_proxy_begin_call(). This function
* may not be used on pending calls that have already been
* ended with dbus_g_proxy_end_call.
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*/
void
dbus_g_proxy_cancel_call (DBusGProxy *proxy,
call_id = DBUS_G_PROXY_CALL_TO_ID (call);
+ if (call_id == 0)
+ {
+ /* nothing to cancel */
+ return;
+ }
+
pending = g_hash_table_lookup (priv->pending_calls, GUINT_TO_POINTER (call_id));
g_hash_table_remove (priv->pending_calls, GUINT_TO_POINTER (call_id));
g_return_if_fail (pending != NULL);
* dbus_g_proxy_send:
* @proxy: a proxy for a remote interface
* @message: the message to address and send
- * @client_serial: return location for message's serial, or #NULL
+ * @client_serial: return location for message's serial, or %NULL
*
* Sends a message to the interface we're proxying for. Does not
* block or wait for a reply. The message is only actually written out
*
* This function adds a reference to the message, so the caller
* still owns its original reference.
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*/
void
dbus_g_proxy_send (DBusGProxy *proxy,
* dbus_g_proxy_add_signal:
* @proxy: the proxy for a remote interface
* @signal_name: the name of the signal
- * @first_type: the first argument type, or G_TYPE_INVALID if none
+ * @first_type: the first argument type, or %G_TYPE_INVALID if none
+ * @...: any subsequent argument types, followed by %G_TYPE_INVALID
*
- * Specifies the argument signature of a signal;.only necessary
- * if the remote object does not support introspection. The arguments
- * specified are the GLib types expected.
+ * Specifies the argument signature of a D-Bus signal. When the signal is
+ * emitted by the remote object, if the GTypes corresponding to its arguments'
+ * types do not match the types given here, the signal will be ignored.
+ *
+ * It is an error to add the same @signal_name to the same @proxy more than
+ * once, even if the argument types given are the same.
+ *
+ * It is also an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*/
void
dbus_g_proxy_add_signal (DBusGProxy *proxy,
g_return_if_fail (DBUS_IS_G_PROXY (proxy));
g_return_if_fail (!DBUS_G_PROXY_DESTROYED (proxy));
- g_return_if_fail (signal_name != NULL);
-
+ g_return_if_fail (g_dbus_is_member_name (signal_name));
+
priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
name = create_signal_name (priv->interface, signal_name);
* Connect a signal handler to a proxy for a remote interface. When
* the remote interface emits the specified signal, the proxy will
* emit a corresponding GLib signal.
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*/
void
dbus_g_proxy_connect_signal (DBusGProxy *proxy,
g_return_if_fail (DBUS_IS_G_PROXY (proxy));
g_return_if_fail (!DBUS_G_PROXY_DESTROYED (proxy));
- g_return_if_fail (signal_name != NULL);
+ g_return_if_fail (g_dbus_is_member_name (signal_name));
g_return_if_fail (handler != NULL);
priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
*
* Disconnect all signal handlers from a proxy that match the given
* criteria.
+ *
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
*/
void
dbus_g_proxy_disconnect_signal (DBusGProxy *proxy,
g_return_if_fail (DBUS_IS_G_PROXY (proxy));
g_return_if_fail (!DBUS_G_PROXY_DESTROYED (proxy));
- g_return_if_fail (signal_name != NULL);
+ g_return_if_fail (g_dbus_is_member_name (signal_name));
g_return_if_fail (handler != NULL);
priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
/**
* dbus_g_proxy_set_default_timeout:
* @proxy: a proxy for a remote interface
- * @timeout: specify the timeout in milliseconds
+ * @timeout: the timeout in milliseconds, or -1 to reset to the libdbus default
*
* Sets the default timeout to use for a proxy. This timeout will be
- * used in calls where the timeout is not specified.
+ * used in calls where the timeout is not specified, or is specified to be -1.
+ * If this timeout is also set to -1, libdbus will use a reasonable default
+ * value.
*
* This is useful for long-running operations that takes longer than
* the default timeout (which is a on the order of magnitude of tens
* (e.g. immediately) and emits a signal when the operation terminates
* (though beware of leaking information with/in the signal return value).
*
+ * It is an error to call this method on a proxy that has emitted
+ * the #DBusGProxy::destroy signal.
+ *
* Since: 0.75
*/
void
g_return_if_fail (DBUS_IS_G_PROXY (proxy));
g_return_if_fail (!DBUS_G_PROXY_DESTROYED (proxy));
+ g_return_if_fail (timeout >= 0 || timeout == -1);
priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
priv->default_timeout = timeout;
}
-
-
-/** @} End of DBusGLib public */
-
-#ifdef DBUS_BUILD_TESTS
-
-/**
- * @ingroup DBusGLibInternals
- * Unit test for GLib proxy functions
- * Returns: #TRUE on success.
- */
-gboolean
-_dbus_g_proxy_test (void)
-{
-
-
- return TRUE;
-}
-
-#endif /* DBUS_BUILD_TESTS */
}
#endif /* DBUS_BUILD_TESTS */
-/**
+/*
* An exported symbol to be run in order to execute
* unit tests. Should not be used by
* any app other than our test app, this symbol
printf ("%s: running glib tests\n", "dbus-glib-test");
if (!_dbus_glib_test (test_data_dir))
die ("glib");
-
- printf ("%s: running utils tests\n", "dbus-glib-test");
- if (!_dbus_gutils_test (test_data_dir))
- die ("gutils");
-
+
printf ("%s: running mainloop integration tests\n", "dbus-glib-test");
if (!_dbus_gmain_test (test_data_dir))
die ("gmain");
*
*/
+#include <config.h>
+
/* #define G_DEBUG_LOCKS 1 */
#include <glib.h>
#include <dbus/dbus.h>
#include "dbus-glib.h"
-/** @addtogroup DBusGLib
- * @{
- */
-
/**
* dbus_g_thread_init:
*
dbus_threads_init_default ();
}
-
-/** @} end of public API */
*
*/
+#include <config.h>
+
#include "dbus-glib.h"
#include "dbus-gtype-specialized-priv.h"
#include "dbus-gvalue-utils.h"
* @stability: Unstable
*
* Specialized gtypes are basically a way to allow the definition of
- * recursive GTypes. It allows the definition of 'containers' which is
- * basically a user defined structure capabale of holding other data and a
+ * recursive #GTypes. It allows the definition of 'containers' which is
+ * basically a user defined structure capable of holding other data, and a
* set of functions defining how to access that structure. Containers come in
- * 3 flavors: collections, maps and structs.
+ * 3 flavors: collections, maps and structs.
*
* A collection is a container that holds an ordered set of items, all
- * of which must be the same type.
+ * of which must be the same type. (This is an <emphasis>array</emphasis>
+ * in standard D-Bus terminology.) dbus-glib specialized collections can be
+ * #GArray (for numeric elements), #GPtrArray (for string, object or
+ * boxed elements), #GSList (for boxed elements, not recommended), or a
+ * user-defined type.
*
- * A map is a container that holds a set of key/value pairs.
- * The keys have one type, and the values another.
+ * A map is a container that holds a set of key/value pairs.
+ * The keys have one type, and the values another; the type of the keys
+ * must be a numeric or string-like type. (This is a <emphasis>dict</emphasis>
+ * (dictionary) or <emphasis>array of dict entry</emphasis> in standard D-Bus
+ * terminology.) dbus-glib specialized maps can be #GHashTable or a
+ * user-defined type.
*
- * A struct is a container that holds a fixed number of members, each member
- * having a predefined type.
+ * A struct is a container that holds a fixed number of members, each member
+ * having a predefined type. (This is a <emphasis>struct</emphasis> in
+ * standard D-Bus terminology.) It is analogous to the C @struct keyword, but
+ * dbus-glib does not generally represent D-Bus structs in C structs.
+ * dbus-glib specialized structs can be #GValueArray or a user-defined type.
*
* A specialization is a GType detailing a particular container with
* particular types (a type specialization).
* the latter. I also need to add some examples.
*/
+/**
+ * DBUS_TYPE_G_BOOLEAN_ARRAY:
+ *
+ * Expands to a function call returning the #GType of a #GArray of #gboolean
+ * (corresponding to the D-Bus signature "ab").
+ */
+
+/**
+ * DBUS_TYPE_G_INT_ARRAY:
+ *
+ * Expands to a function call returning the #GType of a #GArray of #gint
+ * (corresponding to the D-Bus signature "ai").
+ */
+
+/**
+ * DBUS_TYPE_G_UINT_ARRAY:
+ *
+ * Expands to a function call returning the #GType of a #GArray of #guint
+ * (corresponding to the D-Bus signature "au").
+ */
+
+/**
+ * DBUS_TYPE_G_INT64_ARRAY:
+ *
+ * Expands to a function call returning the #GType of a #GArray of #gint64
+ * (corresponding to the D-Bus signature "ax").
+ */
+
+/**
+ * DBUS_TYPE_G_UINT64_ARRAY:
+ *
+ * Expands to a function call returning the #GType of a #GArray of #guint64
+ * (corresponding to the D-Bus signature "at").
+ */
+
+/**
+ * DBUS_TYPE_G_UCHAR_ARRAY:
+ *
+ * Expands to a function call returning the #GType of a #GArray of #guchar
+ * (corresponding to the D-Bus signature "ay").
+ *
+ * Note that this is not the same thing as a #GByteArray! dbus-glib does not
+ * know about the #GByteArray type.
+ */
+
+/**
+ * DBUS_TYPE_G_OBJECT_ARRAY:
+ *
+ * Expands to a function call returning the #GType of a #GPtrArray of #GObject.
+ *
+ * Use this type with caution: it can sometimes be used as a representation
+ * of arrays whose D-Bus signature is "ao" (transferred as an array of object
+ * paths), but the conventional type for such arrays is
+ * <literal>(dbus_g_type_get_collection ("GPtrArray",
+ * DBUS_TYPE_G_OBJECT_PATH))</literal>.
+ */
+
+/**
+ * DBUS_TYPE_G_STRING_STRING_HASHTABLE:
+ *
+ * Expands to a function call returning the #GType of a #GHashTable where the
+ * keys are strings and the values are also strings (corresponding to the
+ * D-Bus signature "a{ss}").
+ */
+
+/**
+ * DBusGTypeSpecializedVtable:
+ * @constructor: returns a new, blank instance of the @type
+ * @free_func: if not %NULL, frees the @type instance @val
+ * @copy_func: returns a "deep copy" of the @type instance @val
+ * @simple_free_func: if not %NULL, frees its argument
+ *
+ * A table of methods used to implement specialized container behaviour on
+ * user-defined collections, maps and structs. Exactly one of @free_func and
+ * @simple_free_func must be implemented; the other must be %NULL.
+ * @constructor and @copy_func must always be implemented.
+ *
+ * There are additional members, which are reserved for future expansion and
+ * must be %NULL.
+ */
+
+/**
+ * DBusGTypeSpecializedConstructor:
+ * @type: a specialized boxed type
+ *
+ * <!-- -->
+ *
+ * Returns: a new instance of @type
+ */
+
+/**
+ * DBusGTypeSpecializedFreeFunc:
+ * @type: a specialized boxed type
+ * @val: an instance of @type
+ *
+ * Frees @val according to @type. This is analogous to #GBoxedFreeFunc, but
+ * can use information from @type (for instance to free the contents of a
+ * container before freeing the actual container).
+ */
+
+/**
+ * DBusGTypeSpecializedCopyFunc:
+ * @type: a specialized boxed type
+ * @src: an instance of @type
+ *
+ * Copies @src according to @type. This is analogous to #GBoxedCopyFunc, but
+ * can use information from @type (for instance to copy each element of a
+ * collection).
+ *
+ * Returns: a deep copy of @src
+ */
+
+/**
+ * DBusGTypeSpecializedCollectionFixedAccessorFunc:
+ * @type: a specialized collection boxed type
+ * @instance: an instance of @type
+ * @values: used to return a pointer to the contents of @instance
+ * @len: used to return the number of elements in @instance
+ *
+ * Implements dbus_g_type_collection_get_fixed() for a #GValue with type
+ * @type, containing @instance.
+ *
+ * Returns: %TRUE on success
+ */
+
+/**
+ * DBusGTypeSpecializedCollectionIterator:
+ * @value: an element of the collection
+ * @user_data: the data supplied when calling
+ * dbus_g_type_collection_value_iterate()
+ *
+ * A library-user-supplied function, called for each element in the
+ * collection when dbus_g_type_collection_value_iterate() is called.
+ */
+
+/**
+ * DBusGTypeSpecializedCollectionIteratorFunc:
+ * @type: a specialized collection boxed type
+ * @instance: an instance of @type
+ * @iterator: the function to call for each element
+ * @user_data: data to pass to @iterator
+ *
+ * Implements dbus_g_type_collection_value_iterate() for a #GValue with
+ * type @type, containing @instance.
+ */
+
+/**
+ * DBusGTypeSpecializedCollectionAppendFunc:
+ * @ctx: an appending context returned by dbus_g_type_specialized_init_append()
+ * @val: a value to copy into the collection
+ *
+ * Implements dbus_g_type_specialized_collection_append().
+ *
+ * This function should use the @val and @specialization_type members of @ctx.
+ */
+
+/**
+ * DBusGTypeSpecializedCollectionEndAppendFunc:
+ * @ctx: an appending context returned by dbus_g_type_specialized_init_append()
+ *
+ * Implements dbus_g_type_specialized_collection_end_append().
+ *
+ * This function should use the @val and @specialization_type members of @ctx.
+ */
+
+/**
+ * DBusGTypeSpecializedCollectionVtable:
+ * @base_vtable: base methods shared between collections and other types
+ * @fixed_accessor: if not %NULL, provides access to the contents of this
+ * collection, as documented for dbus_g_type_collection_get_fixed()
+ * @iterator: iterates through the members of @instance
+ * @append_func: appends a new member to @instance
+ * @end_append_func: if not %NULL, called after each group of calls to
+ * the @append_func
+ *
+ * A table of methods used to implement specialized collection behaviour
+ * on user-defined types. At least @iterator and @append_func must be
+ * implemented.
+ */
+
+/**
+ * DBusGTypeSpecializedMapIterator:
+ * @key_val: a key from the map
+ * @value_val: a value from the map
+ * @user_data: the data supplied when calling
+ * dbus_g_type_map_value_iterate()
+ *
+ * A library-user-supplied function, called for each key/value pair in the
+ * collection when dbus_g_type_map_value_iterate() is called.
+ */
+
+/**
+ * DBusGTypeSpecializedMapIteratorFunc:
+ * @type: a specialized map boxed type
+ * @instance: an instance of @type
+ * @iterator: the function to call for each key/value pair
+ * @user_data: data to pass to @iterator
+ *
+ * Implements dbus_g_type_map_value_iterate() for a #GValue with
+ * type @type, containing @instance.
+ */
+
+/**
+ * DBusGTypeSpecializedMapAppendFunc:
+ * @ctx: an appending context returned by dbus_g_type_specialized_init_append()
+ * @key: a key to add to the collection
+ * @val: a value to add to the collection
+ *
+ * Implements dbus_g_type_specialized_map_append().
+ *
+ * This function should use the @val and @specialization_type members of @ctx,
+ * and replace any existing value with key equal to @key.
+ */
+
+/**
+ * DBusGTypeSpecializedMapVtable:
+ * @base_vtable: base methods shared between maps and other types
+ * @iterator: iterates through the members of @instance
+ * @append_func: adds a new key/value pair to @instance
+ *
+ * A table of methods used to implement specialized collection behaviour
+ * on user-defined types. Both methods must be implemented.
+ */
+
+/**
+ * DBusGTypeSpecializedStructGetMember:
+ * @type: a specialized struct boxed type
+ * @instance: an instance of @type
+ * @member: the index of the member, starting from 0
+ * @ret_value: an initialized #GValue of the appropriate type for the given
+ * member of @type
+ *
+ * Implements dbus_g_type_struct_get_member() for a #GValue with type @type,
+ * containing @instance.
+ *
+ * Returns: %TRUE on success
+ */
+
+/**
+ * DBusGTypeSpecializedStructSetMember:
+ * @type: a specialized struct boxed type
+ * @instance: an instance of @type
+ * @member: the index of the member, starting from 0
+ * @new_value: an initialized #GValue of the appropriate type for the given
+ * member of @type
+ *
+ * Implements dbus_g_type_struct_set_member() for a #GValue with type @type,
+ * containing @instance.
+ *
+ * Returns: %TRUE on success
+ */
+
+/**
+ * DBusGTypeSpecializedStructVtable:
+ * @base_vtable: base methods shared between maps and other types
+ * @get_member: returns a member by its index
+ * @set_member: sets a member by its index
+ *
+ * A table of methods used to implement specialized collection behaviour
+ * on user-defined types. Both methods must be implemented.
+ */
+
typedef enum {
DBUS_G_SPECTYPE_COLLECTION,
DBUS_G_SPECTYPE_MAP,
return NULL;
}
+/**
+ * dbus_g_type_specialized_init:
+ *
+ * Initialize dbus-glib specialized #GType<!-- -->s.
+ *
+ * In older versions of dbus-glib, it was necessary to do this before
+ * instantiating or registering any specialized type. It is now done
+ * automatically whenever necessary.
+ */
void
dbus_g_type_specialized_init (void)
{
const DBusGTypeSpecializedVtable *vtable)
{
DBusGTypeSpecializedContainer *klass;
-
+
+ g_warn_if_fail (vtable->constructor != NULL);
+ /* must have either free_func or simple_free_func */
+ g_warn_if_fail (vtable->free_func != NULL ||
+ vtable->simple_free_func != NULL);
+ g_warn_if_fail (vtable->copy_func != NULL);
+
klass = g_new0 (DBusGTypeSpecializedContainer, 1);
klass->type = type;
klass->vtable = vtable;
const DBusGTypeSpecializedCollectionVtable *vtable,
guint flags)
{
+ /* fixed_accessor is optional */
+ g_warn_if_fail (vtable->iterator != NULL);
+ g_warn_if_fail (vtable->append_func != NULL);
+ /* end_append_func is optional */
+
register_container (name, DBUS_G_SPECTYPE_COLLECTION, (const DBusGTypeSpecializedVtable*) vtable);
}
const DBusGTypeSpecializedMapVtable *vtable,
guint flags)
{
+ g_warn_if_fail (vtable->iterator != NULL);
+ g_warn_if_fail (vtable->append_func != NULL);
+
register_container (name, DBUS_G_SPECTYPE_MAP, (const DBusGTypeSpecializedVtable*) vtable);
}
const DBusGTypeSpecializedStructVtable *vtable,
guint flags)
{
+ g_warn_if_fail (vtable->get_member != NULL);
+ g_warn_if_fail (vtable->set_member != NULL);
+
register_container (name, DBUS_G_SPECTYPE_STRUCT, (const DBusGTypeSpecializedVtable*) vtable);
}
* @map_type: a gtype of a map specialization
*
* Peek the vtable for a given map specialization
+ *
+ * Returns: the vtable
*/
const DBusGTypeSpecializedMapVtable* dbus_g_type_map_peek_vtable (GType map_type)
{
* @collection_type: a gtype of a collection specialization
*
* Peek the vtable for a given collection specialization
+ *
+ * Returns: the vtable
*/
const DBusGTypeSpecializedCollectionVtable* dbus_g_type_collection_peek_vtable (GType collection_type)
{
/**
* dbus_g_type_struct_peek_vtable:
- * @collection_type: a gtype of a struct specialization
+ * @struct_type: a gtype of a struct specialization
*
* Peek the vtable for a given struct specialization
+ *
+ * Returns: the vtable
*/
const DBusGTypeSpecializedStructVtable* dbus_g_type_struct_peek_vtable (GType struct_type)
{
* @gtype: a GType to test
*
* Tests if a given GType is a map,
- * i.e. it was created with #dbus_g_type_get_map.
+ * i.e. it was created with dbus_g_type_get_map().
*
* Returns: true if the given GType is a map
*/
* @gtype: a GType to test
*
* Tests if a given GType is a struct,
- * i.e. it was created with #dbus_g_type_get_struct
+ * i.e. it was created with dbus_g_type_get_struct()
*
* Returns: true if the given GType is a struct
*/
/**
* dbus_g_type_get_collection_specialization:
- * @gtype: a collection GType, as created by #dbus_g_type_get_collection.
+ * @gtype: a collection #GType, as created by dbus_g_type_get_collection()
+ *
+ * Return the type of each element in collections of type @gtype.
+ * It is an error to call this function on a non-collection type.
*
* Returns: the element type for a given collection GType.
- * Returns G_TYPE_INVALID if not a collection GType
*/
GType
dbus_g_type_get_collection_specialization (GType gtype)
/**
* dbus_g_type_get_map_key_specialization:
- * @gtype: a map GType, as created by #dbus_g_type_get_map.
+ * @gtype: a map #GType, as created by dbus_g_type_get_map()
*
- * Returns: the key type for a given map GType.
- * Returns G_TYPE_INVALID if not a map GType
+ * Return the type of the keys in maps of type @gtype.
+ * It is an error to call this function on a non-map type.
+ *
+ * Returns: the key type for a given map #GType.
*/
GType
dbus_g_type_get_map_key_specialization (GType gtype)
/**
* dbus_g_type_get_map_value_specialization:
- * @gtype: a map GType, as created by #dbus_g_type_get_map.
+ * @gtype: a map GType, as created by dbus_g_type_get_map().
+ *
+ * Return the type of the values in maps of type @gtype.
+ * It is an error to call this function on a non-map type.
*
* Returns: the value type for a given map GType.
- * Returns G_TYPE_INVALID if not a map GType
*/
GType
dbus_g_type_get_map_value_specialization (GType gtype)
/**
* dbus_g_type_get_struct_member_type
- * @gtype: a struct GType, as created with #dbus_g_type_get_struct
+ * @gtype: a struct GType, as created with dbus_g_type_get_struct()
* @member: the index of a struct member
*
- * Returns: the type for a given member of a struct #GType.
- * Returns G_TYPE_INVALID if not a struct GType
+ * Get the type of a member of a specialized struct.
+ * It is an error to call this function on a non-struct type.
+ *
+ * Returns: the type for a given member of a struct #GType,
+ * or %G_TYPE_INVALID if @member >= dbus_g_type_get_struct_size()
*/
GType
dbus_g_type_get_struct_member_type (GType gtype, guint member)
/**
* dbus_g_type_get_struct_size
- * @gtype: a struct GType, as created with #dbus_g_type_get_struct.
+ * @gtype: a struct GType, as created with dbus_g_type_get_struct().
+ *
+ * Get the number of members in a specialized struct.
+ * It is an error to call this function on a non-struct type.
*
* Returns: the number of members in a given struct #GType.
- * Returns G_TYPE_INVALID if not a struct GType
*/
guint
dbus_g_type_get_struct_size (GType gtype)
/**
* dbus_g_type_specialized_construct:
- * @gtype: a specialized #GType, as created by #dbus_g_type_get_collection, #dbus_g_type_get_map or #dbus_g_type_get_struct.
+ * @gtype: a specialized #GType, as created by dbus_g_type_get_collection(),
+ * dbus_g_type_get_map() or dbus_g_type_get_struct()
*
* Create an instance of a given specialized type.
* The structure created and returned will depend on the container type of the
/**
* dbus_g_type_collection_get_fixed:
- * @deprecated: maybe?
+ * @value: a GValue containing a boxed specialized collection
+ * that has a @fixed_accessor in its vtable
+ * @data_ret: used to return a pointer to the fixed data, which must not be
+ * modified (for instance, for a #GArray of #gint, this would point
+ * to an array of #gint)
+ * @len_ret: used to return the length (counting collection elements, not
+ * bytes: in a #GArray containing one #gint, this would be 1)
+ *
+ * Calling this function is likely to be a bad idea. Consider using
+ * dbus_g_type_collection_value_iterate() instead.
+ *
+ * On success, @data_ret is a pointer to the underlying data in a collection
+ * of fixed-length fundamental types. Knowledge of the underlying data model
+ * of the collection is needed in order to use @data_ret correctly.
+ *
+ * It is an error to call this function on a specialized type that is not a
+ * collection, or on a collection that does not have a @fixed_accessor in its
+ * #DBusGTypeSpecializedCollectionVtable.
*
- * if the collection has elements of fixed size (i.e. a fundamental type),
- * return the contents of the array.
- * Its pretty obscure and I don't think anyone uses it.
+ * Specialized #GArray<!---->s are the only types provided by dbus-glib that
+ * can be used with this function; user-defined types might also work.
+ *
+ * Returns: %TRUE on success
*/
gboolean
dbus_g_type_collection_get_fixed (GValue *value,
guint *len_ret)
{
DBusGTypeSpecializedData *data;
+ DBusGTypeSpecializedCollectionVtable *vtable;
GType gtype;
dbus_g_type_specialized_init();
g_return_val_if_fail (G_VALUE_HOLDS_BOXED (value), FALSE);
gtype = G_VALUE_TYPE (value);
+ g_return_val_if_fail (dbus_g_type_is_collection (gtype), FALSE);
+
data = lookup_specialization_data (gtype);
- g_return_val_if_fail (data != NULL, FALSE);
+ /* dbus_g_type_is_collection() already checked this */
+ g_assert (data != NULL);
- return ((DBusGTypeSpecializedCollectionVtable *) (data->klass->vtable))->fixed_accessor (gtype,
- g_value_get_boxed (value),
- data_ret, len_ret);
+ vtable = (DBusGTypeSpecializedCollectionVtable *) (data->klass->vtable);
+ g_return_val_if_fail (vtable->fixed_accessor != NULL, FALSE);
+
+ return vtable->fixed_accessor (gtype, g_value_get_boxed (value),
+ data_ret, len_ret);
}
/**
g_return_if_fail (G_VALUE_HOLDS_BOXED (value));
gtype = G_VALUE_TYPE (value);
+ g_return_if_fail (dbus_g_type_is_collection (gtype));
+
data = lookup_specialization_data (gtype);
- g_return_if_fail (data != NULL);
+ /* dbus_g_type_is_collection() already checked this */
+ g_assert (data != NULL);
((DBusGTypeSpecializedCollectionVtable *) data->klass->vtable)->iterator (gtype,
g_value_get_boxed (value),
iterator, user_data);
}
+/**
+ * DBusGTypeSpecializedAppendContext:
+ * @val: the #GValue containing the array to which you're appending
+ * @specialization_type: the #GType of the array's elements
+ *
+ * A context for appending. There are more fields, which are private.
+ */
+
typedef struct {
GValue *val;
GType specialization_type;
DBusGTypeSpecializedData *specdata;
+ guint c;
+ gpointer d;
} DBusGTypeSpecializedAppendContextReal;
+G_STATIC_ASSERT (sizeof (DBusGTypeSpecializedAppendContextReal) ==
+ sizeof (DBusGTypeSpecializedAppendContext));
+
/**
* dbus_g_type_specialized_init_append:
* @value: a #GValue containing an instance of specialized type
* @ctx: a #DBusGTypeSpecializedAppendContext in which to return a new appending context.
- * @deprecated: maybe i'll deprecate this as its a bit wank.
*
* Create a new context for adding elements to a collection or key/value pairs
* to a map. You generally don't need or want to use this..
/**
* dbus_g_type_specialized_collection_append:
- * @ctx: a context created by #dbus_g_type_specialized_init_append
- * @elt: a GValue containing an element to append to the collection.
- * @deprecated: maybe i'll deprecate this as its a bit wank.
+ * @ctx: a context created by dbus_g_type_specialized_init_append()
+ * for a #GValue containing a collection
+ * @elt: a #GValue containing an element to append to the collection
*
* Appends a given element to the end of a collection.
*/
GValue *elt)
{
DBusGTypeSpecializedAppendContextReal *realctx = (DBusGTypeSpecializedAppendContextReal *) ctx;
+
+ g_return_if_fail (dbus_g_type_is_collection (G_VALUE_TYPE (ctx->val)));
+
((DBusGTypeSpecializedCollectionVtable *) realctx->specdata->klass->vtable)->append_func (ctx, elt);
}
/**
* dbus_g_type_specialized_collection_end_append:
- * @ctx: a context created by #dbus_g_type_specialized_init_append
- * @deprecated: maybe i'll deprecate this as its a bit wank.
+ * @ctx: a context created by dbus_g_type_specialized_init_append()
+ * for a #GValue containing a collection
*
* Finish appending elements to a given collection
*/
dbus_g_type_specialized_collection_end_append (DBusGTypeSpecializedAppendContext *ctx)
{
DBusGTypeSpecializedAppendContextReal *realctx = (DBusGTypeSpecializedAppendContextReal *) ctx;
+
+ g_return_if_fail (dbus_g_type_is_collection (G_VALUE_TYPE (ctx->val)));
+
if (((DBusGTypeSpecializedCollectionVtable *) realctx->specdata->klass->vtable)->end_append_func != NULL)
((DBusGTypeSpecializedCollectionVtable *) realctx->specdata->klass->vtable)->end_append_func (ctx);
}
/**
* dbus_g_type_specialized_map_append:
- * @ctx: a context created by #dbus_g_type_specialized_init_append
- * @key: a GValue containing a key
- * @val: a GValue containing a value
- * @deprecated: maybe i'll deprecate this as its a bit wank.
+ * @ctx: a context created by dbus_g_type_specialized_init_append()
+ * for a #GValue containing a map
+ * @key: a GValue containing a key, whose contents will be stolen by @ctx
+ * @val: a GValue containing a value, whose contents will be stolen by @ctx
*
* Inserts the given key/value pair into the map instance.
*/
GValue *val)
{
DBusGTypeSpecializedAppendContextReal *realctx = (DBusGTypeSpecializedAppendContextReal *) ctx;
+
+ g_return_if_fail (dbus_g_type_is_map (G_VALUE_TYPE (ctx->val)));
+
((DBusGTypeSpecializedMapVtable *) realctx->specdata->klass->vtable)->append_func (ctx, key, val);
}
/**
* dbus_g_type_map_value_iterate:
- * @value: a #GValue holding a collection type.
+ * @value: a #GValue holding a specialized map
* @iterator: a function to call for each element
* @user_data: user data to pass to the @iterator
*
g_return_if_fail (G_VALUE_HOLDS_BOXED (value));
gtype = G_VALUE_TYPE (value);
+ g_return_if_fail (dbus_g_type_is_map (gtype));
+
data = lookup_specialization_data (gtype);
- g_return_if_fail (data != NULL);
+ /* already checked by dbus_g_type_is_map() */
+ g_assert (data != NULL);
((DBusGTypeSpecializedMapVtable *) data->klass->vtable)->iterator (gtype,
g_value_get_boxed (value),
* was the correct type for that member, e.g. as returned by
* @dbus_g_type_get_struct_member_type
*
- * Returns: TRUE if sucessful
+ * Returns: %TRUE if successful
*/
gboolean
dbus_g_type_struct_get_member (const GValue *value,
g_return_val_if_fail (G_VALUE_HOLDS_BOXED (value), FALSE);
gtype = G_VALUE_TYPE (value);
+ g_return_val_if_fail (dbus_g_type_is_struct (gtype), FALSE);
+
data = lookup_specialization_data (gtype);
- g_return_val_if_fail (data != NULL, FALSE);
+ /* already checked by dbus_g_type_is_struct() */
+ g_assert (data != NULL);
return ((DBusGTypeSpecializedStructVtable *) (data->klass->vtable))->get_member(gtype,
g_value_get_boxed (value),
* @member: the index of a given member
* @src: an #GValue containing the new value for that struct member
*
- * Sets a given member of a struct to a new value. The type of @src must match
- * the exiting type of @member member of the struct.
+ * Sets a given member of a struct to a new value. The type of @src must match
+ * the existing type of @member member of the struct.
*
- * Returns: TRUE if sucessful
+ * Returns: %TRUE if successful
*/
gboolean
dbus_g_type_struct_set_member (GValue *value,
g_return_val_if_fail (G_VALUE_HOLDS_BOXED (value), FALSE);
gtype = G_VALUE_TYPE (value);
+ g_return_val_if_fail (dbus_g_type_is_struct (gtype), FALSE);
+
data = lookup_specialization_data (gtype);
- g_return_val_if_fail (data != NULL, FALSE);
+ /* already checked by dbus_g_type_is_struct() */
+ g_assert (data != NULL);
return ((DBusGTypeSpecializedStructVtable *) (data->klass->vtable))->set_member(gtype,
g_value_get_boxed (value),
/**
* dbus_g_type_struct_get:
- * @value: a #GValue containing a #DBusGTypeStruct type
+ * @value: a #GValue containing a struct instance
* @member: struct member to get
* @...: location in which to return the value of this member,
* followed optionally by more member/return locations pairs, followed by
- * by #G_MAXUINT
+ * by %G_MAXUINT
*
* Collects the selected values of this struct into the return locations
* provided.
*
- * Returns: #FALSE on failure
+ * Returns: %FALSE on failure
*/
gboolean
/**
* dbus_g_type_struct_set:
- * @value: a #GValue containing a #DBusGTypeStruct type
+ * @value: a #GValue containing a struct instance
* @member: struct member to set
* @...: value for the first member, followed optionally by
- * more member/value pairs, followed by #G_MAXUINT
+ * more member/value pairs, followed by %G_MAXUINT
*
* Sets the selected members of the struct in @value.
*
- * Returns: #FALSE on failure
+ * Returns: %FALSE on failure
*/
gboolean
dbus_g_value_build_g_variant (vvalue)));
}
+static GVariantType *
+dbus_g_value_type_build_g_variant_type (GType type)
+{
+ if (dbus_g_type_is_collection (type))
+ {
+ GType element_type = dbus_g_type_get_collection_specialization (type);
+ GVariantType *element_sig = dbus_g_value_type_build_g_variant_type (
+ element_type);
+ GVariantType *ret = g_variant_type_new_array (element_sig);
+
+ g_variant_type_free (element_sig);
+ return ret;
+ }
+ else if (dbus_g_type_is_map (type))
+ {
+ GType key_type = dbus_g_type_get_map_key_specialization (type);
+ GType value_type = dbus_g_type_get_map_value_specialization (type);
+ GVariantType *key_sig = dbus_g_value_type_build_g_variant_type (
+ key_type);
+ GVariantType *value_sig = dbus_g_value_type_build_g_variant_type (
+ value_type);
+ GVariantType *entry_sig = g_variant_type_new_dict_entry (key_sig,
+ value_sig);
+ GVariantType *ret = g_variant_type_new_array (entry_sig);
+
+ g_variant_type_free (key_sig);
+ g_variant_type_free (value_sig);
+ g_variant_type_free (entry_sig);
+ return ret;
+ }
+ else if (dbus_g_type_is_struct (type))
+ {
+ guint size = dbus_g_type_get_struct_size (type);
+ guint i;
+ GVariantType **sigs = g_new0 (GVariantType *, size);
+ GVariantType *ret;
+
+ for (i = 0; i < size; i++)
+ {
+ GType t = dbus_g_type_get_struct_member_type (type, i);
+
+ sigs[i] = dbus_g_value_type_build_g_variant_type (t);
+ }
+
+ ret = g_variant_type_new_tuple ((const GVariantType * const *) sigs,
+ size);
+
+ for (i = 0; i < size; i++)
+ g_variant_type_free (sigs[i]);
+
+ g_free (sigs);
+ return ret;
+ }
+ else if (type == G_TYPE_BOOLEAN)
+ return g_variant_type_copy (G_VARIANT_TYPE_BOOLEAN);
+ else if (type == G_TYPE_UCHAR)
+ return g_variant_type_copy (G_VARIANT_TYPE_BYTE);
+ else if (type == G_TYPE_INT)
+ return g_variant_type_copy (G_VARIANT_TYPE_INT32);
+ else if (type == G_TYPE_UINT)
+ return g_variant_type_copy (G_VARIANT_TYPE_UINT32);
+ else if (type == G_TYPE_INT64)
+ return g_variant_type_copy (G_VARIANT_TYPE_INT64);
+ else if (type == G_TYPE_UINT64)
+ return g_variant_type_copy (G_VARIANT_TYPE_UINT64);
+ else if (type == G_TYPE_DOUBLE)
+ return g_variant_type_copy (G_VARIANT_TYPE_DOUBLE);
+ else if (type == G_TYPE_STRING)
+ return g_variant_type_copy (G_VARIANT_TYPE_STRING);
+ else if (type == G_TYPE_STRV)
+ return g_variant_type_copy (G_VARIANT_TYPE_STRING_ARRAY);
+ else if (type == DBUS_TYPE_G_OBJECT_PATH)
+ return g_variant_type_copy (G_VARIANT_TYPE_OBJECT_PATH);
+ else if (type == DBUS_TYPE_G_SIGNATURE)
+ return g_variant_type_copy (G_VARIANT_TYPE_SIGNATURE);
+ else if (type == G_TYPE_VALUE)
+ return g_variant_type_copy (G_VARIANT_TYPE_VARIANT);
+ else
+ g_error ("%s: Unknown type: %s", G_STRFUNC, g_type_name (type));
+}
+
/**
* dbus_g_value_build_g_variant:
* @value: a simple or specialized #GValue to convert to a #GVariant
{
GVariant *variant;
GPtrArray *children;
+ GVariantType *signature = NULL;
children = g_ptr_array_new ();
dbus_g_type_collection_value_iterate (value, _collection_iterator,
children);
- variant = g_variant_new_array (NULL, (GVariant **) children->pdata,
+ if (children->len == 0)
+ {
+ /* we can't cheat by saying "the type of the children? that!" */
+ GType element_type = dbus_g_type_get_collection_specialization (
+ type);
+
+ signature = dbus_g_value_type_build_g_variant_type (element_type);
+ }
+
+ variant = g_variant_new_array (signature, (GVariant **) children->pdata,
children->len);
g_ptr_array_free (children, TRUE);
+ g_variant_type_free (signature);
return variant;
}
{
GVariant *variant;
GPtrArray *children;
+ GVariantType *signature = NULL;
children = g_ptr_array_new ();
dbus_g_type_map_value_iterate (value, _map_iterator, children);
- variant = g_variant_new_array (NULL, (GVariant **) children->pdata,
+ if (children->len == 0)
+ {
+ /* we can't cheat by saying "the type of the children? that!" */
+ GType key_type = dbus_g_type_get_map_key_specialization (
+ type);
+ GType value_type = dbus_g_type_get_map_value_specialization (
+ type);
+ GVariantType *k = dbus_g_value_type_build_g_variant_type (key_type);
+ GVariantType *v = dbus_g_value_type_build_g_variant_type (
+ value_type);
+
+ signature = g_variant_type_new_dict_entry (k, v);
+ g_variant_type_free (k);
+ g_variant_type_free (v);
+ }
+
+ variant = g_variant_new_array (signature, (GVariant **) children->pdata,
children->len);
g_ptr_array_free (children, TRUE);
+ g_variant_type_free (signature);
return variant;
}
/* public */
GValue *val;
GType specialization_type;
+ /*< private >*/
/* padding */
gpointer b;
guint c;
gboolean dbus_g_type_collection_get_fixed (GValue *value,
- gpointer *data,
- guint *len);
+ gpointer *data_ret,
+ guint *len_ret);
void dbus_g_type_collection_value_iterate (const GValue *value,
DBusGTypeSpecializedCollectionIterator iterator,
DBusGTypeSpecializedFreeFunc free_func;
DBusGTypeSpecializedCopyFunc copy_func;
GDestroyNotify simple_free_func; /* for type-independent freeing if possible */
+ /*<private>*/
gpointer padding2;
gpointer padding3;
} DBusGTypeSpecializedVtable;
#include "dbus-gtest.h"
#include <string.h>
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-
char**
_dbus_gutils_split_path (const char *path)
{
return g_string_free (str, FALSE);
}
-
-
-#ifdef DBUS_BUILD_TESTS
-
-/**
- * @ingroup DBusGLibInternals
- * Unit test for GLib utils internals
- * Returns: #TRUE on success.
- */
-gboolean
-_dbus_gutils_test (const char *test_data_dir)
-{
-
- return TRUE;
-}
-
-#endif /* DBUS_BUILD_TESTS */
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
#ifndef DBUS_GLIB_UTILS_H
#define DBUS_GLIB_UTILS_H
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-
#include <dbus/dbus.h>
#include <glib-object.h>
G_END_DECLS
#endif /* DBUS_GLIB_UTILS_H */
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
--- /dev/null
+/* GVariant to dbus-glib escape hatch
+ *
+ * Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Alternatively, at your option, you can redistribute and/or modify
+ * this single file under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * that license, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include <config.h>
+
+#include <dbus/dbus-gvalue-parse-variant.h>
+
+#include <string.h>
+
+#include <dbus/dbus-glib.h>
+
+/* Static functions in this file are a bit weird: they take a GVariant as first
+ * argument, but it can be NULL. If it is, @value will be initialized with the
+ * right type for that GVariant, but not filled in, so it'll contain 0 or NULL
+ * or whatever. */
+
+static void dbus_g_value_parse_variant_by_type (GVariant *variant,
+ const GVariantType *variant_type,
+ GValue *value);
+
+static void
+dbus_g_value_dict_parse_variant (GVariant *variant,
+ const GVariantType *member_type,
+ GValue *value)
+{
+ const GVariantType *key_type, *value_type;
+ GValue key_parsed = { 0 }, value_parsed = { 0 };
+
+ g_assert (g_variant_type_is_dict_entry (member_type));
+ key_type = g_variant_type_key (member_type);
+ value_type = g_variant_type_value (member_type);
+
+ /* first get the GTypes, without getting actual values */
+ dbus_g_value_parse_variant_by_type (NULL, key_type, &key_parsed);
+ dbus_g_value_parse_variant_by_type (NULL, value_type, &value_parsed);
+
+ g_value_init (value, dbus_g_type_get_map ("GHashTable",
+ G_VALUE_TYPE (&key_parsed),
+ G_VALUE_TYPE (&value_parsed)));
+ g_value_unset (&key_parsed);
+ g_value_unset (&value_parsed);
+
+ if (variant != NULL)
+ {
+ GVariantIter iter;
+ GVariant *child;
+ DBusGTypeSpecializedAppendContext ctx;
+
+ g_value_take_boxed (value, dbus_g_type_specialized_construct (
+ G_VALUE_TYPE (value)));
+ dbus_g_type_specialized_init_append (value, &ctx);
+
+ g_variant_iter_init (&iter, variant);
+
+ for (child = g_variant_iter_next_value (&iter);
+ child != NULL;
+ child = g_variant_iter_next_value (&iter))
+ {
+ GVariant *grandchild;
+
+ grandchild = g_variant_get_child_value (child, 0);
+ dbus_g_value_parse_variant_by_type (grandchild, key_type,
+ &key_parsed);
+ g_variant_unref (grandchild);
+
+ grandchild = g_variant_get_child_value (child, 1);
+ dbus_g_value_parse_variant_by_type (grandchild, value_type,
+ &value_parsed);
+ g_variant_unref (grandchild);
+
+ /* Here be dragons: this steals the *contents of* key_parsed and
+ * value_parsed, so we can't g_value_unset() them. */
+ dbus_g_type_specialized_map_append (&ctx, &key_parsed,
+ &value_parsed);
+ memset (&key_parsed, '\0', sizeof (key_parsed));
+ memset (&value_parsed, '\0', sizeof (value_parsed));
+ g_variant_unref (child);
+ }
+ }
+}
+
+static void
+dbus_g_value_basic_array_parse_variant (GVariant *variant,
+ gchar type_char,
+ GValue *value)
+{
+ GType gtype = G_TYPE_INVALID;
+ guint dg_size = 0, gv_size = 0;
+
+ switch ((GVariantClass) type_char)
+ {
+ case G_VARIANT_CLASS_STRING:
+ g_value_init (value, G_TYPE_STRV);
+
+ if (variant != NULL)
+ g_value_take_boxed (value, g_variant_dup_strv (variant, NULL));
+ return;
+
+ case G_VARIANT_CLASS_OBJECT_PATH:
+ case G_VARIANT_CLASS_SIGNATURE:
+ {
+ if (type_char == G_VARIANT_CLASS_OBJECT_PATH)
+ gtype = DBUS_TYPE_G_OBJECT_PATH;
+ else
+ gtype = DBUS_TYPE_G_SIGNATURE;
+
+ g_value_init (value,
+ dbus_g_type_get_collection ("GPtrArray", gtype));
+
+ if (variant != NULL)
+ {
+ gsize n = g_variant_n_children (variant);
+ gsize i;
+ GPtrArray *pa = g_ptr_array_sized_new (n);
+
+ for (i = 0; i < n; i++)
+ {
+ GVariant *child = g_variant_get_child_value (variant, i);
+ gchar *s = g_variant_dup_string (child, NULL);
+
+ g_ptr_array_add (pa, s);
+ g_variant_unref (child);
+ }
+
+ g_value_take_boxed (value, pa);
+ }
+ }
+ return;
+
+ /* From here down handles fixed-size types. */
+
+ case G_VARIANT_CLASS_BYTE:
+ gtype = G_TYPE_UCHAR;
+ gv_size = dg_size = sizeof (guchar);
+ break;
+
+ case G_VARIANT_CLASS_BOOLEAN:
+ gtype = G_TYPE_BOOLEAN;
+ dg_size = sizeof (gboolean);
+ gv_size = sizeof (guchar);
+ break;
+
+ case G_VARIANT_CLASS_INT16:
+ gtype = G_TYPE_INT;
+ dg_size = sizeof (gint);
+ gv_size = sizeof (gint16);
+ break;
+
+ case G_VARIANT_CLASS_INT32:
+ gtype = G_TYPE_INT;
+ dg_size = sizeof (gint);
+ gv_size = sizeof (gint32);
+ break;
+
+ case G_VARIANT_CLASS_UINT16:
+ gtype = G_TYPE_UINT;
+ dg_size = sizeof (guint);
+ gv_size = sizeof (guint16);
+ break;
+
+ case G_VARIANT_CLASS_UINT32:
+ gtype = G_TYPE_UINT;
+ dg_size = sizeof (guint);
+ gv_size = sizeof (guint32);
+ break;
+
+ case G_VARIANT_CLASS_INT64:
+ gtype = G_TYPE_INT64;
+ dg_size = gv_size = sizeof (gint64);
+ break;
+
+ case G_VARIANT_CLASS_UINT64:
+ gtype = G_TYPE_UINT64;
+ dg_size = gv_size = sizeof (guint64);
+ break;
+
+ case G_VARIANT_CLASS_DOUBLE:
+ gtype = G_TYPE_DOUBLE;
+ dg_size = gv_size = sizeof (gdouble);
+ break;
+
+ case G_VARIANT_CLASS_HANDLE:
+ case G_VARIANT_CLASS_VARIANT:
+ case G_VARIANT_CLASS_MAYBE:
+ case G_VARIANT_CLASS_ARRAY:
+ case G_VARIANT_CLASS_TUPLE:
+ case G_VARIANT_CLASS_DICT_ENTRY:
+ g_return_if_reached ();
+ }
+
+ g_assert (gtype != G_TYPE_INVALID);
+ g_assert (dg_size != 0);
+ g_assert (gv_size != 0);
+
+ g_value_init (value, dbus_g_type_get_collection ("GArray", gtype));
+
+ if (variant != NULL)
+ {
+ GArray *arr;
+ gsize n, i;
+ gconstpointer blob = g_variant_get_fixed_array (variant, &n, gv_size);
+
+ arr = g_array_sized_new (FALSE, FALSE, dg_size, n);
+ g_value_take_boxed (value, arr);
+
+ if (dg_size == gv_size)
+ {
+ /* fast path: we can just memcpy them in */
+ g_array_append_vals (arr, blob, n);
+ }
+ else
+ {
+ DBusGTypeSpecializedAppendContext ctx;
+
+ dbus_g_type_specialized_init_append (value, &ctx);
+
+ for (i = 0; i < n; i++)
+ {
+ GVariant *child;
+ GValue v = { 0 };
+
+ child = g_variant_get_child_value (variant, i);
+ dbus_g_value_parse_g_variant (child, &v);
+ g_variant_unref (child);
+ dbus_g_type_specialized_collection_append (&ctx, &v);
+ }
+
+ dbus_g_type_specialized_collection_end_append (&ctx);
+ }
+ }
+}
+
+static void
+dbus_g_value_tuple_parse_variant (GVariant *variant,
+ const GVariantType *variant_type,
+ GValue *value)
+{
+ gsize n = g_variant_type_n_items (variant_type);
+ GType *types;
+ gsize i;
+ GValueArray *va = g_value_array_new (n);
+ const GVariantType *inner_type;
+
+ types = g_new0 (GType, n);
+
+ for (i = 0, inner_type = g_variant_type_first (variant_type);
+ i < n;
+ i++, inner_type = g_variant_type_next (inner_type))
+ {
+ GVariant *inner_variant;
+
+ if (variant == NULL)
+ inner_variant = NULL;
+ else
+ inner_variant = g_variant_get_child_value (variant, i);
+
+ g_value_array_append (va, NULL);
+ dbus_g_value_parse_variant_by_type (inner_variant, inner_type,
+ &va->values[i]);
+ types[i] = G_VALUE_TYPE (&va->values[i]);
+
+ if (inner_variant != NULL)
+ g_variant_unref (inner_variant);
+ }
+
+ g_value_init (value, dbus_g_type_get_structv ("GValueArray", n, types));
+
+ if (variant == NULL)
+ g_value_array_free (va);
+ else
+ g_value_take_boxed (value, va);
+
+ g_free (types);
+}
+
+static void
+dbus_g_value_array_parse_variant (GVariant *variant,
+ const GVariantType *variant_type,
+ GValue *value)
+{
+ const GVariantType *member_type;
+ gchar type_char;
+ GPtrArray *pa = NULL;
+ gsize n = 0, i;
+
+ g_assert (g_variant_type_is_array (variant_type));
+
+ member_type = g_variant_type_element (variant_type);
+ type_char = g_variant_type_peek_string (member_type)[0];
+
+ if (g_variant_type_is_dict_entry (member_type))
+ {
+ dbus_g_value_dict_parse_variant (variant, member_type, value);
+ return;
+ }
+
+ if (g_variant_type_is_basic (member_type))
+ {
+ dbus_g_value_basic_array_parse_variant (variant, type_char, value);
+ return;
+ }
+
+ /* all the non-basic types end up as a GPtrArray of boxed */
+ if (variant != NULL)
+ {
+ n = g_variant_n_children (variant);
+ pa = g_ptr_array_sized_new (n);
+ }
+
+ switch ((GVariantClass) type_char)
+ {
+ case G_VARIANT_CLASS_VARIANT:
+ {
+ g_value_init (value,
+ dbus_g_type_get_collection ("GPtrArray", G_TYPE_VALUE));
+ }
+ break;
+
+ case G_VARIANT_CLASS_ARRAY:
+ {
+ GValue v = { 0 };
+
+ dbus_g_value_array_parse_variant (NULL, member_type, &v);
+ g_value_init (value, dbus_g_type_get_collection ("GPtrArray",
+ G_VALUE_TYPE (&v)));
+ }
+ break;
+
+ case G_VARIANT_CLASS_TUPLE:
+ {
+ GValue v = { 0 };
+
+ dbus_g_value_tuple_parse_variant (NULL, member_type, &v);
+ g_value_init (value, dbus_g_type_get_collection ("GPtrArray",
+ G_VALUE_TYPE (&v)));
+ }
+ break;
+
+ case G_VARIANT_CLASS_DICT_ENTRY:
+ case G_VARIANT_CLASS_MAYBE:
+ default:
+ g_critical ("unhandled GVariantClass array<%d>", type_char);
+ g_return_if_reached ();
+ }
+
+ if (variant != NULL)
+ {
+ for (i = 0; i < n; i++)
+ {
+ GVariant *child = g_variant_get_child_value (variant, i);
+ GValue tmp = { 0 };
+
+ dbus_g_value_parse_g_variant (child, &tmp);
+ g_ptr_array_add (pa, g_value_dup_boxed (&tmp));
+ g_variant_unref (child);
+ g_value_unset (&tmp);
+ }
+
+ g_value_take_boxed (value, pa);
+ }
+}
+
+static void
+dbus_g_value_parse_variant_by_type (GVariant *variant,
+ const GVariantType *variant_type,
+ GValue *value)
+{
+ gchar type_char = g_variant_type_peek_string (variant_type)[0];
+
+ switch ((GVariantClass) type_char)
+ {
+ case G_VARIANT_CLASS_BOOLEAN:
+ g_value_init (value, G_TYPE_BOOLEAN);
+
+ if (variant != NULL)
+ g_value_set_boolean (value, !!g_variant_get_boolean (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_BYTE:
+ g_value_init (value, G_TYPE_UCHAR);
+
+ if (variant != NULL)
+ g_value_set_uchar (value, g_variant_get_byte (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_UINT16:
+ /* there is no G_TYPE_UINT16 */
+ g_value_init (value, G_TYPE_UINT);
+
+ if (variant != NULL)
+ g_value_set_uint (value, g_variant_get_uint16 (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_UINT32:
+ g_value_init (value, G_TYPE_UINT);
+
+ if (variant != NULL)
+ g_value_set_uint (value, g_variant_get_uint32 (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_UINT64:
+ g_value_init (value, G_TYPE_UINT64);
+
+ if (variant != NULL)
+ g_value_set_uint64 (value, g_variant_get_uint64 (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_INT16:
+ /* there is no G_TYPE_INT16 */
+ g_value_init (value, G_TYPE_INT);
+
+ if (variant != NULL)
+ g_value_set_int (value, g_variant_get_int16 (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_INT32:
+ g_value_init (value, G_TYPE_INT);
+
+ if (variant != NULL)
+ g_value_set_int (value, g_variant_get_int32 (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_INT64:
+ g_value_init (value, G_TYPE_INT64);
+
+ if (variant != NULL)
+ g_value_set_int64 (value, g_variant_get_int64 (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_DOUBLE:
+ g_value_init (value, G_TYPE_DOUBLE);
+
+ if (variant != NULL)
+ g_value_set_double (value, g_variant_get_double (variant));
+
+ break;
+
+ case G_VARIANT_CLASS_STRING:
+ g_value_init (value, G_TYPE_STRING);
+
+ if (variant != NULL)
+ g_value_set_string (value, g_variant_get_string (variant, NULL));
+
+ break;
+
+ case G_VARIANT_CLASS_OBJECT_PATH:
+ g_value_init (value, DBUS_TYPE_G_OBJECT_PATH);
+
+ if (variant != NULL)
+ g_value_set_boxed (value, g_variant_get_string (variant, NULL));
+
+ break;
+
+ case G_VARIANT_CLASS_SIGNATURE:
+ g_value_init (value, DBUS_TYPE_G_SIGNATURE);
+
+ if (variant != NULL)
+ g_value_set_boxed (value, g_variant_get_string (variant, NULL));
+
+ break;
+
+ case G_VARIANT_CLASS_VARIANT:
+ g_value_init (value, G_TYPE_VALUE);
+
+ if (variant != NULL)
+ {
+ GVariant *inner_variant = g_variant_get_variant (variant);
+ GValue *inner_value = g_new0 (GValue, 1);
+
+ dbus_g_value_parse_g_variant (inner_variant, inner_value);
+ g_value_take_boxed (value, inner_value);
+ g_variant_unref (inner_variant);
+ }
+ break;
+
+ case G_VARIANT_CLASS_ARRAY:
+ dbus_g_value_array_parse_variant (variant, variant_type, value);
+ break;
+
+ case G_VARIANT_CLASS_TUPLE:
+ dbus_g_value_tuple_parse_variant (variant, variant_type, value);
+ break;
+
+ case G_VARIANT_CLASS_DICT_ENTRY:
+ g_critical ("found a dict entry not in a dict");
+ break;
+
+ case G_VARIANT_CLASS_HANDLE:
+ case G_VARIANT_CLASS_MAYBE:
+ g_critical ("unhandled GVariantClass '%c' (%d)",
+ CLAMP (type_char, ' ', '~'),
+ type_char);
+ break;
+ }
+}
+
+/**
+ * dbus_g_value_parse_g_variant:
+ * @variant: a #GVariant
+ * @value: a zero-filled #GValue
+ *
+ * Deserialize @variant and put an equivalent dbus-glib data structure in
+ * @value.
+ *
+ * It is an error if @variant contains any #GVariant extensions not supported
+ * by dbus-glib, including handles (file descriptor passing) and 'maybe' types.
+ */
+void
+dbus_g_value_parse_g_variant (GVariant *variant,
+ GValue *value)
+{
+ g_return_if_fail (variant != NULL);
+ dbus_g_value_parse_variant_by_type (variant, g_variant_get_type (variant),
+ value);
+}
--- /dev/null
+/* GVariant to dbus-glib escape hatch
+ *
+ * Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Alternatively, at your option, you can redistribute and/or modify
+ * this single file under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * that license, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifndef __DBUS_GVALUE_PARSE_VARIANT_H__
+#define __DBUS_GVALUE_PARSE_VARIANT_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+void dbus_g_value_parse_g_variant (GVariant *variant, GValue *value);
+
+G_END_DECLS
+
+#endif
return array;
}
+static void
+array_iterator (GType garray_type,
+ gpointer instance,
+ DBusGTypeSpecializedCollectionIterator iterator,
+ gpointer user_data)
+{
+ GArray *array;
+ GType elt_gtype;
+ guint i;
+
+ array = instance;
+
+ elt_gtype = dbus_g_type_get_collection_specialization (garray_type);
+
+ for (i = 0; i < array->len; i++)
+ {
+ GValue val = {0, };
+ g_value_init (&val, elt_gtype);
+
+ switch (elt_gtype)
+ {
+ case G_TYPE_BOOLEAN:
+ g_value_set_boolean (&val, !!g_array_index (array, gboolean, i));
+ break;
+
+ case G_TYPE_FLOAT:
+ g_value_set_float (&val, g_array_index (array, gfloat, i));
+ break;
+
+ case G_TYPE_DOUBLE:
+ g_value_set_double (&val, g_array_index (array, gdouble, i));
+ break;
+
+ case G_TYPE_CHAR:
+ g_value_set_char (&val, g_array_index (array, gchar, i));
+ break;
+
+ case G_TYPE_UCHAR:
+ g_value_set_uchar (&val, g_array_index (array, guchar, i));
+ break;
+
+ case G_TYPE_INT:
+ g_value_set_int (&val, g_array_index (array, gint, i));
+ break;
+
+ case G_TYPE_UINT:
+ g_value_set_uint (&val, g_array_index (array, guint, i));
+ break;
+
+ case G_TYPE_LONG:
+ g_value_set_long (&val, g_array_index (array, glong, i));
+ break;
+
+ case G_TYPE_ULONG:
+ g_value_set_ulong (&val, g_array_index (array, gulong, i));
+ break;
+
+ case G_TYPE_INT64:
+ g_value_set_int64 (&val, g_array_index (array, gint64, i));
+ break;
+
+ case G_TYPE_UINT64:
+ g_value_set_uint64 (&val, g_array_index (array, guint64, i));
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ iterator (&val, user_data);
+ }
+}
+
+static void
+array_append (DBusGTypeSpecializedAppendContext *ctx,
+ GValue *value)
+{
+ GArray *array = g_value_get_boxed (ctx->val);
+ GType elt_gtype;
+ union {
+ guint64 u64;
+ gint64 i64;
+ gulong ul;
+ glong l;
+ guint u;
+ gint i;
+ guchar uc;
+ gchar c;
+ gboolean b;
+ gfloat f;
+ gdouble d;
+ } tmp;
+
+ elt_gtype = dbus_g_type_get_collection_specialization (
+ G_VALUE_TYPE (ctx->val));
+
+ switch (elt_gtype)
+ {
+ case G_TYPE_BOOLEAN:
+ tmp.b = g_value_get_boolean (value);
+ g_array_append_val (array, tmp.b);
+ break;
+
+ case G_TYPE_FLOAT:
+ tmp.f = g_value_get_float (value);
+ g_array_append_val (array, tmp.f);
+ break;
+
+ case G_TYPE_DOUBLE:
+ tmp.d = g_value_get_double (value);
+ g_array_append_val (array, tmp.d);
+ break;
+
+ case G_TYPE_CHAR:
+ tmp.c = g_value_get_char (value);
+ g_array_append_val (array, tmp.c);
+ break;
+
+ case G_TYPE_UCHAR:
+ tmp.uc = g_value_get_uchar (value);
+ g_array_append_val (array, tmp.uc);
+ break;
+
+ case G_TYPE_INT:
+ tmp.i = g_value_get_int (value);
+ g_array_append_val (array, tmp.i);
+ break;
+
+ case G_TYPE_UINT:
+ tmp.u = g_value_get_uint (value);
+ g_array_append_val (array, tmp.u);
+ break;
+
+ case G_TYPE_LONG:
+ tmp.l = g_value_get_long (value);
+ g_array_append_val (array, tmp.l);
+ break;
+
+ case G_TYPE_ULONG:
+ tmp.ul = g_value_get_ulong (value);
+ g_array_append_val (array, tmp.ul);
+ break;
+
+ case G_TYPE_INT64:
+ tmp.i64 = g_value_get_int64 (value);
+ g_array_append_val (array, tmp.i64);
+ break;
+
+ case G_TYPE_UINT64:
+ tmp.u64 = g_value_get_uint64 (value);
+ g_array_append_val (array, tmp.u64);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+}
+
static gpointer
array_copy (GType type, gpointer src)
{
NULL,
},
array_fixed_accessor,
- NULL,
- NULL,
+ array_iterator,
+ array_append,
NULL
};
#include "dbus/dbus-glib.h"
#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
#include "dbus/dbus-signature.h"
/* Seems reasonable, but this should probably be part of the standard protocol */
}
/**
- * Get the GLib type ID for a DBusGObjectPath boxed type.
+ * DBusGObjectPath:
*
- * Returns: GLib type
+ * A typedef for a string used to represent D-Bus object paths.
+ * Its GType is %DBUS_TYPE_G_OBJECT_PATH, derived from %G_TYPE_BOXED.
+ *
+ * Prior to version 0.FIXME this was used as the type name of
+ * %DBUS_TYPE_G_OBJECT_PATH, but did not actually exist as a typedef.
+ *
+ * Since: 0.FIXME
+ */
+
+/**
+ * DBUS_TYPE_G_OBJECT_PATH:
+ *
+ * The #GType of a #DBusGObjectPath, which is a boxed type containing a
+ * D-Bus object path as a zero-terminated string. Object paths can be
+ * copied with g_strdup() and freed with g_free(), just like %G_TYPE_STRING,
+ * but have a distinct boxed type to allow them to be distinguished when
+ * stored in a #GValue.
+ *
+ * Returns: a type derived from %G_TYPE_BOXED
*/
GType
dbus_g_object_path_get_g_type (void)
}
/**
- * Get the GLib type ID for a DBusGSignature boxed type.
+ * DBusGSignature:
+ *
+ * A typedef for a string used to represent D-Bus signatures.
+ * Its GType is %DBUS_TYPE_G_SIGNATURE, derived from %G_TYPE_BOXED.
+ *
+ * Prior to version 0.FIXME this was used as the type name of
+ * %DBUS_TYPE_G_SIGNATURE, but did not actually exist as a typedef.
*
- * Returns: GLib type
+ * Since: 0.FIXME
+ */
+
+/**
+ * DBUS_TYPE_G_SIGNATURE:
+ *
+ * The #GType of a #DBusGSignature, which is a boxed type containing a
+ * D-Bus signature as a zero-terminated string. Signatures can be
+ * copied with g_strdup() and freed with g_free(), just like %G_TYPE_STRING,
+ * but have a distinct boxed type to allow them to be distinguished when
+ * stored in a #GValue.
+ *
+ * Returns: a type derived from %G_TYPE_BOXED
*/
GType
dbus_g_signature_get_g_type (void)
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected type %s, got type code \'%c\'"),
+ "Expected type %s, got type code \'%c\'",
g_type_name (G_VALUE_TYPE (value)),
(guchar) current_type);
return FALSE;
GError **error)
{
char *sig;
- int current_type;
DBusMessageIter subiter;
GType variant_type;
- current_type = dbus_message_iter_get_arg_type (iter);
dbus_message_iter_recurse (iter, &subiter);
sig = dbus_message_iter_get_signature (&subiter);
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS object path, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS object path, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS object path, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS object path, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS object path, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS object path, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_assert (context->proxy == NULL);
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Unregistered object at path '%s'"),
+ "Unregistered object at path '%s'",
objpath);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS signature, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS signature, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS array, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS array, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS string, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS string, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS struct, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS struct, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Couldn't demarshal argument with signature \"%s\""), current_sig);
+ "Couldn't demarshal argument with signature \"%s\"", current_sig);
dbus_free (current_sig);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS array, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS array, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS dict entry, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS dict entry, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS struct, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS struct, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Couldn't demarshal argument, "
- "struct type %s has no member %d"),
+ "Couldn't demarshal argument, "
+ "struct type %s has no member %d",
g_type_name (G_VALUE_TYPE(value)), i);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Expected D-BUS array, got type code \'%c\'"), (guchar) current_type);
+ "Expected D-BUS array, got type code \'%c\'", (guchar) current_type);
return FALSE;
}
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("No demarshaller registered for type \"%s\" of collection \"%s\""),
+ "No demarshaller registered for type \"%s\" of collection \"%s\"",
g_type_name (coltype),
g_type_name (subtype));
return FALSE;
g_set_error (error,
DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("No demarshaller registered for type \"%s\""),
+ "No demarshaller registered for type \"%s\"",
g_type_name (gtype));
goto out;
{
g_set_error (error, DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Too many arguments in message"));
+ "Too many arguments in message");
goto lose;
}
{
g_set_error (error, DBUS_GERROR,
DBUS_GERROR_INVALID_ARGS,
- _("Too few arguments in message"));
+ "Too few arguments in message");
goto lose;
}
return NULL;
}
+static void oom (void) G_GNUC_NORETURN;
+static void
+oom (void)
+{
+ g_error ("no memory");
+}
+
static gboolean
marshal_basic (DBusMessageIter *iter, const GValue *value)
{
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_BYTE,
&b))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_UCHAR:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_BYTE,
&b))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_BOOLEAN:
{
dbus_bool_t b = g_value_get_boolean (value);
+
+ g_return_val_if_fail (b == TRUE || b == FALSE, FALSE);
+
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_BOOLEAN,
&b))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_INT:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_INT32,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_UINT:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_UINT32,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_LONG:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_INT32,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_ULONG:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_UINT32,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_INT64:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_INT64,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_UINT64:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_UINT64,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_FLOAT:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_DOUBLE,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_DOUBLE:
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_DOUBLE,
&v))
- goto nomem;
+ oom ();
}
return TRUE;
case G_TYPE_STRING:
- /* FIXME, the GValue string may not be valid UTF-8 */
{
const char *v = g_value_get_string (value);
if (!v)
v = "";
+
+ /* FIXME: fd.o #16320: consider using g_return_if_fail to check UTF-8
+ * validity */
+
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_STRING,
&v))
- goto nomem;
+ {
+ gchar *s = g_strdup_value_contents (value);
+
+ g_critical ("Unable to marshal string (not UTF-8 or OOM?): %s",
+ s);
+ g_free (s);
+ return FALSE;
+ }
}
return TRUE;
return FALSE;
}
}
-
- nomem:
- g_error ("no memory");
- return FALSE;
}
static gboolean
DBUS_TYPE_STRUCT,
NULL,
&subiter))
- goto oom;
+ oom ();
if (array)
{
for (i = 0; i < array->n_values; i++)
{
if (!_dbus_gvalue_marshal (&subiter, g_value_array_get_nth (array, i)))
- return FALSE;
+ {
+ dbus_message_iter_abandon_container (iter, &subiter);
+ return FALSE;
+ }
}
}
- if (!dbus_message_iter_close_container (iter, &subiter))
- goto oom;
-
- return TRUE;
- oom:
- g_error ("out of memory");
- return FALSE;
+ return dbus_message_iter_close_container (iter, &subiter);
}
static gboolean
g_assert (G_VALUE_TYPE (value) == dbus_g_proxy_get_type ());
proxy = g_value_get_object (value);
+ g_return_val_if_fail (DBUS_IS_G_PROXY (proxy), FALSE);
path = dbus_g_proxy_get_path (proxy);
-
+ g_return_val_if_fail (g_variant_is_object_path (path), FALSE);
+
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_OBJECT_PATH,
&path))
- return FALSE;
+ oom ();
+
return TRUE;
}
g_assert (G_VALUE_TYPE (value) == DBUS_TYPE_G_OBJECT_PATH);
- path = (const char*) g_value_get_boxed (value);
-
+ path = g_value_get_boxed (value);
+ g_return_val_if_fail (g_variant_is_object_path (path), FALSE);
+
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_OBJECT_PATH,
&path))
- return FALSE;
+ oom ();
+
return TRUE;
}
GObject *obj;
obj = g_value_get_object (value);
+ g_return_val_if_fail (G_IS_OBJECT (obj), FALSE);
+
path = _dbus_gobject_get_path (obj);
+ g_return_val_if_fail (g_variant_is_object_path (path), FALSE);
- if (path == NULL)
- /* FIXME should throw error */
- return FALSE;
-
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_OBJECT_PATH,
&path))
- return FALSE;
+ oom ();
+
return TRUE;
}
g_assert (G_VALUE_TYPE (value) == DBUS_TYPE_G_SIGNATURE);
- sig = (const char*) g_value_get_boxed (value);
+ sig = g_value_get_boxed (value);
+ g_return_val_if_fail (g_variant_is_signature (sig), FALSE);
+ /* failure here isn't strictly *guaranteed* to be OOM, since GDBus might
+ * understand more type-codes than our libdbus */
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_SIGNATURE,
&sig))
{
GType gtype;
DBusMessageIter arr_iter;
- gboolean ret;
struct DBusGLibHashMarshalData hashdata;
char *key_sig;
char *value_sig;
gtype = G_VALUE_TYPE (value);
- ret = FALSE;
-
key_type = dbus_g_type_get_map_key_specialization (gtype);
g_assert (_dbus_gtype_is_valid_hash_key (key_type));
value_type = dbus_g_type_get_map_value_specialization (gtype);
marshal_map_entry,
&hashdata);
- if (!dbus_message_iter_close_container (iter, &arr_iter))
- goto lose;
+ if (hashdata.err)
+ {
+ dbus_message_iter_abandon_container (iter, &arr_iter);
+ goto lose;
+ }
+ else if (!dbus_message_iter_close_container (iter, &arr_iter))
+ {
+ goto lose;
+ }
out:
g_free (entry_sig);
{
GType gtype;
DBusMessageIter subiter;
- gboolean ret;
guint size, i;
GValue val = {0,};
gtype = G_VALUE_TYPE (value);
- ret = FALSE;
-
size = dbus_g_type_get_struct_size (gtype);
if (!dbus_message_iter_open_container (iter,
DBUS_TYPE_STRUCT,
NULL,
&subiter))
- goto oom;
+ oom ();
for (i = 0; i < size; i++)
{
g_value_init (&val, dbus_g_type_get_struct_member_type
(G_VALUE_TYPE(value), i));
+
if (!dbus_g_type_struct_get_member (value, i, &val))
- return FALSE;
+ goto abandon;
+
if (!_dbus_gvalue_marshal (&subiter, &val))
- return FALSE;
+ goto abandon;
+
g_value_unset(&val);
}
- if (!dbus_message_iter_close_container (iter, &subiter))
- goto oom;
+ return dbus_message_iter_close_container (iter, &subiter);
- return TRUE;
- oom:
- g_error ("out of memory");
+abandon:
+ dbus_message_iter_abandon_container (iter, &subiter);
return FALSE;
}
goto out;
if (!_dbus_gvalue_marshal (&subiter, real_value))
- goto out;
+ {
+ dbus_message_iter_abandon_container (iter, &subiter);
+ goto out;
+ }
if (!dbus_message_iter_close_container (iter, &subiter))
goto out;
g_warning ("Cannot marshal type \"%s\" in collection\n", g_type_name (elt_gtype));
return FALSE;
}
+ g_assert (g_variant_is_signature (elt_sig));
if (!dbus_message_iter_open_container (iter,
DBUS_TYPE_ARRAY,
elt_sig,
&subiter))
- goto oom;
+ oom ();
+
g_free (elt_sig);
data.iter = &subiter;
collection_marshal_iterator,
&data);
- if (!dbus_message_iter_close_container (iter, &subiter))
- goto oom;
-
- return !data.err;
- oom:
- g_error ("out of memory");
- return FALSE;
+ if (data.err)
+ {
+ dbus_message_iter_abandon_container (iter, &subiter);
+ return FALSE;
+ }
+
+ return dbus_message_iter_close_container (iter, &subiter);
}
+/* If any of these assertions are violated, then marshal_collection_array
+ * is buggy for that type. dbus_g_value_basic_array_parse_variant() has
+ * general size-conversion code, if needed. */
+G_STATIC_ASSERT (sizeof (dbus_bool_t) == sizeof (gboolean));
+G_STATIC_ASSERT (sizeof (dbus_int32_t) == sizeof (gint));
+G_STATIC_ASSERT (sizeof (dbus_uint32_t) == sizeof (guint));
+/* These should be true regardless, but just for completeness... */
+G_STATIC_ASSERT (sizeof (dbus_int64_t) == sizeof (gint64));
+G_STATIC_ASSERT (sizeof (dbus_uint64_t) == sizeof (guint64));
+G_STATIC_ASSERT (sizeof (double) == sizeof (gdouble));
static gboolean
marshal_collection_array (DBusMessageIter *iter,
GType elt_gtype;
DBusMessageIter subiter;
GArray *array;
- guint elt_size;
char *subsignature_str;
+ array = g_value_get_boxed (value);
+ g_return_val_if_fail (array != NULL, FALSE);
+
elt_gtype = dbus_g_type_get_collection_specialization (G_VALUE_TYPE (value));
g_assert (_dbus_g_type_is_fixed (elt_gtype));
subsignature_str = _dbus_gtype_to_signature (elt_gtype);
g_warning ("Cannot marshal type \"%s\" in collection\n", g_type_name (elt_gtype));
return FALSE;
}
-
- elt_size = _dbus_g_type_fixed_get_size (elt_gtype);
-
- array = g_value_get_boxed (value);
+ g_assert (g_variant_is_signature (subsignature_str));
if (!dbus_message_iter_open_container (iter,
DBUS_TYPE_ARRAY,
subsignature_str,
&subiter))
- goto oom;
+ oom ();
/* TODO - This assumes that basic values are the same size
* is this always true? If it is we can probably avoid
* a lot of the overhead in _marshal_basic_instance...
*/
- if (!array || !dbus_message_iter_append_fixed_array (&subiter,
+ if (!dbus_message_iter_append_fixed_array (&subiter,
subsignature_str[0],
&(array->data),
array->len))
- goto oom;
+ {
+ g_critical ("Unable to serialize %u GArray members as signature %s "
+ "(OOM or invalid boolean value?)", array->len, subsignature_str);
+
+ g_free (subsignature_str);
+ dbus_message_iter_abandon_container (iter, &subiter);
+ return FALSE;
+ }
- if (!dbus_message_iter_close_container (iter, &subiter))
- goto oom;
g_free (subsignature_str);
- return TRUE;
- oom:
- g_error ("out of memory");
- return FALSE;
+ return dbus_message_iter_close_container (iter, &subiter);
}
gboolean
assert_signature_maps_to (expected_sig, gtype);
}
-/**
- * @ingroup DBusGLibInternals
- * @test_data_dir:
- *
+/*
* Unit test for general glib stuff
- * Returns: #TRUE on success.
+ * Returns: %TRUE on success.
*/
gboolean
_dbus_gvalue_test (const char *test_data_dir)
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
am__DEPENDENCIES_1 =
example_client_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/dbus/libdbus-glib-1.la
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am_example_service_OBJECTS = example-service.$(OBJEXT)
example_service_OBJECTS = $(am_example_service_OBJECTS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(example_client_SOURCES) $(example_service_SOURCES) \
$(example_signal_emitter_SOURCES) \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-example-client$(EXEEXT): $(example_client_OBJECTS) $(example_client_DEPENDENCIES)
+example-client$(EXEEXT): $(example_client_OBJECTS) $(example_client_DEPENDENCIES) $(EXTRA_example_client_DEPENDENCIES)
@rm -f example-client$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(example_client_OBJECTS) $(example_client_LDADD) $(LIBS)
-example-service$(EXEEXT): $(example_service_OBJECTS) $(example_service_DEPENDENCIES)
+example-service$(EXEEXT): $(example_service_OBJECTS) $(example_service_DEPENDENCIES) $(EXTRA_example_service_DEPENDENCIES)
@rm -f example-service$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(example_service_OBJECTS) $(example_service_LDADD) $(LIBS)
-example-signal-emitter$(EXEEXT): $(example_signal_emitter_OBJECTS) $(example_signal_emitter_DEPENDENCIES)
+example-signal-emitter$(EXEEXT): $(example_signal_emitter_OBJECTS) $(example_signal_emitter_DEPENDENCIES) $(EXTRA_example_signal_emitter_DEPENDENCIES)
@rm -f example-signal-emitter$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(example_signal_emitter_OBJECTS) $(example_signal_emitter_LDADD) $(LIBS)
-example-signal-recipient$(EXEEXT): $(example_signal_recipient_OBJECTS) $(example_signal_recipient_DEPENDENCIES)
+example-signal-recipient$(EXEEXT): $(example_signal_recipient_OBJECTS) $(example_signal_recipient_DEPENDENCIES) $(EXTRA_example_signal_recipient_DEPENDENCIES)
@rm -f example-signal-recipient$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(example_signal_recipient_OBJECTS) $(example_signal_recipient_LDADD) $(LIBS)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
+#include <config.h>
+
#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <config.h>
+
#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <config.h>
+
#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <config.h>
+
#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $<
sm-marshal.c: Makefile sm-marshal.list
- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
+ echo "#include <config.h>" > $@.tmp
+ @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
+ mv $@.tmp $@
sm-marshal.h: Makefile sm-marshal.list
@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
am__DEPENDENCIES_1 =
statemachine_server_DEPENDENCIES = \
$(top_builddir)/dbus/libdbus-glib-1.la $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(statemachine_server_SOURCES)
DIST_SOURCES = $(statemachine_server_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-statemachine-server$(EXEEXT): $(statemachine_server_OBJECTS) $(statemachine_server_DEPENDENCIES)
+statemachine-server$(EXEEXT): $(statemachine_server_OBJECTS) $(statemachine_server_DEPENDENCIES) $(EXTRA_statemachine_server_DEPENDENCIES)
@rm -f statemachine-server$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(statemachine_server_OBJECTS) $(statemachine_server_LDADD) $(LIBS)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $<
sm-marshal.c: Makefile sm-marshal.list
- @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
+ echo "#include <config.h>" > $@.tmp
+ @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body >> $@.tmp
+ mv $@.tmp $@
sm-marshal.h: Makefile sm-marshal.list
@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header > $@.tmp && mv $@.tmp $@
+#include <config.h>
#ifndef __sm_marshal_MARSHAL_H__
#define __sm_marshal_MARSHAL_H__
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
+#define g_marshal_value_peek_char(v) g_value_get_schar (v)
#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
#define g_marshal_value_peek_int(v) g_value_get_int (v)
#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
#endif /* !G_ENABLE_DEBUG */
-/* VOID:STRING,BOXED (./sm-marshal.list:1) */
+/* VOID:STRING,BOXED (/home/smcv/src/fdo/dbus-glib/dbus/examples/statemachine/sm-marshal.list:1) */
extern void sm_marshal_VOID__STRING_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
+#include <config.h>
+
#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <stdlib.h>
NULL, 0);
g_signal_emit (server, sm_server_signals[MACHINE_CREATED], 0, name, path);
+ g_free (path);
return TRUE;
}
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include "statemachine.h"
+++ /dev/null
-#!/bin/sh
-echo "#error This header makes no sense - see bugs.freedesktop.org 15430" >$2
+++ /dev/null
-#!/bin/sh
-echo "#error This header makes no sense - see bugs.freedesktop.org 15430" >$2
-dbus-glib (0.88-slp1) unstable; urgency=low
+dbus-glib (0.88-0slp2) unstable; urgency=low
+
+ * upgrade from 0.80 to 0.88
+ * Git: 165.213.180.234:slp/pkgs/d/dbus-glib
+ * Tag: dbus-glib_0.88-0slp2
+
+ -- Sewook Park <sewook7.park@samsung.com> Wed, 03 Aug 2011 21:45:16 +0900
+
+dbus-glib (0.80-7slp2) unstable; urgency=low
+
+ * repack
+ * Git: 165.213.180.234:/git/slp/pkgs/dbus-glib
+ * Tag: dbus-glib_0.80-7slp2
+
+ -- Wonguk Jeong <wonguk.jeong@samsung.com> Tue, 02 Nov 2010 20:27:24 +0900
+
+dbus-glib (0.80-6slp2) unstable; urgency=low
+
+ * upate version
+ * Git: 165.213.180.234:/git/slp/pkgs/dbus-glib
+ * Tag: dbus-glib_0.80-6slp2
+
+ -- Wonguk Jeong <wonguk.jeong@samsung.com> Tue, 02 Nov 2010 19:42:37 +0900
+
+dbus-glib (0.80-5slp2) unstable; urgency=low
+
+ * add .la file in dev package
+ * Git: 165.213.180.234:/git/slp/pkgs/dbus-glib
+ * Tag: dbus-glib_0.80-5slp2
+
+ -- Wonguk Jeong <wonguk.jeong@samsung.com> Tue, 02 Nov 2010 11:07:30 +0900
+
+dbus-glib (0.80-4slp2) unstable; urgency=low
+
+ * fix build script for new build system
+
+ -- Wonguk Jeong <wonguk.jeong@samsung.com> Tue, 28 Sep 2010 11:37:50 +0900
+
+dbus-glib (0.80-3slp2) unstable; urgency=low
+
+ * remove tag
+
+ -- Youmin Ha <youmin.ha@samsung.com> Fri, 09 Jul 2010 09:00:08 +0900
+
+dbus-glib (0.80-2slp2) unstable; urgency=low
+
+ * Change maintainer
+ * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/dbus-glib-0.80
+ * Tag: dbus-glib_0.80-2slp2
+
+ -- Youmin Ha <youmin.ha@samsung.com> Thu, 08 Jul 2010 20:45:47 +0900
+
+dbus-glib (0.80-1slp2) unstable; urgency=low
+
+ * apply DAC
+ * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/dbus-glib-0.80
+ * Tag: dbus-glib_0.80-1slp2
+
+ -- lee ho-jun <rcn95@samsung.com> Tue, 20 Apr 2010 23:20:54 -0700
+
+dbus-glib (0.80-0slp2) unstable; urgency=low
+
+ * reupload it because of changing pkgname
+
+ -- lee ho-jun <rcn95@samsung.com> Mon, 29 Mar 2010 22:35:12 -0700
+
+dbus-glib (0.80) unstable; urgency=low
* Initial Release.
- * Git: pkgs/d/dbus-glib
- * Tag: dbus-glib_0.88-slp1
- -- Sewook Park <sewook7.park@samsung.com> Wed, 07 Dec 2011 12:55:49 +0900
+ -- wonguk.jeong <wonguk.jeong@samsung.com> Fri, 13 Nov 2009 10:41:07 +0900
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-rm -rf .libs _libs
install-man1: $(man_MANS)
@$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list=''; test -n "$(man1dir)" || exit 0; \
- { for i in $$list; do echo "$$i"; done; \
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
- sed -n '/\.1[a-z]*$$/p'; \
+ @list1=''; \
+ list2='$(man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
sed -n '/\.1[a-z]*$$/p'; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- test -z "$$files" || { \
- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
# The name of the module, e.g. 'glib'.
DOC_MODULE=dbus-glib
+# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+#DOC_MODULE_VERSION=2
+
+
# The top-level SGML file. You can change this if you want to.
DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../dbus
+# Directories containing the source code.
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
+DOC_SOURCE_DIR=@abs_top_srcdir@/dbus
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
SCAN_OPTIONS=
# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
+MKDB_OPTIONS=--xml-mode --output-format=xml
# Extra options to supply to gtkdoc-mktmpl
# e.g. MKTMPL_OPTIONS=--only-section-tmpl
MKTMPL_OPTIONS=
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=
+
# Extra options to supply to gtkdoc-fixref. Not normally needed.
# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
FIXXREF_OPTIONS=
HFILE_GLOB=$(top_srcdir)/dbus/*.h
CFILE_GLOB=$(top_srcdir)/dbus/*.c
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
+# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
+EXTRA_HFILES=
+
+# Header files or dirs to ignore when scanning. Use base file/dir names
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
IGNORE_HFILES= \
+ dbus-binding-tool-glib.h \
dbus-gidl.h \
+ dbus-glib-tool.h \
dbus-gparser.h \
dbus-gutils.h \
dbus-gsignature.h \
+ dbus-gtest.h \
dbus-gvalue.h \
dbus-gvalue-utils.h \
dbus-gmarshal.h \
- examples/example-service-glue.h \
- examples/example-signal-emitter-glue.h \
- examples/statemachine/sm-marshal.h \
- examples/statemachine/statemachine-glue.h\
- examples/statemachine/statemachine.h \
- examples/statemachine/statemachine-server-glue.h \
- examples/statemachine/statemachine-server.h
+ example-service-glue.h \
+ example-signal-emitter-glue.h \
+ sm-marshal.h \
+ statemachine-glue.h \
+ statemachine.h \
+ statemachine-server-glue.h \
+ statemachine-server.h
# Images to copy into HTML directory.
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
# Only needed if you are using gtkdoc-scangobj to dynamically query widget
# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
+GTKDOC_CFLAGS=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
GTKDOC_LIBS=$(top_builddir)/dbus/libdbus-glib-1.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
# e.g. EXTRA_DIST += version.xml.in
EXTRA_DIST += version.xml.in
-########################################################################
+# Files not to distribute
+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
+#DISTCLEANFILES +=
+
+# Comment this out if you want 'make check' to test you doc status
+# and run some sanity checks
+if ENABLE_GTK_DOC
+TESTS_ENVIRONMENT = cd $(srcdir) && \
+ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+ SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+#TESTS = $(GTKDOC_CHECK)
+endif
+
+-include $(top_srcdir)/git.mk
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Everything below here is generic #
####################################
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = version.xml
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
ACLOCAL = @ACLOCAL@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
# The name of the module, e.g. 'glib'.
DOC_MODULE = dbus-glib
+# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+#DOC_MODULE_VERSION=2
+
# The top-level SGML file. You can change this if you want to.
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR = ../../dbus
+# Directories containing the source code.
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk
+DOC_SOURCE_DIR = @abs_top_srcdir@/dbus
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS =
# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
SCAN_OPTIONS =
# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS = --sgml-mode --output-format=xml
+# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
+MKDB_OPTIONS = --xml-mode --output-format=xml
# Extra options to supply to gtkdoc-mktmpl
# e.g. MKTMPL_OPTIONS=--only-section-tmpl
MKTMPL_OPTIONS =
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS =
+
# Extra options to supply to gtkdoc-fixref. Not normally needed.
# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
FIXXREF_OPTIONS =
HFILE_GLOB = $(top_srcdir)/dbus/*.h
CFILE_GLOB = $(top_srcdir)/dbus/*.c
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
+# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
+EXTRA_HFILES =
+
+# Header files or dirs to ignore when scanning. Use base file/dir names
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
IGNORE_HFILES = \
+ dbus-binding-tool-glib.h \
dbus-gidl.h \
+ dbus-glib-tool.h \
dbus-gparser.h \
dbus-gutils.h \
dbus-gsignature.h \
+ dbus-gtest.h \
dbus-gvalue.h \
dbus-gvalue-utils.h \
dbus-gmarshal.h \
- examples/example-service-glue.h \
- examples/example-signal-emitter-glue.h \
- examples/statemachine/sm-marshal.h \
- examples/statemachine/statemachine-glue.h\
- examples/statemachine/statemachine.h \
- examples/statemachine/statemachine-server-glue.h \
- examples/statemachine/statemachine-server.h
+ example-service-glue.h \
+ example-signal-emitter-glue.h \
+ sm-marshal.h \
+ statemachine-glue.h \
+ statemachine.h \
+ statemachine-server-glue.h \
+ statemachine-server.h
# Images to copy into HTML directory.
# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
# Only needed if you are using gtkdoc-scangobj to dynamically query widget
# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES = -I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
+GTKDOC_CFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/dbus/libdbus-glib-1.la
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
#
GPATH = $(srcdir)
TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+SETUP_FILES = \
+ $(content_files) \
+ $(DOC_MAIN_SGML_FILE) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+
# This includes the standard gtk-doc make rules, copied by gtkdocize.
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
- $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
- version.xml.in
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
- pdf-build.stamp \
- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
- $(srcdir)/pdf.stamp
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
+DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp \
+ tmpl.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP =
@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+# Files not to distribute
+# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
+# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
+#DISTCLEANFILES +=
+
+# Comment this out if you want 'make check' to test you doc status
+# and run some sanity checks
+@ENABLE_GTK_DOC_TRUE@TESTS_ENVIRONMENT = cd $(srcdir) && \
+@ENABLE_GTK_DOC_TRUE@ DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+@ENABLE_GTK_DOC_TRUE@ SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
+
all: all-am
.SUFFIXES:
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/gtk-doc.make:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
$(REPORT_FILES): sgml-build.stamp
+#### setup ####
+
+setup-build.stamp:
+ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ echo ' DOC Preparing build'; \
+ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+ if test "x$$files" != "x" ; then \
+ for file in $$files ; do \
+ test -f $(abs_srcdir)/$$file && \
+ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+ done; \
+ fi; \
+ test -d $(abs_srcdir)/tmpl && \
+ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+ chmod -R u+w $(abs_builddir)/tmpl; } \
+ fi
+ @touch setup-build.stamp
+
#### scan ####
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ @echo ' DOC Scanning header files'
+ @_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
- done ; \
- cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ done ; \
+ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ echo " DOC Introspecting gobjects"; \
+ scanobj_options=""; \
+ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ scanobj_options="--verbose"; \
+ fi; \
+ fi; \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
else \
- cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
- test -f $$i || touch $$i ; \
+ test -f $$i || touch $$i ; \
done \
fi
@touch scan-build.stamp
#### templates ####
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo ' DOC Rebuilding template files'
+ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ if test -w $(abs_srcdir) ; then \
+ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+ fi \
+ fi
@touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
#### xml ####
sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
+ @echo ' DOC Building XML'
@-chmod -R u+w $(srcdir)
- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ @_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
- done ; \
- cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+ done ; \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
@touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
- @rm -rf $(srcdir)/html
- @mkdir $(srcdir)/html
+ @echo ' DOC Building HTML'
+ @rm -rf html
+ @mkdir html
@mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkhtml_options="$$mkhtml_options --verbose"; \
+ fi; \
+ fi; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
+ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
fi; \
- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ -@test "x$(HTML_IMAGES)" = "x" || \
+ for file in $(HTML_IMAGES) ; do \
+ if test -f $(abs_srcdir)/$$file ; then \
+ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+ fi; \
+ if test -f $(abs_builddir)/$$file ; then \
+ cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ fi; \
+ done;
+ @echo ' DOC Fixing cross-references'
+ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@touch html-build.stamp
#### pdf ####
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building PDF'
- @-chmod -R u+w $(srcdir)
- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
- @mkpdf_imgdirs=""; \
+ @echo ' DOC Building PDF'
+ @rm -f $(DOC_MODULE).pdf
+ @mkpdf_options=""; \
+ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkpdf_options="$$mkpdf_options --verbose"; \
+ fi; \
+ fi; \
if test "x$(HTML_IMAGES)" != "x"; then \
for img in $(HTML_IMAGES); do \
part=`dirname $$img`; \
- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
if test $$? != 0; then \
- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
fi; \
done; \
fi; \
- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
@touch pdf-build.stamp
##############
clean-local:
- rm -f *~ *.bak
- rm -rf .libs
+ @rm -f *~ *.bak
+ @rm -rf .libs
distclean-local:
- cd $(srcdir) && \
- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+ rm -rf tmpl; \
+ fi
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
+ @rm -rf xml html
install-data-local:
- @installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
+ @installfiles=`echo $(builddir)/html/*`; \
+ if test "$$installfiles" = '$(builddir)/html/*'; \
+ then echo 1>&2 'Nothing to install' ; \
else \
if test -n "$(DOC_MODULE_VERSION)"; then \
installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
fi; \
$(mkinstalldirs) $${installdir} ; \
for i in $$installfiles; do \
- echo '-- Installing '$$i ; \
+ echo ' $(INSTALL_DATA) '$$i ; \
$(INSTALL_DATA) $$i $${installdir}; \
done; \
if test -n "$(DOC_MODULE_VERSION)"; then \
mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
$${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
fi; \
$(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
fi
@ENABLE_GTK_DOC_FALSE@ @false
dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- cp $(srcdir)/html/* $(distdir)/html
- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+ @mkdir $(distdir)/tmpl
+ @mkdir $(distdir)/html
+ @-cp ./tmpl/*.sgml $(distdir)/tmpl
+ @cp ./html/* $(distdir)/html
+ @-cp ./$(DOC_MODULE).pdf $(distdir)/
+ @-cp ./$(DOC_MODULE).types $(distdir)/
+ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+ @cd $(distdir) && rm -f $(DISTCLEANFILES)
+ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
+#TESTS = $(GTKDOC_CHECK)
-########################################################################
+-include $(top_srcdir)/git.mk
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
why - design, licensing, indentation style, we would rather know
than not know.</para>
- <para>D-Bus' only *required* dependency is an XML parser (either
+ <para>D-Bus' only <emphasis>required</emphasis> dependency is an
+ XML parser (either
libxml or expat). D-Bus includes many language bindings to the
D-Bus system, if you want to build those. The list of projects
using D-Bus is growing and they provide a wealth of examples of
pretty well these days, and when it isn't bug reports are very
welcome.</para>
- <para>
- HomePage: <ulink url="http://http://www.freedesktop.org/wiki/Software/dbus">
- http://http://www.freedesktop.org/wiki/Software/dbus</ulink>
+ <para>For more information on D-Bus, see
+ <ulink url="http://www.freedesktop.org/wiki/Software/dbus">
+ http://www.freedesktop.org/wiki/Software/dbus</ulink>.
</para>
</chapter>
libdbus with a much higher-level approach. The higher level
approach is possible because GLib defines a main loop, an
object/type system, and an out-of-memory handling policy (it exits
- the program). See http://www.gtk.org for GLib information.</para>
+ the program). See <ulink
+ url="http://www.gtk.org">http://www.gtk.org</ulink> for GLib
+ information.</para>
<para>To manipulate remote objects, use DBusGProxy. </para>
</sect1>
<SECTION>
-<FILE>dbus-gconnection</FILE>
-<TITLE>DBusGConnection</TITLE>
+<FILE>dbus-glib</FILE>
+<TITLE>DBusGProxy</TITLE>
+DBUS_GERROR
+DBUS_INSIDE_DBUS_GLIB_H
+DBUS_TYPE_G_BOOLEAN_ARRAY
+DBUS_TYPE_G_CONNECTION
+DBUS_TYPE_G_INT64_ARRAY
+DBUS_TYPE_G_INT_ARRAY
+DBUS_TYPE_G_MESSAGE
+DBUS_TYPE_G_OBJECT_ARRAY
+DBUS_TYPE_G_OBJECT_PATH
+DBUS_TYPE_G_SIGNATURE
+DBUS_TYPE_G_STRING_STRING_HASHTABLE
+DBUS_TYPE_G_UCHAR_ARRAY
+DBUS_TYPE_G_UINT64_ARRAY
+DBUS_TYPE_G_UINT_ARRAY
+DBusGAsyncData
DBusGConnection
+DBusGError
+DBusGMessage
+DBusGMethodInfo
+DBusGMethodInvocation
+DBusGObjectInfo
+DBusGObjectPath
+DBusGProxy
+DBusGProxyCall
+DBusGProxyCallNotify
+DBusGProxyClass
+DBusGSignature
dbus_g_bus_get
-dbus_g_thread_init
+dbus_g_bus_get_private
+dbus_g_connection_flush
+dbus_g_connection_get_g_type
+dbus_g_connection_lookup_g_object
dbus_g_connection_open
dbus_g_connection_ref
-dbus_g_connection_unref
-dbus_g_connection_flush
-dbus_g_connection_get_connection
dbus_g_connection_register_g_object
+dbus_g_connection_unref
dbus_g_connection_unregister_g_object
-dbus_g_connection_lookup_g_object
-<SUBSECTION Standard>
-DBUS_TYPE_G_CONNECTION
-dbus_g_connection_get_g_type
-</SECTION>
-
-<SECTION>
-<FILE>dbus-gobject</FILE>
-DBUS_TYPE_G_OBJECT_PATH
-<TITLE>DBus GObject related functions</TITLE>
-DBusGObjectInfo
-dbus_g_object_type_install_info
-dbus_g_object_path_get_g_type
-dbus_g_object_register_marshaller
-dbus_g_object_register_marshaller_array
-</SECTION>
-
-<SECTION>
-<FILE>dbus-gmessage</FILE>
-<TITLE>DBusGMessage</TITLE>
-DBusGMessage
+dbus_g_error_domain_register
+dbus_g_error_get_name
+dbus_g_error_has_name
+dbus_g_error_quark
+dbus_g_message_get_g_type
dbus_g_message_ref
dbus_g_message_unref
-dbus_g_message_get_message
-<SUBSECTION Standard>
-DBUS_TYPE_G_MESSAGE
-dbus_g_message_get_g_type
-</SECTION>
-
-<SECTION>
-<FILE>dbus-gmethod</FILE>
-<TITLE>DBusGMethod</TITLE>
-DBusGMethodInfo
-DBusGMethodInvocation
-dbus_g_method_get_sender
-dbus_g_method_get_reply
-dbus_g_method_send_reply
dbus_g_method_return
dbus_g_method_return_error
-</SECTION>
-
-<SECTION>
-<FILE>dbus-gerror</FILE>
-<TITLE>DBusGError</TITLE>
-DBusGError
-dbus_g_error_has_name
-dbus_g_error_get_name
-dbus_g_error_quark
-dbus_g_error_domain_register
-<SUBSECTION Standard>
-DBUS_GERROR
-</SECTION>
-
-<SECTION>
-<FILE>dbus-gproxy</FILE>
-<TITLE>DBusGProxy</TITLE>
-DBusGProxy
-dbus_g_proxy_new_for_name
-dbus_g_proxy_new_for_name_owner
-dbus_g_proxy_new_from_proxy
-dbus_g_proxy_new_for_peer
-dbus_g_proxy_set_interface
-dbus_g_proxy_get_path
-dbus_g_proxy_get_bus_name
-dbus_g_proxy_get_interface
+dbus_g_object_path_get_g_type
+dbus_g_object_register_marshaller
+dbus_g_object_register_marshaller_array
+dbus_g_object_type_install_info
+dbus_g_object_type_register_shadow_property
dbus_g_proxy_add_signal
-dbus_g_proxy_connect_signal
-dbus_g_proxy_disconnect_signal
-dbus_g_proxy_send
-dbus_g_proxy_call
-dbus_g_proxy_call_with_timeout
-dbus_g_proxy_call_no_reply
dbus_g_proxy_begin_call
dbus_g_proxy_begin_call_with_timeout
-dbus_g_proxy_end_call
+dbus_g_proxy_call
+dbus_g_proxy_call_no_reply
+dbus_g_proxy_call_with_timeout
dbus_g_proxy_cancel_call
+dbus_g_proxy_connect_signal
+dbus_g_proxy_disconnect_signal
+dbus_g_proxy_end_call
+dbus_g_proxy_get_bus_name
+dbus_g_proxy_get_interface
+dbus_g_proxy_get_path
+dbus_g_proxy_new_for_name
+dbus_g_proxy_new_for_name_owner
+dbus_g_proxy_new_for_peer
+dbus_g_proxy_new_from_proxy
dbus_g_proxy_set_default_timeout
+dbus_g_proxy_set_interface
+dbus_g_signature_get_g_type
+dbus_g_thread_init
+dbus_glib_global_set_disable_legacy_property_access
<SUBSECTION Standard>
DBUS_G_PROXY
+DBUS_G_PROXY_CLASS
+DBUS_G_PROXY_GET_CLASS
DBUS_IS_G_PROXY
+DBUS_IS_G_PROXY_CLASS
DBUS_TYPE_G_PROXY
dbus_g_proxy_get_type
-DBUS_G_PROXY_CLASS
-DBUS_IS_G_PROXY_CLASS
-DBUS_G_PROXY_GET_CLASS
</SECTION>
<SECTION>
<FILE>dbus-glib-lowlevel</FILE>
-<TITLE>DBus GLib low level</TITLE>
-dbus_set_g_error
-dbus_connection_setup_with_g_main
-dbus_server_setup_with_g_main
-<SUBSECTION Standard>
DBUS_TYPE_CONNECTION
DBUS_TYPE_MESSAGE
-DBUS_TYPE_PENDING_CALL
+dbus_connection_get_g_connection
dbus_connection_get_g_type
+dbus_connection_setup_with_g_main
+dbus_g_connection_get_connection
+dbus_g_message_get_message
+dbus_g_method_get_reply
+dbus_g_method_get_sender
+dbus_g_method_send_reply
+dbus_g_proxy_send
dbus_message_get_g_type
-dbus_pending_call_get_g_type
+dbus_server_setup_with_g_main
+dbus_set_g_error
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gobject</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gtool-test</FILE>
+
</SECTION>
<SECTION>
<FILE>dbus-gtype-specialized</FILE>
-<TITLE>Specializable GType System</TITLE>
-DBusGTypeSpecializedCollectionIterator
-DBusGTypeSpecializedMapIterator
DBusGTypeSpecializedAppendContext
-DBusGTypeSpecializedConstructor
-DBusGTypeSpecializedFreeFunc
-DBusGTypeSpecializedCopyFunc
-DBusGTypeSpecializedVtable
-DBusGTypeSpecializedCollectionFixedAccessorFunc
-DBusGTypeSpecializedCollectionIteratorFunc
DBusGTypeSpecializedCollectionAppendFunc
DBusGTypeSpecializedCollectionEndAppendFunc
+DBusGTypeSpecializedCollectionFixedAccessorFunc
+DBusGTypeSpecializedCollectionIterator
+DBusGTypeSpecializedCollectionIteratorFunc
DBusGTypeSpecializedCollectionVtable
-DBusGTypeSpecializedMapIteratorFunc
+DBusGTypeSpecializedConstructor
+DBusGTypeSpecializedCopyFunc
+DBusGTypeSpecializedFreeFunc
DBusGTypeSpecializedMapAppendFunc
+DBusGTypeSpecializedMapIterator
+DBusGTypeSpecializedMapIteratorFunc
DBusGTypeSpecializedMapVtable
DBusGTypeSpecializedStructGetMember
DBusGTypeSpecializedStructSetMember
DBusGTypeSpecializedStructVtable
+DBusGTypeSpecializedVtable
+dbus_g_type_collection_get_fixed
+dbus_g_type_collection_peek_vtable
+dbus_g_type_collection_value_iterate
dbus_g_type_get_collection
-dbus_g_type_get_map
-dbus_g_type_get_structv
-dbus_g_type_get_struct
-dbus_g_type_is_collection
-dbus_g_type_is_map
-dbus_g_type_is_struct
dbus_g_type_get_collection_specialization
+dbus_g_type_get_map
dbus_g_type_get_map_key_specialization
dbus_g_type_get_map_value_specialization
+dbus_g_type_get_struct
dbus_g_type_get_struct_member_type
dbus_g_type_get_struct_size
-dbus_g_type_specialized_construct
-dbus_g_type_specialized_init_append
+dbus_g_type_get_structv
+dbus_g_type_is_collection
+dbus_g_type_is_map
+dbus_g_type_is_struct
+dbus_g_type_map_peek_vtable
+dbus_g_type_map_value_iterate
+dbus_g_type_register_collection
+dbus_g_type_register_map
+dbus_g_type_register_struct
dbus_g_type_specialized_collection_append
dbus_g_type_specialized_collection_end_append
+dbus_g_type_specialized_construct
+dbus_g_type_specialized_init
+dbus_g_type_specialized_init_append
dbus_g_type_specialized_map_append
-dbus_g_type_collection_get_fixed
-dbus_g_type_collection_value_iterate
-dbus_g_type_map_value_iterate
-dbus_g_type_struct_get_member
-dbus_g_type_struct_set_member
dbus_g_type_struct_get
+dbus_g_type_struct_get_member
+dbus_g_type_struct_peek_vtable
dbus_g_type_struct_set
-dbus_g_type_specialized_init
-dbus_g_type_register_collection
-dbus_g_type_register_map
-dbus_g_type_map_peek_vtable
-dbus_g_type_collection_peek_vtable
-dbus_g_type_register_struct
+dbus_g_type_struct_set_member
dbus_g_value_build_g_variant
-DBUS_TYPE_G_BOOLEAN_ARRAY
-DBUS_TYPE_G_UCHAR_ARRAY
-DBUS_TYPE_G_UINT_ARRAY
-DBUS_TYPE_G_INT_ARRAY
-DBUS_TYPE_G_UINT64_ARRAY
-DBUS_TYPE_G_INT64_ARRAY
-DBUS_TYPE_G_OBJECT_ARRAY
-DBUS_TYPE_G_STRING_STRING_HASHTABLE
-DBUS_TYPE_G_SIGNATURE
</SECTION>
-<SUBSECTION Private>
-</SUBSECTION>
+<SECTION>
+<FILE>dbus-gtype-specialized-priv</FILE>
+
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gvalue-parse-variant</FILE>
+dbus_g_value_parse_g_variant
+</SECTION>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Introduction</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="up" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="prev" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="next" href="ch02.html" title="API Reference">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
<td><a accesskey="n" href="ch02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
-<div class="chapter" title="Introduction">
+<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id2629292"></a>Introduction</h2></div></div></div>
+<a name="idp268848"></a>Introduction</h2></div></div></div>
<p>D-Bus is a message bus system, a simple way for applications
to talk to one another.</p>
<p>D-Bus supplies both a system daemon (for events such as "new
to use it, so if you wouldn't use it, by all means mail us and say
why - design, licensing, indentation style, we would rather know
than not know.</p>
-<p>D-Bus' only *required* dependency is an XML parser (either
+<p>D-Bus' only <span class="emphasis"><em>required</em></span> dependency is an
+ XML parser (either
libxml or expat). D-Bus includes many language bindings to the
D-Bus system, if you want to build those. The list of projects
using D-Bus is growing and they provide a wealth of examples of
want to get it widely used and tested. It should be working
pretty well these days, and when it isn't bug reports are very
welcome.</p>
-<p>
- HomePage: <a class="ulink" href="http://http://www.freedesktop.org/wiki/Software/dbus" target="_top">
- http://http://www.freedesktop.org/wiki/Software/dbus</a>
+<p>For more information on D-Bus, see
+ <a class="ulink" href="http://www.freedesktop.org/wiki/Software/dbus" target="_top">
+ http://www.freedesktop.org/wiki/Software/dbus</a>.
</p>
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.15</div>
+ Generated by GTK-Doc V1.18</div>
</body>
</html>
\ No newline at end of file
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>API Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="up" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="prev" href="ch01.html" title="Introduction">
-<link rel="next" href="dbus-glib-DBusGConnection.html" title="DBusGConnection">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="next" href="dbus-glib-dbus-gtype-specialized.html" title="Specializable GType System">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<td> </td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-
DBusGConnection.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="dbus-glib-
dbus-gtype-specialized.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
-<div class="chapter" title="API Reference">
+<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id2602862"></a>API Reference</h2></div></div></div>
+<a name="idp270192"></a>API Reference</h2></div></div></div>
<div class="toc"><dl>
<dt><span class="sect1"><a href="ch02.html#api-overview">API for using D-BUS with GLib</a></span></dt>
<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGConnection.html">DBusGConnection</a></span><span class="refpurpose"> — DBus Connection</span>
+<span class="refentrytitle"><a href="dbus-glib-dbus-gtype-specialized.html">Specializable GType System</a></span><span class="refpurpose"> — Specialized GTypes</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="dbus-glib-dbus-gobject.html">DBus GObject related functions</a></span><span class="refpurpose"> — Exporting a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> remotely</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGMessage.html">DBusGMessage</a></span><span class="refpurpose"> — DBus Message</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGMethod.html">DBusGMethod</a></span><span class="refpurpose"> — GMethod Info & Invocation</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGError.html">DBusGError</a></span><span class="refpurpose"> — DBus GError</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGProxy.html">DBusGProxy</a></span><span class="refpurpose"> — DBus Proxy</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-Specializable-GType-System.html">Specializable GType System</a></span><span class="refpurpose"> — Specialized GTypes</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBus-GLib-low-level.html">DBus GLib low level</a></span><span class="refpurpose"> — DBus lower level functions</span>
+<span class="refentrytitle"><a href="dbus-glib-dbus-glib-lowlevel.html">DBus GLib low level</a></span><span class="refpurpose"> — DBus lower level functions</span>
</dt>
</dl></div>
-<div class="sect1" title="API for using D-BUS with GLib">
+<div class="sect1">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="api-overview"></a>API for using D-BUS with GLib</h2></div></div></div>
<p>libdbus proper is a low-level API, these GLib bindings wrap
libdbus with a much higher-level approach. The higher level
approach is possible because GLib defines a main loop, an
object/type system, and an out-of-memory handling policy (it exits
- the program). See http://www.gtk.org for GLib information.</p>
+ the program). See <a class="ulink" href="http://www.gtk.org" target="_top">http://www.gtk.org</a> for GLib
+ information.</p>
<p>To manipulate remote objects, use DBusGProxy. </p>
</div>
+<span style="color: red"><xi:include></xi:include></span><span style="color: red"><xi:include></xi:include></span><span style="color: red"><xi:include></xi:include></span><span style="color: red"><xi:include></xi:include></span><span style="color: red"><xi:include></xi:include></span><span style="color: red"><xi:include></xi:include></span>
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.15</div>
+ Generated by GTK-Doc V1.18</div>
</body>
</html>
\ No newline at end of file
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Tools Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="up" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="prev" href="dbus-glib-DBus-GLib-low-level.html" title="DBus GLib low level">
+<link rel="prev" href="dbus-glib-dbus-glib-lowlevel.html" title="DBus GLib low level">
<link rel="next" href="dbus-binding-tool.html" title="dbus-binding-tool">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="dbus-glib-
DBus-GLib-low-level.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="dbus-glib-
dbus-glib-lowlevel.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td> </td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
<td><a accesskey="n" href="dbus-binding-tool.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr></table>
-<div class="chapter" title="Tools Reference">
+<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id2595712"></a>Tools Reference</h2></div></div></div>
+<a name="idp4149376"></a>Tools Reference</h2></div></div></div>
<div class="toc"><dl><dt>
<span class="refentrytitle"><a href="dbus-binding-tool.html">dbus-binding-tool</a></span><span class="refpurpose"> — C language GLib bindings generation utility</span>
</dt></dl></div>
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.15</div>
+ Generated by GTK-Doc V1.18</div>
</body>
</html>
\ No newline at end of file
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>dbus-binding-tool</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="up" href="ch03.html" title="Tools Reference">
<link rel="prev" href="ch03.html" title="Tools Reference">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
<td> </td>
</tr></table>
-<div class="refentry" title="dbus-binding-tool">
+<div class="refentry">
<a name="dbus-binding-tool"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
</td>
<td valign="top" align="right"></td>
</tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
<h2>Synopsis</h2>
<div class="cmdsynopsis"><p>[options...] [files...]</p></div>
</div>
-<div class="refsect1" title="Description">
-<a name="id2595729"></a><h2>Description</h2>
+<div class="refsect1">
+<a name="idp5164656"></a><h2>Description</h2>
<p><span class="command"><strong>dbus-binding-tool</strong></span> bla bla bla
</p>
</div>
-<div class="refsect1" title="Invocation">
-<a name="id2595743"></a><h2>Invocation</h2>
+<div class="refsect1">
+<a name="idp5166176"></a><h2>Invocation</h2>
<p><span class="command"><strong>dbus-binding-tool</strong></span> bla bla bla
</p>
-<div class="refsect2" title="Options">
-<a name="id2595756"></a><h3>Options</h3>
+<div class="refsect2">
+<a name="idp5167568"></a><h3>Options</h3>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
</table></div>
</div>
</div>
-<div class="refsect1" title="See also">
-<a name="id2633049"></a><h2>See also</h2>
+<div class="refsect1">
+<a name="idp5173200"></a><h2>See also</h2>
<p><span class="command"><strong>glib-genmarshal</strong></span>(1)
</p>
</div>
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.15</div>
+ Generated by GTK-Doc V1.18</div>
</body>
</html>
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBus GLib low level</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="dbus-glib-Specializable-GType-System.html" title="Specializable GType System">
-<link rel="next" href="ch03.html" title="Tools Reference">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="dbus-glib-Specializable-GType-System.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="ch03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-DBus-GLib-low-level.synopsis" class="shortcut">Top</a>
- |
- <a href="#dbus-glib-DBus-GLib-low-level.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="DBus GLib low level">
-<a name="dbus-glib-DBus-GLib-low-level"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-DBus-GLib-low-level.top_of_page"></a>DBus GLib low level</span></h2>
-<p>DBus GLib low level — DBus lower level functions</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-DBus-GLib-low-level.stability-level"></a><h2>Stability Level</h2>
-Unstable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-DBus-GLib-low-level.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"><span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBus-GLib-low-level.html#dbus-set-g-error" title="dbus_set_g_error ()">dbus_set_g_error</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **gerror</code></em>,
- <em class="parameter"><code><span class="type">DBusError</span> *derror</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBus-GLib-low-level.html#dbus-connection-setup-with-g-main" title="dbus_connection_setup_with_g_main ()">dbus_connection_setup_with_g_main</a> (<em class="parameter"><code><span class="type">DBusConnection</span> *connection</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBus-GLib-low-level.html#dbus-server-setup-with-g-main" title="dbus_server_setup_with_g_main ()">dbus_server_setup_with_g_main</a> (<em class="parameter"><code><span class="type">DBusServer</span> *server</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-DBus-GLib-low-level.description"></a><h2>Description</h2>
-<p>
-These functions can be used to access lower level of DBus.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-DBus-GLib-low-level.details"></a><h2>Details</h2>
-<div class="refsect2" title="dbus_set_g_error ()">
-<a name="dbus-set-g-error"></a><h3>dbus_set_g_error ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_set_g_error (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **gerror</code></em>,
- <em class="parameter"><code><span class="type">DBusError</span> *derror</code></em>);</pre>
-<p>
-Store the information from a DBus method error return into a
-GError. For the normal case of an arbitrary remote process,
-the error code will be DBUS_GERROR_REMOTE_EXCEPTION. Now,
-DBus errors have two components; a message and a "name".
-The former is an arbitrary (normally American English) string.
-The second is a string like com.example.FooFailure which
-programs can use as a conditional source. Because a GError
-only has one string, we use a hack to encode both values:
-</p>
-<p>
-<human readable string><null><error name><null>
-</p>
-<p>
-You can use the following code to retrieve both values:
-</p>
-<p>
-</p>
-<div class="informalexample">
- <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td class="listing_lines" align="right"><pre>1
-2
-3</pre></td>
- <td class="listing_code"><pre class="programlisting"><span class="keyword">const</span><span class="normal"> </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">msg </span><span class="symbol">=</span><span class="normal"> error</span><span class="symbol">-></span><span class="normal">message</span><span class="symbol">;</span>
-<span class="usertype">size_t</span><span class="normal"> len </span><span class="symbol">=</span><span class="normal"> </span><span class="function">strlen</span><span class="symbol">(</span><span class="normal">msg</span><span class="symbol">);</span>
-<span class="keyword">const</span><span class="normal"> </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">error_name </span><span class="symbol">=</span><span class="normal"> msg</span><span class="symbol">+</span><span class="normal">len</span><span class="symbol">+</span><span class="number">1</span><span class="symbol">;</span></pre></td>
- </tr>
- </tbody>
- </table>
-</div>
-
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gerror</code></em> :</span></p></td>
-<td>an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>derror</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_connection_setup_with_g_main ()">
-<a name="dbus-connection-setup-with-g-main"></a><h3>dbus_connection_setup_with_g_main ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_connection_setup_with_g_main (<em class="parameter"><code><span class="type">DBusConnection</span> *connection</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);</pre>
-<p>
-Sets the watch and timeout functions of a <span class="type">DBusConnection</span>
-to integrate the connection with the GLib main loop.
-Pass in <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> for the <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> unless you're
-doing something specialized.
-</p>
-<p>
-If called twice for the same context, does nothing the second
-time. If called once with context A and once with context B,
-context B replaces context A as the context monitoring the
-connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the connection
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> for default context
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_server_setup_with_g_main ()">
-<a name="dbus-server-setup-with-g-main"></a><h3>dbus_server_setup_with_g_main ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_server_setup_with_g_main (<em class="parameter"><code><span class="type">DBusServer</span> *server</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);</pre>
-<p>
-Sets the watch and timeout functions of a <span class="type">DBusServer</span>
-to integrate the server with the GLib main loop.
-In most cases the context argument should be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a>.
-</p>
-<p>
-If called twice for the same context, does nothing the second
-time. If called once with context A and once with context B,
-context B replaces context A as the context monitoring the
-connection.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>server</code></em> :</span></p></td>
-<td>the server
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> for default
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBusGConnection</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="ch02.html" title="API Reference">
-<link rel="next" href="dbus-glib-dbus-gobject.html" title="DBus GObject related functions">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="ch02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-dbus-gobject.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-DBusGConnection.synopsis" class="shortcut">Top</a>
- |
- <a href="#dbus-glib-DBusGConnection.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="DBusGConnection">
-<a name="dbus-glib-DBusGConnection"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-DBusGConnection.top_of_page"></a>DBusGConnection</span></h2>
-<p>DBusGConnection — DBus Connection</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-DBusGConnection.stability-level"></a><h2>Stability Level</h2>
-Stable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-DBusGConnection.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"> <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection">DBusGConnection</a>;
-<a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="returnvalue">DBusGConnection</span></a>* <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-bus-get" title="dbus_g_bus_get ()">dbus_g_bus_get</a> (<em class="parameter"><code><span class="type">DBusBusType</span> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-thread-init" title="dbus_g_thread_init ()">dbus_g_thread_init</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
-<a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="returnvalue">DBusGConnection</span></a>* <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-open" title="dbus_g_connection_open ()">dbus_g_connection_open</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *address</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="returnvalue">DBusGConnection</span></a>* <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-ref" title="dbus_g_connection_ref ()">dbus_g_connection_ref</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-unref" title="dbus_g_connection_unref ()">dbus_g_connection_unref</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-flush" title="dbus_g_connection_flush ()">dbus_g_connection_flush</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>);
-<span class="returnvalue">DBusConnection</span>* <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-get-connection" title="dbus_g_connection_get_connection ()">dbus_g_connection_get_connection</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *gconnection</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-register-g-object" title="dbus_g_connection_register_g_object ()">dbus_g_connection_register_g_object</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *at_path</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-unregister-g-object" title="dbus_g_connection_unregister_g_object ()">dbus_g_connection_unregister_g_object</a>
- (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> * <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-lookup-g-object" title="dbus_g_connection_lookup_g_object ()">dbus_g_connection_lookup_g_object</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *at_path</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-DBusGConnection.description"></a><h2>Description</h2>
-<p>
-A <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> is a boxed type abstracting a DBusConnection.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-DBusGConnection.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBusGConnection">
-<a name="DBusGConnection"></a><h3>DBusGConnection</h3>
-<pre class="programlisting">typedef struct _DBusGConnection DBusGConnection;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_bus_get ()">
-<a name="dbus-g-bus-get"></a><h3>dbus_g_bus_get ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="returnvalue">DBusGConnection</span></a>* dbus_g_bus_get (<em class="parameter"><code><span class="type">DBusBusType</span> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Returns a connection to the given bus. The connection is a global variable
-shared with other callers of this function.
-</p>
-<p>
-(Internally, calls <code class="function">dbus_bus_get()</code> then calls
-<a class="link" href="dbus-glib-DBus-GLib-low-level.html#dbus-connection-setup-with-g-main" title="dbus_connection_setup_with_g_main ()"><code class="function">dbus_connection_setup_with_g_main()</code></a> on the result.)
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>bus type
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>address where an error can be returned.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a DBusConnection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_thread_init ()">
-<a name="dbus-g-thread-init"></a><h3>dbus_g_thread_init ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_thread_init (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-Initializes the D-BUS thread system.
-This function may only be called
-once and must be called prior to calling any
-other function in the D-BUS API.
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_open ()">
-<a name="dbus-g-connection-open"></a><h3>dbus_g_connection_open ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="returnvalue">DBusGConnection</span></a>* dbus_g_connection_open (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *address</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Returns a connection to the given address.
-</p>
-<p>
-(Internally, calls <code class="function">dbus_connection_open()</code> then calls
-<a class="link" href="dbus-glib-DBus-GLib-low-level.html#dbus-connection-setup-with-g-main" title="dbus_connection_setup_with_g_main ()"><code class="function">dbus_connection_setup_with_g_main()</code></a> on the result.)
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td>
-<td>address of the connection to open
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>address where an error can be returned.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a DBusConnection
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_ref ()">
-<a name="dbus-g-connection-ref"></a><h3>dbus_g_connection_ref ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="returnvalue">DBusGConnection</span></a>* dbus_g_connection_ref (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>);</pre>
-<p>
-Increment refcount on a <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the connection that was ref'd
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_unref ()">
-<a name="dbus-g-connection-unref"></a><h3>dbus_g_connection_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_connection_unref (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>);</pre>
-<p>
-Decrement refcount on a <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_flush ()">
-<a name="dbus-g-connection-flush"></a><h3>dbus_g_connection_flush ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_connection_flush (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>);</pre>
-<p>
-Blocks until outgoing calls and signal emissions have been sent.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> to flush
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_get_connection ()">
-<a name="dbus-g-connection-get-connection"></a><h3>dbus_g_connection_get_connection ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusConnection</span>* dbus_g_connection_get_connection (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *gconnection</code></em>);</pre>
-<p>
-Get the <span class="type">DBusConnection</span> corresponding to this <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a>.
-The return value does not have its refcount incremented.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gconnection</code></em> :</span></p></td>
-<td>a <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <span class="type">DBusConnection</span>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_register_g_object ()">
-<a name="dbus-g-connection-register-g-object"></a><h3>dbus_g_connection_register_g_object ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_connection_register_g_object (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *at_path</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);</pre>
-<p>
-Registers a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> at the given path. Properties, methods, and signals
-of the object can then be accessed remotely. Methods are only available
-if method introspection data has been added to the object's class
-with <a class="link" href="dbus-glib-dbus-gobject.html#dbus-g-object-type-install-info" title="dbus_g_object_type_install_info ()"><code class="function">dbus_g_object_type_install_info()</code></a>.
-</p>
-<p>
-The registration will be cancelled if either the <span class="type">DBusConnection</span> or
-the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> gets finalized, or if <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-unregister-g-object" title="dbus_g_connection_unregister_g_object ()"><code class="function">dbus_g_connection_unregister_g_object()</code></a>
-is used.
-</p>
-<p>
-Note: If an object is registered multiple times, the first registration
-takes priority for cases such as turning an object into an object path.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the D-BUS connection
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>at_path</code></em> :</span></p></td>
-<td>the path where the object will live (the object's name)
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>the object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_unregister_g_object ()">
-<a name="dbus-g-connection-unregister-g-object"></a><h3>dbus_g_connection_unregister_g_object ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_connection_unregister_g_object
- (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *object</code></em>);</pre>
-<p>
-Removes <em class="parameter"><code>object</code></em> from the bus. Properties, methods, and signals
-of the object can no longer be accessed remotely.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the D-BUS connection
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td>
-<td>the object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_connection_lookup_g_object ()">
-<a name="dbus-g-connection-lookup-g-object"></a><h3>dbus_g_connection_lookup_g_object ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="returnvalue">GObject</span></a> * dbus_g_connection_lookup_g_object (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *at_path</code></em>);</pre>
-<p>
-FIXME
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>a <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>at_path</code></em> :</span></p></td>
-<td>path
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the object at path <em class="parameter"><code>at_path</code></em>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="See Also">
-<a name="dbus-glib-DBusGConnection.see-also"></a><h2>See Also</h2>
-<span class="type">DBusConnection</span>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBusGError</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="dbus-glib-DBusGMethod.html" title="DBusGMethod">
-<link rel="next" href="dbus-glib-DBusGProxy.html" title="DBusGProxy">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="dbus-glib-DBusGMethod.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-DBusGProxy.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-DBusGError.synopsis" class="shortcut">Top</a>
- |
- <a href="#dbus-glib-DBusGError.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="DBusGError">
-<a name="dbus-glib-DBusGError"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-DBusGError.top_of_page"></a>DBusGError</span></h2>
-<p>DBusGError — DBus GError</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-DBusGError.stability-level"></a><h2>Stability Level</h2>
-Stable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-DBusGError.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">enum <a class="link" href="dbus-glib-DBusGError.html#DBusGError" title="enum DBusGError">DBusGError</a>;
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-DBusGError.html#dbus-g-error-has-name" title="dbus_g_error_has_name ()">dbus_g_error_has_name</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
-const <span class="returnvalue">char</span> * <a class="link" href="dbus-glib-DBusGError.html#dbus-g-error-get-name" title="dbus_g_error_get_name ()">dbus_g_error_get_name</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="dbus-glib-DBusGError.html#dbus-g-error-quark" title="dbus_g_error_quark ()">dbus_g_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGError.html#dbus-g-error-domain-register" title="dbus_g_error_domain_register ()">dbus_g_error_domain_register</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> domain</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *default_iface</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> code_enum</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-DBusGError.description"></a><h2>Description</h2>
-<p>
-<a class="link" href="dbus-glib-DBusGError.html#DBusGError" title="enum DBusGError"><span class="type">DBusGError</span></a> is the <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> used by DBus.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-DBusGError.details"></a><h2>Details</h2>
-<div class="refsect2" title="enum DBusGError">
-<a name="DBusGError"></a><h3>enum DBusGError</h3>
-<pre class="programlisting">typedef enum
-{
-DBUS_GERROR_FAILED,
-DBUS_GERROR_NO_MEMORY,
-DBUS_GERROR_SERVICE_UNKNOWN,
-DBUS_GERROR_NAME_HAS_NO_OWNER,
-DBUS_GERROR_NO_REPLY,
-DBUS_GERROR_IO_ERROR,
-DBUS_GERROR_BAD_ADDRESS,
-DBUS_GERROR_NOT_SUPPORTED,
-DBUS_GERROR_LIMITS_EXCEEDED,
-DBUS_GERROR_ACCESS_DENIED,
-DBUS_GERROR_AUTH_FAILED,
-DBUS_GERROR_NO_SERVER,
-DBUS_GERROR_TIMEOUT,
-DBUS_GERROR_NO_NETWORK,
-DBUS_GERROR_ADDRESS_IN_USE,
-DBUS_GERROR_DISCONNECTED,
-DBUS_GERROR_INVALID_ARGS,
-DBUS_GERROR_FILE_NOT_FOUND,
-DBUS_GERROR_FILE_EXISTS,
-DBUS_GERROR_UNKNOWN_METHOD,
-DBUS_GERROR_TIMED_OUT,
-DBUS_GERROR_MATCH_RULE_NOT_FOUND,
-DBUS_GERROR_MATCH_RULE_INVALID,
-DBUS_GERROR_SPAWN_EXEC_FAILED,
-DBUS_GERROR_SPAWN_FORK_FAILED,
-DBUS_GERROR_SPAWN_CHILD_EXITED,
-DBUS_GERROR_SPAWN_CHILD_SIGNALED,
-DBUS_GERROR_SPAWN_FAILED,
-DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN,
-DBUS_GERROR_INVALID_SIGNATURE,
-DBUS_GERROR_INVALID_FILE_CONTENT,
-DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN,
-DBUS_GERROR_REMOTE_EXCEPTION
-} DBusGError;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_error_has_name ()">
-<a name="dbus-g-error-has-name"></a><h3>dbus_g_error_has_name ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_error_has_name (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
-<p>
-Determine whether D-BUS error name for a remote exception matches
-the given name. This function is intended to be invoked on a
-GError returned from an invocation of a remote method, e.g. via
-dbus_g_proxy_end_call. It will silently return FALSE for errors
-which are not remote D-BUS exceptions (i.e. with a domain other
-than DBUS_GERROR or a code other than
-DBUS_GERROR_REMOTE_EXCEPTION).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>the GError given from the remote method
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>the D-BUS error name
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE iff the remote error has the given name
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_error_get_name ()">
-<a name="dbus-g-error-get-name"></a><h3>dbus_g_error_get_name ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> * dbus_g_error_get_name (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>);</pre>
-<p>
-This function may only be invoked on a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> returned from an
-invocation of a remote method, e.g. via dbus_g_proxy_end_call.
-Moreover, you must ensure that the error's domain is <span class="type">DBUS_GERROR</span>,
-and the code is <span class="type">DBUS_GERROR_REMOTE_EXCEPTION</span>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> given from the remote method
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the D-BUS name for a remote exception.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_error_quark ()">
-<a name="dbus-g-error-quark"></a><h3>dbus_g_error_quark ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> dbus_g_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-The implementation of <span class="type">DBUS_GERROR</span> error domain. See documentation
-for <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> in GLib reference manual.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the error domain quark for use with <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_error_domain_register ()">
-<a name="dbus-g-error-domain-register"></a><h3>dbus_g_error_domain_register ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_error_domain_register (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> domain</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *default_iface</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> code_enum</code></em>);</pre>
-<p>
-Register a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> domain and set of codes with D-Bus. When an object
-raises a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> in the domain <em class="parameter"><code>domain</code></em> from one of its D-Bus methods,
-the D-Bus error name used will be <em class="parameter"><code>default_iface</code></em>, followed by a dot,
-followed by the <span class="type">GEnumValue.value_nick</span> corresponding to the <span class="type">GError.code</span>.
-For D-Bus, it's conventional to use an error name (value_nick) that is
-in CamelCase.
-</p>
-<p>
-(For instance, if a D-Bus method <code class="code">com.example.MyObject.GetThings</code>
-can raise a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> with domain <code class="code">MY_ERROR</code> and code
-<code class="code">MY_ERROR_NOT_HAPPY</code>, you could call
-<code class="code">dbus_g_error_domain_register (MY_ERROR, "com.example.MyError",
-MY_TYPE_ERROR)</code>, and set up the value_nick for
-<code class="code">MY_ERROR_NOT_HAPPY</code> to be <code class="code">NotHappy</code>,
-resulting in the D-Bus error string
-<code class="code">com.example.MyError.NotHappy</code>.)
-</p>
-<p>
-If <em class="parameter"><code>default_iface</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the D-Bus interface of the method that failed
-will be used.
-</p>
-<p>
-(For instance, if the above example had called
-<code class="code">dbus_g_error_domain_register (MY_ERROR, NULL, MY_TYPE_ERROR)</code>
-instead, then the D-Bus error string would be
-<code class="code">com.example.MyObject.NotHappy</code>.)
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>domain</code></em> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> domain
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>default_iface</code></em> :</span></p></td>
-<td>the prefix used for error values, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>code_enum</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a <span class="type">GEnum</span> of the error codes
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="See Also">
-<a name="dbus-glib-DBusGError.see-also"></a><h2>See Also</h2>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBusGMessage</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="dbus-glib-dbus-gobject.html" title="DBus GObject related functions">
-<link rel="next" href="dbus-glib-DBusGMethod.html" title="DBusGMethod">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="dbus-glib-dbus-gobject.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-DBusGMethod.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-DBusGMessage.synopsis" class="shortcut">Top</a>
- |
- <a href="#dbus-glib-DBusGMessage.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="DBusGMessage">
-<a name="dbus-glib-DBusGMessage"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-DBusGMessage.top_of_page"></a>DBusGMessage</span></h2>
-<p>DBusGMessage — DBus Message</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-DBusGMessage.stability-level"></a><h2>Stability Level</h2>
-Stable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-DBusGMessage.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"> <a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage">DBusGMessage</a>;
-<a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="returnvalue">DBusGMessage</span></a>* <a class="link" href="dbus-glib-DBusGMessage.html#dbus-g-message-ref" title="dbus_g_message_ref ()">dbus_g_message_ref</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a> *message</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGMessage.html#dbus-g-message-unref" title="dbus_g_message_unref ()">dbus_g_message_unref</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a> *message</code></em>);
-<span class="returnvalue">DBusMessage</span>* <a class="link" href="dbus-glib-DBusGMessage.html#dbus-g-message-get-message" title="dbus_g_message_get_message ()">dbus_g_message_get_message</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a> *gmessage</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-DBusGMessage.description"></a><h2>Description</h2>
-<p>
-A <a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> is a boxed type abstracting a DBusMessage.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-DBusGMessage.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBusGMessage">
-<a name="DBusGMessage"></a><h3>DBusGMessage</h3>
-<pre class="programlisting">typedef struct _DBusGMessage DBusGMessage;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_message_ref ()">
-<a name="dbus-g-message-ref"></a><h3>dbus_g_message_ref ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="returnvalue">DBusGMessage</span></a>* dbus_g_message_ref (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a> *message</code></em>);</pre>
-<p>
-Increment refcount on a <a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the message that was ref'd
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_message_unref ()">
-<a name="dbus-g-message-unref"></a><h3>dbus_g_message_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_message_unref (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a> *message</code></em>);</pre>
-<p>
-Decrement refcount on a <a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_message_get_message ()">
-<a name="dbus-g-message-get-message"></a><h3>dbus_g_message_get_message ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusMessage</span>* dbus_g_message_get_message (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a> *gmessage</code></em>);</pre>
-<p>
-Get the <span class="type">DBusMessage</span> corresponding to this <a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a>.
-The return value does not have its refcount incremented.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>gmessage</code></em> :</span></p></td>
-<td>a <a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <span class="type">DBusMessage</span>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="See Also">
-<a name="dbus-glib-DBusGMessage.see-also"></a><h2>See Also</h2>
-<span class="type">DBusMessage</span>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBusGMethod</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="dbus-glib-DBusGMessage.html" title="DBusGMessage">
-<link rel="next" href="dbus-glib-DBusGError.html" title="DBusGError">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="dbus-glib-DBusGMessage.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-DBusGError.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-DBusGMethod.synopsis" class="shortcut">Top</a>
- |
- <a href="#dbus-glib-DBusGMethod.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="DBusGMethod">
-<a name="dbus-glib-DBusGMethod"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-DBusGMethod.top_of_page"></a>DBusGMethod</span></h2>
-<p>DBusGMethod — GMethod Info & Invocation</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-DBusGMethod.stability-level"></a><h2>Stability Level</h2>
-Stable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-DBusGMethod.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"> <a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInfo" title="DBusGMethodInfo">DBusGMethodInfo</a>;
- <a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation">DBusGMethodInvocation</a>;
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a>* <a class="link" href="dbus-glib-DBusGMethod.html#dbus-g-method-get-sender" title="dbus_g_method_get_sender ()">dbus_g_method_get_sender</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);
-<span class="returnvalue">DBusMessage</span>* <a class="link" href="dbus-glib-DBusGMethod.html#dbus-g-method-get-reply" title="dbus_g_method_get_reply ()">dbus_g_method_get_reply</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGMethod.html#dbus-g-method-send-reply" title="dbus_g_method_send_reply ()">dbus_g_method_send_reply</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
- <em class="parameter"><code><span class="type">DBusMessage</span> *reply</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGMethod.html#dbus-g-method-return" title="dbus_g_method_return ()">dbus_g_method_return</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGMethod.html#dbus-g-method-return-error" title="dbus_g_method_return_error ()">dbus_g_method_return_error</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-DBusGMethod.description"></a><h2>Description</h2>
-<p>
-These types are used to call methods on <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> objects.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-DBusGMethod.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBusGMethodInfo">
-<a name="DBusGMethodInfo"></a><h3>DBusGMethodInfo</h3>
-<pre class="programlisting">typedef struct {
- GCallback function;
- GClosureMarshal marshaller;
- int data_offset;
-} DBusGMethodInfo;
-</pre>
-<p>
-Object typically generated by <a class="link" href="dbus-binding-tool.html" title="dbus-binding-tool"><span class="type">dbus-binding-tool</span></a> that
-stores a mapping from introspection data to a
-function pointer for a C method to be invoked.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GCallback"><span class="type">GCallback</span></a> <em class="structfield"><code><a name="DBusGMethodInfo.function"></a>function</code></em>;</span></p></td>
-<td>C method to invoke
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> <em class="structfield"><code><a name="DBusGMethodInfo.marshaller"></a>marshaller</code></em>;</span></p></td>
-<td>Marshaller to invoke method
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="DBusGMethodInfo.data-offset"></a>data_offset</code></em>;</span></p></td>
-<td>Offset into the introspection data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="DBusGMethodInvocation">
-<a name="DBusGMethodInvocation"></a><h3>DBusGMethodInvocation</h3>
-<pre class="programlisting">typedef struct _DBusGMethodInvocation DBusGMethodInvocation;</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_method_get_sender ()">
-<a name="dbus-g-method-get-sender"></a><h3>dbus_g_method_get_sender ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a>* dbus_g_method_get_sender (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);</pre>
-<p>
-Get the sender of a message so we can send a
-"reply" later (i.e. send a message directly
-to a service which invoked the method at a
-later time).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
-<td>the method context
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the unique name of the sender. It
-is up to the caller to free the returned string.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_method_get_reply ()">
-<a name="dbus-g-method-get-reply"></a><h3>dbus_g_method_get_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusMessage</span>* dbus_g_method_get_reply (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);</pre>
-<p>
-Get the reply message to append reply values
-Used as a sidedoor when you can't generate dbus values
-of the correct type due to glib binding limitations
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
-<td>the method context
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a <span class="type">DBusMessage</span> with the reply
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_method_send_reply ()">
-<a name="dbus-g-method-send-reply"></a><h3>dbus_g_method_send_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_method_send_reply (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
- <em class="parameter"><code><span class="type">DBusMessage</span> *reply</code></em>);</pre>
-<p>
-Used as a sidedoor when you can't generate dbus values
-of the correct type due to glib binding limitations
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
-<td>the method context
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>reply</code></em> :</span></p></td>
-<td>the reply message, will be unreffed
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_method_return ()">
-<a name="dbus-g-method-return"></a><h3>dbus_g_method_return ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_method_return (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Send a return message for a given method invocation, with arguments.
-This function also frees the sending context.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
-<td>the method context
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_method_return_error ()">
-<a name="dbus-g-method-return-error"></a><h3>dbus_g_method_return_error ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_method_return_error (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInvocation" title="DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> *error</code></em>);</pre>
-<p>
-Send a error message for a given method invocation.
-This function also frees the sending context.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
-<td>the method context
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>the error to send
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="See Also">
-<a name="dbus-glib-DBusGMethod.see-also"></a><h2>See Also</h2>
-<a class="link" href="dbus-glib-DBusGMessage.html#DBusGMessage" title="DBusGMessage"><span class="type">DBusGMessage</span></a>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBusGProxy</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="dbus-glib-DBusGError.html" title="DBusGError">
-<link rel="next" href="dbus-glib-Specializable-GType-System.html" title="Specializable GType System">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="dbus-glib-DBusGError.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-Specializable-GType-System.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-DBusGProxy.synopsis" class="shortcut">Top</a>
- |
- <a href="#dbus-glib-DBusGProxy.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="DBusGProxy">
-<a name="dbus-glib-DBusGProxy"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-DBusGProxy.top_of_page"></a>DBusGProxy</span></h2>
-<p>DBusGProxy — DBus Proxy</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-DBusGProxy.stability-level"></a><h2>Stability Level</h2>
-Stable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-DBusGProxy.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"> <a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy">DBusGProxy</a>;
-<a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name" title="dbus_g_proxy_new_for_name ()">dbus_g_proxy_new_for_name</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *iface</code></em>);
-<a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner" title="dbus_g_proxy_new_for_name_owner ()">dbus_g_proxy_new_for_name_owner</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *iface</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-from-proxy" title="dbus_g_proxy_new_from_proxy ()">dbus_g_proxy_new_from_proxy</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *iface</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path_name</code></em>);
-<a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-peer" title="dbus_g_proxy_new_for_peer ()">dbus_g_proxy_new_for_peer</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path_name</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *interface_name</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-set-interface" title="dbus_g_proxy_set_interface ()">dbus_g_proxy_set_interface</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *interface_name</code></em>);
-const <span class="returnvalue">char</span>* <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-path" title="dbus_g_proxy_get_path ()">dbus_g_proxy_get_path</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>);
-const <span class="returnvalue">char</span>* <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-bus-name" title="dbus_g_proxy_get_bus_name ()">dbus_g_proxy_get_bus_name</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>);
-const <span class="returnvalue">char</span>* <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-interface" title="dbus_g_proxy_get_interface ()">dbus_g_proxy_get_interface</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-add-signal" title="dbus_g_proxy_add_signal ()">dbus_g_proxy_add_signal</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *signal_name</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-connect-signal" title="dbus_g_proxy_connect_signal ()">dbus_g_proxy_connect_signal</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *signal_name</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GCallback"><span class="type">GCallback</span></a> handler</code></em>,
- <em class="parameter"><code><span class="type">void</span> *data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureNotify"><span class="type">GClosureNotify</span></a> free_data_func</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-disconnect-signal" title="dbus_g_proxy_disconnect_signal ()">dbus_g_proxy_disconnect_signal</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *signal_name</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GCallback"><span class="type">GCallback</span></a> handler</code></em>,
- <em class="parameter"><code><span class="type">void</span> *data</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-send" title="dbus_g_proxy_send ()">dbus_g_proxy_send</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">DBusMessage</span> *message</code></em>,
- <em class="parameter"><code><span class="type">dbus_uint32_t</span> *client_serial</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-call" title="dbus_g_proxy_call ()">dbus_g_proxy_call</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-call-with-timeout" title="dbus_g_proxy_call_with_timeout ()">dbus_g_proxy_call_with_timeout</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><span class="type">int</span> timeout</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-call-no-reply" title="dbus_g_proxy_call_no_reply ()">dbus_g_proxy_call_no_reply</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> * <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()">dbus_g_proxy_begin_call</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCallNotify</span> notify</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> destroy</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">DBusGProxyCall</span> * <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call-with-timeout" title="dbus_g_proxy_begin_call_with_timeout ()">dbus_g_proxy_begin_call_with_timeout</a>
- (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCallNotify</span> notify</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> destroy</code></em>,
- <em class="parameter"><code><span class="type">int</span> timeout</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-end-call" title="dbus_g_proxy_end_call ()">dbus_g_proxy_end_call</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCall</span> *call</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-cancel-call" title="dbus_g_proxy_cancel_call ()">dbus_g_proxy_cancel_call</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCall</span> *call</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-set-default-timeout" title="dbus_g_proxy_set_default_timeout ()">dbus_g_proxy_set_default_timeout</a> (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">int</span> timeout</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-DBusGProxy.description"></a><h2>Description</h2>
-<p>
-A <a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> is a boxed type abstracting a <span class="type">DBusProxy</span>.
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-DBusGProxy.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBusGProxy">
-<a name="DBusGProxy"></a><h3>DBusGProxy</h3>
-<pre class="programlisting">typedef struct {
- GObject parent;
-} DBusGProxy;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_new_for_name ()">
-<a name="dbus-g-proxy-new-for-name"></a><h3>dbus_g_proxy_new_for_name ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* dbus_g_proxy_new_for_name (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *iface</code></em>);</pre>
-<p>
-Creates a new proxy for a remote interface exported by a connection
-on a message bus. Method calls and signal connections over this
-proxy will go to the name owner; the name's owner is expected to
-support the given interface name. THE NAME OWNER MAY CHANGE OVER
-TIME, for example between two different method calls, unless the
-name is a unique name. If you need a fixed owner, you need to
-request the current owner and bind a proxy to its unique name
-rather than to the generic name; see
-<a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner" title="dbus_g_proxy_new_for_name_owner ()"><code class="function">dbus_g_proxy_new_for_name_owner()</code></a>.
-</p>
-<p>
-A name-associated proxy only makes sense with a message bus, not
-for app-to-app direct dbus connections.
-</p>
-<p>
-This proxy will only emit the "destroy" signal if the
-<span class="type">DBusConnection</span> is disconnected, the proxy has no remaining
-references, or the name is a unique name and its owner
-disappears. If a well-known name changes owner, the proxy will
-still be alive.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the connection to the remote bus
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>any name on the message bus
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> new proxy object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_new_for_name_owner ()">
-<a name="dbus-g-proxy-new-for-name-owner"></a><h3>dbus_g_proxy_new_for_name_owner ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* dbus_g_proxy_new_for_name_owner (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *iface</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Similar to <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name" title="dbus_g_proxy_new_for_name ()"><code class="function">dbus_g_proxy_new_for_name()</code></a>, but makes a round-trip
-request to the message bus to get the current name owner, then
-binds the proxy to the unique name of the current owner, rather
-than to the well-known name. As a result, the name owner will
-not change over time, and the proxy will emit the "destroy" signal
-when the owner disappears from the message bus.
-</p>
-<p>
-An example of the difference between <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name" title="dbus_g_proxy_new_for_name ()"><code class="function">dbus_g_proxy_new_for_name()</code></a>
-and <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner" title="dbus_g_proxy_new_for_name_owner ()"><code class="function">dbus_g_proxy_new_for_name_owner()</code></a>: if you provide the well-known name
-"org.freedesktop.Database" <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name" title="dbus_g_proxy_new_for_name ()"><code class="function">dbus_g_proxy_new_for_name()</code></a> remains bound
-to that name as it changes owner. <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner" title="dbus_g_proxy_new_for_name_owner ()"><code class="function">dbus_g_proxy_new_for_name_owner()</code></a>
-will fail if the name has no owner. If the name has an owner,
-<a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner" title="dbus_g_proxy_new_for_name_owner ()"><code class="function">dbus_g_proxy_new_for_name_owner()</code></a> will bind to the unique name
-of that owner rather than the generic name.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the connection to the remote bus
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>any name on the message bus
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>return location for an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> new proxy object, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> on error
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_new_from_proxy ()">
-<a name="dbus-g-proxy-new-from-proxy"></a><h3>dbus_g_proxy_new_from_proxy ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* dbus_g_proxy_new_from_proxy (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *iface</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path_name</code></em>);</pre>
-<p>
-Creates a proxy using an existing proxy as a template, substituting
-the specified interface and path. Either or both may be NULL.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>the proxy to use as a template
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iface</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path_name</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> new proxy object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_new_for_peer ()">
-<a name="dbus-g-proxy-new-for-peer"></a><h3>dbus_g_proxy_new_for_peer ()</h3>
-<pre class="programlisting"><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="returnvalue">DBusGProxy</span></a>* dbus_g_proxy_new_for_peer (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGConnection.html#DBusGConnection" title="DBusGConnection"><span class="type">DBusGConnection</span></a> *connection</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *path_name</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *interface_name</code></em>);</pre>
-<p>
-Creates a proxy for an object in peer application (one
-we're directly connected to). That is, this function is
-intended for use when there's no message bus involved,
-we're doing a simple 1-to-1 communication between two
-applications.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
-<td>the connection to the peer
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>path_name</code></em> :</span></p></td>
-<td>name of the object inside the peer to call methods on
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>interface_name</code></em> :</span></p></td>
-<td>name of the interface to call methods on
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> new proxy object
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_set_interface ()">
-<a name="dbus-g-proxy-set-interface"></a><h3>dbus_g_proxy_set_interface ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_set_interface (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *interface_name</code></em>);</pre>
-<p>
-Sets the object interface proxy is bound to
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>the proxy
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>interface_name</code></em> :</span></p></td>
-<td>an object interface
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_get_path ()">
-<a name="dbus-g-proxy-get-path"></a><h3>dbus_g_proxy_get_path ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span>* dbus_g_proxy_get_path (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>);</pre>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>the proxy
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> an object path
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_get_bus_name ()">
-<a name="dbus-g-proxy-get-bus-name"></a><h3>dbus_g_proxy_get_bus_name ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span>* dbus_g_proxy_get_bus_name (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>);</pre>
-<p>
-Gets the bus name a proxy is bound to (may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> in some cases).
-If you created the proxy with <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name" title="dbus_g_proxy_new_for_name ()"><code class="function">dbus_g_proxy_new_for_name()</code></a>, then
-the name you passed to that will be returned.
-If you created it with <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner" title="dbus_g_proxy_new_for_name_owner ()"><code class="function">dbus_g_proxy_new_for_name_owner()</code></a>, then the
-unique connection name will be returned. If you created it
-with <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-peer" title="dbus_g_proxy_new_for_peer ()"><code class="function">dbus_g_proxy_new_for_peer()</code></a> then <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> will be returned.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>the proxy
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the bus name the proxy sends messages to
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_get_interface ()">
-<a name="dbus-g-proxy-get-interface"></a><h3>dbus_g_proxy_get_interface ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span>* dbus_g_proxy_get_interface (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>);</pre>
-<p>
-Gets the object interface proxy is bound to (may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> in some cases).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>the proxy
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> an object interface
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_add_signal ()">
-<a name="dbus-g-proxy-add-signal"></a><h3>dbus_g_proxy_add_signal ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_add_signal (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *signal_name</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Specifies the argument signature of a signal;.only necessary
-if the remote object does not support introspection. The arguments
-specified are the GLib types expected.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>the proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>signal_name</code></em> :</span></p></td>
-<td>the name of the signal
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_type</code></em> :</span></p></td>
-<td>the first argument type, or G_TYPE_INVALID if none
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_connect_signal ()">
-<a name="dbus-g-proxy-connect-signal"></a><h3>dbus_g_proxy_connect_signal ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_connect_signal (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *signal_name</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GCallback"><span class="type">GCallback</span></a> handler</code></em>,
- <em class="parameter"><code><span class="type">void</span> *data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureNotify"><span class="type">GClosureNotify</span></a> free_data_func</code></em>);</pre>
-<p>
-Connect a signal handler to a proxy for a remote interface. When
-the remote interface emits the specified signal, the proxy will
-emit a corresponding GLib signal.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>signal_name</code></em> :</span></p></td>
-<td>the DBus signal name to listen for
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>handler</code></em> :</span></p></td>
-<td>the handler to connect
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td>data to pass to handler
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>free_data_func</code></em> :</span></p></td>
-<td>callback function to destroy data
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_disconnect_signal ()">
-<a name="dbus-g-proxy-disconnect-signal"></a><h3>dbus_g_proxy_disconnect_signal ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_disconnect_signal (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *signal_name</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GCallback"><span class="type">GCallback</span></a> handler</code></em>,
- <em class="parameter"><code><span class="type">void</span> *data</code></em>);</pre>
-<p>
-Disconnect all signal handlers from a proxy that match the given
-criteria.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>signal_name</code></em> :</span></p></td>
-<td>the DBus signal name to disconnect
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>handler</code></em> :</span></p></td>
-<td>the handler to disconnect
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td>the data that was registered with handler
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_send ()">
-<a name="dbus-g-proxy-send"></a><h3>dbus_g_proxy_send ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_send (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">DBusMessage</span> *message</code></em>,
- <em class="parameter"><code><span class="type">dbus_uint32_t</span> *client_serial</code></em>);</pre>
-<p>
-Sends a message to the interface we're proxying for. Does not
-block or wait for a reply. The message is only actually written out
-when you return to the main loop or block in
-<a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-flush" title="dbus_g_connection_flush ()"><code class="function">dbus_g_connection_flush()</code></a>.
-</p>
-<p>
-The message is modified to be addressed to the target interface.
-That is, a destination name field or whatever is needed will be
-added to the message. The basic point of this function is to add
-the necessary header fields, otherwise it's equivalent to
-<code class="function">dbus_connection_send()</code>.
-</p>
-<p>
-This function adds a reference to the message, so the caller
-still owns its original reference.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
-<td>the message to address and send
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>client_serial</code></em> :</span></p></td>
-<td>return location for message's serial, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_call ()">
-<a name="dbus-g-proxy-call"></a><h3>dbus_g_proxy_call ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_proxy_call (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Function for synchronously invoking a method and receiving reply
-values. This function is equivalent to dbus_g_proxy_begin_call
-followed by dbus_g_proxy_end_call. All of the input arguments are
-specified first, followed by G_TYPE_INVALID, followed by all of the
-output values, followed by a second G_TYPE_INVALID. Note that
-this means you must always specify G_TYPE_INVALID twice.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>method</code></em> :</span></p></td>
-<td>method to invoke
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>return location for an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_arg_type</code></em> :</span></p></td>
-<td>type of first "in" argument
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> if an error is set, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> otherwise.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_call_with_timeout ()">
-<a name="dbus-g-proxy-call-with-timeout"></a><h3>dbus_g_proxy_call_with_timeout ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_proxy_call_with_timeout (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><span class="type">int</span> timeout</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Function for synchronously invoking a method and receiving reply
-values. This function is equivalent to dbus_g_proxy_begin_call
-followed by dbus_g_proxy_end_call. All of the input arguments are
-specified first, followed by G_TYPE_INVALID, followed by all of the
-output values, followed by a second G_TYPE_INVALID. Note that
-this means you must always specify G_TYPE_INVALID twice.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>method</code></em> :</span></p></td>
-<td>method to invoke
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>timeout</code></em> :</span></p></td>
-<td>specify the timeout in milliseconds
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>return location for an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_arg_type</code></em> :</span></p></td>
-<td>type of first "in" argument
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> if an error is set, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> otherwise.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_call_no_reply ()">
-<a name="dbus-g-proxy-call-no-reply"></a><h3>dbus_g_proxy_call_no_reply ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_call_no_reply (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Sends a method call message as with <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()"><code class="function">dbus_g_proxy_begin_call()</code></a>, but
-does not ask for a reply or allow you to receive one.
-</p>
-<p>
-TODO: this particular function shouldn't die on out of memory,
-since you should be able to do a call with large arguments.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>method</code></em> :</span></p></td>
-<td>the name of the method to invoke
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_arg_type</code></em> :</span></p></td>
-<td>type of the first argument
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_begin_call ()">
-<a name="dbus-g-proxy-begin-call"></a><h3>dbus_g_proxy_begin_call ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> * dbus_g_proxy_begin_call (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCallNotify</span> notify</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> destroy</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Asynchronously invokes a method on a remote interface. The method
-call will not be sent over the wire until the application returns
-to the main loop, or blocks in <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-flush" title="dbus_g_connection_flush ()"><code class="function">dbus_g_connection_flush()</code></a> to write out
-pending data. The call will be completed after a timeout, or when
-a reply is received. When the call returns, the callback specified
-will be invoked; you can then collect the results of the call
-(which may be an error, or a reply), use <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-end-call" title="dbus_g_proxy_end_call ()"><code class="function">dbus_g_proxy_end_call()</code></a>.
-</p>
-<p>
-TODO this particular function shouldn't die on out of memory,
-since you should be able to do a call with large arguments.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>method</code></em> :</span></p></td>
-<td>the name of the method to invoke
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>notify</code></em> :</span></p></td>
-<td>callback to be invoked when method returns
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
-<td>function called to destroy user_data
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_arg_type</code></em> :</span></p></td>
-<td>type of the first argument
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> call identifier.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_begin_call_with_timeout ()">
-<a name="dbus-g-proxy-begin-call-with-timeout"></a><h3>dbus_g_proxy_begin_call_with_timeout ()</h3>
-<pre class="programlisting"><span class="returnvalue">DBusGProxyCall</span> * dbus_g_proxy_begin_call_with_timeout
- (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code>const <span class="type">char</span> *method</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCallNotify</span> notify</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> destroy</code></em>,
- <em class="parameter"><code><span class="type">int</span> timeout</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Asynchronously invokes a method on a remote interface. The method
-call will not be sent over the wire until the application returns
-to the main loop, or blocks in <a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-flush" title="dbus_g_connection_flush ()"><code class="function">dbus_g_connection_flush()</code></a> to write out
-pending data. The call will be completed after a timeout, or when
-a reply is received. When the call returns, the callback specified
-will be invoked; you can then collect the results of the call
-(which may be an error, or a reply), use <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-end-call" title="dbus_g_proxy_end_call ()"><code class="function">dbus_g_proxy_end_call()</code></a>.
-</p>
-<p>
-TODO this particular function shouldn't die on out of memory,
-since you should be able to do a call with large arguments.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>method</code></em> :</span></p></td>
-<td>the name of the method to invoke
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>notify</code></em> :</span></p></td>
-<td>callback to be invoked when method returns
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data passed to callback
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
-<td>function called to destroy user_data
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>timeout</code></em> :</span></p></td>
-<td>specify the timeout in milliseconds
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_arg_type</code></em> :</span></p></td>
-<td>type of the first argument
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> call identifier.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_end_call ()">
-<a name="dbus-g-proxy-end-call"></a><h3>dbus_g_proxy_end_call ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_proxy_end_call (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCall</span> *call</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_arg_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Collects the results of a method call. The method call was normally
-initiated with <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-end-call" title="dbus_g_proxy_end_call ()"><code class="function">dbus_g_proxy_end_call()</code></a>. You may use this function
-outside of the callback given to dbus_g_proxy_begin_call; in that
-case this function will block if the results haven't yet been
-received.
-</p>
-<p>
-If the call results in an error, the error is set as normal for
-GError and the function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a>.
-</p>
-<p>
-Otherwise, the "out" parameters and return value of the
-method are stored in the provided varargs list.
-The list should be terminated with G_TYPE_INVALID.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>call</code></em> :</span></p></td>
-<td>the pending call ID from <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()"><code class="function">dbus_g_proxy_begin_call()</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>return location for an error
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_arg_type</code></em> :</span></p></td>
-<td>type of first "out" argument
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> if an error is set.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_cancel_call ()">
-<a name="dbus-g-proxy-cancel-call"></a><h3>dbus_g_proxy_cancel_call ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_cancel_call (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">DBusGProxyCall</span> *call</code></em>);</pre>
-<p>
-Cancels a pending method call. The method call was normally
-initiated with <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()"><code class="function">dbus_g_proxy_begin_call()</code></a>. This function
-may not be used on pending calls that have already been
-ended with dbus_g_proxy_end_call.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>call</code></em> :</span></p></td>
-<td>the pending call ID from <a class="link" href="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call" title="dbus_g_proxy_begin_call ()"><code class="function">dbus_g_proxy_begin_call()</code></a>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_proxy_set_default_timeout ()">
-<a name="dbus-g-proxy-set-default-timeout"></a><h3>dbus_g_proxy_set_default_timeout ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_set_default_timeout (<em class="parameter"><code><a class="link" href="dbus-glib-DBusGProxy.html#DBusGProxy" title="DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
- <em class="parameter"><code><span class="type">int</span> timeout</code></em>);</pre>
-<p>
-Sets the default timeout to use for a proxy. This timeout will be
-used in calls where the timeout is not specified.
-</p>
-<p>
-This is useful for long-running operations that takes longer than
-the default timeout (which is a on the order of magnitude of tens
-of seconds). For some applications, consider using a pattern where
-the method returns once the operation is underway
-(e.g. immediately) and emits a signal when the operation terminates
-(though beware of leaking information with/in the signal return value).
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
-<td>a proxy for a remote interface
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>timeout</code></em> :</span></p></td>
-<td>specify the timeout in milliseconds
-</td>
-</tr>
-</tbody>
-</table></div>
-<p class="since">Since 0.75</p>
-</div>
-</div>
-<div class="refsect1" title="See Also">
-<a name="dbus-glib-DBusGProxy.see-also"></a><h2>See Also</h2>
-<span class="type">DBusProxy</span>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DBus GLib low level</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
+<link rel="up" href="ch02.html" title="API Reference">
+<link rel="prev" href="dbus-glib-dbus-gtype-specialized.html" title="Specializable GType System">
+<link rel="next" href="ch03.html" title="Tools Reference">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="dbus-glib-dbus-gtype-specialized.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
+<td><a accesskey="n" href="ch03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts">
+<a href="#dbus-glib-dbus-glib-lowlevel.synopsis" class="shortcut">Top</a>
+ |
+ <a href="#dbus-glib-dbus-glib-lowlevel.description" class="shortcut">Description</a>
+</td></tr>
+</table>
+<div class="refentry">
+<a name="dbus-glib-dbus-glib-lowlevel"></a><div class="titlepage"></div>
+<div class="refnamediv"><table width="100%"><tr>
+<td valign="top">
+<h2><span class="refentrytitle"><a name="dbus-glib-dbus-glib-lowlevel.top_of_page"></a>DBus GLib low level</span></h2>
+<p>DBus GLib low level — DBus lower level functions</p>
+</td>
+<td valign="top" align="right"></td>
+</tr></table></div>
+<div class="refsect1">
+<a name="dbus-glib-dbus-glib-lowlevel.stability-level"></a><h2>Stability Level</h2>
+Unstable, unless otherwise indicated
+</div>
+<div class="refsynopsisdiv">
+<a name="dbus-glib-dbus-glib-lowlevel.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis">#define <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#DBUS-TYPE-CONNECTION:CAPS" title="DBUS_TYPE_CONNECTION">DBUS_TYPE_CONNECTION</a>
+#define <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#DBUS-TYPE-MESSAGE:CAPS" title="DBUS_TYPE_MESSAGE">DBUS_TYPE_MESSAGE</a>
+<a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="returnvalue">DBusGConnection</span></a> * <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-connection-get-g-connection" title="dbus_connection_get_g_connection ()">dbus_connection_get_g_connection</a> (<em class="parameter"><code><span class="type">DBusConnection</span> *connection</code></em>);
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-connection-get-g-type" title="dbus_connection_get_g_type ()">dbus_connection_get_g_type</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-connection-setup-with-g-main" title="dbus_connection_setup_with_g_main ()">dbus_connection_setup_with_g_main</a> (<em class="parameter"><code><span class="type">DBusConnection</span> *connection</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);
+<span class="returnvalue">DBusConnection</span> * <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-g-connection-get-connection" title="dbus_g_connection_get_connection ()">dbus_g_connection_get_connection</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *gconnection</code></em>);
+<span class="returnvalue">DBusMessage</span> * <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-g-message-get-message" title="dbus_g_message_get_message ()">dbus_g_message_get_message</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMessage.html#DBusGMessage"><span class="type">DBusGMessage</span></a> *gmessage</code></em>);
+<span class="returnvalue">DBusMessage</span> * <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-get-reply" title="dbus_g_method_get_reply ()">dbus_g_method_get_reply</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-get-sender" title="dbus_g_method_get_sender ()">dbus_g_method_get_sender</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-send-reply" title="dbus_g_method_send_reply ()">dbus_g_method_send_reply</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
+ <em class="parameter"><code><span class="type">DBusMessage</span> *reply</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-g-proxy-send" title="dbus_g_proxy_send ()">dbus_g_proxy_send</a> (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+ <em class="parameter"><code><span class="type">DBusMessage</span> *message</code></em>,
+ <em class="parameter"><code><span class="type">dbus_uint32_t</span> *client_serial</code></em>);
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-message-get-g-type" title="dbus_message_get_g_type ()">dbus_message_get_g_type</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-server-setup-with-g-main" title="dbus_server_setup_with_g_main ()">dbus_server_setup_with_g_main</a> (<em class="parameter"><code><span class="type">DBusServer</span> *server</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-glib-lowlevel.html#dbus-set-g-error" title="dbus_set_g_error ()">dbus_set_g_error</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **gerror</code></em>,
+ <em class="parameter"><code><span class="type">DBusError</span> *derror</code></em>);
+</pre>
+</div>
+<div class="refsect1">
+<a name="dbus-glib-dbus-glib-lowlevel.description"></a><h2>Description</h2>
+<p>
+These functions can be used to access lower level of DBus.
+</p>
+</div>
+<div class="refsect1">
+<a name="dbus-glib-dbus-glib-lowlevel.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="DBUS-TYPE-CONNECTION:CAPS"></a><h3>DBUS_TYPE_CONNECTION</h3>
+<pre class="programlisting">#define DBUS_TYPE_CONNECTION (dbus_connection_get_g_type ())
+</pre>
+<p>
+Expands to a function call returning a boxed <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> representing a
+<span class="type">DBusConnection</span> pointer from libdbus. Not to be confused with
+<a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBUS-TYPE-G-CONNECTION:CAPS"><code class="literal">DBUS_TYPE_G_CONNECTION</code></a>, which you should usually use instead.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the GLib type</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="DBUS-TYPE-MESSAGE:CAPS"></a><h3>DBUS_TYPE_MESSAGE</h3>
+<pre class="programlisting">#define DBUS_TYPE_MESSAGE (dbus_message_get_g_type ())
+</pre>
+<p>
+Expands to a function call returning a boxed <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> representing a
+<span class="type">DBusMessage</span> pointer from libdbus. Not to be confused with
+<a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMessage.html#DBUS-TYPE-G-MESSAGE:CAPS"><code class="literal">DBUS_TYPE_G_MESSAGE</code></a>, which you should usually use instead.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the GLib type</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-connection-get-g-connection"></a><h3>dbus_connection_get_g_connection ()</h3>
+<pre class="programlisting"><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="returnvalue">DBusGConnection</span></a> * dbus_connection_get_g_connection (<em class="parameter"><code><span class="type">DBusConnection</span> *connection</code></em>);</pre>
+<p>
+Get the <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> corresponding to this <span class="type">DBusConnection</span>. This only
+makes sense if the <span class="type">DBusConnection</span> was originally a <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> that was
+registered with the GLib main loop. The return value does not have its
+refcount incremented.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>a <span class="type">DBusConnection</span>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-connection-get-g-type"></a><h3>dbus_connection_get_g_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_connection_get_g_type (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-connection-setup-with-g-main"></a><h3>dbus_connection_setup_with_g_main ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_connection_setup_with_g_main (<em class="parameter"><code><span class="type">DBusConnection</span> *connection</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);</pre>
+<p>
+Sets the watch and timeout functions of a <span class="type">DBusConnection</span>
+to integrate the connection with the GLib main loop.
+Pass in <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> unless you're
+doing something specialized.
+</p>
+<p>
+If called twice for the same context, does nothing the second
+time. If called once with context A and once with context B,
+context B replaces context A as the context monitoring the
+connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>connection</code></em> :</span></p></td>
+<td>the connection</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for default context</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-connection-get-connection"></a><h3>dbus_g_connection_get_connection ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusConnection</span> * dbus_g_connection_get_connection (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a> *gconnection</code></em>);</pre>
+<p>
+Get the <span class="type">DBusConnection</span> corresponding to this <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>.
+The return value does not have its refcount incremented.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gconnection</code></em> :</span></p></td>
+<td>a <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection"><span class="type">DBusGConnection</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td><span class="type">DBusConnection</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-message-get-message"></a><h3>dbus_g_message_get_message ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusMessage</span> * dbus_g_message_get_message (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMessage.html#DBusGMessage"><span class="type">DBusGMessage</span></a> *gmessage</code></em>);</pre>
+<p>
+Get the <span class="type">DBusMessage</span> corresponding to this <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMessage.html#DBusGMessage"><span class="type">DBusGMessage</span></a>.
+The return value does not have its refcount incremented.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gmessage</code></em> :</span></p></td>
+<td>a <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMessage.html#DBusGMessage"><span class="type">DBusGMessage</span></a>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td><span class="type">DBusMessage</span></td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-method-get-reply"></a><h3>dbus_g_method_get_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">DBusMessage</span> * dbus_g_method_get_reply (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);</pre>
+<p>
+Get the reply message to append reply values
+Used as a sidedoor when you can't generate dbus values
+of the correct type due to glib binding limitations
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
+<td>the method context</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a <span class="type">DBusMessage</span> with the reply</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-method-get-sender"></a><h3>dbus_g_method_get_sender ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * dbus_g_method_get_sender (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>);</pre>
+<p>
+Get the sender of a message so we can send a
+"reply" later (i.e. send a message directly
+to a service which invoked the method at a
+later time).
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
+<td>the method context</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the unique name of the sender. It
+is up to the caller to free the returned string.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-method-send-reply"></a><h3>dbus_g_method_send_reply ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_method_send_reply (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInvocation"><span class="type">DBusGMethodInvocation</span></a> *context</code></em>,
+ <em class="parameter"><code><span class="type">DBusMessage</span> *reply</code></em>);</pre>
+<p>
+Send a manually created reply message.
+</p>
+<p>
+Used as a sidedoor when you can't generate dbus values
+of the correct type due to glib binding limitations
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
+<td>the method context</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>reply</code></em> :</span></p></td>
+<td>the reply message, will be unreffed</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-proxy-send"></a><h3>dbus_g_proxy_send ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_proxy_send (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy"><span class="type">DBusGProxy</span></a> *proxy</code></em>,
+ <em class="parameter"><code><span class="type">DBusMessage</span> *message</code></em>,
+ <em class="parameter"><code><span class="type">dbus_uint32_t</span> *client_serial</code></em>);</pre>
+<p>
+Sends a message to the interface we're proxying for. Does not
+block or wait for a reply. The message is only actually written out
+when you return to the main loop or block in
+<a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-flush"><code class="function">dbus_g_connection_flush()</code></a>.
+</p>
+<p>
+The message is modified to be addressed to the target interface.
+That is, a destination name field or whatever is needed will be
+added to the message. The basic point of this function is to add
+the necessary header fields, otherwise it's equivalent to
+<code class="function">dbus_connection_send()</code>.
+</p>
+<p>
+This function adds a reference to the message, so the caller
+still owns its original reference.
+</p>
+<p>
+It is an error to call this method on a proxy that has emitted
+the <span class="type">"destroy"</span> signal.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>proxy</code></em> :</span></p></td>
+<td>a proxy for a remote interface</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
+<td>the message to address and send</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>client_serial</code></em> :</span></p></td>
+<td>return location for message's serial, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-message-get-g-type"></a><h3>dbus_message_get_g_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_message_get_g_type (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-server-setup-with-g-main"></a><h3>dbus_server_setup_with_g_main ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_server_setup_with_g_main (<em class="parameter"><code><span class="type">DBusServer</span> *server</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> *context</code></em>);</pre>
+<p>
+Sets the watch and timeout functions of a <span class="type">DBusServer</span>
+to integrate the server with the GLib main loop.
+In most cases the context argument should be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+</p>
+<p>
+If called twice for the same context, does nothing the second
+time. If called once with context A and once with context B,
+context B replaces context A as the context monitoring the
+connection.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>server</code></em> :</span></p></td>
+<td>the server</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext"><span class="type">GMainContext</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for default</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-set-g-error"></a><h3>dbus_set_g_error ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_set_g_error (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **gerror</code></em>,
+ <em class="parameter"><code><span class="type">DBusError</span> *derror</code></em>);</pre>
+<p>
+Store the information from a DBus method error return into a
+GError. For the normal case of an arbitrary remote process,
+the error code will be DBUS_GERROR_REMOTE_EXCEPTION. Now,
+DBus errors have two components; a message and a "name".
+The former is an arbitrary (normally American English) string.
+The second is a string like com.example.FooFailure which
+programs can use as a conditional source. Because a GError
+only has one string, we use a hack to encode both values:
+</p>
+<p>
+<human readable string><null><error name><null>
+</p>
+<p>
+You can use the following code to retrieve both values:
+</p>
+<p>
+</p>
+<div class="informalexample">
+ <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="listing_lines" align="right"><pre>1
+2
+3</pre></td>
+ <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">const char</span> <span class="gtkdoc opt">*</span>msg <span class="gtkdoc opt">=</span> error<span class="gtkdoc opt">-></span>message<span class="gtkdoc opt">;</span>
+<span class="gtkdoc kwb">size_t</span> len <span class="gtkdoc opt">=</span> <span class="function">strlen</span><span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">);</span>
+<span class="gtkdoc kwb">const char</span> <span class="gtkdoc opt">*</span>error_name <span class="gtkdoc opt">=</span> msg<span class="gtkdoc opt">+</span>len<span class="gtkdoc opt">+</span><span class="number">1</span><span class="gtkdoc opt">;</span></pre></td>
+ </tr>
+ </tbody>
+ </table>
+</div>
+
+<p>
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>gerror</code></em> :</span></p></td>
+<td>an error</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>derror</code></em> :</span></p></td>
+<td>a <span class="type">DBusError</span>
+</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+</div>
+</div>
+<div class="footer">
+<hr>
+ Generated by GTK-Doc V1.18</div>
+</body>
+</html>
\ No newline at end of file
+++ /dev/null
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DBus GObject related functions</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
-<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
-<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="dbus-glib-DBusGConnection.html" title="DBusGConnection">
-<link rel="next" href="dbus-glib-DBusGMessage.html" title="DBusGMessage">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
-<td><a accesskey="p" href="dbus-glib-DBusGConnection.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-DBusGMessage.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-dbus-gobject.synopsis" class="shortcut">Top</a>
- |
- <a href="#dbus-glib-dbus-gobject.description" class="shortcut">Description</a>
-</td></tr>
-</table>
-<div class="refentry" title="DBus GObject related functions">
-<a name="dbus-glib-dbus-gobject"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-dbus-gobject.top_of_page"></a>DBus GObject related functions</span></h2>
-<p>DBus GObject related functions — Exporting a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> remotely</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-dbus-gobject.stability-level"></a><h2>Stability Level</h2>
-Stable, unless otherwise indicated
-</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-dbus-gobject.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis">#define <a class="link" href="dbus-glib-dbus-gobject.html#DBUS-TYPE-G-OBJECT-PATH:CAPS" title="DBUS_TYPE_G_OBJECT_PATH">DBUS_TYPE_G_OBJECT_PATH</a>
- <a class="link" href="dbus-glib-dbus-gobject.html#DBusGObjectInfo" title="DBusGObjectInfo">DBusGObjectInfo</a>;
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gobject.html#dbus-g-object-type-install-info" title="dbus_g_object_type_install_info ()">dbus_g_object_type_install_info</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> object_type</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gobject.html#DBusGObjectInfo" title="DBusGObjectInfo"><span class="type">DBusGObjectInfo</span></a> *info</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gobject.html#dbus-g-object-path-get-g-type" title="dbus_g_object_path_get_g_type ()">dbus_g_object_path_get_g_type</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller" title="dbus_g_object_register_marshaller ()">dbus_g_object_register_marshaller</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> marshaller</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> rettype</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller-array" title="dbus_g_object_register_marshaller_array ()">dbus_g_object_register_marshaller_array</a>
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> marshaller</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> rettype</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_types</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> *types</code></em>);
-</pre>
-</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-dbus-gobject.description"></a><h2>Description</h2>
-<p>
-FIXME
-</p>
-</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-dbus-gobject.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBUS_TYPE_G_OBJECT_PATH">
-<a name="DBUS-TYPE-G-OBJECT-PATH:CAPS"></a><h3>DBUS_TYPE_G_OBJECT_PATH</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_OBJECT_PATH (dbus_g_object_path_get_g_type ())
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBusGObjectInfo">
-<a name="DBusGObjectInfo"></a><h3>DBusGObjectInfo</h3>
-<pre class="programlisting">typedef struct {
- int format_version;
-
- const DBusGMethodInfo *method_infos;
- int n_method_infos;
- const char *data;
- const char *exported_signals;
- const char *exported_properties;
-} DBusGObjectInfo;
-</pre>
-<p>
-Introspection data for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>, normally autogenerated by
-a tool such as <a class="link" href="dbus-binding-tool.html" title="dbus-binding-tool"><span class="type">dbus-binding-tool</span></a>.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="DBusGObjectInfo.format-version"></a>format_version</code></em>;</span></p></td>
-<td>Allows us to change the rest of this struct
- by adding DBusGObjectInfo2, DBusGObjectInfo3, etc.
-</td>
-</tr>
-<tr>
-<td><p><span class="term">const <a class="link" href="dbus-glib-DBusGMethod.html#DBusGMethodInfo" title="DBusGMethodInfo"><span class="type">DBusGMethodInfo</span></a> *<em class="structfield"><code><a name="DBusGObjectInfo.method-infos"></a>method_infos</code></em>;</span></p></td>
-<td>Array of method pointers
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="type">int</span> <em class="structfield"><code><a name="DBusGObjectInfo.n-method-infos"></a>n_method_infos</code></em>;</span></p></td>
-<td>Length of the infos array
-</td>
-</tr>
-<tr>
-<td><p><span class="term">const <span class="type">char</span> *<em class="structfield"><code><a name="DBusGObjectInfo.data"></a>data</code></em>;</span></p></td>
-<td>Introspection data
-</td>
-</tr>
-<tr>
-<td><p><span class="term">const <span class="type">char</span> *<em class="structfield"><code><a name="DBusGObjectInfo.exported-signals"></a>exported_signals</code></em>;</span></p></td>
-<td>Exported signals
-</td>
-</tr>
-<tr>
-<td><p><span class="term">const <span class="type">char</span> *<em class="structfield"><code><a name="DBusGObjectInfo.exported-properties"></a>exported_properties</code></em>;</span></p></td>
-<td>Exported properties
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_object_type_install_info ()">
-<a name="dbus-g-object-type-install-info"></a><h3>dbus_g_object_type_install_info ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_object_type_install_info (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> object_type</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gobject.html#DBusGObjectInfo" title="DBusGObjectInfo"><span class="type">DBusGObjectInfo</span></a> *info</code></em>);</pre>
-<p>
-Install introspection information about the given object <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>
-sufficient to allow methods on the object to be invoked by name.
-The introspection information is normally generated by
-dbus-glib-tool, then this function is called in the
-<code class="function">class_init()</code> for the object class.
-</p>
-<p>
-Once introspection information has been installed, instances of the
-object registered with #<a class="link" href="dbus-glib-DBusGConnection.html#dbus-g-connection-register-g-object" title="dbus_g_connection_register_g_object ()"><code class="function">dbus_g_connection_register_g_object()</code></a> can have
-their methods invoked remotely.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>object_type</code></em> :</span></p></td>
-<td>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for the object
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>info</code></em> :</span></p></td>
-<td>introspection data generated by <span class="type">dbus-glib-tool</span>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_object_path_get_g_type ()">
-<a name="dbus-g-object-path-get-g-type"></a><h3>dbus_g_object_path_get_g_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_object_path_get_g_type (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
-<p>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_object_register_marshaller ()">
-<a name="dbus-g-object-register-marshaller"></a><h3>dbus_g_object_register_marshaller ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_object_register_marshaller (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> marshaller</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> rettype</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
-<p>
-Register a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> to be used for signal invocations,
-giving its return type and a list of parameter types,
-followed by <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-INVALID:CAPS"><code class="literal">G_TYPE_INVALID</code></a>.
-</p>
-<p>
-This function will not be needed once GLib includes libffi.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshaller</code></em> :</span></p></td>
-<td>a GClosureMarshal to be used for invocation
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>rettype</code></em> :</span></p></td>
-<td>a GType for the return type of the function
-@:... The parameter <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GTypes</span></a>, followed by <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-INVALID:CAPS"><code class="literal">G_TYPE_INVALID</code></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_object_register_marshaller_array ()">
-<a name="dbus-g-object-register-marshaller-array"></a><h3>dbus_g_object_register_marshaller_array ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_object_register_marshaller_array
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> marshaller</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> rettype</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_types</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> *types</code></em>);</pre>
-<p>
-Register a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> to be used for signal invocations.
-<em class="parameter"><code>see_also</code></em> <a class="link" href="dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller" title="dbus_g_object_register_marshaller ()"><span class="type">dbus_g_object_register_marshaller</span></a>
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>marshaller</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Closures.html#GClosureMarshal"><span class="type">GClosureMarshal</span></a> to be used for invocation
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>rettype</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for the return type of the function
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>n_types</code></em> :</span></p></td>
-<td>number of function parameters
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>types</code></em> :</span></p></td>
-<td>a C array of GTypes values
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-<div class="refsect1" title="See Also">
-<a name="dbus-glib-dbus-gobject.see-also"></a><h2>See Also</h2>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a>
-</div>
-</div>
-<div class="footer">
-<hr>
- Generated by GTK-Doc V1.15</div>
-</body>
-</html>
\ No newline at end of file
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Specializable GType System</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="up" href="ch02.html" title="API Reference">
-<link rel="prev" href="dbus-glib-DBusGProxy.html" title="DBusGProxy">
-<link rel="next" href="dbus-glib-DBus-GLib-low-level.html" title="DBus GLib low level">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<link rel="prev" href="ch02.html" title="API Reference">
+<link rel="next" href="dbus-glib-dbus-glib-lowlevel.html" title="DBus GLib low level">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
<tr valign="middle">
-<td><a accesskey="p" href="
dbus-glib-DBusGProxy.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td><a accesskey="p" href="
ch02.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
<td><a accesskey="u" href="ch02.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
<th width="100%" align="center">D-Bus GLib bindings - Reference Manual</th>
-<td><a accesskey="n" href="dbus-glib-
DBus-GLib-low-level.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="dbus-glib-
dbus-glib-lowlevel.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
</tr>
<tr><td colspan="5" class="shortcuts">
-<a href="#dbus-glib-Specializable-GType-System.synopsis" class="shortcut">Top</a>
+<a href="#dbus-glib-dbus-gtype-specialized.synopsis" class="shortcut">Top</a>
|
- <a href="#dbus-glib-Specializable-GType-System.description" class="shortcut">Description</a>
+ <a href="#dbus-glib-dbus-gtype-specialized.description" class="shortcut">Description</a>
</td></tr>
</table>
-<div class="refentry" title="Specializable GType System">
-<a name="dbus-glib-
Specializable-GType-System"></a><div class="titlepage"></div>
+<div class="refentry">
+<a name="dbus-glib-
dbus-gtype-specialized"></a><div class="titlepage"></div>
<div class="refnamediv"><table width="100%"><tr>
<td valign="top">
-<h2><span class="refentrytitle"><a name="dbus-glib-Specializable-GType-System.top_of_page"></a>Specializable GType System</span></h2>
+<h2><span class="refentrytitle"><a name="dbus-glib-dbus-gtype-specialized.top_of_page"></a>Specializable GType System</span></h2>
<p>Specializable GType System — Specialized GTypes</p>
</td>
<td valign="top" align="right"></td>
</tr></table></div>
-<div class="refsect1" title="Stability Level">
-<a name="dbus-glib-Specializable-GType-System.stability-level"></a><h2>Stability Level</h2>
+<div class="refsect1">
+<a name="dbus-glib-dbus-gtype-specialized.stability-level"></a><h2>Stability Level</h2>
Unstable, unless otherwise indicated
</div>
-<div class="refsynopsisdiv" title="Synopsis">
-<a name="dbus-glib-Specializable-GType-System.synopsis"></a><h2>Synopsis</h2>
-<pre class="synopsis"><span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()">*DBusGTypeSpecializedCollectionIterator</a>)
- (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()">*DBusGTypeSpecializedMapIterator</a>) (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key_val</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value_val</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
- <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext">DBusGTypeSpecializedAppendContext</a>;
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedConstructor" title="DBusGTypeSpecializedConstructor ()">*DBusGTypeSpecializedConstructor</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>);
-<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedFreeFunc" title="DBusGTypeSpecializedFreeFunc ()">*DBusGTypeSpecializedFreeFunc</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCopyFunc" title="DBusGTypeSpecializedCopyFunc ()">*DBusGTypeSpecializedCopyFunc</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> src</code></em>);
- <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedVtable" title="DBusGTypeSpecializedVtable">DBusGTypeSpecializedVtable</a>;
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionFixedAccessorFunc" title="DBusGTypeSpecializedCollectionFixedAccessorFunc ()">*DBusGTypeSpecializedCollectionFixedAccessorFunc</a>)
+<div class="refsynopsisdiv">
+<a name="dbus-glib-dbus-gtype-specialized.synopsis"></a><h2>Synopsis</h2>
+<pre class="synopsis"> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext">DBusGTypeSpecializedAppendContext</a>;
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionAppendFunc" title="DBusGTypeSpecializedCollectionAppendFunc ()">*DBusGTypeSpecializedCollectionAppendFunc</a>)
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionEndAppendFunc" title="DBusGTypeSpecializedCollectionEndAppendFunc ()">*DBusGTypeSpecializedCollectionEndAppendFunc</a>)
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionFixedAccessorFunc" title="DBusGTypeSpecializedCollectionFixedAccessorFunc ()">*DBusGTypeSpecializedCollectionFixedAccessorFunc</a>)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *values</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *len</code></em>);
-<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIteratorFunc" title="DBusGTypeSpecializedCollectionIteratorFunc ()">*DBusGTypeSpecializedCollectionIteratorFunc</a>)
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()">*DBusGTypeSpecializedCollectionIterator</a>)
+ (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIteratorFunc" title="DBusGTypeSpecializedCollectionIteratorFunc ()">*DBusGTypeSpecializedCollectionIteratorFunc</a>)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionAppendFunc" title="DBusGTypeSpecializedCollectionAppendFunc ()">*DBusGTypeSpecializedCollectionAppendFunc</a>)
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+ <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable">DBusGTypeSpecializedCollectionVtable</a>;
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedConstructor" title="DBusGTypeSpecializedConstructor ()">*DBusGTypeSpecializedConstructor</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCopyFunc" title="DBusGTypeSpecializedCopyFunc ()">*DBusGTypeSpecializedCopyFunc</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> src</code></em>);
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedFreeFunc" title="DBusGTypeSpecializedFreeFunc ()">*DBusGTypeSpecializedFreeFunc</a>) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> val</code></em>);
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapAppendFunc" title="DBusGTypeSpecializedMapAppendFunc ()">*DBusGTypeSpecializedMapAppendFunc</a>)
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);
-<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionEndAppendFunc" title="DBusGTypeSpecializedCollectionEndAppendFunc ()">*DBusGTypeSpecializedCollectionEndAppendFunc</a>)
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);
- <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable">DBusGTypeSpecializedCollectionVtable</a>;
-<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIteratorFunc" title="DBusGTypeSpecializedMapIteratorFunc ()">*DBusGTypeSpecializedMapIteratorFunc</a>)
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()">*DBusGTypeSpecializedMapIterator</a>) (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key_val</code></em>,
+ <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value_val</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIteratorFunc" title="DBusGTypeSpecializedMapIteratorFunc ()">*DBusGTypeSpecializedMapIteratorFunc</a>)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapAppendFunc" title="DBusGTypeSpecializedMapAppendFunc ()">*DBusGTypeSpecializedMapAppendFunc</a>)
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);
- <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable">DBusGTypeSpecializedMapVtable</a>;
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructGetMember" title="DBusGTypeSpecializedStructGetMember ()">*DBusGTypeSpecializedStructGetMember</a>)
+ <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable">DBusGTypeSpecializedMapVtable</a>;
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructGetMember" title="DBusGTypeSpecializedStructGetMember ()">*DBusGTypeSpecializedStructGetMember</a>)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *ret_value</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructSetMember" title="DBusGTypeSpecializedStructSetMember ()">*DBusGTypeSpecializedStructSetMember</a>)
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructSetMember" title="DBusGTypeSpecializedStructSetMember ()">*DBusGTypeSpecializedStructSetMember</a>)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *new_value</code></em>);
- <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable">DBusGTypeSpecializedStructVtable</a>;
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()">dbus_g_type_get_collection</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+ <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable">DBusGTypeSpecializedStructVtable</a>;
+ <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedVtable" title="DBusGTypeSpecializedVtable">DBusGTypeSpecializedVtable</a>;
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-get-fixed" title="dbus_g_type_collection_get_fixed ()">dbus_g_type_collection_get_fixed</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *data_ret</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *len_ret</code></em>);
+const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="returnvalue">DBusGTypeSpecializedCollectionVtable</span></a> * <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-peek-vtable" title="dbus_g_type_collection_peek_vtable ()">dbus_g_type_collection_peek_vtable</a>
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> collection_type</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-value-iterate" title="dbus_g_type_collection_value_iterate ()">dbus_g_type_collection_value_iterate</a>
+ (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()">dbus_g_type_get_collection</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> specialization</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()">dbus_g_type_get_map</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection-specialization" title="dbus_g_type_get_collection_specialization ()">dbus_g_type_get_collection_specialization</a>
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()">dbus_g_type_get_map</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> key_specialization</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> value_specialization</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-structv" title="dbus_g_type_get_structv ()">dbus_g_type_get_structv</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> num_members</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> *types</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()">dbus_g_type_get_struct</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_type</code></em>,
- <em class="parameter"><code>...</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-collection" title="dbus_g_type_is_collection ()">dbus_g_type_is_collection</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-map" title="dbus_g_type_is_map ()">dbus_g_type_is_map</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-struct" title="dbus_g_type_is_struct ()">dbus_g_type_is_struct</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection-specialization" title="dbus_g_type_get_collection_specialization ()">dbus_g_type_get_collection_specialization</a>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map-key-specialization" title="dbus_g_type_get_map_key_specialization ()">dbus_g_type_get_map_key_specialization</a>
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-key-specialization" title="dbus_g_type_get_map_key_specialization ()">dbus_g_type_get_map_key_specialization</a>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map-value-specialization" title="dbus_g_type_get_map_value_specialization ()">dbus_g_type_get_map_value_specialization</a>
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-value-specialization" title="dbus_g_type_get_map_value_specialization ()">dbus_g_type_get_map_value_specialization</a>
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-member-type" title="dbus_g_type_get_struct_member_type ()">dbus_g_type_get_struct_member_type</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>,
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()">dbus_g_type_get_struct</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_type</code></em>,
+ <em class="parameter"><code>...</code></em>);
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct-member-type" title="dbus_g_type_get_struct_member_type ()">dbus_g_type_get_struct_member_type</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-size" title="dbus_g_type_get_struct_size ()">dbus_g_type_get_struct_size</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-construct" title="dbus_g_type_specialized_construct ()">dbus_g_type_specialized_construct</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()">dbus_g_type_specialized_init_append</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-append" title="dbus_g_type_specialized_collection_append ()">dbus_g_type_specialized_collection_append</a>
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct-size" title="dbus_g_type_get_struct_size ()">dbus_g_type_get_struct_size</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-structv" title="dbus_g_type_get_structv ()">dbus_g_type_get_structv</a> (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> num_members</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> *types</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-collection" title="dbus_g_type_is_collection ()">dbus_g_type_is_collection</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-map" title="dbus_g_type_is_map ()">dbus_g_type_is_map</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-struct" title="dbus_g_type_is_struct ()">dbus_g_type_is_struct</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
+const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="returnvalue">DBusGTypeSpecializedMapVtable</span></a> * <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-peek-vtable" title="dbus_g_type_map_peek_vtable ()">dbus_g_type_map_peek_vtable</a>
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> map_type</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-value-iterate" title="dbus_g_type_map_value_iterate ()">dbus_g_type_map_value_iterate</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-collection" title="dbus_g_type_register_collection ()">dbus_g_type_register_collection</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+ <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="type">DBusGTypeSpecializedCollectionVtable</span></a> *vtable</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-map" title="dbus_g_type_register_map ()">dbus_g_type_register_map</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+ <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="type">DBusGTypeSpecializedMapVtable</span></a> *vtable</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-struct" title="dbus_g_type_register_struct ()">dbus_g_type_register_struct</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+ <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable"><span class="type">DBusGTypeSpecializedStructVtable</span></a> *vtable</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-append" title="dbus_g_type_specialized_collection_append ()">dbus_g_type_specialized_collection_append</a>
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *elt</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-end-append" title="dbus_g_type_specialized_collection_end_append ()">dbus_g_type_specialized_collection_end_append</a>
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-map-append" title="dbus_g_type_specialized_map_append ()">dbus_g_type_specialized_map_append</a> (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-end-append" title="dbus_g_type_specialized_collection_end_append ()">dbus_g_type_specialized_collection_end_append</a>
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-construct" title="dbus_g_type_specialized_construct ()">dbus_g_type_specialized_construct</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init" title="dbus_g_type_specialized_init ()">dbus_g_type_specialized_init</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()">dbus_g_type_specialized_init_append</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);
+<span class="returnvalue">void</span> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-map-append" title="dbus_g_type_specialized_map_append ()">dbus_g_type_specialized_map_append</a> (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-get-fixed" title="dbus_g_type_collection_get_fixed ()">dbus_g_type_collection_get_fixed</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *len</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-value-iterate" title="dbus_g_type_collection_value_iterate ()">dbus_g_type_collection_value_iterate</a>
- (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-map-value-iterate" title="dbus_g_type_map_value_iterate ()">dbus_g_type_map_value_iterate</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get-member" title="dbus_g_type_struct_get_member ()">dbus_g_type_struct_get_member</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-get" title="dbus_g_type_struct_get ()">dbus_g_type_struct_get</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *dest</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-
Specializable-GType-System.html#dbus-g-type-struct-set-member" title="dbus_g_type_struct_set_member ()">dbus_g_type_struct_set_member</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code>...</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-
dbus-gtype-specialized.html#dbus-g-type-struct-get-member" title="dbus_g_type_struct_get_member ()">dbus_g_type_struct_get_member</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *src</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get" title="dbus_g_type_struct_get ()">dbus_g_type_struct_get</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *dest</code></em>);
+const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable"><span class="returnvalue">DBusGTypeSpecializedStructVtable</span></a> * <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-peek-vtable" title="dbus_g_type_struct_peek_vtable ()">dbus_g_type_struct_peek_vtable</a>
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> struct_type</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-set" title="dbus_g_type_struct_set ()">dbus_g_type_struct_set</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
<em class="parameter"><code>...</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-
Specializable-GType-System.html#dbus-g-type-struct-set" title="dbus_g_type_struct_set ()">dbus_g_type_struct_set</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="dbus-glib-
dbus-gtype-specialized.html#dbus-g-type-struct-set-member" title="dbus_g_type_struct_set_member ()">dbus_g_type_struct_set_member</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
- <em class="parameter"><code>...</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init" title="dbus_g_type_specialized_init ()">dbus_g_type_specialized_init</a> (<em class="parameter"><code><span class="type">void</span></code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-collection" title="dbus_g_type_register_collection ()">dbus_g_type_register_collection</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="type">DBusGTypeSpecializedCollectionVtable</span></a> *vtable</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-map" title="dbus_g_type_register_map ()">dbus_g_type_register_map</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="type">DBusGTypeSpecializedMapVtable</span></a> *vtable</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);
-const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="returnvalue">DBusGTypeSpecializedMapVtable</span></a>* <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-map-peek-vtable" title="dbus_g_type_map_peek_vtable ()">dbus_g_type_map_peek_vtable</a>
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> map_type</code></em>);
-const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="returnvalue">DBusGTypeSpecializedCollectionVtable</span></a>* <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-peek-vtable" title="dbus_g_type_collection_peek_vtable ()">dbus_g_type_collection_peek_vtable</a>
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> collection_type</code></em>);
-<span class="returnvalue">void</span> <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-struct" title="dbus_g_type_register_struct ()">dbus_g_type_register_struct</a> (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable"><span class="type">DBusGTypeSpecializedStructVtable</span></a> *vtable</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);
-<a href="http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> * <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-value-build-g-variant" title="dbus_g_value_build_g_variant ()">dbus_g_value_build_g_variant</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-BOOLEAN-ARRAY:CAPS" title="DBUS_TYPE_G_BOOLEAN_ARRAY">DBUS_TYPE_G_BOOLEAN_ARRAY</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UCHAR-ARRAY:CAPS" title="DBUS_TYPE_G_UCHAR_ARRAY">DBUS_TYPE_G_UCHAR_ARRAY</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT-ARRAY:CAPS" title="DBUS_TYPE_G_UINT_ARRAY">DBUS_TYPE_G_UINT_ARRAY</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT-ARRAY:CAPS" title="DBUS_TYPE_G_INT_ARRAY">DBUS_TYPE_G_INT_ARRAY</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT64-ARRAY:CAPS" title="DBUS_TYPE_G_UINT64_ARRAY">DBUS_TYPE_G_UINT64_ARRAY</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT64-ARRAY:CAPS" title="DBUS_TYPE_G_INT64_ARRAY">DBUS_TYPE_G_INT64_ARRAY</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-OBJECT-ARRAY:CAPS" title="DBUS_TYPE_G_OBJECT_ARRAY">DBUS_TYPE_G_OBJECT_ARRAY</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-STRING-STRING-HASHTABLE:CAPS" title="DBUS_TYPE_G_STRING_STRING_HASHTABLE">DBUS_TYPE_G_STRING_STRING_HASHTABLE</a>
-#define <a class="link" href="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-SIGNATURE:CAPS" title="DBUS_TYPE_G_SIGNATURE">DBUS_TYPE_G_SIGNATURE</a>
+ <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *src</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> * <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-value-build-g-variant" title="dbus_g_value_build_g_variant ()">dbus_g_value_build_g_variant</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);
</pre>
</div>
-<div class="refsect1" title="Description">
-<a name="dbus-glib-Specializable-GType-System.description"></a><h2>Description</h2>
+<div class="refsect1">
+<a name="dbus-glib-dbus-gtype-specialized.description"></a><h2>Description</h2>
<p>
Specialized gtypes are basically a way to allow the definition of
-recursive GTypes. It allows the definition of 'containers' which is
-basically a user defined structure capabale of holding other data and a
+recursive <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GTypes</span></a>. It allows the definition of 'containers' which is
+basically a user defined structure capable of holding other data, and a
set of functions defining how to access that structure. Containers come in
-3 flavors: collections, maps and structs.
+3 flavors: collections, maps and structs.
</p>
<p>
A collection is a container that holds an ordered set of items, all
-of which must be the same type.
+of which must be the same type. (This is an <span class="emphasis"><em>array</em></span>
+in standard D-Bus terminology.) dbus-glib specialized collections can be
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> (for numeric elements), <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> (for string, object or
+boxed elements), <a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> (for boxed elements, not recommended), or a
+user-defined type.
</p>
<p>
-A map is a container that holds a set of key/value pairs.
-The keys have one type, and the values another.
+A map is a container that holds a set of key/value pairs.
+The keys have one type, and the values another; the type of the keys
+must be a numeric or string-like type. (This is a <span class="emphasis"><em>dict</em></span>
+(dictionary) or <span class="emphasis"><em>array of dict entry</em></span> in standard D-Bus
+terminology.) dbus-glib specialized maps can be <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> or a
+user-defined type.
</p>
<p>
-A struct is a container that holds a fixed number of members, each member
-having a predefined type.
+A struct is a container that holds a fixed number of members, each member
+having a predefined type. (This is a <span class="emphasis"><em>struct</em></span> in
+standard D-Bus terminology.) It is analogous to the C <em class="parameter"><code>struct</code></em> keyword, but
+dbus-glib does not generally represent D-Bus structs in C structs.
+dbus-glib specialized structs can be <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Value-arrays.html#GValueArray"><span class="type">GValueArray</span></a> or a user-defined type.
</p>
<p>
A specialization is a GType detailing a particular container with
the latter. I also need to add some examples.
</p>
</div>
-<div class="refsect1" title="Details">
-<a name="dbus-glib-Specializable-GType-System.details"></a><h2>Details</h2>
-<div class="refsect2" title="DBusGTypeSpecializedCollectionIterator ()">
-<a name="DBusGTypeSpecializedCollectionIterator"></a><h3>DBusGTypeSpecializedCollectionIterator ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionIterator)
- (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<div class="refsect1">
+<a name="dbus-glib-dbus-gtype-specialized.details"></a><h2>Details</h2>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedAppendContext"></a><h3>DBusGTypeSpecializedAppendContext</h3>
+<pre class="programlisting">typedef struct {
+ /* public */
+ GValue *val;
+ GType specialization_type;
+} DBusGTypeSpecializedAppendContext;
+</pre>
<p>
+A context for appending. There are more fields, which are private.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *<em class="structfield"><code><a name="DBusGTypeSpecializedAppendContext.val"></a>val</code></em>;</span></p></td>
+<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing the array to which you're appending</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedAppendContext.specialization-type"></a>specialization_type</code></em>;</span></p></td>
+<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the array's elements</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedMapIterator ()">
-<a name="DBusGTypeSpecializedMapIterator"></a><h3>DBusGTypeSpecializedMapIterator ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedMapIterator) (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key_val</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value_val</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedCollectionAppendFunc"></a><h3>DBusGTypeSpecializedCollectionAppendFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionAppendFunc)
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);</pre>
+<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-append" title="dbus_g_type_specialized_collection_append ()"><code class="function">dbus_g_type_specialized_collection_append()</code></a>.
+</p>
<p>
+This function should use the <em class="parameter"><code>val</code></em> and <em class="parameter"><code>specialization_type</code></em> members of <em class="parameter"><code>ctx</code></em>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>key_val</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>value_val</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
+<td>an appending context returned by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><code class="function">dbus_g_type_specialized_init_append()</code></a>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
+<td>a value to copy into the collection</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedAppendContext">
-<a name="DBusGTypeSpecializedAppendContext"></a><h3>DBusGTypeSpecializedAppendContext</h3>
-<pre class="programlisting">typedef struct {
- /* public */
- GValue *val;
- GType specialization_type;
- /* padding */
- gpointer b;
- guint c;
- gpointer d;
-} DBusGTypeSpecializedAppendContext;
-</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedCollectionEndAppendFunc"></a><h3>DBusGTypeSpecializedCollectionEndAppendFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionEndAppendFunc)
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);</pre>
<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-end-append" title="dbus_g_type_specialized_collection_end_append ()"><code class="function">dbus_g_type_specialized_collection_end_append()</code></a>.
</p>
+<p>
+This function should use the <em class="parameter"><code>val</code></em> and <em class="parameter"><code>specialization_type</code></em> members of <em class="parameter"><code>ctx</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
+<td>an appending context returned by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><code class="function">dbus_g_type_specialized_init_append()</code></a>
+</td>
+</tr></tbody>
+</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedConstructor ()">
-<a name="DBusGTypeSpecializedConstructor"></a><h3>DBusGTypeSpecializedConstructor ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (*DBusGTypeSpecializedConstructor) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedCollectionFixedAccessorFunc"></a><h3>DBusGTypeSpecializedCollectionFixedAccessorFunc ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (*DBusGTypeSpecializedCollectionFixedAccessorFunc)
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *values</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *len</code></em>);</pre>
<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-get-fixed" title="dbus_g_type_collection_get_fixed ()"><code class="function">dbus_g_type_collection_get_fixed()</code></a> for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> with type
+<em class="parameter"><code>type</code></em>, containing <em class="parameter"><code>instance</code></em>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
+<td>a specialized collection boxed type</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>instance</code></em> :</span></p></td>
+<td>an instance of <em class="parameter"><code>type</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>values</code></em> :</span></p></td>
+<td>used to return a pointer to the contents of <em class="parameter"><code>instance</code></em>
+</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
+<td>used to return the number of elements in <em class="parameter"><code>instance</code></em>
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedFreeFunc ()">
-<a name="DBusGTypeSpecializedFreeFunc"></a><h3>DBusGTypeSpecializedFreeFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedFreeFunc) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> val</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedCollectionIterator"></a><h3>DBusGTypeSpecializedCollectionIterator ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionIterator)
+ (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
<p>
+A library-user-supplied function, called for each element in the
+collection when <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-value-iterate" title="dbus_g_type_collection_value_iterate ()"><code class="function">dbus_g_type_collection_value_iterate()</code></a> is called.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>an element of the collection</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>the data supplied when calling
+<a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-value-iterate" title="dbus_g_type_collection_value_iterate ()"><code class="function">dbus_g_type_collection_value_iterate()</code></a>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedCopyFunc ()">
-<a name="DBusGTypeSpecializedCopyFunc"></a><h3>DBusGTypeSpecializedCopyFunc ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (*DBusGTypeSpecializedCopyFunc) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> src</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedCollectionIteratorFunc"></a><h3>DBusGTypeSpecializedCollectionIteratorFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionIteratorFunc)
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-value-iterate" title="dbus_g_type_collection_value_iterate ()"><code class="function">dbus_g_type_collection_value_iterate()</code></a> for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> with
+type <em class="parameter"><code>type</code></em>, containing <em class="parameter"><code>instance</code></em>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
-</td>
+<td>a specialized collection boxed type</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>src</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>instance</code></em> :</span></p></td>
+<td>an instance of <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>iterator</code></em> :</span></p></td>
+<td>the function to call for each element</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>data to pass to <em class="parameter"><code>iterator</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedVtable">
-<a name="DBusGTypeSpecializedVtable"></a><h3>DBusGTypeSpecializedVtable</h3>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedCollectionVtable"></a><h3>DBusGTypeSpecializedCollectionVtable</h3>
<pre class="programlisting">typedef struct {
- DBusGTypeSpecializedConstructor constructor;
- DBusGTypeSpecializedFreeFunc free_func;
- DBusGTypeSpecializedCopyFunc copy_func;
- GDestroyNotify simple_free_func; /* for type-independent freeing if possible */
- gpointer padding2;
- gpointer padding3;
-} DBusGTypeSpecializedVtable;
+ DBusGTypeSpecializedVtable base_vtable;
+ DBusGTypeSpecializedCollectionFixedAccessorFunc fixed_accessor;
+ DBusGTypeSpecializedCollectionIteratorFunc iterator;
+ DBusGTypeSpecializedCollectionAppendFunc append_func;
+ DBusGTypeSpecializedCollectionEndAppendFunc end_append_func;
+} DBusGTypeSpecializedCollectionVtable;
</pre>
<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBusGTypeSpecializedCollectionFixedAccessorFunc ()">
-<a name="DBusGTypeSpecializedCollectionFixedAccessorFunc"></a><h3>DBusGTypeSpecializedCollectionFixedAccessorFunc ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (*DBusGTypeSpecializedCollectionFixedAccessorFunc)
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *values</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *len</code></em>);</pre>
-<p>
+A table of methods used to implement specialized collection behaviour
+on user-defined types. At least <em class="parameter"><code>iterator</code></em> and <em class="parameter"><code>append_func</code></em> must be
+implemented.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedVtable" title="DBusGTypeSpecializedVtable"><span class="type">DBusGTypeSpecializedVtable</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedCollectionVtable.base-vtable"></a>base_vtable</code></em>;</span></p></td>
+<td>base methods shared between collections and other types</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>instance</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionFixedAccessorFunc" title="DBusGTypeSpecializedCollectionFixedAccessorFunc ()"><span class="type">DBusGTypeSpecializedCollectionFixedAccessorFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedCollectionVtable.fixed-accessor"></a>fixed_accessor</code></em>;</span></p></td>
+<td>if not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, provides access to the contents of this
+collection, as documented for <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-get-fixed" title="dbus_g_type_collection_get_fixed ()"><code class="function">dbus_g_type_collection_get_fixed()</code></a>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>values</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIteratorFunc" title="DBusGTypeSpecializedCollectionIteratorFunc ()"><span class="type">DBusGTypeSpecializedCollectionIteratorFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedCollectionVtable.iterator"></a>iterator</code></em>;</span></p></td>
+<td>iterates through the members of <em class="parameter"><code>instance</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionAppendFunc" title="DBusGTypeSpecializedCollectionAppendFunc ()"><span class="type">DBusGTypeSpecializedCollectionAppendFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedCollectionVtable.append-func"></a>append_func</code></em>;</span></p></td>
+<td>appends a new member to <em class="parameter"><code>instance</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionEndAppendFunc" title="DBusGTypeSpecializedCollectionEndAppendFunc ()"><span class="type">DBusGTypeSpecializedCollectionEndAppendFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedCollectionVtable.end-append-func"></a>end_append_func</code></em>;</span></p></td>
+<td>if not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, called after each group of calls to
+the <em class="parameter"><code>append_func</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedCollectionIteratorFunc ()">
-<a name="DBusGTypeSpecializedCollectionIteratorFunc"></a><h3>DBusGTypeSpecializedCollectionIteratorFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionIteratorFunc)
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedConstructor"></a><h3>DBusGTypeSpecializedConstructor ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (*DBusGTypeSpecializedConstructor) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>);</pre>
<p>
+
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
-</td>
+<td>a specialized boxed type</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>instance</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a new instance of <em class="parameter"><code>type</code></em>
</td>
</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedCopyFunc"></a><h3>DBusGTypeSpecializedCopyFunc ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> (*DBusGTypeSpecializedCopyFunc) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> src</code></em>);</pre>
+<p>
+Copies <em class="parameter"><code>src</code></em> according to <em class="parameter"><code>type</code></em>. This is analogous to <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Boxed-Types.html#GBoxedCopyFunc"><span class="type">GBoxedCopyFunc</span></a>, but
+can use information from <em class="parameter"><code>type</code></em> (for instance to copy each element of a
+collection).
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
+<td>a specialized boxed type</td>
+</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>iterator</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><em class="parameter"><code>src</code></em> :</span></p></td>
+<td>an instance of <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a deep copy of <em class="parameter"><code>src</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedCollectionAppendFunc ()">
-<a name="DBusGTypeSpecializedCollectionAppendFunc"></a><h3>DBusGTypeSpecializedCollectionAppendFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionAppendFunc)
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedFreeFunc"></a><h3>DBusGTypeSpecializedFreeFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedFreeFunc) (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> val</code></em>);</pre>
<p>
+Frees <em class="parameter"><code>val</code></em> according to <em class="parameter"><code>type</code></em>. This is analogous to <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Boxed-Types.html#GBoxedFreeFunc"><span class="type">GBoxedFreeFunc</span></a>, but
+can use information from <em class="parameter"><code>type</code></em> (for instance to free the contents of a
+container before freeing the actual container).
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
+<td>a specialized boxed type</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>
+<td>an instance of <em class="parameter"><code>type</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedCollectionEndAppendFunc ()">
-<a name="DBusGTypeSpecializedCollectionEndAppendFunc"></a><h3>DBusGTypeSpecializedCollectionEndAppendFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedCollectionEndAppendFunc)
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedMapAppendFunc"></a><h3>DBusGTypeSpecializedMapAppendFunc ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedMapAppendFunc)
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);</pre>
+<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-map-append" title="dbus_g_type_specialized_map_append ()"><code class="function">dbus_g_type_specialized_map_append()</code></a>.
+</p>
<p>
+This function should use the <em class="parameter"><code>val</code></em> and <em class="parameter"><code>specialization_type</code></em> members of <em class="parameter"><code>ctx</code></em>,
+and replace any existing value with key equal to <em class="parameter"><code>key</code></em>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
-<tbody><tr>
+<tbody>
+<tr>
<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>
+<td>an appending context returned by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><code class="function">dbus_g_type_specialized_init_append()</code></a>
</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="DBusGTypeSpecializedCollectionVtable">
-<a name="DBusGTypeSpecializedCollectionVtable"></a><h3>DBusGTypeSpecializedCollectionVtable</h3>
-<pre class="programlisting">typedef struct {
- DBusGTypeSpecializedVtable base_vtable;
- DBusGTypeSpecializedCollectionFixedAccessorFunc fixed_accessor;
- DBusGTypeSpecializedCollectionIteratorFunc iterator;
- DBusGTypeSpecializedCollectionAppendFunc append_func;
- DBusGTypeSpecializedCollectionEndAppendFunc end_append_func;
-} DBusGTypeSpecializedCollectionVtable;
-</pre>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
+<td>a key to add to the collection</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
+<td>a value to add to the collection</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedMapIterator"></a><h3>DBusGTypeSpecializedMapIterator ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedMapIterator) (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key_val</code></em>,
+ <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value_val</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
<p>
+A library-user-supplied function, called for each key/value pair in the
+collection when <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-value-iterate" title="dbus_g_type_map_value_iterate ()"><code class="function">dbus_g_type_map_value_iterate()</code></a> is called.
</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>key_val</code></em> :</span></p></td>
+<td>a key from the map</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value_val</code></em> :</span></p></td>
+<td>a value from the map</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>the data supplied when calling
+<a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-value-iterate" title="dbus_g_type_map_value_iterate ()"><code class="function">dbus_g_type_map_value_iterate()</code></a>
+</td>
+</tr>
+</tbody>
+</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedMapIteratorFunc ()">
+<div class="refsect2">
<a name="DBusGTypeSpecializedMapIteratorFunc"></a><h3>DBusGTypeSpecializedMapIteratorFunc ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedMapIteratorFunc)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> instance</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-value-iterate" title="dbus_g_type_map_value_iterate ()"><code class="function">dbus_g_type_map_value_iterate()</code></a> for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> with
+type <em class="parameter"><code>type</code></em>, containing <em class="parameter"><code>instance</code></em>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
-</td>
+<td>a specialized map boxed type</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>instance</code></em> :</span></p></td>
-<td>
+<td>an instance of <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>iterator</code></em> :</span></p></td>
-<td>
-</td>
+<td>the function to call for each key/value pair</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>
+<td>data to pass to <em class="parameter"><code>iterator</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedMapAppendFunc ()">
-<a name="DBusGTypeSpecializedMapAppendFunc"></a><h3>DBusGTypeSpecializedMapAppendFunc ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> (*DBusGTypeSpecializedMapAppendFunc)
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedMapVtable"></a><h3>DBusGTypeSpecializedMapVtable</h3>
+<pre class="programlisting">typedef struct {
+ DBusGTypeSpecializedVtable base_vtable;
+ DBusGTypeSpecializedMapIteratorFunc iterator;
+ DBusGTypeSpecializedMapAppendFunc append_func;
+} DBusGTypeSpecializedMapVtable;
+</pre>
<p>
+A table of methods used to implement specialized collection behaviour
+on user-defined types. Both methods must be implemented.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedVtable" title="DBusGTypeSpecializedVtable"><span class="type">DBusGTypeSpecializedVtable</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedMapVtable.base-vtable"></a>base_vtable</code></em>;</span></p></td>
+<td>base methods shared between maps and other types</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIteratorFunc" title="DBusGTypeSpecializedMapIteratorFunc ()"><span class="type">DBusGTypeSpecializedMapIteratorFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedMapVtable.iterator"></a>iterator</code></em>;</span></p></td>
+<td>iterates through the members of <em class="parameter"><code>instance</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapAppendFunc" title="DBusGTypeSpecializedMapAppendFunc ()"><span class="type">DBusGTypeSpecializedMapAppendFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedMapVtable.append-func"></a>append_func</code></em>;</span></p></td>
+<td>adds a new key/value pair to <em class="parameter"><code>instance</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedMapVtable">
-<a name="DBusGTypeSpecializedMapVtable"></a><h3>DBusGTypeSpecializedMapVtable</h3>
-<pre class="programlisting">typedef struct {
- DBusGTypeSpecializedVtable base_vtable;
- DBusGTypeSpecializedMapIteratorFunc iterator;
- DBusGTypeSpecializedMapAppendFunc append_func;
-} DBusGTypeSpecializedMapVtable;
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBusGTypeSpecializedStructGetMember ()">
+<div class="refsect2">
<a name="DBusGTypeSpecializedStructGetMember"></a><h3>DBusGTypeSpecializedStructGetMember ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (*DBusGTypeSpecializedStructGetMember)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *ret_value</code></em>);</pre>
<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-get-member" title="dbus_g_type_struct_get_member ()"><code class="function">dbus_g_type_struct_get_member()</code></a> for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> with type <em class="parameter"><code>type</code></em>,
+containing <em class="parameter"><code>instance</code></em>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
-</td>
+<td>a specialized struct boxed type</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>instance</code></em> :</span></p></td>
-<td>
+<td>an instance of <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>
-</td>
+<td>the index of the member, starting from 0</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>ret_value</code></em> :</span></p></td>
-<td>
+<td>an initialized <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> of the appropriate type for the given
+member of <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedStructSetMember ()">
+<div class="refsect2">
<a name="DBusGTypeSpecializedStructSetMember"></a><h3>DBusGTypeSpecializedStructSetMember ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (*DBusGTypeSpecializedStructSetMember)
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> type</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *new_value</code></em>);</pre>
<p>
+Implements <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-set-member" title="dbus_g_type_struct_set_member ()"><code class="function">dbus_g_type_struct_set_member()</code></a> for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> with type <em class="parameter"><code>type</code></em>,
+containing <em class="parameter"><code>instance</code></em>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>type</code></em> :</span></p></td>
-<td>
-</td>
+<td>a specialized struct boxed type</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>instance</code></em> :</span></p></td>
-<td>
+<td>an instance of <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>
-</td>
+<td>the index of the member, starting from 0</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>new_value</code></em> :</span></p></td>
-<td>
+<td>an initialized <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> of the appropriate type for the given
+member of <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="DBusGTypeSpecializedStructVtable">
+<div class="refsect2">
<a name="DBusGTypeSpecializedStructVtable"></a><h3>DBusGTypeSpecializedStructVtable</h3>
<pre class="programlisting">typedef struct {
DBusGTypeSpecializedVtable base_vtable;
} DBusGTypeSpecializedStructVtable;
</pre>
<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_type_get_collection ()">
-<a name="dbus-g-type-get-collection"></a><h3>dbus_g_type_get_collection ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_collection (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> specialization</code></em>);</pre>
-<p>
-Gets a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular collection instance,
-creating the type if not already created.
+A table of methods used to implement specialized collection behaviour
+on user-defined types. Both methods must be implemented.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
-<td>a string specifying a registered collection type
-</td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedVtable" title="DBusGTypeSpecializedVtable"><span class="type">DBusGTypeSpecializedVtable</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedStructVtable.base-vtable"></a>base_vtable</code></em>;</span></p></td>
+<td>base methods shared between maps and other types</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>specialization</code></em> :</span></p></td>
-<td>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of collection elements
-</td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructGetMember" title="DBusGTypeSpecializedStructGetMember ()"><span class="type">DBusGTypeSpecializedStructGetMember</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedStructVtable.get-member"></a>get_member</code></em>;</span></p></td>
+<td>returns a member by its index</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance
-</td>
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructSetMember" title="DBusGTypeSpecializedStructSetMember ()"><span class="type">DBusGTypeSpecializedStructSetMember</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedStructVtable.set-member"></a>set_member</code></em>;</span></p></td>
+<td>sets a member by its index</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_map ()">
-<a name="dbus-g-type-get-map"></a><h3>dbus_g_type_get_map ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_map (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> key_specialization</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> value_specialization</code></em>);</pre>
+<div class="refsect2">
+<a name="DBusGTypeSpecializedVtable"></a><h3>DBusGTypeSpecializedVtable</h3>
+<pre class="programlisting">typedef struct {
+ DBusGTypeSpecializedConstructor constructor;
+ DBusGTypeSpecializedFreeFunc free_func;
+ DBusGTypeSpecializedCopyFunc copy_func;
+ GDestroyNotify simple_free_func; /* for type-independent freeing if possible */
+} DBusGTypeSpecializedVtable;
+</pre>
<p>
-Gets a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular map instance,
-creating the type if not already created.
+A table of methods used to implement specialized container behaviour on
+user-defined collections, maps and structs. Exactly one of <em class="parameter"><code>free_func</code></em> and
+<em class="parameter"><code>simple_free_func</code></em> must be implemented; the other must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<em class="parameter"><code>constructor</code></em> and <em class="parameter"><code>copy_func</code></em> must always be implemented.
+</p>
+<p>
+There are additional members, which are reserved for future expansion and
+must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
-<td>a string specifying a registered map type
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedConstructor" title="DBusGTypeSpecializedConstructor ()"><span class="type">DBusGTypeSpecializedConstructor</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedVtable.constructor"></a>constructor</code></em>;</span></p></td>
+<td>returns a new, blank instance of the <em class="parameter"><code>type</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>key_specialization</code></em> :</span></p></td>
-<td>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of keys
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedFreeFunc" title="DBusGTypeSpecializedFreeFunc ()"><span class="type">DBusGTypeSpecializedFreeFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedVtable.free-func"></a>free_func</code></em>;</span></p></td>
+<td>if not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, frees the <em class="parameter"><code>type</code></em> instance <em class="parameter"><code>val</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value_specialization</code></em> :</span></p></td>
-<td>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of values
+<td><p><span class="term"><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCopyFunc" title="DBusGTypeSpecializedCopyFunc ()"><span class="type">DBusGTypeSpecializedCopyFunc</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedVtable.copy-func"></a>copy_func</code></em>;</span></p></td>
+<td>returns a "deep copy" of the <em class="parameter"><code>type</code></em> instance <em class="parameter"><code>val</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance
-</td>
+<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> <em class="structfield"><code><a name="DBusGTypeSpecializedVtable.simple-free-func"></a>simple_free_func</code></em>;</span></p></td>
+<td>if not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, frees its argument</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_structv ()">
-<a name="dbus-g-type-get-structv"></a><h3>dbus_g_type_get_structv ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_structv (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> num_members</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> *types</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-collection-get-fixed"></a><h3>dbus_g_type_collection_get_fixed ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_collection_get_fixed (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *data_ret</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *len_ret</code></em>);</pre>
<p>
-Gets a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular struct instance,
-creating the type if not already created.
+Calling this function is likely to be a bad idea. Consider using
+<a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-value-iterate" title="dbus_g_type_collection_value_iterate ()"><code class="function">dbus_g_type_collection_value_iterate()</code></a> instead.
+</p>
+<p>
+On success, <em class="parameter"><code>data_ret</code></em> is a pointer to the underlying data in a collection
+of fixed-length fundamental types. Knowledge of the underlying data model
+of the collection is needed in order to use <em class="parameter"><code>data_ret</code></em> correctly.
+</p>
+<p>
+It is an error to call this function on a specialized type that is not a
+collection, or on a collection that does not have a <em class="parameter"><code>fixed_accessor</code></em> in its
+<a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="type">DBusGTypeSpecializedCollectionVtable</span></a>.
+</p>
+<p>
+Specialized <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a>s are the only types provided by dbus-glib that
+can be used with this function; user-defined types might also work.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
-<td>a string specifying a registered struct type
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a GValue containing a boxed specialized collection
+that has a <em class="parameter"><code>fixed_accessor</code></em> in its vtable</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>num_members</code></em> :</span></p></td>
-<td>number of members in the struct
-</td>
+<td><p><span class="term"><em class="parameter"><code>data_ret</code></em> :</span></p></td>
+<td>used to return a pointer to the fixed data, which must not be
+modified (for instance, for a <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> of <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>, this would point
+to an array of <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>)</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>types</code></em> :</span></p></td>
-<td>an array specufying a GType for each struct element
-</td>
+<td><p><span class="term"><em class="parameter"><code>len_ret</code></em> :</span></p></td>
+<td>used to return the length (counting collection elements, not
+bytes: in a <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> containing one <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a>, this would be 1)</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_struct ()">
-<a name="dbus-g-type-get-struct"></a><h3>dbus_g_type_get_struct ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_struct (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_type</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-collection-peek-vtable"></a><h3>dbus_g_type_collection_peek_vtable ()</h3>
+<pre class="programlisting">const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="returnvalue">DBusGTypeSpecializedCollectionVtable</span></a> * dbus_g_type_collection_peek_vtable
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> collection_type</code></em>);</pre>
<p>
-Varags methsod to get a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular struct instance,
-creating the type if not already created.
+Peek the vtable for a given collection specialization
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
-<td>a string specifying a registered struct type
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>first_type</code></em> :</span></p></td>
-<td>
-<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for the struct's first member
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>more GTypes for the struct's members, terminated by G_TYPE_INVALID
-</td>
+<td><p><span class="term"><em class="parameter"><code>collection_type</code></em> :</span></p></td>
+<td>a gtype of a collection specialization</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance
-</td>
+<td>the vtable</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_is_collection ()">
-<a name="dbus-g-type-is-collection"></a><h3>dbus_g_type_is_collection ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_is_collection (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-collection-value-iterate"></a><h3>dbus_g_type_collection_value_iterate ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_collection_value_iterate
+ (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
<p>
-Tests if a given GType is a collection.
+Calls the given function for each element of the collection.
+The function is passed a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing the element and the given
+<em class="parameter"><code>user_data</code></em> parameter. The collection may not be modified while iterating over
+it.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a GType to test
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> holding a collection type.</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> true if the given GType is a collection
+<td><p><span class="term"><em class="parameter"><code>iterator</code></em> :</span></p></td>
+<td>a function to call for each element</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>user data to pass to the <em class="parameter"><code>iterator</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_is_map ()">
-<a name="dbus-g-type-is-map"></a><h3>dbus_g_type_is_map ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_is_map (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-get-collection"></a><h3>dbus_g_type_get_collection ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_collection (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> specialization</code></em>);</pre>
<p>
-Tests if a given GType is a map,
-i.e. it was created with <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><span class="type">dbus_g_type_get_map</span></a>.
+Gets a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular collection instance,
+creating the type if not already created.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a GType to test
-</td>
+<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
+<td>a string specifying a registered collection type</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>specialization</code></em> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of collection elements</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> true if the given GType is a map
-</td>
+<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_is_struct ()">
-<a name="dbus-g-type-is-struct"></a><h3>dbus_g_type_is_struct ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_is_struct (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-get-collection-specialization"></a><h3>dbus_g_type_get_collection_specialization ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_collection_specialization
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
<p>
-Tests if a given GType is a struct,
-i.e. it was created with <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><span class="type">dbus_g_type_get_struct</span></a>
+Return the type of each element in collections of type <em class="parameter"><code>gtype</code></em>.
+It is an error to call this function on a non-collection type.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a GType to test
+<td>a collection <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>, as created by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()"><code class="function">dbus_g_type_get_collection()</code></a>
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> true if the given GType is a struct
-</td>
+<td>the element type for a given collection GType.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_collection_specialization ()">
-<a name="dbus-g-type-get-collection-specialization"></a><h3>dbus_g_type_get_collection_specialization ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_collection_specialization
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-get-map"></a><h3>dbus_g_type_get_map ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_map (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> key_specialization</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> value_specialization</code></em>);</pre>
+<p>
+Gets a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular map instance,
+creating the type if not already created.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a collection GType, as created by <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()"><span class="type">dbus_g_type_get_collection</span></a>.
-</td>
+<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
+<td>a string specifying a registered map type</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>key_specialization</code></em> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of keys</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value_specialization</code></em> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of values</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the element type for a given collection GType.
-Returns G_TYPE_INVALID if not a collection GType
-</td>
+<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_map_key_specialization ()">
+<div class="refsect2">
<a name="dbus-g-type-get-map-key-specialization"></a><h3>dbus_g_type_get_map_key_specialization ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_map_key_specialization
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<p>
+Return the type of the keys in maps of type <em class="parameter"><code>gtype</code></em>.
+It is an error to call this function on a non-map type.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a map GType, as created by <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><span class="type">dbus_g_type_get_map</span></a>.
+<td>a map <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>, as created by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><code class="function">dbus_g_type_get_map()</code></a>
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the key type for a given map GType.
-Returns G_TYPE_INVALID if not a map GType
-</td>
+<td>the key type for a given map <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_map_value_specialization ()">
+<div class="refsect2">
<a name="dbus-g-type-get-map-value-specialization"></a><h3>dbus_g_type_get_map_value_specialization ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_map_value_specialization
(<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<p>
+Return the type of the values in maps of type <em class="parameter"><code>gtype</code></em>.
+It is an error to call this function on a non-map type.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a map GType, as created by <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><span class="type">dbus_g_type_get_map</span></a>.
-</td>
+<td>a map GType, as created by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><code class="function">dbus_g_type_get_map()</code></a>.</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the value type for a given map GType.
-Returns G_TYPE_INVALID if not a map GType
-</td>
+<td>the value type for a given map GType.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_struct_member_type ()">
-<a name="dbus-g-type-get-struct-member-type"></a><h3>dbus_g_type_get_struct_member_type ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_struct_member_type (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-get-struct"></a><h3>dbus_g_type_get_struct ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_struct (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> first_type</code></em>,
+ <em class="parameter"><code>...</code></em>);</pre>
+<p>
+Varags methsod to get a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular struct instance,
+creating the type if not already created.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a struct GType, as created with <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><span class="type">dbus_g_type_get_struct</span></a>
-</td>
+<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
+<td>a string specifying a registered struct type</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>the index of a struct member
-</td>
+<td><p><span class="term"><em class="parameter"><code>first_type</code></em> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for the struct's first member</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
+<td>more GTypes for the struct's members, terminated by G_TYPE_INVALID</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the type for a given member of a struct <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.
-Returns G_TYPE_INVALID if not a struct GType
-</td>
+<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_get_struct_size ()">
-<a name="dbus-g-type-get-struct-size"></a><h3>dbus_g_type_get_struct_size ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> dbus_g_type_get_struct_size (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-get-struct-member-type"></a><h3>dbus_g_type_get_struct_member_type ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_struct_member_type (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>);</pre>
+<p>
+Get the type of a member of a specialized struct.
+It is an error to call this function on a non-struct type.
+</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a struct GType, as created with <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><span class="type">dbus_g_type_get_struct</span></a>.
+<td>a struct GType, as created with <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><code class="function">dbus_g_type_get_struct()</code></a>
</td>
</tr>
<tr>
+<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
+<td>the index of a struct member</td>
+</tr>
+<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the number of members in a given struct <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.
-Returns G_TYPE_INVALID if not a struct GType
+<td>the type for a given member of a struct <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>,
+or <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-INVALID:CAPS"><code class="literal">G_TYPE_INVALID</code></a> if <em class="parameter"><code>member</code></em> >= <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct-size" title="dbus_g_type_get_struct_size ()"><code class="function">dbus_g_type_get_struct_size()</code></a>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_specialized_construct ()">
-<a name="dbus-g-type-specialized-construct"></a><h3>dbus_g_type_specialized_construct ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#g
pointer"><span class="returnvalue">gpointer</span></a> dbus_g_type_specialized_construct (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-get-struct-size"></a><h3>dbus_g_type_get_struct_size ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#g
uint"><span class="returnvalue">guint</span></a> dbus_g_type_get_struct_size (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
<p>
-Create an instance of a given specialized type.
-The structure created and returned will depend on the container type of the
-GType. E.g. If the given type was created by
-dbus_g_type_get_collection("GArray", G_TYPE_INT),
-then this will return a GArray with element_size of sizeof(int)
+Get the number of members in a specialized struct.
+It is an error to call this function on a non-struct type.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
-<td>a specialized <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>, as created by <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()"><span class="type">dbus_g_type_get_collection</span></a>, <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><span class="type">dbus_g_type_get_map</span></a> or <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><span class="type">dbus_g_type_get_struct</span></a>.
-</td>
+<td>a struct GType, as created with <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><code class="function">dbus_g_type_get_struct()</code></a>.</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a pointer to a newly constructed instance of the given type.
-</td>
+<td>the number of members in a given struct <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_specialized_init_append ()">
-<a name="dbus-g-type-specialized-init-append"></a><h3>dbus_g_type_specialized_init_append ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_init_append (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-get-structv"></a><h3>dbus_g_type_get_structv ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> dbus_g_type_get_structv (<em class="parameter"><code>const <span class="type">char</span> *container</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> num_members</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> *types</code></em>);</pre>
<p>
-Create a new context for adding elements to a collection or key/value pairs
-to a map. You generally don't need or want to use this..
+Gets a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a particular struct instance,
+creating the type if not already created.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing an instance of specialized type
-</td>
+<td><p><span class="term"><em class="parameter"><code>container</code></em> :</span></p></td>
+<td>a string specifying a registered struct type</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>a <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> in which to return a new appending context.
-</td>
+<td><p><span class="term"><em class="parameter"><code>num_members</code></em> :</span></p></td>
+<td>number of members in the struct</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>types</code></em> :</span></p></td>
+<td>an array specufying a GType for each struct element</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of that instance</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_specialized_collection_append ()">
-<a name="dbus-g-type-specialized-collection-append"></a><h3>dbus_g_type_specialized_collection_append ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_collection_append
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *elt</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-is-collection"></a><h3>dbus_g_type_is_collection ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_is_collection (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
<p>
-Appends a given element to the end of a collection.
+Tests if a given GType is a collection.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>a context created by <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><span class="type">dbus_g_type_specialized_init_append</span></a>
-</td>
+<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
+<td>a GType to test</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>elt</code></em> :</span></p></td>
-<td>a GValue containing an element to append to the collection.
-</td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>true if the given GType is a collection</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_specialized_collection_end_append ()">
-<a name="dbus-g-type-specialized-collection-end-append"></a><h3>dbus_g_type_specialized_collection_end_append ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_collection_end_append
- (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);</pre>
-<p>
-Finish appending elements to a given collection
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>a context created by <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><span class="type">dbus_g_type_specialized_init_append</span></a>
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="dbus_g_type_specialized_map_append ()">
-<a name="dbus-g-type-specialized-map-append"></a><h3>dbus_g_type_specialized_map_append ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_map_append (<em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-is-map"></a><h3>dbus_g_type_is_map ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_is_map (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
<p>
-Inserts the given key/value pair into the map instance.
+Tests if a given GType is a map,
+i.e. it was created with <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><code class="function">dbus_g_type_get_map()</code></a>.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
-<td>a context created by <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><span class="type">dbus_g_type_specialized_init_append</span></a>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
-<td>a GValue containing a key
-</td>
+<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
+<td>a GType to test</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
-<td>a GValue containing a value
-</td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>true if the given GType is a map</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_collection_get_fixed ()">
-<a name="dbus-g-type-collection-get-fixed"></a><h3>dbus_g_type_collection_get_fixed ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_collection_get_fixed (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *data</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *len</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-is-struct"></a><h3>dbus_g_type_is_struct ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_is_struct (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
<p>
-if the collection has elements of fixed size (i.e. a fundamental type),
-return the contents of the array.
-Its pretty obscure and I don't think anyone uses it.
+Tests if a given GType is a struct,
+i.e. it was created with <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><code class="function">dbus_g_type_get_struct()</code></a>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
-<td>
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>len</code></em> :</span></p></td>
-<td>
-</td>
+<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
+<td>a GType to test</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>
-</td>
+<td>true if the given GType is a struct</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_collection_value_iterate ()">
-<a name="dbus-g-type-collection-value-iterate"></a><h3>dbus_g_type_collection_value_iterate ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_collection_value_iterate
- (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator" title="DBusGTypeSpecializedCollectionIterator ()"><span class="type">DBusGTypeSpecializedCollectionIterator</span></a> iterator</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-map-peek-vtable"></a><h3>dbus_g_type_map_peek_vtable ()</h3>
+<pre class="programlisting">const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="returnvalue">DBusGTypeSpecializedMapVtable</span></a> * dbus_g_type_map_peek_vtable
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> map_type</code></em>);</pre>
<p>
-Calls the given function for each element of the collection.
-The function is passed a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing the element and the given
-<em class="parameter"><code>user_data</code></em> parameter. The collection may not be modified while iterating over
-it.
+Peek the vtable for a given map specialization
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> holding a collection type.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>iterator</code></em> :</span></p></td>
-<td>a function to call for each element
-</td>
+<td><p><span class="term"><em class="parameter"><code>map_type</code></em> :</span></p></td>
+<td>a gtype of a map specialization</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>user data to pass to the <em class="parameter"><code>iterator</code></em>
-</td>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the vtable</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_map_value_iterate ()">
+<div class="refsect2">
<a name="dbus-g-type-map-value-iterate"></a><h3>dbus_g_type_map_value_iterate ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_map_value_iterate (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIterator" title="DBusGTypeSpecializedMapIterator ()"><span class="type">DBusGTypeSpecializedMapIterator</span></a> iterator</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
<p>
Calls the given function for each key/value pair of the map.
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> holding a collection type.
-</td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> holding a specialized map</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>iterator</code></em> :</span></p></td>
-<td>a function to call for each element
-</td>
+<td>a function to call for each element</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_struct_get_member ()">
-<a name="dbus-g-type-struct-get-member"></a><h3>dbus_g_type_struct_get_member ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_get_member (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *dest</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-register-collection"></a><h3>dbus_g_type_register_collection ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_register_collection (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+ <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="type">DBusGTypeSpecializedCollectionVtable</span></a> *vtable</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);</pre>
<p>
-Fetches a given member of a given struct instance. <em class="parameter"><code>dest</code></em> must be initialised
-was the correct type for that member, e.g. as returned by
-<em class="parameter"><code>dbus_g_type_get_struct_member_type</code></em>
+Defines a new collection container.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a struct instance
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>the index of a given member
-</td>
+<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
+<td>The name of a new collection container</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
-<td>an initialised <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> in which to return the struct member
-</td>
+<td><p><span class="term"><em class="parameter"><code>vtable</code></em> :</span></p></td>
+<td>the vtable defining the new container</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if sucessful
-</td>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>As yet unused.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_struct_set_member ()">
-<a name="dbus-g-type-struct-set-member"></a><h3>dbus_g_type_struct_set_member ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_set_member (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *src</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-register-map"></a><h3>dbus_g_type_register_map ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_register_map (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+ <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="type">DBusGTypeSpecializedMapVtable</span></a> *vtable</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);</pre>
<p>
-Sets a given member of a struct to a new value. The type of <em class="parameter"><code>src</code></em> must match
-the exiting type of <em class="parameter"><code>member</code></em> member of the struct.
+Defines a new map container.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a struct instance
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>the index of a given member
-</td>
+<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
+<td>The name of a new map container</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>src</code></em> :</span></p></td>
-<td>an <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing the new value for that struct member
-</td>
+<td><p><span class="term"><em class="parameter"><code>vtable</code></em> :</span></p></td>
+<td>the vtable defining the new container</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> TRUE if sucessful
-</td>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>As yet unused.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_struct_get ()">
-<a name="dbus-g-type-struct-get"></a><h3>dbus_g_type_struct_get ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_get (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-register-struct"></a><h3>dbus_g_type_register_struct ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_register_struct (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
+ <em class="parameter"><code>const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable"><span class="type">DBusGTypeSpecializedStructVtable</span></a> *vtable</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);</pre>
<p>
-Collects the selected values of this struct into the return locations
-provided.
+Defines a new struct container.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a <span class="type">DBusGTypeStruct</span> type
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>struct member to get
-</td>
+<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
+<td>The name of a new struct container</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>location in which to return the value of this member,
- followed optionally by more member/return locations pairs, followed by
- by <a href="http://library.gnome.org/devel/glib/unstable/glib-Limits-of-Basic-Types.html#G-MAXUINT:CAPS"><span class="type">G_MAXUINT</span></a>
-</td>
+<td><p><span class="term"><em class="parameter"><code>vtable</code></em> :</span></p></td>
+<td>the vtable defining the new container</td>
</tr>
<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> on failure
-</td>
+<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
+<td>As yet unused.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_struct_set ()">
-<a name="dbus-g-type-struct-set"></a><h3>dbus_g_type_struct_set ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_set (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
- <em class="parameter"><code>...</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-specialized-collection-append"></a><h3>dbus_g_type_specialized_collection_append ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_collection_append
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *elt</code></em>);</pre>
<p>
-Sets the selected members of the struct in <em class="parameter"><code>value</code></em>.
+Appends a given element to the end of a collection.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a <span class="type">DBusGTypeStruct</span> type
-</td>
+<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
+<td>a context created by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><code class="function">dbus_g_type_specialized_init_append()</code></a>
+for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a collection</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
-<td>struct member to set
-</td>
+<td><p><span class="term"><em class="parameter"><code>elt</code></em> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing an element to append to the collection</td>
</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-type-specialized-collection-end-append"></a><h3>dbus_g_type_specialized_collection_end_append ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_collection_end_append
+ (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);</pre>
+<p>
+Finish appending elements to a given collection
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
+<td>a context created by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><code class="function">dbus_g_type_specialized_init_append()</code></a>
+for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a collection</td>
+</tr></tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-type-specialized-construct"></a><h3>dbus_g_type_specialized_construct ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> dbus_g_type_specialized_construct (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
+<p>
+Create an instance of a given specialized type.
+The structure created and returned will depend on the container type of the
+GType. E.g. If the given type was created by
+dbus_g_type_get_collection("GArray", G_TYPE_INT),
+then this will return a GArray with element_size of sizeof(int)
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>value for the first member, followed optionally by
- more member/value pairs, followed by <a href="http://library.gnome.org/devel/glib/unstable/glib-Limits-of-Basic-Types.html#G-MAXUINT:CAPS"><span class="type">G_MAXUINT</span></a>
+<td><p><span class="term"><em class="parameter"><code>gtype</code></em> :</span></p></td>
+<td>a specialized <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>, as created by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()"><code class="function">dbus_g_type_get_collection()</code></a>,
+<a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><code class="function">dbus_g_type_get_map()</code></a> or <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><code class="function">dbus_g_type_get_struct()</code></a>
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a> on failure
-</td>
+<td>a pointer to a newly constructed instance of the given type.</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_specialized_init ()">
+<div class="refsect2">
<a name="dbus-g-type-specialized-init"></a><h3>dbus_g_type_specialized_init ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_init (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
<p>
+Initialize dbus-glib specialized <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>s.
+</p>
+<p>
+In older versions of dbus-glib, it was necessary to do this before
+instantiating or registering any specialized type. It is now done
+automatically whenever necessary.
</p>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_register_collection ()">
-<a name="dbus-g-type-register-collection"></a><h3>dbus_g_type_register_collection ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_register_collection (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="type">DBusGTypeSpecializedCollectionVtable</span></a> *vtable</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-specialized-init-append"></a><h3>dbus_g_type_specialized_init_append ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_init_append (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>);</pre>
<p>
-Defines a new collection container.
+Create a new context for adding elements to a collection or key/value pairs
+to a map. You generally don't need or want to use this..
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The name of a new collection container
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing an instance of specialized type</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>vtable</code></em> :</span></p></td>
-<td>the vtable defining the new container
+<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
+<td>a <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> in which to return a new appending context.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-type-specialized-map-append"></a><h3>dbus_g_type_specialized_map_append ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_specialized_map_append (<em class="parameter"><code><a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext" title="DBusGTypeSpecializedAppendContext"><span class="type">DBusGTypeSpecializedAppendContext</span></a> *ctx</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *key</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *val</code></em>);</pre>
+<p>
+Inserts the given key/value pair into the map instance.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>ctx</code></em> :</span></p></td>
+<td>a context created by <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append" title="dbus_g_type_specialized_init_append ()"><code class="function">dbus_g_type_specialized_init_append()</code></a>
+for a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a map</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td>
+<td>a GValue containing a key, whose contents will be stolen by <em class="parameter"><code>ctx</code></em>
</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>As yet unused.
+<td><p><span class="term"><em class="parameter"><code>val</code></em> :</span></p></td>
+<td>a GValue containing a value, whose contents will be stolen by <em class="parameter"><code>ctx</code></em>
</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_register_map ()">
-<a name="dbus-g-type-register-map"></a><h3>dbus_g_type_register_map ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_register_map (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="type">DBusGTypeSpecializedMapVtable</span></a> *vtable</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-struct-get"></a><h3>dbus_g_type_struct_get ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_get (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
+ <em class="parameter"><code>...</code></em>);</pre>
<p>
-Defines a new map container.
+Collects the selected values of this struct into the return locations
+provided.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The name of a new map container
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a struct instance</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>vtable</code></em> :</span></p></td>
-<td>the vtable defining the new container
-</td>
+<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
+<td>struct member to get</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>As yet unused.
+<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
+<td>location in which to return the value of this member,
+followed optionally by more member/return locations pairs, followed by
+by <code class="literal">G_MAXUINT</code>
</td>
</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure</td>
+</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_map_peek_vtable ()">
-<a name="dbus-g-type-map-peek-vtable"></a><h3>dbus_g_type_map_peek_vtable ()</h3>
-<pre class="programlisting">const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable" title="DBusGTypeSpecializedMapVtable"><span class="returnvalue">DBusGTypeSpecializedMapVtable</span></a>* dbus_g_type_map_peek_vtable
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> map_type</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-struct-get-member"></a><h3>dbus_g_type_struct_get_member ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_get_member (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *dest</code></em>);</pre>
<p>
-Peek the vtable for a given map specialization
+Fetches a given member of a given struct instance. <em class="parameter"><code>dest</code></em> must be initialised
+was the correct type for that member, e.g. as returned by
+<em class="parameter"><code>dbus_g_type_get_struct_member_type</code></em>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>map_type</code></em> :</span></p></td>
-<td>a gtype of a map specialization
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a struct instance</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
+<td>the index of a given member</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
+<td>an initialised <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> in which to return the struct member</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if successful</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_collection_peek_vtable ()">
-<a name="dbus-g-type-collection-peek-vtable"></a><h3>dbus_g_type_collection_peek_vtable ()</h3>
-<pre class="programlisting">const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable" title="DBusGTypeSpecializedCollectionVtable"><span class="returnvalue">DBusGTypeSpecializedCollectionVtable</span></a>* dbus_g_type_collection_peek_vtable
- (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> collection_type</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-struct-peek-vtable"></a><h3>dbus_g_type_struct_peek_vtable ()</h3>
+<pre class="programlisting">const <a class="link" href="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable"><span class="returnvalue">DBusGTypeSpecializedStructVtable</span></a> * dbus_g_type_struct_peek_vtable
+ (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> struct_type</code></em>);</pre>
<p>
-Peek the vtable for a given collection specialization
+Peek the vtable for a given struct specialization
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>collection_type</code></em> :</span></p></td>
-<td>a gtype of a collection specialization
+<td><p><span class="term"><em class="parameter"><code>struct_type</code></em> :</span></p></td>
+<td>a gtype of a struct specialization</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>the vtable</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="dbus-g-type-struct-set"></a><h3>dbus_g_type_struct_set ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_set (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
+ <em class="parameter"><code>...</code></em>);</pre>
+<p>
+Sets the selected members of the struct in <em class="parameter"><code>value</code></em>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a struct instance</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
+<td>struct member to set</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
+<td>value for the first member, followed optionally by
+more member/value pairs, followed by <code class="literal">G_MAXUINT</code>
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td>
-</td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_type_register_struct ()">
-<a name="dbus-g-type-register-struct"></a><h3>dbus_g_type_register_struct ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span> dbus_g_type_register_struct (<em class="parameter"><code>const <span class="type">char</span> *name</code></em>,
- <em class="parameter"><code>const <a class="link" href="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructVtable" title="DBusGTypeSpecializedStructVtable"><span class="type">DBusGTypeSpecializedStructVtable</span></a> *vtable</code></em>,
- <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> flags</code></em>);</pre>
+<div class="refsect2">
+<a name="dbus-g-type-struct-set-member"></a><h3>dbus_g_type_struct_set_member ()</h3>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> dbus_g_type_struct_set_member (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> member</code></em>,
+ <em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *src</code></em>);</pre>
<p>
-Defines a new struct container.
+Sets a given member of a struct to a new value. The type of <em class="parameter"><code>src</code></em> must match
+the existing type of <em class="parameter"><code>member</code></em> member of the struct.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
<tbody>
<tr>
-<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td>
-<td>The name of a new struct container
-</td>
+<td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
+<td>a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing a struct instance</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>vtable</code></em> :</span></p></td>
-<td>the vtable defining the new container
-</td>
+<td><p><span class="term"><em class="parameter"><code>member</code></em> :</span></p></td>
+<td>the index of a given member</td>
</tr>
<tr>
-<td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td>As yet unused.
-</td>
+<td><p><span class="term"><em class="parameter"><code>src</code></em> :</span></p></td>
+<td>an <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> containing the new value for that struct member</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if successful</td>
</tr>
</tbody>
</table></div>
</div>
<hr>
-<div class="refsect2" title="dbus_g_value_build_g_variant ()">
+<div class="refsect2">
<a name="dbus-g-value-build-g-variant"></a><h3>dbus_g_value_build_g_variant ()</h3>
<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#GVariant"><span class="returnvalue">GVariant</span></a> * dbus_g_value_build_g_variant (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
<p>
<p>
The value must either be a simple value (integer, string, boolean,
object path etc.) or a specialized container registered with
-<a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()"><code class="function">dbus_g_type_get_collection()</code></a>, <a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><code class="function">dbus_g_type_get_map()</code></a> or
-<a class="link" href="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><code class="function">dbus_g_type_get_struct()</code></a>. Providing any other type is a programming error
+<a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection" title="dbus_g_type_get_collection ()"><code class="function">dbus_g_type_get_collection()</code></a>, <a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map" title="dbus_g_type_get_map ()"><code class="function">dbus_g_type_get_map()</code></a> or
+<a class="link" href="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct" title="dbus_g_type_get_struct ()"><code class="function">dbus_g_type_get_struct()</code></a>. Providing any other type is a programming error
(including as a child type).
</p>
<div class="variablelist"><table border="0">
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a href="http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> containing <em class="parameter"><code>value</code></em> with a floating reference
-</td>
+<td>a new <a href="http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> containing <em class="parameter"><code>value</code></em> with a floating reference</td>
</tr>
</tbody>
</table></div>
</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_BOOLEAN_ARRAY">
-<a name="DBUS-TYPE-G-BOOLEAN-ARRAY:CAPS"></a><h3>DBUS_TYPE_G_BOOLEAN_ARRAY</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_BOOLEAN_ARRAY (dbus_g_type_get_collection ("GArray", G_TYPE_BOOLEAN))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_UCHAR_ARRAY">
-<a name="DBUS-TYPE-G-UCHAR-ARRAY:CAPS"></a><h3>DBUS_TYPE_G_UCHAR_ARRAY</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_UCHAR_ARRAY (dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_UINT_ARRAY">
-<a name="DBUS-TYPE-G-UINT-ARRAY:CAPS"></a><h3>DBUS_TYPE_G_UINT_ARRAY</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_UINT_ARRAY (dbus_g_type_get_collection ("GArray", G_TYPE_UINT))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_INT_ARRAY">
-<a name="DBUS-TYPE-G-INT-ARRAY:CAPS"></a><h3>DBUS_TYPE_G_INT_ARRAY</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_INT_ARRAY (dbus_g_type_get_collection ("GArray", G_TYPE_INT))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_UINT64_ARRAY">
-<a name="DBUS-TYPE-G-UINT64-ARRAY:CAPS"></a><h3>DBUS_TYPE_G_UINT64_ARRAY</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_UINT64_ARRAY (dbus_g_type_get_collection ("GArray", G_TYPE_UINT64))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_INT64_ARRAY">
-<a name="DBUS-TYPE-G-INT64-ARRAY:CAPS"></a><h3>DBUS_TYPE_G_INT64_ARRAY</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_INT64_ARRAY (dbus_g_type_get_collection ("GArray", G_TYPE_INT64))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_OBJECT_ARRAY">
-<a name="DBUS-TYPE-G-OBJECT-ARRAY:CAPS"></a><h3>DBUS_TYPE_G_OBJECT_ARRAY</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_OBJECT_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_OBJECT))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_STRING_STRING_HASHTABLE">
-<a name="DBUS-TYPE-G-STRING-STRING-HASHTABLE:CAPS"></a><h3>DBUS_TYPE_G_STRING_STRING_HASHTABLE</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
-</pre>
-<p>
-</p>
-</div>
-<hr>
-<div class="refsect2" title="DBUS_TYPE_G_SIGNATURE">
-<a name="DBUS-TYPE-G-SIGNATURE:CAPS"></a><h3>DBUS_TYPE_G_SIGNATURE</h3>
-<pre class="programlisting">#define DBUS_TYPE_G_SIGNATURE (dbus_g_signature_get_g_type ())
-</pre>
-<p>
-</p>
-</div>
</div>
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.15</div>
+ Generated by GTK-Doc V1.18</div>
</body>
</html>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
-<book xmlns="http://www.devhelp.net/book" title="D-Bus GLib bindings - Reference Manual" link="index.html" author="" name="dbus-glib">
- <chapters>
- <sub name="Introduction" link="ch01.html"/>
- <sub name="API Reference" link="ch02.html">
- <sub name="API for using D-BUS with GLib" link="ch02.html#api-overview"/>
- <sub name="DBusGConnection" link="dbus-glib-DBusGConnection.html"/>
- <sub name="DBus GObject related functions" link="dbus-glib-dbus-gobject.html"/>
- <sub name="DBusGMessage" link="dbus-glib-DBusGMessage.html"/>
- <sub name="DBusGMethod" link="dbus-glib-DBusGMethod.html"/>
- <sub name="DBusGError" link="dbus-glib-DBusGError.html"/>
- <sub name="DBusGProxy" link="dbus-glib-DBusGProxy.html"/>
- <sub name="Specializable GType System" link="dbus-glib-Specializable-GType-System.html"/>
- <sub name="DBus GLib low level" link="dbus-glib-DBus-GLib-low-level.html"/>
- </sub>
- <sub name="Tools Reference" link="ch03.html">
- <sub name="dbus-binding-tool" link="dbus-binding-tool.html"/>
- </sub>
- </chapters>
- <functions>
- <function name="DBusGConnection" link="dbus-glib-DBusGConnection.html#DBusGConnection"/>
- <function name="dbus_g_bus_get ()" link="dbus-glib-DBusGConnection.html#dbus-g-bus-get"/>
- <function name="dbus_g_thread_init ()" link="dbus-glib-DBusGConnection.html#dbus-g-thread-init"/>
- <function name="dbus_g_connection_open ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-open"/>
- <function name="dbus_g_connection_ref ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-ref"/>
- <function name="dbus_g_connection_unref ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-unref"/>
- <function name="dbus_g_connection_flush ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-flush"/>
- <function name="dbus_g_connection_get_connection ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-get-connection"/>
- <function name="dbus_g_connection_register_g_object ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-register-g-object"/>
- <function name="dbus_g_connection_unregister_g_object ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-unregister-g-object"/>
- <function name="dbus_g_connection_lookup_g_object ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-lookup-g-object"/>
- <function name="DBUS_TYPE_G_OBJECT_PATH" link="dbus-glib-dbus-gobject.html#DBUS-TYPE-G-OBJECT-PATH:CAPS"/>
- <function name="DBusGObjectInfo" link="dbus-glib-dbus-gobject.html#DBusGObjectInfo"/>
- <function name="dbus_g_object_type_install_info ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-type-install-info"/>
- <function name="dbus_g_object_path_get_g_type ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-path-get-g-type"/>
- <function name="dbus_g_object_register_marshaller ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller"/>
- <function name="dbus_g_object_register_marshaller_array ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller-array"/>
- <function name="DBusGMessage" link="dbus-glib-DBusGMessage.html#DBusGMessage"/>
- <function name="dbus_g_message_ref ()" link="dbus-glib-DBusGMessage.html#dbus-g-message-ref"/>
- <function name="dbus_g_message_unref ()" link="dbus-glib-DBusGMessage.html#dbus-g-message-unref"/>
- <function name="dbus_g_message_get_message ()" link="dbus-glib-DBusGMessage.html#dbus-g-message-get-message"/>
- <function name="DBusGMethodInfo" link="dbus-glib-DBusGMethod.html#DBusGMethodInfo"/>
- <function name="DBusGMethodInvocation" link="dbus-glib-DBusGMethod.html#DBusGMethodInvocation"/>
- <function name="dbus_g_method_get_sender ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-get-sender"/>
- <function name="dbus_g_method_get_reply ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-get-reply"/>
- <function name="dbus_g_method_send_reply ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-send-reply"/>
- <function name="dbus_g_method_return ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-return"/>
- <function name="dbus_g_method_return_error ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-return-error"/>
- <function name="enum DBusGError" link="dbus-glib-DBusGError.html#DBusGError"/>
- <function name="dbus_g_error_has_name ()" link="dbus-glib-DBusGError.html#dbus-g-error-has-name"/>
- <function name="dbus_g_error_get_name ()" link="dbus-glib-DBusGError.html#dbus-g-error-get-name"/>
- <function name="dbus_g_error_quark ()" link="dbus-glib-DBusGError.html#dbus-g-error-quark"/>
- <function name="dbus_g_error_domain_register ()" link="dbus-glib-DBusGError.html#dbus-g-error-domain-register"/>
- <function name="DBusGProxy" link="dbus-glib-DBusGProxy.html#DBusGProxy"/>
- <function name="dbus_g_proxy_new_for_name ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name"/>
- <function name="dbus_g_proxy_new_for_name_owner ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner"/>
- <function name="dbus_g_proxy_new_from_proxy ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-from-proxy"/>
- <function name="dbus_g_proxy_new_for_peer ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-peer"/>
- <function name="dbus_g_proxy_set_interface ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-set-interface"/>
- <function name="dbus_g_proxy_get_path ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-path"/>
- <function name="dbus_g_proxy_get_bus_name ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-bus-name"/>
- <function name="dbus_g_proxy_get_interface ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-interface"/>
- <function name="dbus_g_proxy_add_signal ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-add-signal"/>
- <function name="dbus_g_proxy_connect_signal ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-connect-signal"/>
- <function name="dbus_g_proxy_disconnect_signal ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-disconnect-signal"/>
- <function name="dbus_g_proxy_send ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-send"/>
- <function name="dbus_g_proxy_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-call"/>
- <function name="dbus_g_proxy_call_with_timeout ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-call-with-timeout"/>
- <function name="dbus_g_proxy_call_no_reply ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-call-no-reply"/>
- <function name="dbus_g_proxy_begin_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call"/>
- <function name="dbus_g_proxy_begin_call_with_timeout ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call-with-timeout"/>
- <function name="dbus_g_proxy_end_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-end-call"/>
- <function name="dbus_g_proxy_cancel_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-cancel-call"/>
- <function name="dbus_g_proxy_set_default_timeout ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-set-default-timeout"/>
- <function name="DBusGTypeSpecializedCollectionIterator ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator"/>
- <function name="DBusGTypeSpecializedMapIterator ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator"/>
- <function name="DBusGTypeSpecializedAppendContext" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext"/>
- <function name="DBusGTypeSpecializedConstructor ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedConstructor"/>
- <function name="DBusGTypeSpecializedFreeFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedFreeFunc"/>
- <function name="DBusGTypeSpecializedCopyFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCopyFunc"/>
- <function name="DBusGTypeSpecializedVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedVtable"/>
- <function name="DBusGTypeSpecializedCollectionFixedAccessorFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionFixedAccessorFunc"/>
- <function name="DBusGTypeSpecializedCollectionIteratorFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIteratorFunc"/>
- <function name="DBusGTypeSpecializedCollectionAppendFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionAppendFunc"/>
- <function name="DBusGTypeSpecializedCollectionEndAppendFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionEndAppendFunc"/>
- <function name="DBusGTypeSpecializedCollectionVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable"/>
- <function name="DBusGTypeSpecializedMapIteratorFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIteratorFunc"/>
- <function name="DBusGTypeSpecializedMapAppendFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapAppendFunc"/>
- <function name="DBusGTypeSpecializedMapVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable"/>
- <function name="DBusGTypeSpecializedStructGetMember ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructGetMember"/>
- <function name="DBusGTypeSpecializedStructSetMember ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructSetMember"/>
- <function name="DBusGTypeSpecializedStructVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructVtable"/>
- <function name="dbus_g_type_get_collection ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection"/>
- <function name="dbus_g_type_get_map ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map"/>
- <function name="dbus_g_type_get_structv ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-structv"/>
- <function name="dbus_g_type_get_struct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct"/>
- <function name="dbus_g_type_is_collection ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-collection"/>
- <function name="dbus_g_type_is_map ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-map"/>
- <function name="dbus_g_type_is_struct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-struct"/>
- <function name="dbus_g_type_get_collection_specialization ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection-specialization"/>
- <function name="dbus_g_type_get_map_key_specialization ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-key-specialization"/>
- <function name="dbus_g_type_get_map_value_specialization ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-value-specialization"/>
- <function name="dbus_g_type_get_struct_member_type ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-member-type"/>
- <function name="dbus_g_type_get_struct_size ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-size"/>
- <function name="dbus_g_type_specialized_construct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-construct"/>
- <function name="dbus_g_type_specialized_init_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init-append"/>
- <function name="dbus_g_type_specialized_collection_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-append"/>
- <function name="dbus_g_type_specialized_collection_end_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-end-append"/>
- <function name="dbus_g_type_specialized_map_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-map-append"/>
- <function name="dbus_g_type_collection_get_fixed ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-get-fixed"/>
- <function name="dbus_g_type_collection_value_iterate ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-value-iterate"/>
- <function name="dbus_g_type_map_value_iterate ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-map-value-iterate"/>
- <function name="dbus_g_type_struct_get_member ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get-member"/>
- <function name="dbus_g_type_struct_set_member ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-set-member"/>
- <function name="dbus_g_type_struct_get ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get"/>
- <function name="dbus_g_type_struct_set ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-set"/>
- <function name="dbus_g_type_specialized_init ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init"/>
- <function name="dbus_g_type_register_collection ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-collection"/>
- <function name="dbus_g_type_register_map ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-map"/>
- <function name="dbus_g_type_map_peek_vtable ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-map-peek-vtable"/>
- <function name="dbus_g_type_collection_peek_vtable ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-peek-vtable"/>
- <function name="dbus_g_type_register_struct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-struct"/>
- <function name="dbus_g_value_build_g_variant ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-value-build-g-variant"/>
- <function name="DBUS_TYPE_G_BOOLEAN_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-BOOLEAN-ARRAY:CAPS"/>
- <function name="DBUS_TYPE_G_UCHAR_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UCHAR-ARRAY:CAPS"/>
- <function name="DBUS_TYPE_G_UINT_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT-ARRAY:CAPS"/>
- <function name="DBUS_TYPE_G_INT_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT-ARRAY:CAPS"/>
- <function name="DBUS_TYPE_G_UINT64_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT64-ARRAY:CAPS"/>
- <function name="DBUS_TYPE_G_INT64_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT64-ARRAY:CAPS"/>
- <function name="DBUS_TYPE_G_OBJECT_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-OBJECT-ARRAY:CAPS"/>
- <function name="DBUS_TYPE_G_STRING_STRING_HASHTABLE" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-STRING-STRING-HASHTABLE:CAPS"/>
- <function name="DBUS_TYPE_G_SIGNATURE" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-SIGNATURE:CAPS"/>
- <function name="dbus_set_g_error ()" link="dbus-glib-DBus-GLib-low-level.html#dbus-set-g-error"/>
- <function name="dbus_connection_setup_with_g_main ()" link="dbus-glib-DBus-GLib-low-level.html#dbus-connection-setup-with-g-main"/>
- <function name="dbus_server_setup_with_g_main ()" link="dbus-glib-DBus-GLib-low-level.html#dbus-server-setup-with-g-main"/>
- <function name="Options" link="dbus-binding-tool.html#id2595756"/>
- </functions>
-</book>
<sub name="Introduction" link="ch01.html"/>
<sub name="API Reference" link="ch02.html">
<sub name="API for using D-BUS with GLib" link="ch02.html#api-overview"/>
- <sub name="DBusGConnection" link="dbus-glib-DBusGConnection.html"/>
- <sub name="DBus GObject related functions" link="dbus-glib-dbus-gobject.html"/>
- <sub name="DBusGMessage" link="dbus-glib-DBusGMessage.html"/>
- <sub name="DBusGMethod" link="dbus-glib-DBusGMethod.html"/>
- <sub name="DBusGError" link="dbus-glib-DBusGError.html"/>
- <sub name="DBusGProxy" link="dbus-glib-DBusGProxy.html"/>
- <sub name="Specializable GType System" link="dbus-glib-Specializable-GType-System.html"/>
- <sub name="DBus GLib low level" link="dbus-glib-DBus-GLib-low-level.html"/>
+ <sub name="Specializable GType System" link="dbus-glib-dbus-gtype-specialized.html"/>
+ <sub name="DBus GLib low level" link="dbus-glib-dbus-glib-lowlevel.html"/>
</sub>
<sub name="Tools Reference" link="ch03.html">
<sub name="dbus-binding-tool" link="dbus-binding-tool.html"/>
</sub>
</chapters>
<functions>
- <keyword type="struct" name="DBusGConnection" link="dbus-glib-DBusGConnection.html#DBusGConnection"/>
- <keyword type="function" name="dbus_g_bus_get ()" link="dbus-glib-DBusGConnection.html#dbus-g-bus-get"/>
- <keyword type="function" name="dbus_g_thread_init ()" link="dbus-glib-DBusGConnection.html#dbus-g-thread-init"/>
- <keyword type="function" name="dbus_g_connection_open ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-open"/>
- <keyword type="function" name="dbus_g_connection_ref ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-ref"/>
- <keyword type="function" name="dbus_g_connection_unref ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-unref"/>
- <keyword type="function" name="dbus_g_connection_flush ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-flush"/>
- <keyword type="function" name="dbus_g_connection_get_connection ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-get-connection"/>
- <keyword type="function" name="dbus_g_connection_register_g_object ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-register-g-object"/>
- <keyword type="function" name="dbus_g_connection_unregister_g_object ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-unregister-g-object"/>
- <keyword type="function" name="dbus_g_connection_lookup_g_object ()" link="dbus-glib-DBusGConnection.html#dbus-g-connection-lookup-g-object"/>
- <keyword type="macro" name="DBUS_TYPE_G_OBJECT_PATH" link="dbus-glib-dbus-gobject.html#DBUS-TYPE-G-OBJECT-PATH:CAPS"/>
- <keyword type="struct" name="DBusGObjectInfo" link="dbus-glib-dbus-gobject.html#DBusGObjectInfo"/>
- <keyword type="function" name="dbus_g_object_type_install_info ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-type-install-info"/>
- <keyword type="function" name="dbus_g_object_path_get_g_type ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-path-get-g-type"/>
- <keyword type="function" name="dbus_g_object_register_marshaller ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller"/>
- <keyword type="function" name="dbus_g_object_register_marshaller_array ()" link="dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller-array"/>
- <keyword type="struct" name="DBusGMessage" link="dbus-glib-DBusGMessage.html#DBusGMessage"/>
- <keyword type="function" name="dbus_g_message_ref ()" link="dbus-glib-DBusGMessage.html#dbus-g-message-ref"/>
- <keyword type="function" name="dbus_g_message_unref ()" link="dbus-glib-DBusGMessage.html#dbus-g-message-unref"/>
- <keyword type="function" name="dbus_g_message_get_message ()" link="dbus-glib-DBusGMessage.html#dbus-g-message-get-message"/>
- <keyword type="struct" name="DBusGMethodInfo" link="dbus-glib-DBusGMethod.html#DBusGMethodInfo"/>
- <keyword type="struct" name="DBusGMethodInvocation" link="dbus-glib-DBusGMethod.html#DBusGMethodInvocation"/>
- <keyword type="function" name="dbus_g_method_get_sender ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-get-sender"/>
- <keyword type="function" name="dbus_g_method_get_reply ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-get-reply"/>
- <keyword type="function" name="dbus_g_method_send_reply ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-send-reply"/>
- <keyword type="function" name="dbus_g_method_return ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-return"/>
- <keyword type="function" name="dbus_g_method_return_error ()" link="dbus-glib-DBusGMethod.html#dbus-g-method-return-error"/>
- <keyword type="enum" name="enum DBusGError" link="dbus-glib-DBusGError.html#DBusGError"/>
- <keyword type="function" name="dbus_g_error_has_name ()" link="dbus-glib-DBusGError.html#dbus-g-error-has-name"/>
- <keyword type="function" name="dbus_g_error_get_name ()" link="dbus-glib-DBusGError.html#dbus-g-error-get-name"/>
- <keyword type="function" name="dbus_g_error_quark ()" link="dbus-glib-DBusGError.html#dbus-g-error-quark"/>
- <keyword type="function" name="dbus_g_error_domain_register ()" link="dbus-glib-DBusGError.html#dbus-g-error-domain-register"/>
- <keyword type="struct" name="DBusGProxy" link="dbus-glib-DBusGProxy.html#DBusGProxy"/>
- <keyword type="function" name="dbus_g_proxy_new_for_name ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name"/>
- <keyword type="function" name="dbus_g_proxy_new_for_name_owner ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner"/>
- <keyword type="function" name="dbus_g_proxy_new_from_proxy ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-from-proxy"/>
- <keyword type="function" name="dbus_g_proxy_new_for_peer ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-peer"/>
- <keyword type="function" name="dbus_g_proxy_set_interface ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-set-interface"/>
- <keyword type="function" name="dbus_g_proxy_get_path ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-path"/>
- <keyword type="function" name="dbus_g_proxy_get_bus_name ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-bus-name"/>
- <keyword type="function" name="dbus_g_proxy_get_interface ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-get-interface"/>
- <keyword type="function" name="dbus_g_proxy_add_signal ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-add-signal"/>
- <keyword type="function" name="dbus_g_proxy_connect_signal ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-connect-signal"/>
- <keyword type="function" name="dbus_g_proxy_disconnect_signal ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-disconnect-signal"/>
- <keyword type="function" name="dbus_g_proxy_send ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-send"/>
- <keyword type="function" name="dbus_g_proxy_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-call"/>
- <keyword type="function" name="dbus_g_proxy_call_with_timeout ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-call-with-timeout"/>
- <keyword type="function" name="dbus_g_proxy_call_no_reply ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-call-no-reply"/>
- <keyword type="function" name="dbus_g_proxy_begin_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call"/>
- <keyword type="function" name="dbus_g_proxy_begin_call_with_timeout ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call-with-timeout"/>
- <keyword type="function" name="dbus_g_proxy_end_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-end-call"/>
- <keyword type="function" name="dbus_g_proxy_cancel_call ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-cancel-call"/>
- <keyword type="function" name="dbus_g_proxy_set_default_timeout ()" link="dbus-glib-DBusGProxy.html#dbus-g-proxy-set-default-timeout" since="0.75"/>
- <keyword type="function" name="DBusGTypeSpecializedCollectionIterator ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator"/>
- <keyword type="function" name="DBusGTypeSpecializedMapIterator ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator"/>
- <keyword type="struct" name="DBusGTypeSpecializedAppendContext" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext"/>
- <keyword type="function" name="DBusGTypeSpecializedConstructor ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedConstructor"/>
- <keyword type="function" name="DBusGTypeSpecializedFreeFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedFreeFunc"/>
- <keyword type="function" name="DBusGTypeSpecializedCopyFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCopyFunc"/>
- <keyword type="struct" name="DBusGTypeSpecializedVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedVtable"/>
- <keyword type="function" name="DBusGTypeSpecializedCollectionFixedAccessorFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionFixedAccessorFunc"/>
- <keyword type="function" name="DBusGTypeSpecializedCollectionIteratorFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIteratorFunc"/>
- <keyword type="function" name="DBusGTypeSpecializedCollectionAppendFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionAppendFunc"/>
- <keyword type="function" name="DBusGTypeSpecializedCollectionEndAppendFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionEndAppendFunc"/>
- <keyword type="struct" name="DBusGTypeSpecializedCollectionVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable"/>
- <keyword type="function" name="DBusGTypeSpecializedMapIteratorFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIteratorFunc"/>
- <keyword type="function" name="DBusGTypeSpecializedMapAppendFunc ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapAppendFunc"/>
- <keyword type="struct" name="DBusGTypeSpecializedMapVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable"/>
- <keyword type="function" name="DBusGTypeSpecializedStructGetMember ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructGetMember"/>
- <keyword type="function" name="DBusGTypeSpecializedStructSetMember ()" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructSetMember"/>
- <keyword type="struct" name="DBusGTypeSpecializedStructVtable" link="dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructVtable"/>
- <keyword type="function" name="dbus_g_type_get_collection ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection"/>
- <keyword type="function" name="dbus_g_type_get_map ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map"/>
- <keyword type="function" name="dbus_g_type_get_structv ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-structv"/>
- <keyword type="function" name="dbus_g_type_get_struct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct"/>
- <keyword type="function" name="dbus_g_type_is_collection ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-collection"/>
- <keyword type="function" name="dbus_g_type_is_map ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-map"/>
- <keyword type="function" name="dbus_g_type_is_struct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-is-struct"/>
- <keyword type="function" name="dbus_g_type_get_collection_specialization ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection-specialization"/>
- <keyword type="function" name="dbus_g_type_get_map_key_specialization ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-key-specialization"/>
- <keyword type="function" name="dbus_g_type_get_map_value_specialization ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-value-specialization"/>
- <keyword type="function" name="dbus_g_type_get_struct_member_type ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-member-type"/>
- <keyword type="function" name="dbus_g_type_get_struct_size ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-size"/>
- <keyword type="function" name="dbus_g_type_specialized_construct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-construct"/>
- <keyword type="function" name="dbus_g_type_specialized_init_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init-append"/>
- <keyword type="function" name="dbus_g_type_specialized_collection_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-append"/>
- <keyword type="function" name="dbus_g_type_specialized_collection_end_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-end-append"/>
- <keyword type="function" name="dbus_g_type_specialized_map_append ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-map-append"/>
- <keyword type="function" name="dbus_g_type_collection_get_fixed ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-get-fixed"/>
- <keyword type="function" name="dbus_g_type_collection_value_iterate ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-value-iterate"/>
- <keyword type="function" name="dbus_g_type_map_value_iterate ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-map-value-iterate"/>
- <keyword type="function" name="dbus_g_type_struct_get_member ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get-member"/>
- <keyword type="function" name="dbus_g_type_struct_set_member ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-set-member"/>
- <keyword type="function" name="dbus_g_type_struct_get ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get"/>
- <keyword type="function" name="dbus_g_type_struct_set ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-set"/>
- <keyword type="function" name="dbus_g_type_specialized_init ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init"/>
- <keyword type="function" name="dbus_g_type_register_collection ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-collection"/>
- <keyword type="function" name="dbus_g_type_register_map ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-map"/>
- <keyword type="function" name="dbus_g_type_map_peek_vtable ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-map-peek-vtable"/>
- <keyword type="function" name="dbus_g_type_collection_peek_vtable ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-peek-vtable"/>
- <keyword type="function" name="dbus_g_type_register_struct ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-type-register-struct"/>
- <keyword type="function" name="dbus_g_value_build_g_variant ()" link="dbus-glib-Specializable-GType-System.html#dbus-g-value-build-g-variant"/>
- <keyword type="macro" name="DBUS_TYPE_G_BOOLEAN_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-BOOLEAN-ARRAY:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_UCHAR_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UCHAR-ARRAY:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_UINT_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT-ARRAY:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_INT_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT-ARRAY:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_UINT64_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT64-ARRAY:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_INT64_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT64-ARRAY:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_OBJECT_ARRAY" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-OBJECT-ARRAY:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_STRING_STRING_HASHTABLE" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-STRING-STRING-HASHTABLE:CAPS"/>
- <keyword type="macro" name="DBUS_TYPE_G_SIGNATURE" link="dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-SIGNATURE:CAPS"/>
- <keyword type="function" name="dbus_set_g_error ()" link="dbus-glib-DBus-GLib-low-level.html#dbus-set-g-error"/>
- <keyword type="function" name="dbus_connection_setup_with_g_main ()" link="dbus-glib-DBus-GLib-low-level.html#dbus-connection-setup-with-g-main"/>
- <keyword type="function" name="dbus_server_setup_with_g_main ()" link="dbus-glib-DBus-GLib-low-level.html#dbus-server-setup-with-g-main"/>
- <keyword type="" name="Options" link="dbus-binding-tool.html#id2595756"/>
+ <keyword type="struct" name="DBusGTypeSpecializedAppendContext" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext"/>
+ <keyword type="function" name="DBusGTypeSpecializedCollectionAppendFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionAppendFunc"/>
+ <keyword type="function" name="DBusGTypeSpecializedCollectionEndAppendFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionEndAppendFunc"/>
+ <keyword type="function" name="DBusGTypeSpecializedCollectionFixedAccessorFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionFixedAccessorFunc"/>
+ <keyword type="function" name="DBusGTypeSpecializedCollectionIterator ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIterator"/>
+ <keyword type="function" name="DBusGTypeSpecializedCollectionIteratorFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIteratorFunc"/>
+ <keyword type="struct" name="DBusGTypeSpecializedCollectionVtable" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable"/>
+ <keyword type="function" name="DBusGTypeSpecializedConstructor ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedConstructor"/>
+ <keyword type="function" name="DBusGTypeSpecializedCopyFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCopyFunc"/>
+ <keyword type="function" name="DBusGTypeSpecializedFreeFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedFreeFunc"/>
+ <keyword type="function" name="DBusGTypeSpecializedMapAppendFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapAppendFunc"/>
+ <keyword type="function" name="DBusGTypeSpecializedMapIterator ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIterator"/>
+ <keyword type="function" name="DBusGTypeSpecializedMapIteratorFunc ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIteratorFunc"/>
+ <keyword type="struct" name="DBusGTypeSpecializedMapVtable" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapVtable"/>
+ <keyword type="function" name="DBusGTypeSpecializedStructGetMember ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructGetMember"/>
+ <keyword type="function" name="DBusGTypeSpecializedStructSetMember ()" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructSetMember"/>
+ <keyword type="struct" name="DBusGTypeSpecializedStructVtable" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructVtable"/>
+ <keyword type="struct" name="DBusGTypeSpecializedVtable" link="dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedVtable"/>
+ <keyword type="function" name="dbus_g_type_collection_get_fixed ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-get-fixed"/>
+ <keyword type="function" name="dbus_g_type_collection_peek_vtable ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-peek-vtable"/>
+ <keyword type="function" name="dbus_g_type_collection_value_iterate ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-value-iterate"/>
+ <keyword type="function" name="dbus_g_type_get_collection ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection"/>
+ <keyword type="function" name="dbus_g_type_get_collection_specialization ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection-specialization"/>
+ <keyword type="function" name="dbus_g_type_get_map ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map"/>
+ <keyword type="function" name="dbus_g_type_get_map_key_specialization ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map-key-specialization"/>
+ <keyword type="function" name="dbus_g_type_get_map_value_specialization ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map-value-specialization"/>
+ <keyword type="function" name="dbus_g_type_get_struct ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct"/>
+ <keyword type="function" name="dbus_g_type_get_struct_member_type ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct-member-type"/>
+ <keyword type="function" name="dbus_g_type_get_struct_size ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct-size"/>
+ <keyword type="function" name="dbus_g_type_get_structv ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-structv"/>
+ <keyword type="function" name="dbus_g_type_is_collection ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-collection"/>
+ <keyword type="function" name="dbus_g_type_is_map ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-map"/>
+ <keyword type="function" name="dbus_g_type_is_struct ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-struct"/>
+ <keyword type="function" name="dbus_g_type_map_peek_vtable ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-peek-vtable"/>
+ <keyword type="function" name="dbus_g_type_map_value_iterate ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-value-iterate"/>
+ <keyword type="function" name="dbus_g_type_register_collection ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-collection"/>
+ <keyword type="function" name="dbus_g_type_register_map ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-map"/>
+ <keyword type="function" name="dbus_g_type_register_struct ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-struct"/>
+ <keyword type="function" name="dbus_g_type_specialized_collection_append ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-append"/>
+ <keyword type="function" name="dbus_g_type_specialized_collection_end_append ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-end-append"/>
+ <keyword type="function" name="dbus_g_type_specialized_construct ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-construct"/>
+ <keyword type="function" name="dbus_g_type_specialized_init ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init"/>
+ <keyword type="function" name="dbus_g_type_specialized_init_append ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append"/>
+ <keyword type="function" name="dbus_g_type_specialized_map_append ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-map-append"/>
+ <keyword type="function" name="dbus_g_type_struct_get ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-get"/>
+ <keyword type="function" name="dbus_g_type_struct_get_member ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-get-member"/>
+ <keyword type="function" name="dbus_g_type_struct_peek_vtable ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-peek-vtable"/>
+ <keyword type="function" name="dbus_g_type_struct_set ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-set"/>
+ <keyword type="function" name="dbus_g_type_struct_set_member ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-set-member"/>
+ <keyword type="function" name="dbus_g_value_build_g_variant ()" link="dbus-glib-dbus-gtype-specialized.html#dbus-g-value-build-g-variant"/>
+ <keyword type="macro" name="DBUS_TYPE_CONNECTION" link="dbus-glib-dbus-glib-lowlevel.html#DBUS-TYPE-CONNECTION:CAPS"/>
+ <keyword type="macro" name="DBUS_TYPE_MESSAGE" link="dbus-glib-dbus-glib-lowlevel.html#DBUS-TYPE-MESSAGE:CAPS"/>
+ <keyword type="function" name="dbus_connection_get_g_connection ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-connection-get-g-connection"/>
+ <keyword type="function" name="dbus_connection_get_g_type ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-connection-get-g-type"/>
+ <keyword type="function" name="dbus_connection_setup_with_g_main ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-connection-setup-with-g-main"/>
+ <keyword type="function" name="dbus_g_connection_get_connection ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-g-connection-get-connection"/>
+ <keyword type="function" name="dbus_g_message_get_message ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-g-message-get-message"/>
+ <keyword type="function" name="dbus_g_method_get_reply ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-get-reply"/>
+ <keyword type="function" name="dbus_g_method_get_sender ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-get-sender"/>
+ <keyword type="function" name="dbus_g_method_send_reply ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-send-reply"/>
+ <keyword type="function" name="dbus_g_proxy_send ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-g-proxy-send"/>
+ <keyword type="function" name="dbus_message_get_g_type ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-message-get-g-type"/>
+ <keyword type="function" name="dbus_server_setup_with_g_main ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-server-setup-with-g-main"/>
+ <keyword type="function" name="dbus_set_g_error ()" link="dbus-glib-dbus-glib-lowlevel.html#dbus-set-g-error"/>
+ <keyword type="" name="Options" link="dbus-binding-tool.html#idp5167568"/>
</functions>
</book>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>D-Bus GLib bindings - Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="D-Bus GLib bindings - Reference Manual">
<link rel="next" href="ch01.html" title="Introduction">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="book" title="D-Bus GLib bindings - Reference Manual">
+<div class="book">
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">D-Bus GLib bindings - Reference Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for version 0.86
+<div><p class="releaseinfo">for version 0.100
</p></div>
</div>
<hr>
<dd><dl>
<dt><span class="sect1"><a href="ch02.html#api-overview">API for using D-BUS with GLib</a></span></dt>
<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGConnection.html">DBusGConnection</a></span><span class="refpurpose"> — DBus Connection</span>
+<span class="refentrytitle"><a href="dbus-glib-dbus-gtype-specialized.html">Specializable GType System</a></span><span class="refpurpose"> — Specialized GTypes</span>
</dt>
<dt>
-<span class="refentrytitle"><a href="dbus-glib-dbus-gobject.html">DBus GObject related functions</a></span><span class="refpurpose"> — Exporting a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> remotely</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGMessage.html">DBusGMessage</a></span><span class="refpurpose"> — DBus Message</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGMethod.html">DBusGMethod</a></span><span class="refpurpose"> — GMethod Info & Invocation</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGError.html">DBusGError</a></span><span class="refpurpose"> — DBus GError</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBusGProxy.html">DBusGProxy</a></span><span class="refpurpose"> — DBus Proxy</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-Specializable-GType-System.html">Specializable GType System</a></span><span class="refpurpose"> — Specialized GTypes</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="dbus-glib-DBus-GLib-low-level.html">DBus GLib low level</a></span><span class="refpurpose"> — DBus lower level functions</span>
+<span class="refentrytitle"><a href="dbus-glib-dbus-glib-lowlevel.html">DBus GLib low level</a></span><span class="refpurpose"> — DBus lower level functions</span>
</dt>
</dl></dd>
<dt><span class="chapter"><a href="ch03.html">Tools Reference</a></span></dt>
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.15</div>
+ Generated by GTK-Doc V1.18</div>
</body>
</html>
\ No newline at end of file
-<ANCHOR id="dbus-glib-DBusGConnection" href="dbus-glib/dbus-glib-DBusGConnection.html">
-<ANCHOR id="dbus-glib-DBusGConnection.stability-level" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-glib-DBusGConnection.stability-level">
-<ANCHOR id="dbus-glib-DBusGConnection.synopsis" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-glib-DBusGConnection.synopsis">
-<ANCHOR id="dbus-glib-DBusGConnection.description" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-glib-DBusGConnection.description">
-<ANCHOR id="dbus-glib-DBusGConnection.details" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-glib-DBusGConnection.details">
-<ANCHOR id="DBusGConnection" href="dbus-glib/dbus-glib-DBusGConnection.html#DBusGConnection">
-<ANCHOR id="dbus-g-bus-get" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-bus-get">
-<ANCHOR id="dbus-g-thread-init" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-thread-init">
-<ANCHOR id="dbus-g-connection-open" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-open">
-<ANCHOR id="dbus-g-connection-ref" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-ref">
-<ANCHOR id="dbus-g-connection-unref" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-unref">
-<ANCHOR id="dbus-g-connection-flush" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-flush">
-<ANCHOR id="dbus-g-connection-get-connection" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-get-connection">
-<ANCHOR id="dbus-g-connection-register-g-object" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-register-g-object">
-<ANCHOR id="dbus-g-connection-unregister-g-object" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-unregister-g-object">
-<ANCHOR id="dbus-g-connection-lookup-g-object" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-g-connection-lookup-g-object">
-<ANCHOR id="dbus-glib-DBusGConnection.see-also" href="dbus-glib/dbus-glib-DBusGConnection.html#dbus-glib-DBusGConnection.see-also">
-<ANCHOR id="dbus-glib-dbus-gobject" href="dbus-glib/dbus-glib-dbus-gobject.html">
-<ANCHOR id="dbus-glib-dbus-gobject.stability-level" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-glib-dbus-gobject.stability-level">
-<ANCHOR id="dbus-glib-dbus-gobject.synopsis" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-glib-dbus-gobject.synopsis">
-<ANCHOR id="dbus-glib-dbus-gobject.description" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-glib-dbus-gobject.description">
-<ANCHOR id="dbus-glib-dbus-gobject.details" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-glib-dbus-gobject.details">
-<ANCHOR id="DBUS-TYPE-G-OBJECT-PATH:CAPS" href="dbus-glib/dbus-glib-dbus-gobject.html#DBUS-TYPE-G-OBJECT-PATH:CAPS">
-<ANCHOR id="DBusGObjectInfo" href="dbus-glib/dbus-glib-dbus-gobject.html#DBusGObjectInfo">
-<ANCHOR id="dbus-g-object-type-install-info" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-g-object-type-install-info">
-<ANCHOR id="dbus-g-object-path-get-g-type" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-g-object-path-get-g-type">
-<ANCHOR id="dbus-g-object-register-marshaller" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller">
-<ANCHOR id="dbus-g-object-register-marshaller-array" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-g-object-register-marshaller-array">
-<ANCHOR id="dbus-glib-dbus-gobject.see-also" href="dbus-glib/dbus-glib-dbus-gobject.html#dbus-glib-dbus-gobject.see-also">
-<ANCHOR id="dbus-glib-DBusGMessage" href="dbus-glib/dbus-glib-DBusGMessage.html">
-<ANCHOR id="dbus-glib-DBusGMessage.stability-level" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-glib-DBusGMessage.stability-level">
-<ANCHOR id="dbus-glib-DBusGMessage.synopsis" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-glib-DBusGMessage.synopsis">
-<ANCHOR id="dbus-glib-DBusGMessage.description" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-glib-DBusGMessage.description">
-<ANCHOR id="dbus-glib-DBusGMessage.details" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-glib-DBusGMessage.details">
-<ANCHOR id="DBusGMessage" href="dbus-glib/dbus-glib-DBusGMessage.html#DBusGMessage">
-<ANCHOR id="dbus-g-message-ref" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-g-message-ref">
-<ANCHOR id="dbus-g-message-unref" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-g-message-unref">
-<ANCHOR id="dbus-g-message-get-message" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-g-message-get-message">
-<ANCHOR id="dbus-glib-DBusGMessage.see-also" href="dbus-glib/dbus-glib-DBusGMessage.html#dbus-glib-DBusGMessage.see-also">
-<ANCHOR id="dbus-glib-DBusGMethod" href="dbus-glib/dbus-glib-DBusGMethod.html">
-<ANCHOR id="dbus-glib-DBusGMethod.stability-level" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-glib-DBusGMethod.stability-level">
-<ANCHOR id="dbus-glib-DBusGMethod.synopsis" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-glib-DBusGMethod.synopsis">
-<ANCHOR id="dbus-glib-DBusGMethod.description" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-glib-DBusGMethod.description">
-<ANCHOR id="dbus-glib-DBusGMethod.details" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-glib-DBusGMethod.details">
-<ANCHOR id="DBusGMethodInfo" href="dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInfo">
-<ANCHOR id="DBusGMethodInvocation" href="dbus-glib/dbus-glib-DBusGMethod.html#DBusGMethodInvocation">
-<ANCHOR id="dbus-g-method-get-sender" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-g-method-get-sender">
-<ANCHOR id="dbus-g-method-get-reply" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-g-method-get-reply">
-<ANCHOR id="dbus-g-method-send-reply" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-g-method-send-reply">
-<ANCHOR id="dbus-g-method-return" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-g-method-return">
-<ANCHOR id="dbus-g-method-return-error" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-g-method-return-error">
-<ANCHOR id="dbus-glib-DBusGMethod.see-also" href="dbus-glib/dbus-glib-DBusGMethod.html#dbus-glib-DBusGMethod.see-also">
-<ANCHOR id="dbus-glib-DBusGError" href="dbus-glib/dbus-glib-DBusGError.html">
-<ANCHOR id="dbus-glib-DBusGError.stability-level" href="dbus-glib/dbus-glib-DBusGError.html#dbus-glib-DBusGError.stability-level">
-<ANCHOR id="dbus-glib-DBusGError.synopsis" href="dbus-glib/dbus-glib-DBusGError.html#dbus-glib-DBusGError.synopsis">
-<ANCHOR id="dbus-glib-DBusGError.description" href="dbus-glib/dbus-glib-DBusGError.html#dbus-glib-DBusGError.description">
-<ANCHOR id="dbus-glib-DBusGError.details" href="dbus-glib/dbus-glib-DBusGError.html#dbus-glib-DBusGError.details">
-<ANCHOR id="DBusGError" href="dbus-glib/dbus-glib-DBusGError.html#DBusGError">
-<ANCHOR id="dbus-g-error-has-name" href="dbus-glib/dbus-glib-DBusGError.html#dbus-g-error-has-name">
-<ANCHOR id="dbus-g-error-get-name" href="dbus-glib/dbus-glib-DBusGError.html#dbus-g-error-get-name">
-<ANCHOR id="dbus-g-error-quark" href="dbus-glib/dbus-glib-DBusGError.html#dbus-g-error-quark">
-<ANCHOR id="dbus-g-error-domain-register" href="dbus-glib/dbus-glib-DBusGError.html#dbus-g-error-domain-register">
-<ANCHOR id="dbus-glib-DBusGError.see-also" href="dbus-glib/dbus-glib-DBusGError.html#dbus-glib-DBusGError.see-also">
-<ANCHOR id="dbus-glib-DBusGProxy" href="dbus-glib/dbus-glib-DBusGProxy.html">
-<ANCHOR id="dbus-glib-DBusGProxy.stability-level" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-glib-DBusGProxy.stability-level">
-<ANCHOR id="dbus-glib-DBusGProxy.synopsis" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-glib-DBusGProxy.synopsis">
-<ANCHOR id="dbus-glib-DBusGProxy.description" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-glib-DBusGProxy.description">
-<ANCHOR id="dbus-glib-DBusGProxy.details" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-glib-DBusGProxy.details">
-<ANCHOR id="DBusGProxy" href="dbus-glib/dbus-glib-DBusGProxy.html#DBusGProxy">
-<ANCHOR id="dbus-g-proxy-new-for-name" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name">
-<ANCHOR id="dbus-g-proxy-new-for-name-owner" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-name-owner">
-<ANCHOR id="dbus-g-proxy-new-from-proxy" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-new-from-proxy">
-<ANCHOR id="dbus-g-proxy-new-for-peer" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-new-for-peer">
-<ANCHOR id="dbus-g-proxy-set-interface" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-set-interface">
-<ANCHOR id="dbus-g-proxy-get-path" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-get-path">
-<ANCHOR id="dbus-g-proxy-get-bus-name" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-get-bus-name">
-<ANCHOR id="dbus-g-proxy-get-interface" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-get-interface">
-<ANCHOR id="dbus-g-proxy-add-signal" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-add-signal">
-<ANCHOR id="dbus-g-proxy-connect-signal" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-connect-signal">
-<ANCHOR id="dbus-g-proxy-disconnect-signal" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-disconnect-signal">
-<ANCHOR id="dbus-g-proxy-send" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-send">
-<ANCHOR id="dbus-g-proxy-call" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-call">
-<ANCHOR id="dbus-g-proxy-call-with-timeout" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-call-with-timeout">
-<ANCHOR id="dbus-g-proxy-call-no-reply" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-call-no-reply">
-<ANCHOR id="dbus-g-proxy-begin-call" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call">
-<ANCHOR id="dbus-g-proxy-begin-call-with-timeout" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-begin-call-with-timeout">
-<ANCHOR id="dbus-g-proxy-end-call" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-end-call">
-<ANCHOR id="dbus-g-proxy-cancel-call" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-cancel-call">
-<ANCHOR id="dbus-g-proxy-set-default-timeout" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-g-proxy-set-default-timeout">
-<ANCHOR id="dbus-glib-DBusGProxy.see-also" href="dbus-glib/dbus-glib-DBusGProxy.html#dbus-glib-DBusGProxy.see-also">
-<ANCHOR id="dbus-glib-Specializable-GType-System" href="dbus-glib/dbus-glib-Specializable-GType-System.html">
-<ANCHOR id="dbus-glib-Specializable-GType-System.stability-level" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-glib-Specializable-GType-System.stability-level">
-<ANCHOR id="dbus-glib-Specializable-GType-System.synopsis" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-glib-Specializable-GType-System.synopsis">
-<ANCHOR id="dbus-glib-Specializable-GType-System.description" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-glib-Specializable-GType-System.description">
-<ANCHOR id="dbus-glib-Specializable-GType-System.details" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-glib-Specializable-GType-System.details">
-<ANCHOR id="DBusGTypeSpecializedCollectionIterator" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIterator">
-<ANCHOR id="DBusGTypeSpecializedMapIterator" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIterator">
-<ANCHOR id="DBusGTypeSpecializedAppendContext" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedAppendContext">
-<ANCHOR id="DBusGTypeSpecializedConstructor" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedConstructor">
-<ANCHOR id="DBusGTypeSpecializedFreeFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedFreeFunc">
-<ANCHOR id="DBusGTypeSpecializedCopyFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCopyFunc">
-<ANCHOR id="DBusGTypeSpecializedVtable" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedVtable">
-<ANCHOR id="DBusGTypeSpecializedCollectionFixedAccessorFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionFixedAccessorFunc">
-<ANCHOR id="DBusGTypeSpecializedCollectionIteratorFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionIteratorFunc">
-<ANCHOR id="DBusGTypeSpecializedCollectionAppendFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionAppendFunc">
-<ANCHOR id="DBusGTypeSpecializedCollectionEndAppendFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionEndAppendFunc">
-<ANCHOR id="DBusGTypeSpecializedCollectionVtable" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedCollectionVtable">
-<ANCHOR id="DBusGTypeSpecializedMapIteratorFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapIteratorFunc">
-<ANCHOR id="DBusGTypeSpecializedMapAppendFunc" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapAppendFunc">
-<ANCHOR id="DBusGTypeSpecializedMapVtable" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedMapVtable">
-<ANCHOR id="DBusGTypeSpecializedStructGetMember" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructGetMember">
-<ANCHOR id="DBusGTypeSpecializedStructSetMember" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructSetMember">
-<ANCHOR id="DBusGTypeSpecializedStructVtable" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBusGTypeSpecializedStructVtable">
-<ANCHOR id="dbus-g-type-get-collection" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection">
-<ANCHOR id="dbus-g-type-get-map" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map">
-<ANCHOR id="dbus-g-type-get-structv" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-structv">
-<ANCHOR id="dbus-g-type-get-struct" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct">
-<ANCHOR id="dbus-g-type-is-collection" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-is-collection">
-<ANCHOR id="dbus-g-type-is-map" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-is-map">
-<ANCHOR id="dbus-g-type-is-struct" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-is-struct">
-<ANCHOR id="dbus-g-type-get-collection-specialization" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-collection-specialization">
-<ANCHOR id="dbus-g-type-get-map-key-specialization" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-key-specialization">
-<ANCHOR id="dbus-g-type-get-map-value-specialization" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-map-value-specialization">
-<ANCHOR id="dbus-g-type-get-struct-member-type" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-member-type">
-<ANCHOR id="dbus-g-type-get-struct-size" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-get-struct-size">
-<ANCHOR id="dbus-g-type-specialized-construct" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-construct">
-<ANCHOR id="dbus-g-type-specialized-init-append" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init-append">
-<ANCHOR id="dbus-g-type-specialized-collection-append" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-append">
-<ANCHOR id="dbus-g-type-specialized-collection-end-append" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-collection-end-append">
-<ANCHOR id="dbus-g-type-specialized-map-append" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-map-append">
-<ANCHOR id="dbus-g-type-collection-get-fixed" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-get-fixed">
-<ANCHOR id="dbus-g-type-collection-value-iterate" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-value-iterate">
-<ANCHOR id="dbus-g-type-map-value-iterate" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-map-value-iterate">
-<ANCHOR id="dbus-g-type-struct-get-member" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get-member">
-<ANCHOR id="dbus-g-type-struct-set-member" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-set-member">
-<ANCHOR id="dbus-g-type-struct-get" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-get">
-<ANCHOR id="dbus-g-type-struct-set" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-struct-set">
-<ANCHOR id="dbus-g-type-specialized-init" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-specialized-init">
-<ANCHOR id="dbus-g-type-register-collection" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-register-collection">
-<ANCHOR id="dbus-g-type-register-map" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-register-map">
-<ANCHOR id="dbus-g-type-map-peek-vtable" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-map-peek-vtable">
-<ANCHOR id="dbus-g-type-collection-peek-vtable" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-collection-peek-vtable">
-<ANCHOR id="dbus-g-type-register-struct" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-type-register-struct">
-<ANCHOR id="dbus-g-value-build-g-variant" href="dbus-glib/dbus-glib-Specializable-GType-System.html#dbus-g-value-build-g-variant">
-<ANCHOR id="DBUS-TYPE-G-BOOLEAN-ARRAY:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-BOOLEAN-ARRAY:CAPS">
-<ANCHOR id="DBUS-TYPE-G-UCHAR-ARRAY:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UCHAR-ARRAY:CAPS">
-<ANCHOR id="DBUS-TYPE-G-UINT-ARRAY:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT-ARRAY:CAPS">
-<ANCHOR id="DBUS-TYPE-G-INT-ARRAY:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT-ARRAY:CAPS">
-<ANCHOR id="DBUS-TYPE-G-UINT64-ARRAY:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UINT64-ARRAY:CAPS">
-<ANCHOR id="DBUS-TYPE-G-INT64-ARRAY:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-INT64-ARRAY:CAPS">
-<ANCHOR id="DBUS-TYPE-G-OBJECT-ARRAY:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-OBJECT-ARRAY:CAPS">
-<ANCHOR id="DBUS-TYPE-G-STRING-STRING-HASHTABLE:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-STRING-STRING-HASHTABLE:CAPS">
-<ANCHOR id="DBUS-TYPE-G-SIGNATURE:CAPS" href="dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-SIGNATURE:CAPS">
-<ANCHOR id="dbus-glib-DBus-GLib-low-level" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html">
-<ANCHOR id="dbus-glib-DBus-GLib-low-level.stability-level" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html#dbus-glib-DBus-GLib-low-level.stability-level">
-<ANCHOR id="dbus-glib-DBus-GLib-low-level.synopsis" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html#dbus-glib-DBus-GLib-low-level.synopsis">
-<ANCHOR id="dbus-glib-DBus-GLib-low-level.description" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html#dbus-glib-DBus-GLib-low-level.description">
-<ANCHOR id="dbus-glib-DBus-GLib-low-level.details" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html#dbus-glib-DBus-GLib-low-level.details">
-<ANCHOR id="dbus-set-g-error" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html#dbus-set-g-error">
-<ANCHOR id="dbus-connection-setup-with-g-main" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html#dbus-connection-setup-with-g-main">
-<ANCHOR id="dbus-server-setup-with-g-main" href="dbus-glib/dbus-glib-DBus-GLib-low-level.html#dbus-server-setup-with-g-main">
+<ANCHOR id="dbus-glib-dbus-gtype-specialized" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html">
+<ANCHOR id="dbus-glib-dbus-gtype-specialized.stability-level" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-glib-dbus-gtype-specialized.stability-level">
+<ANCHOR id="dbus-glib-dbus-gtype-specialized.synopsis" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-glib-dbus-gtype-specialized.synopsis">
+<ANCHOR id="dbus-glib-dbus-gtype-specialized.description" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-glib-dbus-gtype-specialized.description">
+<ANCHOR id="dbus-glib-dbus-gtype-specialized.details" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-glib-dbus-gtype-specialized.details">
+<ANCHOR id="DBusGTypeSpecializedAppendContext" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedAppendContext">
+<ANCHOR id="DBusGTypeSpecializedCollectionAppendFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionAppendFunc">
+<ANCHOR id="DBusGTypeSpecializedCollectionEndAppendFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionEndAppendFunc">
+<ANCHOR id="DBusGTypeSpecializedCollectionFixedAccessorFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionFixedAccessorFunc">
+<ANCHOR id="DBusGTypeSpecializedCollectionIterator" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIterator">
+<ANCHOR id="DBusGTypeSpecializedCollectionIteratorFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionIteratorFunc">
+<ANCHOR id="DBusGTypeSpecializedCollectionVtable" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCollectionVtable">
+<ANCHOR id="DBusGTypeSpecializedConstructor" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedConstructor">
+<ANCHOR id="DBusGTypeSpecializedCopyFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedCopyFunc">
+<ANCHOR id="DBusGTypeSpecializedFreeFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedFreeFunc">
+<ANCHOR id="DBusGTypeSpecializedMapAppendFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapAppendFunc">
+<ANCHOR id="DBusGTypeSpecializedMapIterator" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIterator">
+<ANCHOR id="DBusGTypeSpecializedMapIteratorFunc" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapIteratorFunc">
+<ANCHOR id="DBusGTypeSpecializedMapVtable" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedMapVtable">
+<ANCHOR id="DBusGTypeSpecializedStructGetMember" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructGetMember">
+<ANCHOR id="DBusGTypeSpecializedStructSetMember" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructSetMember">
+<ANCHOR id="DBusGTypeSpecializedStructVtable" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedStructVtable">
+<ANCHOR id="DBusGTypeSpecializedVtable" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#DBusGTypeSpecializedVtable">
+<ANCHOR id="dbus-g-type-collection-get-fixed" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-get-fixed">
+<ANCHOR id="dbus-g-type-collection-peek-vtable" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-peek-vtable">
+<ANCHOR id="dbus-g-type-collection-value-iterate" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-collection-value-iterate">
+<ANCHOR id="dbus-g-type-get-collection" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection">
+<ANCHOR id="dbus-g-type-get-collection-specialization" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-collection-specialization">
+<ANCHOR id="dbus-g-type-get-map" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map">
+<ANCHOR id="dbus-g-type-get-map-key-specialization" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map-key-specialization">
+<ANCHOR id="dbus-g-type-get-map-value-specialization" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-map-value-specialization">
+<ANCHOR id="dbus-g-type-get-struct" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct">
+<ANCHOR id="dbus-g-type-get-struct-member-type" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct-member-type">
+<ANCHOR id="dbus-g-type-get-struct-size" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-struct-size">
+<ANCHOR id="dbus-g-type-get-structv" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-get-structv">
+<ANCHOR id="dbus-g-type-is-collection" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-collection">
+<ANCHOR id="dbus-g-type-is-map" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-map">
+<ANCHOR id="dbus-g-type-is-struct" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-is-struct">
+<ANCHOR id="dbus-g-type-map-peek-vtable" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-peek-vtable">
+<ANCHOR id="dbus-g-type-map-value-iterate" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-map-value-iterate">
+<ANCHOR id="dbus-g-type-register-collection" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-collection">
+<ANCHOR id="dbus-g-type-register-map" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-map">
+<ANCHOR id="dbus-g-type-register-struct" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-register-struct">
+<ANCHOR id="dbus-g-type-specialized-collection-append" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-append">
+<ANCHOR id="dbus-g-type-specialized-collection-end-append" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-collection-end-append">
+<ANCHOR id="dbus-g-type-specialized-construct" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-construct">
+<ANCHOR id="dbus-g-type-specialized-init" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init">
+<ANCHOR id="dbus-g-type-specialized-init-append" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-init-append">
+<ANCHOR id="dbus-g-type-specialized-map-append" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-specialized-map-append">
+<ANCHOR id="dbus-g-type-struct-get" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-get">
+<ANCHOR id="dbus-g-type-struct-get-member" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-get-member">
+<ANCHOR id="dbus-g-type-struct-peek-vtable" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-peek-vtable">
+<ANCHOR id="dbus-g-type-struct-set" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-set">
+<ANCHOR id="dbus-g-type-struct-set-member" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-type-struct-set-member">
+<ANCHOR id="dbus-g-value-build-g-variant" href="dbus-glib/dbus-glib-dbus-gtype-specialized.html#dbus-g-value-build-g-variant">
+<ANCHOR id="dbus-glib-dbus-glib-lowlevel" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html">
+<ANCHOR id="dbus-glib-dbus-glib-lowlevel.stability-level" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-glib-dbus-glib-lowlevel.stability-level">
+<ANCHOR id="dbus-glib-dbus-glib-lowlevel.synopsis" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-glib-dbus-glib-lowlevel.synopsis">
+<ANCHOR id="dbus-glib-dbus-glib-lowlevel.description" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-glib-dbus-glib-lowlevel.description">
+<ANCHOR id="dbus-glib-dbus-glib-lowlevel.details" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-glib-dbus-glib-lowlevel.details">
+<ANCHOR id="DBUS-TYPE-CONNECTION:CAPS" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#DBUS-TYPE-CONNECTION:CAPS">
+<ANCHOR id="DBUS-TYPE-MESSAGE:CAPS" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#DBUS-TYPE-MESSAGE:CAPS">
+<ANCHOR id="dbus-connection-get-g-connection" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-connection-get-g-connection">
+<ANCHOR id="dbus-connection-get-g-type" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-connection-get-g-type">
+<ANCHOR id="dbus-connection-setup-with-g-main" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-connection-setup-with-g-main">
+<ANCHOR id="dbus-g-connection-get-connection" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-g-connection-get-connection">
+<ANCHOR id="dbus-g-message-get-message" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-g-message-get-message">
+<ANCHOR id="dbus-g-method-get-reply" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-get-reply">
+<ANCHOR id="dbus-g-method-get-sender" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-get-sender">
+<ANCHOR id="dbus-g-method-send-reply" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-g-method-send-reply">
+<ANCHOR id="dbus-g-proxy-send" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-g-proxy-send">
+<ANCHOR id="dbus-message-get-g-type" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-message-get-g-type">
+<ANCHOR id="dbus-server-setup-with-g-main" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-server-setup-with-g-main">
+<ANCHOR id="dbus-set-g-error" href="dbus-glib/dbus-glib-dbus-glib-lowlevel.html#dbus-set-g-error">
<ANCHOR id="dbus-binding-tool" href="dbus-glib/dbus-binding-tool.html">
/* this is needed so that the local anchors are displayed below the naviagtion */
div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
{
+ display: inline-block;
position: relative;
- padding-top:4.5em;
+ top:-5em;
}
/* this seems to be a bug in the xsl style sheets when generating indexes */
div.index div.index
</para>
+<!-- ##### MACRO DBUS_TYPE_G_CONNECTION ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### FUNCTION dbus_g_bus_get ##### -->
<para>
@Returns:
+<!-- ##### FUNCTION dbus_g_bus_get_private ##### -->
+<para>
+
+</para>
+
+@type:
+@context:
+@error:
+@Returns:
+
+
<!-- ##### FUNCTION dbus_g_thread_init ##### -->
<para>
@Returns:
-<!-- ##### FUNCTION dbus_g_error_quark ##### -->
+<!-- ##### FUNCTION dbus_g_error_domain_register ##### -->
<para>
</para>
-@void:
-@Returns:
+@domain:
+@default_iface:
+@code_enum:
-<!-- ##### FUNCTION dbus_g_error_domain_register ##### -->
+<!-- ##### MACRO DBUS_GERROR ##### -->
<para>
</para>
-@domain:
-@default_iface:
-@code_enum:
<!-- ##### SECTION Image ##### -->
-<!-- ##### FUNCTION dbus_set_g_error ##### -->
+<!-- ##### MACRO DBUS_TYPE_CONNECTION ##### -->
<para>
</para>
-@gerror:
-@derror:
+
+
+<!-- ##### MACRO DBUS_TYPE_MESSAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### FUNCTION dbus_connection_get_g_connection ##### -->
+<para>
+
+</para>
+
+@connection:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_connection_get_g_type ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
<!-- ##### FUNCTION dbus_connection_setup_with_g_main ##### -->
@context:
+<!-- ##### FUNCTION dbus_g_connection_get_connection ##### -->
+<para>
+
+</para>
+
+@gconnection:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_message_get_message ##### -->
+<para>
+
+</para>
+
+@gmessage:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_method_get_reply ##### -->
+<para>
+
+</para>
+
+@context:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_method_get_sender ##### -->
+<para>
+
+</para>
+
+@context:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_method_send_reply ##### -->
+<para>
+
+</para>
+
+@context:
+@reply:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_send ##### -->
+<para>
+
+</para>
+
+@proxy:
+@message:
+@client_serial:
+
+
+<!-- ##### FUNCTION dbus_message_get_g_type ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
<!-- ##### FUNCTION dbus_server_setup_with_g_main ##### -->
<para>
@context:
+<!-- ##### FUNCTION dbus_set_g_error ##### -->
+<para>
+
+</para>
+
+@gerror:
+@derror:
+
+
+<!-- ##### SECTION ./tmpl/dbus-gconnection.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gconnection.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gconnection.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gconnection.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gconnection.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gconnection.sgml:Title ##### -->
+DBusGConnection
+
+
+<!-- ##### SECTION ./tmpl/dbus-gerror.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gerror.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gerror.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gerror.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gerror.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gerror.sgml:Title ##### -->
+DBusGError
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmessage.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmessage.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmessage.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmessage.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmessage.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmessage.sgml:Title ##### -->
+DBusGMessage
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmethod.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmethod.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmethod.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmethod.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmethod.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gmethod.sgml:Title ##### -->
+DBusGMethod
+
+
+<!-- ##### SECTION ./tmpl/dbus-gproxy.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gproxy.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gproxy.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/dbus-gproxy.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gproxy.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/dbus-gproxy.sgml:Title ##### -->
+DBusGProxy
+
+
+<!-- ##### SECTION ./tmpl/example-service-glue.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/example-service-glue.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/example-service-glue.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/example-service-glue.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/example-service-glue.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/example-service-glue.sgml:Title ##### -->
+example-service-glue
+
+
+<!-- ##### SECTION ./tmpl/example-signal-emitter-glue.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/example-signal-emitter-glue.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/example-signal-emitter-glue.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/example-signal-emitter-glue.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/example-signal-emitter-glue.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/example-signal-emitter-glue.sgml:Title ##### -->
+example-signal-emitter-glue
+
+
+<!-- ##### SECTION ./tmpl/sm-marshal.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/sm-marshal.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/sm-marshal.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/sm-marshal.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/sm-marshal.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/sm-marshal.sgml:Title ##### -->
+sm-marshal
+
+
+<!-- ##### SECTION ./tmpl/statemachine-glue.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/statemachine-glue.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/statemachine-glue.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/statemachine-glue.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/statemachine-glue.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/statemachine-glue.sgml:Title ##### -->
+statemachine-glue
+
+
+<!-- ##### SECTION ./tmpl/statemachine-server-glue.sgml:Image ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/statemachine-server-glue.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/statemachine-server-glue.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/statemachine-server-glue.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/statemachine-server-glue.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/statemachine-server-glue.sgml:Title ##### -->
+statemachine-server-glue
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_object_BOOLEAN__POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_object_BOOLEAN__POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_object_BOOLEAN__POINTER_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_server_BOOLEAN__POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_server_BOOLEAN__STRING_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### FUNCTION dbus_glib_marshal_some_object_BOOLEAN__POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### FUNCTION dbus_glib_marshal_some_object_BOOLEAN__STRING_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### FUNCTION dbus_glib_marshal_test_object_BOOLEAN__POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+<!-- ##### VARIABLE dbus_glib_sm_object_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE dbus_glib_sm_server_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE dbus_glib_some_object_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE dbus_glib_test_object_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_char ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_double ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_float ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_int ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_long ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_object ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_param ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_string ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### MACRO g_marshal_value_peek_variant ##### -->
+<para>
+
+</para>
+
+@v:
+
+<!-- ##### FUNCTION sm_marshal_VOID__STRING_BOXED ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+DBusGProxy
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO DBUS_GERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_INSIDE_DBUS_GLIB_H ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_BOOLEAN_ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_CONNECTION ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_INT64_ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_INT_ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_MESSAGE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_OBJECT_ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_OBJECT_PATH ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_SIGNATURE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_STRING_STRING_HASHTABLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_UCHAR_ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_UINT64_ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO DBUS_TYPE_G_UINT_ARRAY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT DBusGAsyncData ##### -->
+<para>
+
+</para>
+
+@cb:
+@userdata:
+
+<!-- ##### STRUCT DBusGConnection ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ENUM DBusGError ##### -->
+<para>
+
+</para>
+
+@DBUS_GERROR_FAILED:
+@DBUS_GERROR_NO_MEMORY:
+@DBUS_GERROR_SERVICE_UNKNOWN:
+@DBUS_GERROR_NAME_HAS_NO_OWNER:
+@DBUS_GERROR_NO_REPLY:
+@DBUS_GERROR_IO_ERROR:
+@DBUS_GERROR_BAD_ADDRESS:
+@DBUS_GERROR_NOT_SUPPORTED:
+@DBUS_GERROR_LIMITS_EXCEEDED:
+@DBUS_GERROR_ACCESS_DENIED:
+@DBUS_GERROR_AUTH_FAILED:
+@DBUS_GERROR_NO_SERVER:
+@DBUS_GERROR_TIMEOUT:
+@DBUS_GERROR_NO_NETWORK:
+@DBUS_GERROR_ADDRESS_IN_USE:
+@DBUS_GERROR_DISCONNECTED:
+@DBUS_GERROR_INVALID_ARGS:
+@DBUS_GERROR_FILE_NOT_FOUND:
+@DBUS_GERROR_FILE_EXISTS:
+@DBUS_GERROR_UNKNOWN_METHOD:
+@DBUS_GERROR_TIMED_OUT:
+@DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+@DBUS_GERROR_MATCH_RULE_INVALID:
+@DBUS_GERROR_SPAWN_EXEC_FAILED:
+@DBUS_GERROR_SPAWN_FORK_FAILED:
+@DBUS_GERROR_SPAWN_CHILD_EXITED:
+@DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+@DBUS_GERROR_SPAWN_FAILED:
+@DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+@DBUS_GERROR_INVALID_SIGNATURE:
+@DBUS_GERROR_INVALID_FILE_CONTENT:
+@DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+@DBUS_GERROR_REMOTE_EXCEPTION:
+
+<!-- ##### STRUCT DBusGMessage ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT DBusGMethodInfo ##### -->
+<para>
+
+</para>
+
+@function:
+@marshaller:
+@data_offset:
+
+<!-- ##### STRUCT DBusGMethodInvocation ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT DBusGObjectInfo ##### -->
+<para>
+
+</para>
+
+@format_version:
+@method_infos:
+@n_method_infos:
+@data:
+@exported_signals:
+@exported_properties:
+
+<!-- ##### TYPEDEF DBusGObjectPath ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### STRUCT DBusGProxy ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL DBusGProxy::destroy ##### -->
+<para>
+
+</para>
+
+@dbusgproxy: the object which received the signal.
+
+<!-- ##### SIGNAL DBusGProxy::received ##### -->
+<para>
+
+</para>
+
+@dbusgproxy: the object which received the signal.
+@arg1:
+@arg2:
+
+<!-- ##### ARG DBusGProxy:connection ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG DBusGProxy:interface ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG DBusGProxy:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG DBusGProxy:path ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT DBusGProxyCall ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### USER_FUNCTION DBusGProxyCallNotify ##### -->
+<para>
+
+</para>
+
+@proxy:
+@call_id:
+@user_data:
+
+
+<!-- ##### STRUCT DBusGProxyClass ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### TYPEDEF DBusGSignature ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION dbus_g_bus_get ##### -->
+<para>
+
+</para>
+
+@type:
+@error:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_bus_get_private ##### -->
+<para>
+
+</para>
+
+@type:
+@context:
+@error:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_connection_flush ##### -->
+<para>
+
+</para>
+
+@connection:
+
+
+<!-- ##### FUNCTION dbus_g_connection_get_g_type ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_connection_lookup_g_object ##### -->
+<para>
+
+</para>
+
+@connection:
+@at_path:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_connection_open ##### -->
+<para>
+
+</para>
+
+@address:
+@error:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_connection_ref ##### -->
+<para>
+
+</para>
+
+@connection:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_connection_register_g_object ##### -->
+<para>
+
+</para>
+
+@connection:
+@at_path:
+@object:
+
+
+<!-- ##### FUNCTION dbus_g_connection_unref ##### -->
+<para>
+
+</para>
+
+@connection:
+
+
+<!-- ##### FUNCTION dbus_g_connection_unregister_g_object ##### -->
+<para>
+
+</para>
+
+@connection:
+@object:
+
+
+<!-- ##### FUNCTION dbus_g_error_domain_register ##### -->
+<para>
+
+</para>
+
+@domain:
+@default_iface:
+@code_enum:
+
+
+<!-- ##### FUNCTION dbus_g_error_get_name ##### -->
+<para>
+
+</para>
+
+@error:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_error_has_name ##### -->
+<para>
+
+</para>
+
+@error:
+@name:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_error_quark ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_message_get_g_type ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_message_ref ##### -->
+<para>
+
+</para>
+
+@message:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_message_unref ##### -->
+<para>
+
+</para>
+
+@message:
+
+
+<!-- ##### FUNCTION dbus_g_method_return ##### -->
+<para>
+
+</para>
+
+@context:
+@...:
+
+
+<!-- ##### FUNCTION dbus_g_method_return_error ##### -->
+<para>
+
+</para>
+
+@context:
+@error:
+
+
+<!-- ##### FUNCTION dbus_g_object_path_get_g_type ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_object_register_marshaller ##### -->
+<para>
+
+</para>
+
+@marshaller:
+@rettype:
+@...:
+
+
+<!-- ##### FUNCTION dbus_g_object_register_marshaller_array ##### -->
+<para>
+
+</para>
+
+@marshaller:
+@rettype:
+@n_types:
+@types:
+
+
+<!-- ##### FUNCTION dbus_g_object_type_install_info ##### -->
+<para>
+
+</para>
+
+@object_type:
+@info:
+
+
+<!-- ##### FUNCTION dbus_g_object_type_register_shadow_property ##### -->
+<para>
+
+</para>
+
+@iface_type:
+@dbus_prop_name:
+@shadow_prop_name:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_add_signal ##### -->
+<para>
+
+</para>
+
+@proxy:
+@signal_name:
+@first_type:
+@...:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### -->
+<para>
+
+</para>
+
+@proxy:
+@method:
+@notify:
+@user_data:
+@destroy:
+@first_arg_type:
+@...:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_begin_call_with_timeout ##### -->
+<para>
+
+</para>
+
+@proxy:
+@method:
+@notify:
+@user_data:
+@destroy:
+@timeout:
+@first_arg_type:
+@...:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_call ##### -->
+<para>
+
+</para>
+
+@proxy:
+@method:
+@error:
+@first_arg_type:
+@...:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_call_no_reply ##### -->
+<para>
+
+</para>
+
+@proxy:
+@method:
+@first_arg_type:
+@...:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_call_with_timeout ##### -->
+<para>
+
+</para>
+
+@proxy:
+@method:
+@timeout:
+@error:
+@first_arg_type:
+@...:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_cancel_call ##### -->
+<para>
+
+</para>
+
+@proxy:
+@call:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_connect_signal ##### -->
+<para>
+
+</para>
+
+@proxy:
+@signal_name:
+@handler:
+@data:
+@free_data_func:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_disconnect_signal ##### -->
+<para>
+
+</para>
+
+@proxy:
+@signal_name:
+@handler:
+@data:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_end_call ##### -->
+<para>
+
+</para>
+
+@proxy:
+@call:
+@error:
+@first_arg_type:
+@...:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_get_bus_name ##### -->
+<para>
+
+</para>
+
+@proxy:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_get_interface ##### -->
+<para>
+
+</para>
+
+@proxy:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_get_path ##### -->
+<para>
+
+</para>
+
+@proxy:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_new_for_name ##### -->
+<para>
+
+</para>
+
+@connection:
+@name:
+@path:
+@iface:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_new_for_name_owner ##### -->
+<para>
+
+</para>
+
+@connection:
+@name:
+@path:
+@iface:
+@error:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_new_for_peer ##### -->
+<para>
+
+</para>
+
+@connection:
+@path:
+@iface:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_new_from_proxy ##### -->
+<para>
+
+</para>
+
+@proxy:
+@iface:
+@path:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_set_default_timeout ##### -->
+<para>
+
+</para>
+
+@proxy:
+@timeout:
+
+
+<!-- ##### FUNCTION dbus_g_proxy_set_interface ##### -->
+<para>
+
+</para>
+
+@proxy:
+@interface_name:
+
+
+<!-- ##### FUNCTION dbus_g_signature_get_g_type ##### -->
+<para>
+
+</para>
+
+@void:
+@Returns:
+
+
+<!-- ##### FUNCTION dbus_g_thread_init ##### -->
+<para>
+
+</para>
+
+@void:
+
+
+<!-- ##### FUNCTION dbus_glib_global_set_disable_legacy_property_access ##### -->
+<para>
+
+</para>
+
+@void:
+
+
</para>
+<!-- ##### MACRO DBUS_TYPE_G_MESSAGE ##### -->
+<para>
+
+</para>
+
+
+
<!-- ##### FUNCTION dbus_g_message_ref ##### -->
<para>
</para>
@context:
-@Varargs:
+@...:
<!-- ##### FUNCTION dbus_g_method_return_error ##### -->
<!-- ##### SECTION Image ##### -->
-<!-- ##### MACRO DBUS_TYPE_G_OBJECT_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### STRUCT DBusGObjectInfo ##### -->
-<para>
-
-</para>
-
-@format_version:
-@method_infos:
-@n_method_infos:
-@data:
-@exported_signals:
-@exported_properties:
-
-<!-- ##### FUNCTION dbus_g_object_type_install_info ##### -->
-<para>
-
-</para>
-
-@object_type:
-@info:
-
-
-<!-- ##### FUNCTION dbus_g_object_path_get_g_type ##### -->
-<para>
-
-</para>
-
-@void:
-@Returns:
-
-
-<!-- ##### FUNCTION dbus_g_object_register_marshaller ##### -->
-<para>
-
-</para>
-
-@marshaller:
-@rettype:
-@Varargs:
-
-
-<!-- ##### FUNCTION dbus_g_object_register_marshaller_array ##### -->
-<para>
-
-</para>
-
-@marshaller:
-@rettype:
-@n_types:
-@types:
-
-
</para>
-@parent:
+
+<!-- ##### STRUCT DBusGProxyCall ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### USER_FUNCTION DBusGProxyCallNotify ##### -->
+<para>
+
+</para>
+
+@proxy:
+@call_id:
+@user_data:
+
<!-- ##### FUNCTION dbus_g_proxy_new_for_name ##### -->
<para>
@proxy:
@iface:
-@path_name:
+@path:
@Returns:
</para>
@connection:
-@path_name:
-@interface_name:
+@path:
+@iface:
@Returns:
@proxy:
@signal_name:
@first_type:
-@Varargs:
+@...:
<!-- ##### FUNCTION dbus_g_proxy_connect_signal ##### -->
@method:
@error:
@first_arg_type:
-@Varargs:
+@...:
@Returns:
@timeout:
@error:
@first_arg_type:
-@Varargs:
+@...:
@Returns:
@proxy:
@method:
@first_arg_type:
-@Varargs:
+@...:
<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### -->
@proxy:
@method:
@notify:
-@data:
+@user_data:
@destroy:
@first_arg_type:
-@Varargs:
+@...:
@Returns:
@destroy:
@timeout:
@first_arg_type:
-@Varargs:
+@...:
@Returns:
@call:
@error:
@first_arg_type:
-@Varargs:
+@...:
@Returns:
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+dbus-gtool-test
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+dbus-gtype-specialized-priv
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
<!-- ##### SECTION Image ##### -->
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionIterator ##### -->
+<!-- ##### STRUCT DBusGTypeSpecializedAppendContext ##### -->
<para>
</para>
-@value:
-@user_data:
-
+@val:
+@specialization_type:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedMapIterator ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionAppendFunc ##### -->
<para>
</para>
-@key_val:
-@value_val:
-@user_data:
+@ctx:
+@val:
-<!-- ##### STRUCT DBusGTypeSpecializedAppendContext ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionEndAppendFunc ##### -->
<para>
</para>
-@val:
-@specialization_type:
-@b:
-@c:
-@d:
+@ctx:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedConstructor ##### -->
+
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionFixedAccessorFunc ##### -->
<para>
</para>
@type:
+@instance:
+@values:
+@len:
@Returns:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedFreeFunc ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionIterator ##### -->
<para>
</para>
-@type:
-@val:
+@value:
+@user_data:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedCopyFunc ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionIteratorFunc ##### -->
<para>
</para>
@type:
-@src:
-@Returns:
+@instance:
+@iterator:
+@user_data:
-<!-- ##### STRUCT DBusGTypeSpecializedVtable ##### -->
+<!-- ##### STRUCT DBusGTypeSpecializedCollectionVtable ##### -->
<para>
</para>
-@constructor:
-@free_func:
-@copy_func:
-@simple_free_func:
-@padding2:
-@padding3:
+@base_vtable:
+@fixed_accessor:
+@iterator:
+@append_func:
+@end_append_func:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionFixedAccessorFunc ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedConstructor ##### -->
<para>
</para>
@type:
-@instance:
-@values:
-@len:
@Returns:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionIteratorFunc ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedCopyFunc ##### -->
<para>
</para>
@type:
-@instance:
-@iterator:
-@user_data:
+@src:
+@Returns:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionAppendFunc ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedFreeFunc ##### -->
<para>
</para>
-@ctx:
+@type:
@val:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedCollectionEndAppendFunc ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedMapAppendFunc ##### -->
<para>
</para>
@ctx:
+@key:
+@val:
-<!-- ##### STRUCT DBusGTypeSpecializedCollectionVtable ##### -->
+<!-- ##### USER_FUNCTION DBusGTypeSpecializedMapIterator ##### -->
<para>
</para>
-@base_vtable:
-@fixed_accessor:
-@iterator:
-@append_func:
-@end_append_func:
+@key_val:
+@value_val:
+@user_data:
+
<!-- ##### USER_FUNCTION DBusGTypeSpecializedMapIteratorFunc ##### -->
<para>
@user_data:
-<!-- ##### USER_FUNCTION DBusGTypeSpecializedMapAppendFunc ##### -->
-<para>
-
-</para>
-
-@ctx:
-@key:
-@val:
-
-
<!-- ##### STRUCT DBusGTypeSpecializedMapVtable ##### -->
<para>
@get_member:
@set_member:
-<!-- ##### FUNCTION dbus_g_type_get_collection ##### -->
+<!-- ##### STRUCT DBusGTypeSpecializedVtable ##### -->
<para>
</para>
-@container:
-@specialization:
-@Returns:
-
+@constructor:
+@free_func:
+@copy_func:
+@simple_free_func:
-<!-- ##### FUNCTION dbus_g_type_get_map ##### -->
+<!-- ##### FUNCTION dbus_g_type_collection_get_fixed ##### -->
<para>
</para>
-@container:
-@key_specialization:
-@value_specialization:
+@value:
+@data_ret:
+@len_ret:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_get_structv ##### -->
+<!-- ##### FUNCTION dbus_g_type_collection_peek_vtable ##### -->
<para>
</para>
-@container:
-@num_members:
-@types:
+@collection_type:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_get_struct ##### -->
+<!-- ##### FUNCTION dbus_g_type_collection_value_iterate ##### -->
<para>
</para>
-@container:
-@first_type:
-@Varargs:
-@Returns:
+@value:
+@iterator:
+@user_data:
-<!-- ##### FUNCTION dbus_g_type_is_collection ##### -->
+<!-- ##### FUNCTION dbus_g_type_get_collection ##### -->
<para>
</para>
-@gtype:
+@container:
+@specialization:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_is_map ##### -->
+<!-- ##### FUNCTION dbus_g_type_get_collection_specialization ##### -->
<para>
</para>
@Returns:
-<!-- ##### FUNCTION dbus_g_type_is_struct ##### -->
+<!-- ##### FUNCTION dbus_g_type_get_map ##### -->
<para>
</para>
-@gtype:
+@container:
+@key_specialization:
+@value_specialization:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_get_collection_specialization ##### -->
+<!-- ##### FUNCTION dbus_g_type_get_map_key_specialization ##### -->
<para>
</para>
@Returns:
-<!-- ##### FUNCTION dbus_g_type_get_map_key_specialization ##### -->
+<!-- ##### FUNCTION dbus_g_type_get_map_value_specialization ##### -->
<para>
</para>
@Returns:
-<!-- ##### FUNCTION dbus_g_type_get_map_value_specialization ##### -->
+<!-- ##### FUNCTION dbus_g_type_get_struct ##### -->
<para>
</para>
-@gtype:
+@container:
+@first_type:
+@...:
@Returns:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_specialized_construct ##### -->
+<!-- ##### FUNCTION dbus_g_type_get_structv ##### -->
<para>
</para>
-@gtype:
+@container:
+@num_members:
+@types:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_specialized_init_append ##### -->
-<para>
-
-</para>
-
-@value:
-@ctx:
-
-
-<!-- ##### FUNCTION dbus_g_type_specialized_collection_append ##### -->
-<para>
-
-</para>
-
-@ctx:
-@elt:
-
-
-<!-- ##### FUNCTION dbus_g_type_specialized_collection_end_append ##### -->
-<para>
-
-</para>
-
-@ctx:
-
-
-<!-- ##### FUNCTION dbus_g_type_specialized_map_append ##### -->
-<para>
-
-</para>
-
-@ctx:
-@key:
-@val:
-
-
-<!-- ##### FUNCTION dbus_g_type_collection_get_fixed ##### -->
+<!-- ##### FUNCTION dbus_g_type_is_collection ##### -->
<para>
</para>
-@value:
-@data:
-@len:
+@gtype:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_collection_value_iterate ##### -->
-<para>
-
-</para>
-
-@value:
-@iterator:
-@user_data:
-
-
-<!-- ##### FUNCTION dbus_g_type_map_value_iterate ##### -->
-<para>
-
-</para>
-
-@value:
-@iterator:
-@user_data:
-
-
-<!-- ##### FUNCTION dbus_g_type_struct_get_member ##### -->
+<!-- ##### FUNCTION dbus_g_type_is_map ##### -->
<para>
</para>
-@value:
-@member:
-@dest:
+@gtype:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_struct_set_member ##### -->
+<!-- ##### FUNCTION dbus_g_type_is_struct ##### -->
<para>
</para>
-@value:
-@member:
-@src:
+@gtype:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_struct_get ##### -->
+<!-- ##### FUNCTION dbus_g_type_map_peek_vtable ##### -->
<para>
</para>
-@value:
-@member:
-@Varargs:
+@map_type:
@Returns:
-<!-- ##### FUNCTION dbus_g_type_struct_set ##### -->
+<!-- ##### FUNCTION dbus_g_type_map_value_iterate ##### -->
<para>
</para>
@value:
-@member:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION dbus_g_type_specialized_init ##### -->
-<para>
-
-</para>
-
-@void:
+@iterator:
+@user_data:
<!-- ##### FUNCTION dbus_g_type_register_collection ##### -->
@flags:
-<!-- ##### FUNCTION dbus_g_type_map_peek_vtable ##### -->
+<!-- ##### FUNCTION dbus_g_type_register_struct ##### -->
<para>
</para>
-@map_type:
-@Returns:
+@name:
+@vtable:
+@flags:
-<!-- ##### FUNCTION dbus_g_type_collection_peek_vtable ##### -->
+<!-- ##### FUNCTION dbus_g_type_specialized_collection_append ##### -->
<para>
</para>
-@collection_type:
-@Returns:
+@ctx:
+@elt:
-<!-- ##### FUNCTION dbus_g_type_register_struct ##### -->
+<!-- ##### FUNCTION dbus_g_type_specialized_collection_end_append ##### -->
<para>
</para>
-@name:
-@vtable:
-@flags:
+@ctx:
-<!-- ##### FUNCTION dbus_g_value_build_g_variant ##### -->
+<!-- ##### FUNCTION dbus_g_type_specialized_construct ##### -->
<para>
</para>
-@value:
+@gtype:
@Returns:
-<!-- ##### MACRO DBUS_TYPE_G_BOOLEAN_ARRAY ##### -->
+<!-- ##### FUNCTION dbus_g_type_specialized_init ##### -->
<para>
</para>
+@void:
-<!-- ##### MACRO DBUS_TYPE_G_UCHAR_ARRAY ##### -->
+<!-- ##### FUNCTION dbus_g_type_specialized_init_append ##### -->
<para>
</para>
+@value:
+@ctx:
-<!-- ##### MACRO DBUS_TYPE_G_UINT_ARRAY ##### -->
+<!-- ##### FUNCTION dbus_g_type_specialized_map_append ##### -->
<para>
</para>
+@ctx:
+@key:
+@val:
-<!-- ##### MACRO DBUS_TYPE_G_INT_ARRAY ##### -->
+<!-- ##### FUNCTION dbus_g_type_struct_get ##### -->
<para>
</para>
+@value:
+@member:
+@...:
+@Returns:
-<!-- ##### MACRO DBUS_TYPE_G_UINT64_ARRAY ##### -->
+<!-- ##### FUNCTION dbus_g_type_struct_get_member ##### -->
<para>
</para>
+@value:
+@member:
+@dest:
+@Returns:
-<!-- ##### MACRO DBUS_TYPE_G_INT64_ARRAY ##### -->
+<!-- ##### FUNCTION dbus_g_type_struct_peek_vtable ##### -->
<para>
</para>
+@struct_type:
+@Returns:
-<!-- ##### MACRO DBUS_TYPE_G_OBJECT_ARRAY ##### -->
+<!-- ##### FUNCTION dbus_g_type_struct_set ##### -->
<para>
</para>
+@value:
+@member:
+@...:
+@Returns:
-<!-- ##### MACRO DBUS_TYPE_G_STRING_STRING_HASHTABLE ##### -->
+<!-- ##### FUNCTION dbus_g_type_struct_set_member ##### -->
<para>
</para>
+@value:
+@member:
+@src:
+@Returns:
-<!-- ##### MACRO DBUS_TYPE_G_SIGNATURE ##### -->
+<!-- ##### FUNCTION dbus_g_value_build_g_variant ##### -->
<para>
</para>
+@value:
+@Returns:
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+dbus-gvalue-parse-variant
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION dbus_g_value_parse_g_variant ##### -->
+<para>
+
+</para>
+
+@variant:
+@value:
+
+
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+example-service-glue
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_some_object_BOOLEAN__POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_some_object_BOOLEAN__STRING_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### VARIABLE dbus_glib_some_object_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_char ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_double ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_float ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_long ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_object ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_param ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_string ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_variant ##### -->
+<para>
+
+</para>
+
+@v:
+
+
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+example-signal-emitter-glue
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_test_object_BOOLEAN__POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### VARIABLE dbus_glib_test_object_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_char ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_double ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_float ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_long ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_object ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_param ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_string ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_variant ##### -->
+<para>
+
+</para>
+
+@v:
+
+
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+sm-marshal
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION sm_marshal_VOID__STRING_BOXED ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+statemachine-glue
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_object_BOOLEAN__POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_object_BOOLEAN__POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_object_BOOLEAN__POINTER_POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### VARIABLE dbus_glib_sm_object_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_char ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_double ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_float ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_long ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_object ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_param ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_string ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_variant ##### -->
+<para>
+
+</para>
+
+@v:
+
+
--- /dev/null
+<!-- ##### SECTION Title ##### -->
+statemachine-server-glue
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_server_BOOLEAN__POINTER_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### FUNCTION dbus_glib_marshal_sm_server_BOOLEAN__STRING_POINTER ##### -->
+<para>
+
+</para>
+
+@closure:
+@return_value:
+@n_param_values:
+@param_values:
+@invocation_hint:
+@marshal_data:
+
+
+<!-- ##### VARIABLE dbus_glib_sm_server_object_info ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO g_marshal_value_peek_boolean ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_boxed ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_char ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_double ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_enum ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_flags ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_float ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_int64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_long ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_object ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_param ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_pointer ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_string ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uchar ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_uint64 ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_ulong ##### -->
+<para>
+
+</para>
+
+@v:
+
+
+<!-- ##### MACRO g_marshal_value_peek_variant ##### -->
+<para>
+
+</para>
+
+@v:
+
+
####################################
if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN = $(LIBTOOL) --mode=execute
else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
GTKDOC_RUN =
endif
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-EXTRA_DIST = \
+SETUP_FILES = \
$(content_files) \
- $(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
- pdf-build.stamp \
- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
- $(srcdir)/pdf.stamp
+EXTRA_DIST = \
+ $(HTML_IMAGES) \
+ $(SETUP_FILES)
+
+DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp \
+ tmpl.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(REPORT_FILES): sgml-build.stamp
+#### setup ####
+
+setup-build.stamp:
+ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ echo ' DOC Preparing build'; \
+ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+ if test "x$$files" != "x" ; then \
+ for file in $$files ; do \
+ test -f $(abs_srcdir)/$$file && \
+ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+ done; \
+ fi; \
+ test -d $(abs_srcdir)/tmpl && \
+ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+ chmod -R u+w $(abs_builddir)/tmpl; } \
+ fi
+ @touch setup-build.stamp
+
#### scan ####
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ @echo ' DOC Scanning header files'
+ @_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
- done ; \
- cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ done ; \
+ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ echo " DOC Introspecting gobjects"; \
+ scanobj_options=""; \
+ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ scanobj_options="--verbose"; \
+ fi; \
+ fi; \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
else \
- cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
- test -f $$i || touch $$i ; \
+ test -f $$i || touch $$i ; \
done \
fi
@touch scan-build.stamp
#### templates ####
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo ' DOC Rebuilding template files'
+ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ if test -w $(abs_srcdir) ; then \
+ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+ fi \
+ fi
@touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
#### xml ####
sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
+ @echo ' DOC Building XML'
@-chmod -R u+w $(srcdir)
- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ @_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
- done ; \
- cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+ done ; \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
@touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
- @rm -rf $(srcdir)/html
- @mkdir $(srcdir)/html
+ @echo ' DOC Building HTML'
+ @rm -rf html
+ @mkdir html
@mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkhtml_options="$$mkhtml_options --verbose"; \
+ fi; \
+ fi; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
+ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
fi; \
- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ -@test "x$(HTML_IMAGES)" = "x" || \
+ for file in $(HTML_IMAGES) ; do \
+ if test -f $(abs_srcdir)/$$file ; then \
+ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+ fi; \
+ if test -f $(abs_builddir)/$$file ; then \
+ cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ fi; \
+ done;
+ @echo ' DOC Fixing cross-references'
+ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@touch html-build.stamp
#### pdf ####
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building PDF'
- @-chmod -R u+w $(srcdir)
- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
- @mkpdf_imgdirs=""; \
+ @echo ' DOC Building PDF'
+ @rm -f $(DOC_MODULE).pdf
+ @mkpdf_options=""; \
+ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
+ if test "$(?)" = "0"; then \
+ if test "x$(V)" = "x1"; then \
+ mkpdf_options="$$mkpdf_options --verbose"; \
+ fi; \
+ fi; \
if test "x$(HTML_IMAGES)" != "x"; then \
for img in $(HTML_IMAGES); do \
part=`dirname $$img`; \
- echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
if test $$? != 0; then \
- mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
fi; \
done; \
fi; \
- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
@touch pdf-build.stamp
##############
clean-local:
- rm -f *~ *.bak
- rm -rf .libs
+ @rm -f *~ *.bak
+ @rm -rf .libs
distclean-local:
- cd $(srcdir) && \
- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+ rm -rf tmpl; \
+ fi
maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
+ @rm -rf xml html
install-data-local:
- @installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
+ @installfiles=`echo $(builddir)/html/*`; \
+ if test "$$installfiles" = '$(builddir)/html/*'; \
+ then echo 1>&2 'Nothing to install' ; \
else \
if test -n "$(DOC_MODULE_VERSION)"; then \
installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
fi; \
$(mkinstalldirs) $${installdir} ; \
for i in $$installfiles; do \
- echo '-- Installing '$$i ; \
+ echo ' $(INSTALL_DATA) '$$i ; \
$(INSTALL_DATA) $$i $${installdir}; \
done; \
if test -n "$(DOC_MODULE_VERSION)"; then \
mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
$${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
fi; \
$(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
fi
endif
dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- cp $(srcdir)/html/* $(distdir)/html
- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+ @mkdir $(distdir)/tmpl
+ @mkdir $(distdir)/html
+ @-cp ./tmpl/*.sgml $(distdir)/tmpl
+ @cp ./html/* $(distdir)/html
+ @-cp ./$(DOC_MODULE).pdf $(distdir)/
+ @-cp ./$(DOC_MODULE).types $(distdir)/
+ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+ @cd $(distdir) && rm -f $(DISTCLEANFILES)
+ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
-# Generated from ltmain.m4sh.
-# libtool (GNU libtool) 2.2.10
+# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# --quiet, --silent don't print informational messages
# --no-quiet, --no-silent
# print informational messages (default)
+# --no-warn don't display warning messages
# --tag=TAG use configuration variables from tag TAG
# -v, --verbose print more informational messages than default
# --no-verbose don't print the extra informational messages
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.10
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1
# automake: $automake_version
# autoconf: $autoconf_version
#
# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.2.10
+VERSION="2.4.2 Debian-2.4.2-1.1"
TIMESTAMP=""
-package_revision=1.3175
+package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-}
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ esac
+} # func_stripname may be replaced by extended shell implementation
-# Generated shell functions inserted here.
# These SED scripts presuppose an absolute path with a trailing slash.
pathcar='s,^/\([^/]*\).*$,\1,'
;;
*)
save_IFS="$IFS"
- IFS=:
+ IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
# name if it has been set yet.
func_echo ()
{
- $ECHO "$progname${mode+: }$mode: $*"
+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
}
# func_verbose arg...
# Echo program name prefixed message to standard error.
func_error ()
{
- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
}
# func_warning arg...
# Echo program name prefixed warning message to standard error.
func_warning ()
{
- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
# bash bug again:
:
fi
}
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result. All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
+
# func_version
# Echo version message to standard output and exit.
func_version ()
{
+ $opt_debug
+
$SED -n '/(C)/!b go
:more
/\./!{
# Echo short help message to standard output and exit.
func_usage ()
{
+ $opt_debug
+
$SED -n '/^# Usage:/,/^# *.*--help/ {
s/^# //
s/^# *$//
# unless 'noexit' is passed as argument.
func_help ()
{
+ $opt_debug
+
$SED -n '/^# Usage:/,/# Report bugs to/ {
+ :print
s/^# //
s/^# *$//
s*\$progname*'$progname'*
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
- }' < "$progpath"
+ d
+ }
+ /^# .* home page:/b print
+ /^# General help using/b print
+ ' < "$progpath"
ret=$?
if test -z "$1"; then
exit $ret
# exit_cmd.
func_missing_arg ()
{
+ $opt_debug
+
func_error "missing argument for $1."
exit_cmd=exit
}
-exit_cmd=:
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+ my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+ my_sed_long_arg='1s/^--[^=]*=//'
+
+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
magic_exe="%%%MAGIC EXE variable%%%"
# Global variables.
-# $mode is unset
nonopt=
-execute_dlfiles=
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
exec_cmd=
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+ func_quote_for_eval "${2}"
+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
esac
}
-# Parse options once, thoroughly. This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+ fi
+
+ exit $EXIT_MISMATCH
+ fi
+}
- # Shorthand for --mode=foo, only valid as the first argument
- case $1 in
- clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
- compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
- execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
- finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
- install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
- link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
- esac
- # Parse non-mode specific arguments:
- while test "$#" -gt 0; do
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly. This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+ # this just eases exit handling
+ while test $# -gt 0; do
opt="$1"
shift
-
case $opt in
- --config) func_config ;;
-
- --debug) preserve_args="$preserve_args $opt"
+ --debug|-x) opt_debug='set -x'
func_echo "enabling shell trace mode"
- opt_debug='set -x'
$opt_debug
;;
-
- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
- execute_dlfiles="$execute_dlfiles $1"
- shift
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
;;
-
- --dry-run | -n) opt_dry_run=: ;;
- --features) func_features ;;
- --finish) mode="finish" ;;
-
- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
- case $1 in
- # Valid mode arguments:
- clean) ;;
- compile) ;;
- execute) ;;
- finish) ;;
- install) ;;
- link) ;;
- relink) ;;
- uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
- esac
-
- mode="$1"
+ --config)
+ opt_config=:
+func_config
+ ;;
+ --dlopen|-dlopen)
+ optarg="$1"
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
shift
;;
-
--preserve-dup-deps)
- opt_duplicate_deps=: ;;
-
- --quiet|--silent) preserve_args="$preserve_args $opt"
- opt_silent=:
- opt_verbose=false
+ opt_preserve_dup_deps=:
;;
-
- --no-quiet|--no-silent)
- preserve_args="$preserve_args $opt"
- opt_silent=false
+ --features)
+ opt_features=:
+func_features
;;
-
- --verbose| -v) preserve_args="$preserve_args $opt"
+ --finish)
+ opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ --help)
+ opt_help=:
+ ;;
+ --help-all)
+ opt_help_all=:
+opt_help=': help-all'
+ ;;
+ --mode)
+ test $# = 0 && func_missing_arg $opt && break
+ optarg="$1"
+ opt_mode="$optarg"
+case $optarg in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+esac
+ shift
+ ;;
+ --no-silent|--no-quiet)
opt_silent=false
- opt_verbose=:
+func_append preserve_args " $opt"
;;
-
- --no-verbose) preserve_args="$preserve_args $opt"
+ --no-warning|--no-warn)
+ opt_warning=false
+func_append preserve_args " $opt"
+ ;;
+ --no-verbose)
opt_verbose=false
+func_append preserve_args " $opt"
;;
-
- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
- preserve_args="$preserve_args $opt $1"
- func_enable_tag "$1" # tagname is set here
+ --silent|--quiet)
+ opt_silent=:
+func_append preserve_args " $opt"
+ opt_verbose=false
+ ;;
+ --verbose|-v)
+ opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+ ;;
+ --tag)
+ test $# = 0 && func_missing_arg $opt && break
+ optarg="$1"
+ opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
shift
;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+ --version) func_version ;;
+
# Separate optargs to long options:
- -dlopen=*|--mode=*|--tag=*)
- func_opt_split "$opt"
- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ --*=*)
+ func_split_long_opt "$opt"
+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
shift
;;
- -\?|-h) func_usage ;;
- --help) opt_help=: ;;
- --help-all) opt_help=': help-all' ;;
- --version) func_version ;;
-
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
-
- *) nonopt="$opt"
- break
+ # Separate non-argument short options:
+ -\?*|-h*|-n*|-v*)
+ func_split_short_opt "$opt"
+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;
esac
done
+ # Validate options:
+
+ # save first non-option argument
+ if test "$#" -gt 0; then
+ nonopt="$opt"
+ shift
+ fi
+
+ # preserve --debug
+ test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
opt_duplicate_compiler_generated_deps=:
;;
*)
- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
;;
esac
- # Having warned about all mis-specified options, bail out if
- # anything was wrong.
- $exit_cmd $EXIT_FAILURE
-}
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
fi
- exit $EXIT_MISMATCH
- fi
-}
-
-
-## ----------- ##
-## Main. ##
-## ----------- ##
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
-$opt_help || {
- # Sanity checks first:
- func_check_version_match
-
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
- test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$progname --help --mode=$opt_mode' for more information."
+ }
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # Bail if the options were screwed
+ $exit_cmd $EXIT_FAILURE
+}
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$execute_dlfiles" && test "$mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$mode' for more information."
-}
+## ----------- ##
+## Main. ##
+## ----------- ##
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
- func_ltwrapper_scriptname_result=""
- if func_ltwrapper_executable_p "$1"; then
- func_dirname_and_basename "$1" "" "."
- func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- fi
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
}
# func_ltwrapper_p file
}
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot. Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+ func_resolve_sysroot_result=$1
+ case $func_resolve_sysroot_result in
+ =*)
+ func_stripname '=' '' "$func_resolve_sysroot_result"
+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+ ;;
+ esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+ case "$lt_sysroot:$1" in
+ ?*:"$lt_sysroot"*)
+ func_stripname "$lt_sysroot" '' "$1"
+ func_replace_sysroot_result="=$func_stripname_result"
+ ;;
+ *)
+ # Including no sysroot.
+ func_replace_sysroot_result=$1
+ ;;
+ esac
+}
+
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ func_append_quoted CC_quoted "$arg"
done
CC_expanded=`func_echo_all $CC`
CC_quoted_expanded=`func_echo_all $CC_quoted`
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
- func_quote_for_eval "$arg"
- CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ func_append_quoted CC_quoted "$arg"
done
CC_expanded=`func_echo_all $CC`
CC_quoted_expanded=`func_echo_all $CC_quoted`
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
- else
- write_oldobj=none
- fi
+ if test "$build_old_libs" = yes; then
+ write_oldobj=\'${3}\'
+ else
+ write_oldobj=none
+ fi
+
+ $opt_dry_run || {
+ cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+ $MV "${write_libobj}T" "${write_libobj}"
+ }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+ $opt_debug
+ func_convert_core_file_wine_to_w32_result="$1"
+ if test -n "$1"; then
+ # Unfortunately, winepath does not exit with a non-zero error code, so we
+ # are forced to check the contents of stdout. On the other hand, if the
+ # command is not found, the shell will set an exit code of 127 and print
+ # *an error message* to stdout. So we must check for both error code of
+ # zero AND non-empty stdout, which explains the odd construction:
+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ func_convert_core_file_wine_to_w32_result=
+ fi
+ fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+ $opt_debug
+ # unfortunately, winepath doesn't convert paths, only file names
+ func_convert_core_path_wine_to_w32_result=""
+ if test -n "$1"; then
+ oldIFS=$IFS
+ IFS=:
+ for func_convert_core_path_wine_to_w32_f in $1; do
+ IFS=$oldIFS
+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -z "$func_convert_core_path_wine_to_w32_result"; then
+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ else
+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+ fi
+ fi
+ done
+ IFS=$oldIFS
+ fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+ $opt_debug
+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+ if test "$?" -ne 0; then
+ # on failure, ensure result is empty
+ func_cygpath_result=
+ fi
+ else
+ func_cygpath_result=
+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format. Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+ $opt_debug
+ # awkward: cmd appends spaces to result
+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+ $opt_debug
+ if test -z "$2" && test -n "$1" ; then
+ func_error "Could not determine host file name corresponding to"
+ func_error " \`$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_file_result="$1"
+ fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+ $opt_debug
+ if test -z "$4" && test -n "$3"; then
+ func_error "Could not determine the host path corresponding to"
+ func_error " \`$3'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback. This is a deliberately simplistic "conversion" and
+ # should not be "improved". See libtool.info.
+ if test "x$1" != "x$2"; then
+ lt_replace_pathsep_chars="s|$1|$2|g"
+ func_to_host_path_result=`echo "$3" |
+ $SED -e "$lt_replace_pathsep_chars"`
+ else
+ func_to_host_path_result="$3"
+ fi
+ fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+ $opt_debug
+ case $4 in
+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ ;;
+ esac
+ case $4 in
+ $2 ) func_append func_to_host_path_result "$3"
+ ;;
+ esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+ $opt_debug
+ $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result. If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+ $opt_debug
+ case ,$2, in
+ *,"$to_tool_file_cmd",*)
+ func_to_tool_file_result=$1
+ ;;
+ *)
+ $to_tool_file_cmd "$1"
+ func_to_tool_file_result=$func_to_host_file_result
+ ;;
+ esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+ func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper. Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_msys_to_w32 "$1"
+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format. Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+ # LT_CYGPATH in this case.
+ func_to_host_file_result=`cygpath -m "$1"`
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format. Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_file_wine_to_w32 "$1"
+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ func_convert_core_msys_to_w32 "$1"
+ func_cygpath -u "$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_file_result="$1"
+ if test -n "$1"; then
+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+ func_convert_core_file_wine_to_w32 "$1"
+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result="$func_cygpath_result"
+ fi
+ func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format. If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+# file name conversion function : func_convert_file_X_to_Y ()
+# path conversion function : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same. If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+ $opt_debug
+ if test -z "$to_host_path_cmd"; then
+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+ to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+ $opt_debug
+ func_init_to_host_path_cmd
+ $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+ func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper. Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # Remove leading and trailing path separator characters from ARG. MSYS
+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+ # and winepath ignores them completely.
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format. Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format. Requires a wine environment and
+# a working winepath. Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_convert_path_check : ";" \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+ fi
+}
+# end func_convert_path_nix_to_w32
- $opt_dry_run || {
- cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-# Name of the PIC object.
-pic_object=$write_lobj
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # See func_convert_path_msys_to_w32:
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result="$func_cygpath_result"
+ func_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
+}
+# end func_convert_path_msys_to_cygwin
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-EOF
- $MV "${write_libobj}T" "${write_libobj}"
- }
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+ $opt_debug
+ func_to_host_path_result="$1"
+ if test -n "$1"; then
+ # Remove leading and trailing path separator characters from
+ # ARG. msys behavior is inconsistent here, cygpath turns them
+ # into '.;' and ';.', and winepath ignores them completely.
+ func_stripname : : "$1"
+ func_to_host_path_tmp1=$func_stripname_result
+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result="$func_cygpath_result"
+ func_convert_path_check : : \
+ "$func_to_host_path_tmp1" "$func_to_host_path_result"
+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+ fi
}
+# end func_convert_path_nix_to_cygwin
+
# func_mode_compile arg...
func_mode_compile ()
;;
-pie | -fpie | -fPIE)
- pie_flag="$pie_flag $arg"
+ func_append pie_flag " $arg"
continue
;;
-shared | -static | -prefer-pic | -prefer-non-pic)
- later="$later $arg"
+ func_append later " $arg"
continue
;;
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
- func_quote_for_eval "$arg"
- lastarg="$lastarg $func_quote_for_eval_result"
+ func_append_quoted lastarg "$arg"
done
IFS="$save_ifs"
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
# Add the arguments to base_compile.
- base_compile="$base_compile $lastarg"
+ func_append base_compile " $lastarg"
continue
;;
esac # case $arg_mode
# Aesthetically quote the previous argument.
- func_quote_for_eval "$lastarg"
- base_compile="$base_compile $func_quote_for_eval_result"
+ func_append_quoted base_compile "$lastarg"
done # for arg
case $arg_mode in
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- removelist="$removelist $output_obj"
+ func_append removelist " $output_obj"
$ECHO "$srcfile" > "$lockfile"
fi
$opt_dry_run || $RM $removelist
- removelist="$removelist $lockfile"
+ func_append removelist " $lockfile"
trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
- if test -n "$fix_srcfile_path"; then
- eval srcfile=\"$fix_srcfile_path\"
- fi
+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+ srcfile=$func_to_tool_file_result
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
if test -z "$output_obj"; then
# Place PIC objects in $objdir
- command="$command -o $lobj"
+ func_append command " -o $lobj"
fi
func_show_eval_locale "$command" \
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
- command="$command -o $obj"
+ func_append command " -o $obj"
fi
# Suppress compiler output if we already did a PIC compilation.
- command="$command$suppress_output"
+ func_append command "$suppress_output"
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
}
$opt_help || {
- test "$mode" = compile && func_mode_compile ${1+"$@"}
+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
}
func_mode_help ()
{
# We need to display help for each of the modes.
- case $mode in
+ case $opt_mode in
"")
# Generic help is extracted from the usage comments
# at the start of this file.
;;
*)
- func_fatal_help "invalid operation mode \`$mode'"
+ func_fatal_help "invalid operation mode \`$opt_mode'"
;;
esac
else
{
func_help noexit
- for mode in compile link execute install finish uninstall clean; do
+ for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
} | sed -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
- for mode in compile link execute install finish uninstall clean; do
+ for opt_mode in compile link execute install finish uninstall clean; do
echo
func_mode_help
done
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
- for file in $execute_dlfiles; do
+ for file in $opt_dlopen; do
test -f "$file" \
|| func_fatal_help "\`$file' is not a file"
dir=
case $file in
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
+ func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
;;
esac
# Quote arguments (to preserve shell metacharacters).
- func_quote_for_eval "$file"
- args="$args $func_quote_for_eval_result"
+ func_append_quoted args "$file"
done
if test "X$opt_dry_run" = Xfalse; then
fi
}
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
$opt_debug
- libdirs="$nonopt"
+ libs=
+ libdirs=
admincmds=
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for dir
- do
- libdirs="$libdirs $dir"
- done
+ for opt in "$nonopt" ${1+"$@"}
+ do
+ if test -d "$opt"; then
+ func_append libdirs " $opt"
+
+ elif test -f "$opt"; then
+ if func_lalib_unsafe_p "$opt"; then
+ func_append libs " $opt"
+ else
+ func_warning "\`$opt' is not a valid libtool archive"
+ fi
+
+ else
+ func_fatal_error "invalid argument \`$opt'"
+ fi
+ done
+
+ if test -n "$libs"; then
+ if test -n "$lt_sysroot"; then
+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+ else
+ sysroot_cmd=
+ fi
+
+ # Remove sysroot references
+ if $opt_dry_run; then
+ for lib in $libs; do
+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ done
+ else
+ tmpdir=`func_mktempdir`
+ for lib in $libs; do
+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ > $tmpdir/tmp-la
+ mv -f $tmpdir/tmp-la $lib
+ done
+ ${RM}r "$tmpdir"
+ fi
+ fi
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
- $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+ $opt_dry_run || eval "$cmds" || func_append admincmds "
$cmds"
fi
done
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $ECHO " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ echo "----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+ echo
+ echo "If you ever happen to want to link against installed libraries"
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $ECHO " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
+ $ECHO " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+ $ECHO " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ echo
- echo "See any operating system documentation about shared libraries for"
- case $host in
- solaris2.[6789]|solaris2.1[0-9])
- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- echo "pages."
- ;;
- *)
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- ;;
- esac
- echo "----------------------------------------------------------------------"
+ echo "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ echo "pages."
+ ;;
+ *)
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+ echo "----------------------------------------------------------------------"
+ fi
exit $EXIT_SUCCESS
}
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
# func_mode_install arg...
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
- install_prog="$install_prog$func_quote_for_eval_result"
+ func_append install_prog "$func_quote_for_eval_result"
install_shared_prog=$install_prog
case " $install_prog " in
*[\\\ /]cp\ *) install_cp=: ;;
do
arg2=
if test -n "$dest"; then
- files="$files $dest"
+ func_append files " $dest"
dest=$arg
continue
fi
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
- install_prog="$install_prog $func_quote_for_eval_result"
+ func_append install_prog " $func_quote_for_eval_result"
if test -n "$arg2"; then
func_quote_for_eval "$arg2"
fi
- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
+ func_append install_shared_prog " $func_quote_for_eval_result"
done
test -z "$install_prog" && \
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
func_quote_for_eval "$install_override_mode"
- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+ func_append install_shared_prog " -m $func_quote_for_eval_result"
fi
fi
case $file in
*.$libext)
# Do the static libraries later.
- staticlibs="$staticlibs $file"
+ func_append staticlibs " $file"
;;
*.la)
+ func_resolve_sysroot "$file"
+ file=$func_resolve_sysroot_result
+
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
- *) current_libdirs="$current_libdirs $libdir" ;;
+ *) func_append current_libdirs " $libdir" ;;
esac
else
# Note the libdir as a future libdir.
case "$future_libdirs " in
*" $libdir "*) ;;
- *) future_libdirs="$future_libdirs $libdir" ;;
+ *) func_append future_libdirs " $libdir" ;;
esac
fi
func_dirname "$file" "/" ""
dir="$func_dirname_result"
- dir="$dir$objdir"
+ func_append dir "$objdir"
if test -n "$relink_command"; then
# Determine the prefix the user has applied to our future dir.
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"
;;
*.lo)
# Set up the ranlib parameters.
oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
if test -n "$stripme" && test -n "$old_striplib"; then
- func_show_eval "$old_striplib $oldlib" 'exit $?'
+ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
fi
# Do each command in the postinstall commands.
fi
}
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
#endif
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
/* External symbol declarations for the compiler. */\
"
# Add our own program objects to the symbol list.
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
- func_verbose "extracting global C symbols from \`$progfile'"
- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
if test -n "$exclude_expsyms"; then
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
- $opt_dry_run || {
- eval '$ECHO ": $name " >> "$nlist"'
- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- }
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ # if an import library, we need to obtain dlname
+ if func_win32_import_lib_p "$dlprefile"; then
+ func_tr_sh "$dlprefile"
+ eval "curr_lafile=\$libfile_$func_tr_sh_result"
+ dlprefile_dlbasename=""
+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+ # Use subshell, to avoid clobbering current variable values
+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+ if test -n "$dlprefile_dlname" ; then
+ func_basename "$dlprefile_dlname"
+ dlprefile_dlbasename="$func_basename_result"
+ else
+ # no lafile. user explicitly requested -dlpreopen <import library>.
+ $sharedlib_from_linklib_cmd "$dlprefile"
+ dlprefile_dlbasename=$sharedlib_from_linklib_result
+ fi
+ fi
+ $opt_dry_run || {
+ if test -n "$dlprefile_dlbasename" ; then
+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+ else
+ func_warning "Could not compute DLL name from $name"
+ eval '$ECHO ": $name " >> "$nlist"'
+ fi
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+ }
+ else # not an import lib
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ fi
+ ;;
+ *)
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ ;;
+ esac
done
$opt_dry_run || {
const char *name;
void *address;
} lt_dlsymlist;
-"
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- echo >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
- runtime relocations are performed -- see ld's documentation
- on pseudo-relocs. */"
- lt_dlsym_const= ;;
- *osf5*)
- echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
- lt_dlsym_const= ;;
- *)
- lt_dlsym_const=const ;;
- esac
-
- echo >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
+extern LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
- *) symtab_cflags="$symtab_cflags $arg" ;;
+ *) func_append symtab_cflags " $arg" ;;
esac
done
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- win32_nmres=`eval $NM -f posix -A $1 |
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
$SED -n -e '
1,100{
/ I /{
$ECHO "$win32_libid_type"
}
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+# $sharedlib_from_linklib_cmd
+# Result is available in the variable
+# $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+ $opt_debug
+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+ $opt_debug
+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+ $SED '/^Contents of section '"$match_literal"':/{
+ # Place marker at beginning of archive member dllname section
+ s/.*/====MARK====/
+ p
+ d
+ }
+ # These lines can sometimes be longer than 43 characters, but
+ # are always uninteresting
+ /:[ ]*file format pe[i]\{,1\}-/d
+ /^In archive [^:]*:/d
+ # Ensure marker is printed
+ /^====MARK====/p
+ # Remove all lines with less than 43 characters
+ /^.\{43\}/!d
+ # From remaining lines, remove first 43 characters
+ s/^.\{43\}//' |
+ $SED -n '
+ # Join marker and all lines until next marker into a single line
+ /^====MARK====/ b para
+ H
+ $ b para
+ b
+ :para
+ x
+ s/\n//g
+ # Remove the marker
+ s/^====MARK====//
+ # Remove trailing dots and whitespace
+ s/[\. \t]*$//
+ # Print
+ /./p' |
+ # we now have a list, one entry per line, of the stringified
+ # contents of the appropriate section of all members of the
+ # archive which possess that section. Heuristic: eliminate
+ # all those which have a first or second character that is
+ # a '.' (that is, objdump's representation of an unprintable
+ # character.) This should work for all archives with less than
+ # 0x302f exports -- but will fail for DLLs whose name actually
+ # begins with a literal '.' or a single character followed by
+ # a '.'.
+ #
+ # Of those that remain, print the first one.
+ $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $opt_debug
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $opt_debug
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+# $sharedlib_from_linklib_cmd
+# Result is available in the variable
+# $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+ $opt_debug
+ if func_cygming_gnu_implib_p "$1" ; then
+ # binutils import library
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+ elif func_cygming_ms_implib_p "$1" ; then
+ # ms-generated import library
+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+ else
+ # unknown
+ sharedlib_from_linklib_result=""
+ fi
+}
# func_extract_an_archive dir oldlib
# launches target application with the remaining arguments.
func_exec_program ()
{
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
+ case \" \$* \" in
+ *\\ --lt-*)
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done ;;
+ esac
func_exec_program_core \${1+\"\$@\"}
}
if test -f \"\$progdir/\$program\"; then"
+ # fixup the dll searchpath if we need to.
+ #
+ # Fix the DLL searchpath if we need to. Do this before prepending
+ # to shlibpath, because on Windows, both are PATH and uninstalled
+ # libraries must come first.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
"
fi
- # fixup the dll searchpath if we need to.
- if test -n "$dllsearchpath"; then
- $ECHO "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
- fi
-
$ECHO "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
}
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin. Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
- func_to_host_path_result="$1"
- if test -n "$1"; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- case $build in
- *mingw* ) # actually, msys
- # awkward: cmd appends spaces to result
- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_path_result=`cygpath -w "$1" |
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # Unfortunately, winepath does not exit with a non-zero
- # error code, so we are forced to check the contents of
- # stdout. On the other hand, if the command is not
- # found, the shell will set an exit code of 127 and print
- # *an error message* to stdout. So we must check for both
- # error code of zero AND non-empty stdout, which explains
- # the odd construction:
- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
- $SED -e "$lt_sed_naive_backslashify"`
- else
- # Allow warning below.
- func_to_host_path_result=
- fi
- ;;
- esac
- if test -z "$func_to_host_path_result" ; then
- func_error "Could not determine host path corresponding to"
- func_error " \`$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback:
- func_to_host_path_result="$1"
- fi
- ;;
- esac
- fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-# $build $host
-# mingw (msys) mingw [e.g. native]
-# cygwin mingw
-# *nix + wine mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
- func_to_host_pathlist_result="$1"
- if test -n "$1"; then
- case $host in
- *mingw* )
- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- # Remove leading and trailing path separator characters from
- # ARG. msys behavior is inconsistent here, cygpath turns them
- # into '.;' and ';.', and winepath ignores them completely.
- func_stripname : : "$1"
- func_to_host_pathlist_tmp1=$func_stripname_result
- case $build in
- *mingw* ) # Actually, msys.
- # Awkward: cmd appends spaces to result.
- func_to_host_pathlist_result=`
- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
- ;;
- *cygwin* )
- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
- $SED -e "$lt_sed_naive_backslashify"`
- ;;
- * )
- # unfortunately, winepath doesn't convert pathlists
- func_to_host_pathlist_result=""
- func_to_host_pathlist_oldIFS=$IFS
- IFS=:
- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
- IFS=$func_to_host_pathlist_oldIFS
- if test -n "$func_to_host_pathlist_f" ; then
- func_to_host_path "$func_to_host_pathlist_f"
- if test -n "$func_to_host_path_result" ; then
- if test -z "$func_to_host_pathlist_result" ; then
- func_to_host_pathlist_result="$func_to_host_path_result"
- else
- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
- fi
- fi
- fi
- done
- IFS=$func_to_host_pathlist_oldIFS
- ;;
- esac
- if test -z "$func_to_host_pathlist_result"; then
- func_error "Could not determine the host path(s) corresponding to"
- func_error " \`$1'"
- func_error "Continuing, but uninstalled executables may not work."
- # Fallback. This may break if $1 contains DOS-style drive
- # specifications. The fix is not to complicate the expression
- # below, but for the user to provide a working wine installation
- # with winepath so that path translation in the cross-to-mingw
- # case works properly.
- lt_replace_pathsep_nix_to_dos="s|:|;|g"
- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
- $SED -e "$lt_replace_pathsep_nix_to_dos"`
- fi
- # Now, add the leading and trailing path separators back
- case "$1" in
- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
- ;;
- esac
- case "$1" in
- *: ) func_append func_to_host_pathlist_result ";"
- ;;
- esac
- ;;
- esac
- fi
-}
-# end: func_to_host_pathlist
-
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
# Must ONLY be called from within func_mode_link because
EOF
cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
+volatile const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- func_to_host_pathlist "$temp_rpath"
+ func_to_host_path "$temp_rpath"
cat <<EOF
-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE = "$func_to_host_path_result";
EOF
else
cat <<"EOF"
fi
if test -n "$dllsearchpath"; then
- func_to_host_pathlist "$dllsearchpath:"
+ func_to_host_path "$dllsearchpath:"
cat <<EOF
const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE = "$func_to_host_path_result";
EOF
else
cat <<"EOF"
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+ because on Windows, both *_VARNAMEs are PATH but uninstalled
+ libraries must come first. */
lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
nonnull (lt_argv_zero));
{
EOF
func_emit_wrapper yes |
- $SED -e 's/\([\\"]\)/\\\1/g' \
- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
+ $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/ fputs ("\1", f);/p
+g
+D'
cat <<"EOF"
}
EOF
;;
*)
if test "$prev" = dlfiles; then
- dlfiles="$dlfiles $arg"
+ func_append dlfiles " $arg"
else
- dlprefiles="$dlprefiles $arg"
+ func_append dlprefiles " $arg"
fi
prev=
continue
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ *) func_append deplibs " $qarg.ltframework" # this is fixed later
;;
esac
;;
moreargs=
for fil in `cat "$save_arg"`
do
-# moreargs="$moreargs $fil"
+# func_append moreargs " $fil"
arg=$fil
# A libtool-controlled object.
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
- *) rpath="$rpath $arg" ;;
+ *) func_append rpath " $arg" ;;
esac
else
case "$xrpath " in
*" $arg "*) ;;
- *) xrpath="$xrpath $arg" ;;
+ *) func_append xrpath " $arg" ;;
esac
fi
prev=
continue
;;
weak)
- weak_libs="$weak_libs $arg"
+ func_append weak_libs " $arg"
prev=
continue
;;
xcclinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xcompiler)
- compiler_flags="$compiler_flags $qarg"
+ func_append compiler_flags " $qarg"
prev=
func_append compile_command " $qarg"
func_append finalize_command " $qarg"
continue
;;
xlinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $wl$qarg"
+ func_append linker_flags " $qarg"
+ func_append compiler_flags " $wl$qarg"
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
;;
-L*)
- func_stripname '-L' '' "$arg"
- dir=$func_stripname_result
- if test -z "$dir"; then
+ func_stripname "-L" '' "$arg"
+ if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
func_fatal_error "require no space between \`-L' and \`$1'"
else
func_fatal_error "need path for \`-L' option"
fi
fi
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
;;
esac
case "$deplibs " in
- *" -L$dir "*) ;;
+ *" -L$dir "* | *" $arg "*)
+ # Will only happen for absolute or sysroot arguments
+ ;;
*)
- deplibs="$deplibs -L$dir"
- lib_search_path="$lib_search_path $dir"
+ # Preserve sysroot, but never include relative directories
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+ *) func_append deplibs " -L$dir" ;;
+ esac
+ func_append lib_search_path " $dir"
;;
esac
case $host in
case :$dllsearchpath: in
*":$dir:"*) ;;
::) dllsearchpath=$dir;;
- *) dllsearchpath="$dllsearchpath:$dir";;
+ *) func_append dllsearchpath ":$dir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs System.ltframework"
+ func_append deplibs " System.ltframework"
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
;;
esac
fi
- deplibs="$deplibs $arg"
+ func_append deplibs " $arg"
continue
;;
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
- -model|-arch|-isysroot)
- compiler_flags="$compiler_flags $arg"
+ -model|-arch|-isysroot|--sysroot)
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
case "$new_inherited_linker_flags " in
*" $arg "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+ * ) func_append new_inherited_linker_flags " $arg" ;;
esac
continue
;;
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
+ =*)
+ func_stripname '=' '' "$dir"
+ dir=$lt_sysroot$func_stripname_result
+ ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
continue
;;
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $func_quote_for_eval_result"
- compiler_flags="$compiler_flags $func_quote_for_eval_result"
+ func_append arg " $func_quote_for_eval_result"
+ func_append compiler_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
- arg="$arg $wl$func_quote_for_eval_result"
- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
- linker_flags="$linker_flags $func_quote_for_eval_result"
+ func_append arg " $wl$func_quote_for_eval_result"
+ func_append compiler_flags " $wl$func_quote_for_eval_result"
+ func_append linker_flags " $func_quote_for_eval_result"
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
# @file GCC response files
# -tp=* Portland pgcc target processor selection
+ # --sysroot=* for sysroot support
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
func_append finalize_command " $arg"
- compiler_flags="$compiler_flags $arg"
+ func_append compiler_flags " $arg"
continue
;;
*.$objext)
# A standard object.
- objs="$objs $arg"
+ func_append objs " $arg"
;;
*.lo)
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
+ func_append dlfiles " $pic_object"
prev=
continue
else
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
+ func_append dlprefiles " $pic_object"
prev=
fi
*.$libext)
# An archive.
- deplibs="$deplibs $arg"
- old_deplibs="$old_deplibs $arg"
+ func_append deplibs " $arg"
+ func_append old_deplibs " $arg"
continue
;;
*.la)
# A libtool-controlled library.
+ func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
- dlfiles="$dlfiles $arg"
+ func_append dlfiles " $func_resolve_sysroot_result"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
- dlprefiles="$dlprefiles $arg"
+ func_append dlprefiles " $func_resolve_sysroot_result"
prev=
else
- deplibs="$deplibs $arg"
+ func_append deplibs " $func_resolve_sysroot_result"
fi
continue
;;
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
+ func_to_tool_file "$output_objdir/"
+ tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
func_mkdir_p "$output_objdir"
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- libs="$libs $deplib"
+ func_append libs " $deplib"
done
if test "$linkmode" = lib; then
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
esac
- pre_post_deps="$pre_post_deps $pre_post_dep"
+ func_append pre_post_deps " $pre_post_dep"
done
fi
pre_post_deps=
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
+ func_resolve_sysroot "$lib"
case $lib in
- *.la) func_source "$lib" ;;
+ *.la) func_source "$func_resolve_sysroot_result" ;;
esac
# Collect preopened libtool deplibs, except any this library
deplib_base=$func_basename_result
case " $weak_libs " in
*" $deplib_base "*) ;;
- *) deplibs="$deplibs $deplib" ;;
+ *) func_append deplibs " $deplib" ;;
esac
done
done
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- compiler_flags="$compiler_flags $deplib"
+ func_append compiler_flags " $deplib"
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ * ) func_append new_inherited_linker_flags " $deplib" ;;
esac
fi
fi
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
if test "$pass" = conv; then
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
func_warning "\`-L' is ignored for archives/objects"
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
- dir=$func_stripname_result
+ func_resolve_sysroot "$func_stripname_result"
+ dir=$func_resolve_sysroot_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
- *) xrpath="$xrpath $dir" ;;
+ *) func_append xrpath " $dir" ;;
esac
fi
deplibs="$deplib $deplibs"
continue
;;
- *.la) lib="$deplib" ;;
+ *.la)
+ func_resolve_sysroot "$deplib"
+ lib=$func_resolve_sysroot_result
+ ;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
- newdlprefiles="$newdlprefiles $deplib"
+ func_append newdlprefiles " $deplib"
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- newdlfiles="$newdlfiles $deplib"
+ func_append newdlfiles " $deplib"
fi
fi
continue
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
esac
done
fi
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ test -n "$dlopen" && func_append dlfiles " $dlopen"
+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
if test "$pass" = conv; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ func_append convenience " $ladir/$objdir/$old_library"
+ func_append old_convenience " $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
continue
fi # $pass = conv
# Get the name of the library we link against.
linklib=
- for l in $old_library $library_names; do
- linklib="$l"
- done
+ if test -n "$old_library" &&
+ { test "$prefer_static_libs" = yes ||
+ test "$prefer_static_libs,$installed" = "built,no"; }; then
+ linklib=$old_library
+ else
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
+ fi
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
- dlprefiles="$dlprefiles $lib $dependency_libs"
+ func_append dlprefiles " $lib $dependency_libs"
else
- newdlfiles="$newdlfiles $lib"
+ func_append newdlfiles " $lib"
fi
continue
fi # $pass = dlopen
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
else
- dir="$libdir"
- absdir="$libdir"
+ dir="$lt_sysroot$libdir"
+ absdir="$lt_sysroot$libdir"
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ func_append notinst_path " $abs_ladir"
else
dir="$ladir/$objdir"
absdir="$abs_ladir/$objdir"
# Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ func_append notinst_path " $abs_ladir"
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
- # Prefer using a static library (so that no silly _DYNAMIC symbols
- # are required to link).
- if test -n "$old_library"; then
- newdlprefiles="$newdlprefiles $dir/$old_library"
- # Keep a list of preopened convenience libraries to check
- # that they are being used correctly in the link pass.
- test -z "$libdir" && \
- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
- # Otherwise, use the dlname, so that lt_dlopen finds it.
- elif test -n "$dlname"; then
- newdlprefiles="$newdlprefiles $dir/$dlname"
- else
- newdlprefiles="$newdlprefiles $dir/$linklib"
- fi
+ case "$host" in
+ # special handling for platforms with PE-DLLs.
+ *cygwin* | *mingw* | *cegcc* )
+ # Linker will automatically link against shared library if both
+ # static and shared are present. Therefore, ensure we extract
+ # symbols from the import library if a shared library is present
+ # (otherwise, the dlopen module name will be incorrect). We do
+ # this by putting the import library name into $newdlprefiles.
+ # We recover the dlopen module name by 'saving' the la file
+ # name in a special purpose variable, and (later) extracting the
+ # dlname from the la file.
+ if test -n "$dlname"; then
+ func_tr_sh "$dir/$linklib"
+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+ func_append newdlprefiles " $dir/$linklib"
+ else
+ func_append newdlprefiles " $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ func_append dlpreconveniencelibs " $dir/$old_library"
+ fi
+ ;;
+ * )
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ func_append newdlprefiles " $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ func_append dlpreconveniencelibs " $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ func_append newdlprefiles " $dir/$dlname"
+ else
+ func_append newdlprefiles " $dir/$linklib"
+ fi
+ ;;
+ esac
fi # $pass = dlpreopen
if test -z "$libdir"; then
if test "$linkmode" = prog && test "$pass" != link; then
- newlib_search_path="$newlib_search_path $ladir"
+ func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
linkalldeplibs=no
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
- newlib_search_path="$newlib_search_path $func_stripname_result"
+ func_resolve_sysroot "$func_stripname_result"
+ func_append newlib_search_path " $func_resolve_sysroot_result"
;;
esac
# Need to link against all dependency_libs?
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_duplicate_deps ; then
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $deplib"
done # for deplib
continue
fi # $linkmode = prog...
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
- *) temp_rpath="$temp_rpath$absdir:" ;;
+ *) func_append temp_rpath "$absdir:" ;;
esac
fi
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
- notinst_deplibs="$notinst_deplibs $lib"
+ func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
+ func_append notinst_deplibs " $lib"
need_relink=yes
fi
;;
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
+ *) func_append finalize_rpath " $libdir" ;;
esac
;;
esac
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$mode" != relink; then
+ if test "$linkmode" = prog || test "$opt_mode" != relink; then
add_shlibpath=
add_dir=
add=
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
+ add_dir="-L$absdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ *) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
if test "$linkmode" = prog; then
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
fi
fi
fi
- if test "$linkmode" = prog || test "$mode" = relink; then
+ if test "$linkmode" = prog || test "$opt_mode" = relink; then
add_shlibpath=
add_dir=
add=
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ *) func_append finalize_shlibpath "$libdir:" ;;
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ func_append add_dir " -L$inst_prefix_dir$libdir"
;;
esac
fi
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
- *) xrpath="$xrpath $temp_xrpath";;
+ *) func_append xrpath " $temp_xrpath";;
esac;;
- *) temp_deplibs="$temp_deplibs $libdir";;
+ *) func_append temp_deplibs " $libdir";;
esac
done
dependency_libs="$temp_deplibs"
fi
- newlib_search_path="$newlib_search_path $absdir"
+ func_append newlib_search_path " $absdir"
# Link against this library
test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- if $opt_duplicate_deps ; then
+ case $deplib in
+ -L*) func_stripname '-L' '' "$deplib"
+ func_resolve_sysroot "$func_stripname_result";;
+ *) func_resolve_sysroot "$deplib" ;;
+ esac
+ if $opt_preserve_dup_deps ; then
case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ *" $func_resolve_sysroot_result "*)
+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;
esac
fi
- tmp_libs="$tmp_libs $deplib"
+ func_append tmp_libs " $func_resolve_sysroot_result"
done
if test "$link_all_deplibs" != no; then
case $deplib in
-L*) path="$deplib" ;;
*.la)
+ func_resolve_sysroot "$deplib"
+ deplib=$func_resolve_sysroot_result
func_dirname "$deplib" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
path=
fi
fi
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
- *) lib_search_path="$lib_search_path $dir" ;;
+ *) func_append lib_search_path " $dir" ;;
esac
done
newlib_search_path=
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
- *) tmp_libs="$tmp_libs $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
;;
- *) tmp_libs="$tmp_libs $deplib" ;;
+ *) func_append tmp_libs " $deplib" ;;
esac
done
eval $var=\"$tmp_libs\"
;;
esac
if test -n "$i" ; then
- tmp_libs="$tmp_libs $i"
+ func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
- objs="$objs$old_deplibs"
+ func_append objs "$old_deplibs"
;;
lib)
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
$ECHO "*** objects $objs is not portable!"
- libobjs="$libobjs $objs"
+ func_append libobjs " $objs"
fi
fi
# which has an extra 1 added just for fun
#
case $version_type in
+ # correct linux to gnu/linux during the next big refactor
darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
versuffix="$major.$revision"
;;
- linux)
+ linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
done
# Make executables depend on our current version.
- verstring="$verstring:${current}.0"
+ func_append verstring ":${current}.0"
;;
qnx)
fi
func_generate_dlsyms "$libname" "$libname" "yes"
- libobjs="$libobjs $symfileobj"
+ func_append libobjs " $symfileobj"
test "X$libobjs" = "X " && libobjs=
- if test "$mode" != relink; then
+ if test "$opt_mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
continue
fi
fi
- removelist="$removelist $p"
+ func_append removelist " $p"
;;
*) ;;
esac
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
# If the user specified any rpath flags, then add them.
temp_xrpath=
for libdir in $xrpath; do
- temp_xrpath="$temp_xrpath -R$libdir"
+ func_replace_sysroot "$libdir"
+ func_append temp_xrpath " -R$func_replace_sysroot_result"
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
- *) dlfiles="$dlfiles $lib" ;;
+ *) func_append dlfiles " $lib" ;;
esac
done
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
- *) dlprefiles="$dlprefiles $lib" ;;
+ *) func_append dlprefiles " $lib" ;;
esac
done
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- deplibs="$deplibs System.ltframework"
+ func_append deplibs " System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
- deplibs="$deplibs -lc"
+ func_append deplibs " -lc"
fi
;;
esac
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
echo
fi
;;
*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
;;
esac
done
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
i=""
;;
esac
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
else
droppeddeps=yes
echo
fi
;;
*)
- newdeplibs="$newdeplibs $i"
+ func_append newdeplibs " $i"
;;
esac
done
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
fi
if test -n "$a_deplib" ; then
libname=`eval "\\$ECHO \"$libname_spec\""`
+ if test -n "$file_magic_glob"; then
+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+ else
+ libnameglob=$libname
+ fi
+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ if test "$want_nocaseglob" = yes; then
+ shopt -s nocaseglob
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ $nocaseglob
+ else
+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+ fi
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
;;
*)
# Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
;;
esac
potlib="$potent_lib" # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
a_deplib=""
break 2
fi
;;
*)
# Add a -L argument.
- newdeplibs="$newdeplibs $a_deplib"
+ func_append newdeplibs " $a_deplib"
;;
esac
done # Gone through all deplibs.
*)
case " $deplibs " in
*" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
deplibs="$new_libs"
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
+ # Remove ${wl} instances when linking with ld.
+ # FIXME: should test the right _cmds variable.
+ case $archive_cmds in
+ *\$LD\ *) wl= ;;
+ esac
if test "$hardcode_into_libs" = yes; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
- test "$mode" != relink && rpath="$compile_rpath$rpath"
+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
+ func_replace_sysroot "$libdir"
+ libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- dep_rpath="$dep_rpath $flag"
+ func_append dep_rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
+ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
fi
shlibpath="$finalize_shlibpath"
- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
linknames=
for link
do
- linknames="$linknames $link"
+ func_append linknames " $link"
done
# Use standard objects if they are pic
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
export_symbols="$output_objdir/$libname.uexp"
- delfiles="$delfiles $export_symbols"
+ func_append delfiles " $export_symbols"
fi
orig_export_symbols=
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
+ for cmd1 in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
- func_len " $cmd"
- len=$func_len_result
- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ # Take the normal branch if the nm_file_list_spec branch
+ # doesn't work or if tool conversion is not needed.
+ case $nm_file_list_spec~$to_tool_file_cmd in
+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+ try_normal_branch=yes
+ eval cmd=\"$cmd1\"
+ func_len " $cmd"
+ len=$func_len_result
+ ;;
+ *)
+ try_normal_branch=no
+ ;;
+ esac
+ if test "$try_normal_branch" = yes \
+ && { test "$len" -lt "$max_cmd_len" \
+ || test "$max_cmd_len" -le -1; }
+ then
+ func_show_eval "$cmd" 'exit $?'
+ skipped_export=false
+ elif test -n "$nm_file_list_spec"; then
+ func_basename "$output"
+ output_la=$func_basename_result
+ save_libobjs=$libobjs
+ save_output=$output
+ output=${output_objdir}/${output_la}.nm
+ func_to_tool_file "$output"
+ libobjs=$nm_file_list_spec$func_to_tool_file_result
+ func_append delfiles " $output"
+ func_verbose "creating $NM input file list: $output"
+ for obj in $save_libobjs; do
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result"
+ done > "$output"
+ eval cmd=\"$cmd1\"
func_show_eval "$cmd" 'exit $?'
+ output=$save_output
+ libobjs=$save_libobjs
skipped_export=false
else
# The command line is too long to execute in one step.
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
case " $convenience " in
*" $test_deplib "*) ;;
*)
- tmp_deplibs="$tmp_deplibs $test_deplib"
+ func_append tmp_deplibs " $test_deplib"
;;
esac
done
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
- libobjs="$libobjs $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
- linker_flags="$linker_flags $flag"
+ func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
echo 'INPUT (' > $output
for obj in $save_libobjs
do
- $ECHO "$obj" >> $output
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result" >> $output
done
echo ')' >> $output
- delfiles="$delfiles $output"
+ func_append delfiles " $output"
+ func_to_tool_file "$output"
+ output=$func_to_tool_file_result
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
fi
for obj
do
- $ECHO "$obj" >> $output
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result" >> $output
done
- delfiles="$delfiles $output"
- output=$firstobj\"$file_list_spec$output\"
+ func_append delfiles " $output"
+ func_to_tool_file "$output"
+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
if test -n "$last_robj"; then
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
fi
- delfiles="$delfiles $output"
+ func_append delfiles " $output"
else
output=
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- libobjs="$libobjs $func_extract_archives_result"
+ func_append libobjs " $func_extract_archives_result"
test "X$libobjs" = "X " && libobjs=
fi
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
IFS="$save_ifs"
# Restore the uninstalled library and exit
- if test "$mode" = relink; then
+ if test "$opt_mode" = relink; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $convenience
reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
+ # If we're not building shared, we need to use non_pic_objs
+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
# Create the old-style object.
reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- compile_command="$compile_command ${wl}-bind_at_load"
- finalize_command="$finalize_command ${wl}-bind_at_load"
+ func_append compile_command " ${wl}-bind_at_load"
+ func_append finalize_command " ${wl}-bind_at_load"
;;
esac
fi
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
- new_libs="$new_libs -L$path/$objdir" ;;
+ func_append new_libs " -L$path/$objdir" ;;
esac
;;
esac
-L*)
case " $new_libs " in
*" $deplib "*) ;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
;;
- *) new_libs="$new_libs $deplib" ;;
+ *) func_append new_libs " $deplib" ;;
esac
done
compile_deplibs="$new_libs"
- compile_command="$compile_command $compile_deplibs"
- finalize_command="$finalize_command $finalize_deplibs"
+ func_append compile_command " $compile_deplibs"
+ func_append finalize_command " $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir" ;;
+ *) func_append finalize_rpath " $libdir" ;;
esac
done
fi
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
case $host in
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
- *) dllsearchpath="$dllsearchpath:$libdir";;
+ *) func_append dllsearchpath ":$libdir";;
esac
case :$dllsearchpath: in
*":$testbindir:"*) ;;
::) dllsearchpath=$testbindir;;
- *) dllsearchpath="$dllsearchpath:$testbindir";;
+ *) func_append dllsearchpath ":$testbindir";;
esac
;;
esac
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
;;
esac
fi
else
eval flag=\"$hardcode_libdir_flag_spec\"
- rpath="$rpath $flag"
+ func_append rpath " $flag"
fi
elif test -n "$runpath_var"; then
case "$finalize_perm_rpath " in
*" $libdir "*) ;;
- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ *) func_append finalize_perm_rpath " $libdir" ;;
esac
fi
done
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
- rpath="$rpath$dir:"
+ func_append rpath "$dir:"
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
+
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
exit $EXIT_SUCCESS
fi
func_show_eval "$link_command" 'exit $?'
+ if test -n "$postlink_cmds"; then
+ func_to_tool_file "$output_objdir/$outputname"
+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Now create the wrapper script.
func_verbose "creating $output"
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
- oldobjs="$oldobjs $symfileobj"
+ func_append oldobjs " $symfileobj"
fi
fi
addlibs="$old_convenience"
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $addlibs
- oldobjs="$oldobjs $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# Do each command in the archive commands.
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
- oldobjs="$oldobjs $func_extract_archives_result"
+ func_append oldobjs " $func_extract_archives_result"
fi
# POSIX demands no paths to be encoded in archives. We have
else
echo "copying selected object files to avoid basename conflicts..."
gentop="$output_objdir/${outputname}x"
- generated="$generated $gentop"
+ func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- oldobjs="$oldobjs $gentop/$newobj"
+ func_append oldobjs " $gentop/$newobj"
;;
- *) oldobjs="$oldobjs $obj" ;;
+ *) func_append oldobjs " $obj" ;;
esac
done
fi
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
eval cmds=\"$old_archive_cmds\"
func_len " $cmds"
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
+ elif test -n "$archiver_list_spec"; then
+ func_verbose "using command file archive linking..."
+ for obj in $oldobjs
+ do
+ func_to_tool_file "$obj"
+ $ECHO "$func_to_tool_file_result"
+ done > $output_objdir/$libname.libcmd
+ func_to_tool_file "$output_objdir/$libname.libcmd"
+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+ cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
*.la)
func_basename "$deplib"
name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ func_resolve_sysroot "$deplib"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- newdependency_libs="$newdependency_libs $libdir/$name"
+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+ ;;
+ -L*)
+ func_stripname -L '' "$deplib"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdependency_libs " -L$func_replace_sysroot_result"
+ ;;
+ -R*)
+ func_stripname -R '' "$deplib"
+ func_replace_sysroot "$func_stripname_result"
+ func_append newdependency_libs " -R$func_replace_sysroot_result"
;;
- *) newdependency_libs="$newdependency_libs $deplib" ;;
+ *) func_append newdependency_libs " $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlfiles="$newdlfiles $libdir/$name"
+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
- *) newdlfiles="$newdlfiles $lib" ;;
+ *) func_append newdlfiles " $lib" ;;
esac
done
dlfiles="$newdlfiles"
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
- newdlprefiles="$newdlprefiles $libdir/$name"
+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlfiles="$newdlfiles $abs"
+ func_append newdlfiles " $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
- newdlprefiles="$newdlprefiles $abs"
+ func_append newdlprefiles " $abs"
done
dlprefiles="$newdlprefiles"
fi
exit $EXIT_SUCCESS
}
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
func_mode_link ${1+"$@"}
for arg
do
case $arg in
- -f) RM="$RM $arg"; rmforce=yes ;;
- -*) RM="$RM $arg" ;;
- *) files="$files $arg" ;;
+ -f) func_append RM " $arg"; rmforce=yes ;;
+ -*) func_append RM " $arg" ;;
+ *) func_append files " $arg" ;;
esac
done
rmdirs=
- origobjdir="$objdir"
for file in $files; do
func_dirname "$file" "" "."
dir="$func_dirname_result"
if test "X$dir" = X.; then
- objdir="$origobjdir"
+ odir="$objdir"
else
- objdir="$dir/$origobjdir"
+ odir="$dir/$objdir"
fi
func_basename "$file"
name="$func_basename_result"
- test "$mode" = uninstall && objdir="$dir"
+ test "$opt_mode" = uninstall && odir="$dir"
- # Remember objdir for removal later, being careful to avoid duplicates
- if test "$mode" = clean; then
+ # Remember odir for removal later, being careful to avoid duplicates
+ if test "$opt_mode" = clean; then
case " $rmdirs " in
- *" $objdir "*) ;;
- *) rmdirs="$rmdirs $objdir" ;;
+ *" $odir "*) ;;
+ *) func_append rmdirs " $odir" ;;
esac
fi
# Delete the libtool libraries and symlinks.
for n in $library_names; do
- rmfiles="$rmfiles $objdir/$n"
+ func_append rmfiles " $odir/$n"
done
- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$mode" in
+ case "$opt_mode" in
clean)
- case " $library_names " in
- # " " in the beginning catches empty $dlname
+ case " $library_names " in
*" $dlname "*) ;;
- *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
esac
- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
;;
uninstall)
if test -n "$library_names"; then
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
- rmfiles="$rmfiles $dir/$pic_object"
+ func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
if test -n "$non_pic_object" &&
test "$non_pic_object" != none; then
- rmfiles="$rmfiles $dir/$non_pic_object"
+ func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$mode" = clean ; then
+ if test "$opt_mode" = clean ; then
noexename=$name
case $file in
*.exe)
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
- rmfiles="$rmfiles $file"
+ func_append rmfiles " $file"
;;
esac
# Do a test to see if this is a libtool program.
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+ func_append rmfiles " $func_ltwrapper_scriptname_result"
else
relink_command=
func_source $dir/$noexename
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
if test "$fast_install" = yes && test -n "$relink_command"; then
- rmfiles="$rmfiles $objdir/lt-$name"
+ func_append rmfiles " $odir/lt-$name"
fi
if test "X$noexename" != "X$name" ; then
- rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ func_append rmfiles " $odir/lt-${noexename}.c"
fi
fi
fi
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
exit $exit_status
}
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
func_mode_uninstall ${1+"$@"}
-test -z "$mode" && {
+test -z "$opt_mode" && {
help="$generic_help"
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$mode'"
+ func_fatal_help "invalid operation mode \`$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
ACLOCAL = @ACLOCAL@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
AC_DEFUN([GTK_DOC_CHECK],
[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
[PKG_CHECK_EXISTS([gtk-doc >= $1],,
AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+ dnl don't check for glib if we build glib
+ if test "x$PACKAGE_NAME" != "xglib"; then
+ dnl don't fail if someone does not have glib
+ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,)
+ fi
fi
AC_MSG_CHECKING([whether to build gtk-doc documentation])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
m4_require([_LT_CMD_RELOAD])dnl
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- _LT_PROG_XSI_SHELLFNS
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
+ _LT_PROG_REPLACE_SHELLFNS
- mv -f "$cfgfile" "$ofile" ||
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
m4_case([$1],
[C], [_LT_LANG(C)],
[C++], [_LT_LANG(CXX)],
+ [Go], [_LT_LANG(GO)],
[Java], [_LT_LANG(GCJ)],
[Fortran 77], [_LT_LANG(F77)],
[Fortran], [_LT_LANG(FC)],
])# _LT_LANG
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_GO. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC], [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+ if test -n "$ac_tool_prefix"; then
+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+ fi
+fi
+if test -z "$GOC"; then
+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
# _LT_LANG_DEFAULT_CONFIG
# -----------------------
m4_defun([_LT_LANG_DEFAULT_CONFIG],
m4_ifdef([LT_PROG_GCJ],
[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+ [LT_LANG(GO)],
+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
AC_PROVIDE_IFELSE([LT_PROG_RC],
[LT_LANG(RC)],
[m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # If there is a non-empty error log, and "single_module"
+ # appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
rm -rf libconftest.dylib*
rm -f conftest.*
fi])
+
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
[lt_cv_ld_exported_symbols_list],
[lt_cv_ld_exported_symbols_list=no
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
+
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
[lt_cv_ld_force_load=no
cat > conftest.c << _LT_EOF
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
_lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
])
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
# Checks for linker and compiler features on darwin
m4_defun([_LT_DARWIN_LINKER_FEATURES],
[
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
if test "$lt_cv_ld_force_load" = "yes"; then
_LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
fi
])
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
# Links a minimal program and checks the executable
# for the system default hardcoded library path. In most cases,
# this is /usr/lib:/lib, but when the MPI compilers are used
# the location of the communication and MPI libs are included too.
# If we don't find anything, use the default library path according
# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+ lt_aix_libpath_sed='[
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }]'
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi],[])
+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ fi
+ ])
+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
])# _LT_SYS_MODULE_PATH_AIX
AC_MSG_CHECKING([how to print strings])
# Test print first, because it will be a builtin if present.
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
ECHO='print -r --'
elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
])# _LT_PROG_ECHO_BACKSLASH
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[ --with-sysroot[=DIR] Search for dependent libraries within DIR
+ (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted. We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_ERROR([The sysroot must be an absolute path.])
+ ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
# _LT_ENABLE_LOCK
# ---------------
m4_defun([_LT_ENABLE_LOCK],
CFLAGS="$SAVE_CFLAGS"
fi
;;
-sparc*-*solaris*)
+*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
])# _LT_ENABLE_LOCK
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+ [lt_cv_ar_at_file=no
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+ [echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([lt_ar_try])
+ if test "$ac_status" -eq 0; then
+ # Ensure the archiver fails upon bogus file names.
+ rm -f conftest.$ac_objext libconftest.a
+ AC_TRY_EVAL([lt_ar_try])
+ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+ ])
+ ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+ [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
# _LT_CMD_OLD_ARCHIVE
# -------------------
m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
lt_cv_sys_max_cmd_len=196608
;;
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
osf*)
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
/* When -fvisbility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
-void fnord () { int i=42; }
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
case $host_os in
aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
shlibpath_var=LIBPATH
;;
aix[[4-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
;;
bsdi[[45]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[23]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
esac
;;
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-
haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
;;
interix[[3-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
nonstopux*) version_type=nonstopux ;;
*)
if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
dynamic_linker=no
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
;;
newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
;;
sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
sysv4*MP*)
if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
soname_spec='$libname${shared_ext}.$major'
shlibpath_var=LD_LIBRARY_PATH
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
;;
uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
;;
esac
])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
- [Command to use when deplibs_check_method == "file_magic"])
+ [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+ [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
])# _LT_CHECK_MAGIC_METHOD
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+# -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh
+ # decide which to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+ [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+ [lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
# LT_LIB_M
# --------
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-const struct {
+LT@&t@_DLSYM_CONST struct {
const char *name;
void *address;
}
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
AC_MSG_RESULT(ok)
fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+ [Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
-AC_MSG_CHECKING([for $compiler option to produce PIC])
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
;;
esac
;;
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
dgux*)
case $cc_basename in
ec++*)
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+ fi
;;
esac
else
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
;;
+ *Sun\ F* | *Sun*Fortran*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
*Sun\ C*)
# Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
+ *Intel*\ [[CF]]*Compiler*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ *Portland\ Group*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
esac
;;
esac
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
;;
esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- [How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
#
# Check to make sure the PIC flag actually works.
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+ [How to pass a linker flag through the compiler])
#
# Check to make sure the static flag actually works.
#
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
;;
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
+ ;;
cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ case $cc_basename in
+ cl*)
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+ ;;
+ esac
+ ;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ ;;
esac
- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=
+ tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+ esac
;;
darwin* | rhapsody*)
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
hpux9*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
hpux10*)
if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
if test "$with_gnu_ld" = no; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- )
- LDFLAGS="$save_LDFLAGS"
+ # This should be the same for all languages, so no per-tag cache variable.
+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+ [lt_cv_irix_exported_symbol],
+ [save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+ [C++], [[int foo (void) { return 0; }]],
+ [Fortran 77], [[
+ subroutine foo
+ end]],
+ [Fortran], [[
+ subroutine foo
+ end]])])],
+ [lt_cv_irix_exported_symbol=yes],
+ [lt_cv_irix_exported_symbol=no])
+ LDFLAGS="$save_LDFLAGS"])
+ if test "$lt_cv_irix_exported_symbol" = yes; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ fi
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
[Flag to hardcode $libdir into a binary during linking.
This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
- [[If ld is used when linking, flag to hardcode $libdir into a binary
- during linking. This must work even if $libdir does not exist]])
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
- [Fix the shell variable $srcfile for the compiler])
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+ [Commands necessary for finishing linking programs])
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+ lt_save_CFLAGS=$CFLAGS
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
+ CFLAGS=$CXXFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- _LT_SYS_MODULE_PATH_AIX
+ _LT_SYS_MODULE_PATH_AIX([$1])
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
;;
cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
+ case $GXX,$cc_basename in
+ ,cl* | no,cl*)
+ # Native MSVC
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ # Don't use ranlib
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # g++
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
esac
;;
- freebsd[[12]]*)
+ freebsd2.*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
*)
if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
fi # test -n "$compiler"
CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
])# _LT_LANG_CXX_CONFIG
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
}
};
_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case $p in
+ case ${prev}${p} in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
test $p = "-R"; then
prev=$p
continue
- else
- prev=
fi
+ # Expand the sysroot to ease extracting the directories later.
+ if test -z "$prev"; then
+ case $p in
+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+ esac
+ fi
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
+ case ${prev} in
+ -L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
+ prev=
;;
+ *.lto.$objext) ;; # Ignore GCC LTO objects
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
fi
$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
+ CFLAGS=$FFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
GCC=$lt_save_GCC
CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
fi # test "$_lt_disable_F77" != yes
AC_LANG_POP
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_TAGVAR(hardcode_libdir_separator, $1)=
_LT_TAGVAR(hardcode_minus_L, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=no
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
+ CFLAGS=$FCFLAGS
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=yes
CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
AC_LANG_RESTORE
GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_GCJ_CONFIG
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
# _LT_LANG_RC_CONFIG([TAG])
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
CC=${RC-"windres"}
+CFLAGS=
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
GCC=$lt_save_GCC
AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
])# _LT_LANG_RC_CONFIG
dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
# LT_PROG_RC
# ----------
AC_DEFUN([LT_PROG_RC],
AC_SUBST([OBJDUMP])
])
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
# _LT_DECL_SED
# ------------
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,b/c, \
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac])
+
+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+ func_basename_result="${1##*/}"])
+
+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"])
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}])
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $[*] ))
-}
+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+ func_split_long_opt_name=${1%%=*}
+ func_split_long_opt_arg=${1#*=}])
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac])
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
+fi
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-}
+if test x"$lt_shell_append" = xyes; then
+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+ func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
+ # Save a `func_append' function call where possible by direct use of '+='
+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+else
+ # Save a `func_append' function call even when '+=' is not available
+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+fi
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
+if test x"$_lt_function_replace_fail" = x":"; then
+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+ ;;
+ esac
;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+ *-*-cygwin* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+ ;;
+ esac
;;
- esac
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+ [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
- [AS_HELP_STRING([--with-pic],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
+ [lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+ IFS="$lt_save_ifs"
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
[pic_mode=default])
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# Generated from ltversion.in.
+# @configure_input@
-# serial 3175 ltversion.m4
+# serial 3337 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.10])
-m4_define([LT_PACKAGE_REVISION], [1.3175])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.10'
-macro_revision='1.3175'
+[macro_version='2.4.2'
+macro_revision='1.3337'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
Name: dbus-glib
Summary: GLib bindings for D-Bus
-Version: 0.94
-Release: 1
+Version: 0.100
+Release: 2
Group: System/Libraries
License: AFL/GPL
URL: http://www.freedesktop.org/software/dbus/
the GLib thread abstraction and main loop.
%package devel
-Summary: Libraries and headers for the D-Bus GLib bindings
+Summary: Libraries and headers for the D-Bus GLib bindings (Developement)
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
-Headers and static libraries for the D-Bus GLib bindings
+Headers and static libraries for the D-Bus GLib bindings (Developement)
%prep
%setup -q
%configure --disable-static \
--disable-tests \
--enable-verbose-mode=yes \
- --enable-asserts=yes \
--disable-gtk-doc
make %{?jobs:-j%jobs}
-SUBDIRS = core interfaces
-DIST_SUBDIRS = core interfaces
+SUBDIRS = lib . core interfaces manual
+DIST_SUBDIRS = lib core interfaces manual
INCLUDES = \
-I$(top_srcdir) \
TEST_BINARIES=
endif
-if DBUS_GCOV_ENABLED
-GCOV_BINARIES=decode-gcov
-else
-GCOV_BINARIES=
-endif
-
-noinst_PROGRAMS= $(TEST_BINARIES) $(GCOV_BINARIES)
-
-decode_gcov_SOURCES= \
- decode-gcov.c
+noinst_PROGRAMS= $(TEST_BINARIES)
test_service_SOURCES= \
test-service.c
test_service_LDADD=$(DBUS_LIBS)
-decode_gcov_LDADD=$(DBUS_LIBS)
EXTRA_DIST = data/nested-introspect.xml test-compile-nested.sh
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+noinst_PROGRAMS = $(am__EXEEXT_1)
subdir = test
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@DBUS_BUILD_TESTS_TRUE@am__EXEEXT_1 = test-service$(EXEEXT)
-@DBUS_GCOV_ENABLED_TRUE@am__EXEEXT_2 = decode-gcov$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
-am_decode_gcov_OBJECTS = decode-gcov.$(OBJEXT)
-decode_gcov_OBJECTS = $(am_decode_gcov_OBJECTS)
-am__DEPENDENCIES_1 =
-decode_gcov_DEPENDENCIES = $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
am_test_service_OBJECTS = test-service.$(OBJEXT)
test_service_OBJECTS = $(am_test_service_OBJECTS)
+am__DEPENDENCIES_1 =
test_service_DEPENDENCIES = $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(decode_gcov_SOURCES) $(test_service_SOURCES)
-DIST_SOURCES = $(decode_gcov_SOURCES) $(test_service_SOURCES)
+SOURCES = $(test_service_SOURCES)
+DIST_SOURCES = $(test_service_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = core interfaces
-DIST_SUBDIRS = core interfaces
+SUBDIRS = lib . core interfaces manual
+DIST_SUBDIRS = lib core interfaces manual
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
@DBUS_BUILD_TESTS_FALSE@TEST_BINARIES =
@DBUS_BUILD_TESTS_TRUE@TEST_BINARIES = test-service
-@DBUS_GCOV_ENABLED_FALSE@GCOV_BINARIES =
-@DBUS_GCOV_ENABLED_TRUE@GCOV_BINARIES = decode-gcov
-decode_gcov_SOURCES = \
- decode-gcov.c
-
test_service_SOURCES = \
test-service.c
test_service_LDADD = $(DBUS_LIBS)
-decode_gcov_LDADD = $(DBUS_LIBS)
EXTRA_DIST = data/nested-introspect.xml test-compile-nested.sh
TESTS_ENVIRONMENT = top_builddir=$(top_builddir) srcdir=$(srcdir)
TESTS = test-compile-nested.sh
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-decode-gcov$(EXEEXT): $(decode_gcov_OBJECTS) $(decode_gcov_DEPENDENCIES)
- @rm -f decode-gcov$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(decode_gcov_OBJECTS) $(decode_gcov_LDADD) $(LIBS)
-test-service$(EXEEXT): $(test_service_OBJECTS) $(test_service_DEPENDENCIES)
+test-service$(EXEEXT): $(test_service_OBJECTS) $(test_service_DEPENDENCIES) $(EXTRA_test_service_DEPENDENCIES)
@rm -f test-service$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_service_OBJECTS) $(test_service_LDADD) $(LIBS)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode-gcov.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-service.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
+ col="$$grn"; \
else \
- echo "$$red$$dashes"; \
+ col="$$red"; \
fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
test "$$failed" -eq 0; \
else :; fi
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
--- /dev/null
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <dbus/dbus.h>
+#include <glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+DBusConnection *bus;
+GMainContext *main_context;
+
+typedef struct _SpiReentrantCallClosure
+{
+ GMainLoop *loop;
+ DBusMessage *reply;
+} SpiReentrantCallClosure;
+
+static void
+set_reply (DBusPendingCall * pending, void *user_data)
+{
+ SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data;
+
+ closure->reply = dbus_pending_call_steal_reply (pending);
+ dbus_connection_setup_with_g_main (bus, NULL);
+
+ g_main_loop_quit (closure->loop);
+}
+
+static DBusMessage *
+send_and_allow_reentry (DBusConnection * bus, DBusMessage * message)
+{
+ DBusPendingCall *pending;
+ SpiReentrantCallClosure closure;
+
+ closure.loop = g_main_loop_new (main_context, FALSE);
+ dbus_connection_setup_with_g_main (bus, main_context);
+
+ if (!dbus_connection_send_with_reply (bus, message, &pending, 3000))
+ {
+ dbus_connection_setup_with_g_main (bus, NULL);
+ return NULL;
+ }
+ dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
+ g_main_loop_run (closure.loop);
+
+ g_main_loop_unref (closure.loop);
+ return closure.reply;
+}
+
+int
+main(int argc, const char *argv[])
+{
+ DBusError error;
+ DBusMessage *message = NULL, *reply = NULL;
+ const char *str;
+
+ main_context = g_main_context_new ();
+ dbus_error_init (&error);
+ bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
+ if (!bus)
+ {
+ fprintf(stderr, "Couldn't connect to bus: %s\n", error.name);
+ return 1;
+ }
+ dbus_connection_setup_with_g_main (bus, NULL);
+ message = dbus_message_new_method_call ("org.freedesktop.DBus", "/org/freedesktop/DBus", DBUS_INTERFACE_DBUS, "GetId");
+ reply = send_and_allow_reentry (bus, message);
+ if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
+ {
+ char *err;
+ dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID);
+ fprintf (stderr, "Got error: %s\n", err);
+ return 1;
+ }
+ dbus_message_unref (reply);
+ dbus_message_unref (message);
+ message = dbus_message_new_method_call ("org.freedesktop.DBus", "/org/freedesktop/DBus", DBUS_INTERFACE_DBUS, "GetId");
+ reply = send_and_allow_reentry (bus, message);
+ if (!reply)
+ {
+ fprintf(stderr, "Sorry; dbus wouldn't answer me: %s\n", error.message);
+ exit(1);
+ }
+ if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
+ {
+ char *err;
+ dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID);
+ fprintf (stderr, "Got error: %s\n", err);
+ return 1;
+ }
+ if (!dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+ {
+ fprintf(stderr, "Sorry; can't communicate: %s\n", error.message);
+ exit(1);
+ }
+
+ return 0;
+}
+++ /dev/null
-/* Regression test for freedesktop.org #5688.
- *
- * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright © 2009 Nokia Corporation
- *
- * In preparation for dbus-glib relicensing (if it ever happens), this file is
- * licensed under (at your option) either the AFL v2.1, the GPL v2 or later,
- * or an MIT/X11-style license:
- *
- * Licensed under the Academic Free License version 2.1
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#include "dbus/dbus-gutils.h" /* for DBUS_G_CONNECTION_FROM_CONNECTION */
-
-#include "my-object.h"
-
-GMainLoop *loop;
-
-int
-main (int argc, char **argv)
-{
- DBusConnection *d_connection;
- DBusGConnection *connection;
- DBusError d_error;
- GObject *obj;
-
- dbus_error_init (&d_error);
- loop = g_main_loop_new (NULL, FALSE);
-
- g_type_init ();
- g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
-
- d_connection = dbus_bus_get_private (DBUS_BUS_SESSION, NULL);
-
- if (d_connection == NULL)
- g_error ("%s: %s", d_error.name, d_error.message);
-
- dbus_connection_setup_with_g_main (d_connection, NULL);
-
- connection = DBUS_G_CONNECTION_FROM_CONNECTION (d_connection);
-
- obj = g_object_new (MY_TYPE_OBJECT, NULL);
- dbus_g_connection_register_g_object (connection, "/foo", obj);
- g_assert (dbus_g_connection_lookup_g_object (connection, "/foo") == obj);
- g_assert (dbus_g_connection_lookup_g_object (connection, "/bar") == NULL);
-
- dbus_connection_close (d_connection);
- dbus_connection_unref (d_connection);
-
- g_object_unref (obj);
-
- return 0;
-}
$(DBUS_GLIB_THREADS_LIBS) \
$(DBUS_GLIB_LIBS) \
$(DBUS_LIBS) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la \
+ $(NULL)
tool_ldadd = \
$(LDADD) \
## build even when not doing "make check"
noinst_PROGRAMS = \
test-dbus-glib \
+ test-error-mapping \
test-service-glib \
$(THREAD_APPS) \
peer-server \
peer-client \
test-types \
- test-5688 \
- test-unregister \
+ test-30574 \
+ test-peer-on-bus \
+ test-proxy-peer \
+ test-registrations \
test-variant-recursion \
test-gvariant
-test_5688_SOURCES = \
+test_30574_SOURCES = \
+ 30574.c
+
+test_proxy_peer_SOURCES = \
+ my-object-marshal.c \
my-object.c \
my-object.h \
- my-object-subclass.c \
- my-object-subclass.h \
- my-object-marshal.c \
- 5688.c
+ proxy-peer.c
-test_unregister_SOURCES = \
+test_registrations_SOURCES = \
my-object.c \
my-object.h \
my-object-subclass.c \
my-object-subclass.h \
my-object-marshal.c \
- unregister.c
+ registrations.c
test_dbus_glib_SOURCES= \
- my-object-marshal.c \
+ my-object.c \
+ my-object.h \
+ my-object-marshal.c \
test-dbus-glib.c
test_dbus_glib_LDADD= $(tool_ldadd)
+test_error_mapping_SOURCES = \
+ my-object.c \
+ my-object.h \
+ my-object-marshal.c \
+ error-mapping.c
+
test_variant_recursion_SOURCES=test-variant-recursion.c
test_variant_recursion_LDADD= $(tool_ldadd)
$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
my-object-marshal.c: Makefile my-object-marshal.list
- @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body > my-object-marshal.c
+ echo "#include <config.h>" > $@.tmp
+ @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body >> $@.tmp
+ mv $@.tmp $@
my-object-marshal.h: Makefile my-object-marshal.list
@GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header > my-object-marshal.h
test_gvariant_SOURCES = \
test-gvariant.c
+test_peer_on_bus_SOURCES = peer-on-bus.c
+
CLEANFILES = \
$(BUILT_SOURCES) \
run-with-tmp-session-bus.conf
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@DBUS_BUILD_TESTS_TRUE@TESTS = run-test.sh run-peer-test.sh
@DBUS_BUILD_TESTS_FALSE@@HAVE_GLIB_THREADS_TRUE@noinst_PROGRAMS = test-profile$(EXEEXT)
@DBUS_BUILD_TESTS_TRUE@noinst_PROGRAMS = test-dbus-glib$(EXEEXT) \
+@DBUS_BUILD_TESTS_TRUE@ test-error-mapping$(EXEEXT) \
@DBUS_BUILD_TESTS_TRUE@ test-service-glib$(EXEEXT) \
@DBUS_BUILD_TESTS_TRUE@ $(am__EXEEXT_1) peer-server$(EXEEXT) \
@DBUS_BUILD_TESTS_TRUE@ peer-client$(EXEEXT) \
-@DBUS_BUILD_TESTS_TRUE@ test-types$(EXEEXT) test-5688$(EXEEXT) \
-@DBUS_BUILD_TESTS_TRUE@ test-unregister$(EXEEXT) \
+@DBUS_BUILD_TESTS_TRUE@ test-types$(EXEEXT) test-30574$(EXEEXT) \
+@DBUS_BUILD_TESTS_TRUE@ test-peer-on-bus$(EXEEXT) \
+@DBUS_BUILD_TESTS_TRUE@ test-proxy-peer$(EXEEXT) \
+@DBUS_BUILD_TESTS_TRUE@ test-registrations$(EXEEXT) \
@DBUS_BUILD_TESTS_TRUE@ test-variant-recursion$(EXEEXT) \
@DBUS_BUILD_TESTS_TRUE@ test-gvariant$(EXEEXT)
subdir = test/core
peer_client_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
peer_client_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__peer_server_SOURCES_DIST = my-object.c my-object.h \
my-object-subclass.c my-object-subclass.h my-object-marshal.c \
peer_server_OBJECTS = $(am_peer_server_OBJECTS)
peer_server_LDADD = $(LDADD)
peer_server_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la
-am__test_5688_SOURCES_DIST = my-object.c my-object.h \
- my-object-subclass.c my-object-subclass.h my-object-marshal.c \
- 5688.c
-@DBUS_BUILD_TESTS_TRUE@am_test_5688_OBJECTS = my-object.$(OBJEXT) \
-@DBUS_BUILD_TESTS_TRUE@ my-object-subclass.$(OBJEXT) \
-@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.$(OBJEXT) \
-@DBUS_BUILD_TESTS_TRUE@ 5688.$(OBJEXT)
-test_5688_OBJECTS = $(am_test_5688_OBJECTS)
-test_5688_LDADD = $(LDADD)
-test_5688_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la
-am__test_dbus_glib_SOURCES_DIST = my-object-marshal.c test-dbus-glib.c
+ $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
+am__test_30574_SOURCES_DIST = 30574.c
+@DBUS_BUILD_TESTS_TRUE@am_test_30574_OBJECTS = 30574.$(OBJEXT)
+test_30574_OBJECTS = $(am_test_30574_OBJECTS)
+test_30574_LDADD = $(LDADD)
+test_30574_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
+am__test_dbus_glib_SOURCES_DIST = my-object.c my-object.h \
+ my-object-marshal.c test-dbus-glib.c
@DBUS_BUILD_TESTS_TRUE@am_test_dbus_glib_OBJECTS = \
+@DBUS_BUILD_TESTS_TRUE@ my-object.$(OBJEXT) \
@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.$(OBJEXT) \
@DBUS_BUILD_TESTS_TRUE@ test-dbus-glib.$(OBJEXT)
test_dbus_glib_OBJECTS = $(am_test_dbus_glib_OBJECTS)
am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la
+ $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
$(top_builddir)/dbus/libdbus-gtool.la
@DBUS_BUILD_TESTS_TRUE@test_dbus_glib_DEPENDENCIES = \
@DBUS_BUILD_TESTS_TRUE@ $(am__DEPENDENCIES_3)
+am__test_error_mapping_SOURCES_DIST = my-object.c my-object.h \
+ my-object-marshal.c error-mapping.c
+@DBUS_BUILD_TESTS_TRUE@am_test_error_mapping_OBJECTS = \
+@DBUS_BUILD_TESTS_TRUE@ my-object.$(OBJEXT) \
+@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.$(OBJEXT) \
+@DBUS_BUILD_TESTS_TRUE@ error-mapping.$(OBJEXT)
+test_error_mapping_OBJECTS = $(am_test_error_mapping_OBJECTS)
+test_error_mapping_LDADD = $(LDADD)
+test_error_mapping_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__test_gvariant_SOURCES_DIST = test-gvariant.c
@DBUS_BUILD_TESTS_TRUE@am_test_gvariant_OBJECTS = \
@DBUS_BUILD_TESTS_TRUE@ test-gvariant.$(OBJEXT)
test_gvariant_LDADD = $(LDADD)
test_gvariant_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
+am__test_peer_on_bus_SOURCES_DIST = peer-on-bus.c
+@DBUS_BUILD_TESTS_TRUE@am_test_peer_on_bus_OBJECTS = \
+@DBUS_BUILD_TESTS_TRUE@ peer-on-bus.$(OBJEXT)
+test_peer_on_bus_OBJECTS = $(am_test_peer_on_bus_OBJECTS)
+test_peer_on_bus_LDADD = $(LDADD)
+test_peer_on_bus_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__test_profile_SOURCES_DIST = test-profile.c
@HAVE_GLIB_THREADS_TRUE@am_test_profile_OBJECTS = \
@HAVE_GLIB_THREADS_TRUE@ test-profile.$(OBJEXT)
test_profile_LDADD = $(LDADD)
test_profile_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
+am__test_proxy_peer_SOURCES_DIST = my-object-marshal.c my-object.c \
+ my-object.h proxy-peer.c
+@DBUS_BUILD_TESTS_TRUE@am_test_proxy_peer_OBJECTS = \
+@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.$(OBJEXT) \
+@DBUS_BUILD_TESTS_TRUE@ my-object.$(OBJEXT) \
+@DBUS_BUILD_TESTS_TRUE@ proxy-peer.$(OBJEXT)
+test_proxy_peer_OBJECTS = $(am_test_proxy_peer_OBJECTS)
+test_proxy_peer_LDADD = $(LDADD)
+test_proxy_peer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
+am__test_registrations_SOURCES_DIST = my-object.c my-object.h \
+ my-object-subclass.c my-object-subclass.h my-object-marshal.c \
+ registrations.c
+@DBUS_BUILD_TESTS_TRUE@am_test_registrations_OBJECTS = \
+@DBUS_BUILD_TESTS_TRUE@ my-object.$(OBJEXT) \
+@DBUS_BUILD_TESTS_TRUE@ my-object-subclass.$(OBJEXT) \
+@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.$(OBJEXT) \
+@DBUS_BUILD_TESTS_TRUE@ registrations.$(OBJEXT)
+test_registrations_OBJECTS = $(am_test_registrations_OBJECTS)
+test_registrations_LDADD = $(LDADD)
+test_registrations_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__test_service_glib_SOURCES_DIST = my-object.c my-object.h \
my-object-subclass.c my-object-subclass.h my-object-marshal.c \
test-service-glib.c
test_service_glib_LDADD = $(LDADD)
test_service_glib_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__test_thread_client_SOURCES_DIST = test-thread-client.c \
test-thread.h
@DBUS_BUILD_TESTS_TRUE@@HAVE_GLIB_THREADS_TRUE@am_test_thread_client_OBJECTS = test-thread-client.$(OBJEXT)
test_thread_client_LDADD = $(LDADD)
test_thread_client_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__test_thread_server_SOURCES_DIST = test-thread-server.c \
test-thread.h
@DBUS_BUILD_TESTS_TRUE@@HAVE_GLIB_THREADS_TRUE@am_test_thread_server_OBJECTS = test-thread-server.$(OBJEXT)
test_thread_server_LDADD = $(LDADD)
test_thread_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__test_types_SOURCES_DIST = test-types.c
@DBUS_BUILD_TESTS_TRUE@am_test_types_OBJECTS = test-types.$(OBJEXT)
test_types_OBJECTS = $(am_test_types_OBJECTS)
test_types_LDADD = $(LDADD)
test_types_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la
-am__test_unregister_SOURCES_DIST = my-object.c my-object.h \
- my-object-subclass.c my-object-subclass.h my-object-marshal.c \
- unregister.c
-@DBUS_BUILD_TESTS_TRUE@am_test_unregister_OBJECTS = \
-@DBUS_BUILD_TESTS_TRUE@ my-object.$(OBJEXT) \
-@DBUS_BUILD_TESTS_TRUE@ my-object-subclass.$(OBJEXT) \
-@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.$(OBJEXT) \
-@DBUS_BUILD_TESTS_TRUE@ unregister.$(OBJEXT)
-test_unregister_OBJECTS = $(am_test_unregister_OBJECTS)
-test_unregister_LDADD = $(LDADD)
-test_unregister_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(am__DEPENDENCIES_1) $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la
am__test_variant_recursion_SOURCES_DIST = test-variant-recursion.c
@DBUS_BUILD_TESTS_TRUE@am_test_variant_recursion_OBJECTS = \
@DBUS_BUILD_TESTS_TRUE@ test-variant-recursion.$(OBJEXT)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(peer_client_SOURCES) $(peer_server_SOURCES) \
- $(test_5688_SOURCES) $(test_dbus_glib_SOURCES) \
- $(test_gvariant_SOURCES) $(test_profile_SOURCES) \
+ $(test_30574_SOURCES) $(test_dbus_glib_SOURCES) \
+ $(test_error_mapping_SOURCES) $(test_gvariant_SOURCES) \
+ $(test_peer_on_bus_SOURCES) $(test_profile_SOURCES) \
+ $(test_proxy_peer_SOURCES) $(test_registrations_SOURCES) \
$(test_service_glib_SOURCES) $(test_thread_client_SOURCES) \
$(test_thread_server_SOURCES) $(test_types_SOURCES) \
- $(test_unregister_SOURCES) $(test_variant_recursion_SOURCES)
+ $(test_variant_recursion_SOURCES)
DIST_SOURCES = $(am__peer_client_SOURCES_DIST) \
- $(am__peer_server_SOURCES_DIST) $(am__test_5688_SOURCES_DIST) \
+ $(am__peer_server_SOURCES_DIST) $(am__test_30574_SOURCES_DIST) \
$(am__test_dbus_glib_SOURCES_DIST) \
+ $(am__test_error_mapping_SOURCES_DIST) \
$(am__test_gvariant_SOURCES_DIST) \
+ $(am__test_peer_on_bus_SOURCES_DIST) \
$(am__test_profile_SOURCES_DIST) \
+ $(am__test_proxy_peer_SOURCES_DIST) \
+ $(am__test_registrations_SOURCES_DIST) \
$(am__test_service_glib_SOURCES_DIST) \
$(am__test_thread_client_SOURCES_DIST) \
$(am__test_thread_server_SOURCES_DIST) \
$(am__test_types_SOURCES_DIST) \
- $(am__test_unregister_SOURCES_DIST) \
$(am__test_variant_recursion_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
am__tty_colors = \
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
$(DBUS_GLIB_THREADS_LIBS) \
$(DBUS_GLIB_LIBS) \
$(DBUS_LIBS) \
- $(top_builddir)/dbus/libdbus-glib-1.la
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(top_builddir)/test/lib/libtest.la \
+ $(NULL)
tool_ldadd = \
$(LDADD) \
@DBUS_BUILD_TESTS_TRUE@@HAVE_GLIB_THREADS_TRUE@ test-thread-client.c \
@DBUS_BUILD_TESTS_TRUE@@HAVE_GLIB_THREADS_TRUE@ test-thread.h
-@DBUS_BUILD_TESTS_TRUE@test_5688_SOURCES = \
+@DBUS_BUILD_TESTS_TRUE@test_30574_SOURCES = \
+@DBUS_BUILD_TESTS_TRUE@ 30574.c
+
+@DBUS_BUILD_TESTS_TRUE@test_proxy_peer_SOURCES = \
+@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \
@DBUS_BUILD_TESTS_TRUE@ my-object.c \
@DBUS_BUILD_TESTS_TRUE@ my-object.h \
-@DBUS_BUILD_TESTS_TRUE@ my-object-subclass.c \
-@DBUS_BUILD_TESTS_TRUE@ my-object-subclass.h \
-@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \
-@DBUS_BUILD_TESTS_TRUE@ 5688.c
+@DBUS_BUILD_TESTS_TRUE@ proxy-peer.c
-@DBUS_BUILD_TESTS_TRUE@test_unregister_SOURCES = \
+@DBUS_BUILD_TESTS_TRUE@test_registrations_SOURCES = \
@DBUS_BUILD_TESTS_TRUE@ my-object.c \
@DBUS_BUILD_TESTS_TRUE@ my-object.h \
@DBUS_BUILD_TESTS_TRUE@ my-object-subclass.c \
@DBUS_BUILD_TESTS_TRUE@ my-object-subclass.h \
@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \
-@DBUS_BUILD_TESTS_TRUE@ unregister.c
+@DBUS_BUILD_TESTS_TRUE@ registrations.c
@DBUS_BUILD_TESTS_TRUE@test_dbus_glib_SOURCES = \
-@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \
+@DBUS_BUILD_TESTS_TRUE@ my-object.c \
+@DBUS_BUILD_TESTS_TRUE@ my-object.h \
+@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \
@DBUS_BUILD_TESTS_TRUE@ test-dbus-glib.c
@DBUS_BUILD_TESTS_TRUE@test_dbus_glib_LDADD = $(tool_ldadd)
+@DBUS_BUILD_TESTS_TRUE@test_error_mapping_SOURCES = \
+@DBUS_BUILD_TESTS_TRUE@ my-object.c \
+@DBUS_BUILD_TESTS_TRUE@ my-object.h \
+@DBUS_BUILD_TESTS_TRUE@ my-object-marshal.c \
+@DBUS_BUILD_TESTS_TRUE@ error-mapping.c
+
@DBUS_BUILD_TESTS_TRUE@test_variant_recursion_SOURCES = test-variant-recursion.c
@DBUS_BUILD_TESTS_TRUE@test_variant_recursion_LDADD = $(tool_ldadd)
@DBUS_BUILD_TESTS_TRUE@BUILT_SOURCES = test-service-glib-glue.h test-service-glib-subclass-glue.h test-service-glib-bindings.h my-object-marshal.c my-object-marshal.h
@DBUS_BUILD_TESTS_TRUE@test_gvariant_SOURCES = \
@DBUS_BUILD_TESTS_TRUE@ test-gvariant.c
+@DBUS_BUILD_TESTS_TRUE@test_peer_on_bus_SOURCES = peer-on-bus.c
@DBUS_BUILD_TESTS_TRUE@CLEANFILES = \
@DBUS_BUILD_TESTS_TRUE@ $(BUILT_SOURCES) \
@DBUS_BUILD_TESTS_TRUE@ run-with-tmp-session-bus.conf
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-peer-client$(EXEEXT): $(peer_client_OBJECTS) $(peer_client_DEPENDENCIES)
+peer-client$(EXEEXT): $(peer_client_OBJECTS) $(peer_client_DEPENDENCIES) $(EXTRA_peer_client_DEPENDENCIES)
@rm -f peer-client$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(peer_client_OBJECTS) $(peer_client_LDADD) $(LIBS)
-peer-server$(EXEEXT): $(peer_server_OBJECTS) $(peer_server_DEPENDENCIES)
+peer-server$(EXEEXT): $(peer_server_OBJECTS) $(peer_server_DEPENDENCIES) $(EXTRA_peer_server_DEPENDENCIES)
@rm -f peer-server$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(peer_server_OBJECTS) $(peer_server_LDADD) $(LIBS)
-test-5688$(EXEEXT): $(test_5688_OBJECTS) $(test_5688_DEPENDENCIES)
- @rm -f test-5688$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_5688_OBJECTS) $(test_5688_LDADD) $(LIBS)
-test-dbus-glib$(EXEEXT): $(test_dbus_glib_OBJECTS) $(test_dbus_glib_DEPENDENCIES)
+test-30574$(EXEEXT): $(test_30574_OBJECTS) $(test_30574_DEPENDENCIES) $(EXTRA_test_30574_DEPENDENCIES)
+ @rm -f test-30574$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_30574_OBJECTS) $(test_30574_LDADD) $(LIBS)
+test-dbus-glib$(EXEEXT): $(test_dbus_glib_OBJECTS) $(test_dbus_glib_DEPENDENCIES) $(EXTRA_test_dbus_glib_DEPENDENCIES)
@rm -f test-dbus-glib$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_dbus_glib_OBJECTS) $(test_dbus_glib_LDADD) $(LIBS)
-test-gvariant$(EXEEXT): $(test_gvariant_OBJECTS) $(test_gvariant_DEPENDENCIES)
+test-error-mapping$(EXEEXT): $(test_error_mapping_OBJECTS) $(test_error_mapping_DEPENDENCIES) $(EXTRA_test_error_mapping_DEPENDENCIES)
+ @rm -f test-error-mapping$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_error_mapping_OBJECTS) $(test_error_mapping_LDADD) $(LIBS)
+test-gvariant$(EXEEXT): $(test_gvariant_OBJECTS) $(test_gvariant_DEPENDENCIES) $(EXTRA_test_gvariant_DEPENDENCIES)
@rm -f test-gvariant$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_gvariant_OBJECTS) $(test_gvariant_LDADD) $(LIBS)
-test-profile$(EXEEXT): $(test_profile_OBJECTS) $(test_profile_DEPENDENCIES)
+test-peer-on-bus$(EXEEXT): $(test_peer_on_bus_OBJECTS) $(test_peer_on_bus_DEPENDENCIES) $(EXTRA_test_peer_on_bus_DEPENDENCIES)
+ @rm -f test-peer-on-bus$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_peer_on_bus_OBJECTS) $(test_peer_on_bus_LDADD) $(LIBS)
+test-profile$(EXEEXT): $(test_profile_OBJECTS) $(test_profile_DEPENDENCIES) $(EXTRA_test_profile_DEPENDENCIES)
@rm -f test-profile$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_profile_OBJECTS) $(test_profile_LDADD) $(LIBS)
-test-service-glib$(EXEEXT): $(test_service_glib_OBJECTS) $(test_service_glib_DEPENDENCIES)
+test-proxy-peer$(EXEEXT): $(test_proxy_peer_OBJECTS) $(test_proxy_peer_DEPENDENCIES) $(EXTRA_test_proxy_peer_DEPENDENCIES)
+ @rm -f test-proxy-peer$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_proxy_peer_OBJECTS) $(test_proxy_peer_LDADD) $(LIBS)
+test-registrations$(EXEEXT): $(test_registrations_OBJECTS) $(test_registrations_DEPENDENCIES) $(EXTRA_test_registrations_DEPENDENCIES)
+ @rm -f test-registrations$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_registrations_OBJECTS) $(test_registrations_LDADD) $(LIBS)
+test-service-glib$(EXEEXT): $(test_service_glib_OBJECTS) $(test_service_glib_DEPENDENCIES) $(EXTRA_test_service_glib_DEPENDENCIES)
@rm -f test-service-glib$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_service_glib_OBJECTS) $(test_service_glib_LDADD) $(LIBS)
-test-thread-client$(EXEEXT): $(test_thread_client_OBJECTS) $(test_thread_client_DEPENDENCIES)
+test-thread-client$(EXEEXT): $(test_thread_client_OBJECTS) $(test_thread_client_DEPENDENCIES) $(EXTRA_test_thread_client_DEPENDENCIES)
@rm -f test-thread-client$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_thread_client_OBJECTS) $(test_thread_client_LDADD) $(LIBS)
-test-thread-server$(EXEEXT): $(test_thread_server_OBJECTS) $(test_thread_server_DEPENDENCIES)
+test-thread-server$(EXEEXT): $(test_thread_server_OBJECTS) $(test_thread_server_DEPENDENCIES) $(EXTRA_test_thread_server_DEPENDENCIES)
@rm -f test-thread-server$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_thread_server_OBJECTS) $(test_thread_server_LDADD) $(LIBS)
-test-types$(EXEEXT): $(test_types_OBJECTS) $(test_types_DEPENDENCIES)
+test-types$(EXEEXT): $(test_types_OBJECTS) $(test_types_DEPENDENCIES) $(EXTRA_test_types_DEPENDENCIES)
@rm -f test-types$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_types_OBJECTS) $(test_types_LDADD) $(LIBS)
-test-unregister$(EXEEXT): $(test_unregister_OBJECTS) $(test_unregister_DEPENDENCIES)
- @rm -f test-unregister$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_unregister_OBJECTS) $(test_unregister_LDADD) $(LIBS)
-test-variant-recursion$(EXEEXT): $(test_variant_recursion_OBJECTS) $(test_variant_recursion_DEPENDENCIES)
+test-variant-recursion$(EXEEXT): $(test_variant_recursion_OBJECTS) $(test_variant_recursion_DEPENDENCIES) $(EXTRA_test_variant_recursion_DEPENDENCIES)
@rm -f test-variant-recursion$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_variant_recursion_OBJECTS) $(test_variant_recursion_LDADD) $(LIBS)
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/5688.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/30574.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error-mapping.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/my-object-marshal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/my-object-subclass.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/my-object.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer-client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer-on-bus.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer-server.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy-peer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/registrations.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dbus-glib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gvariant.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-profile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread-server.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-types.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-variant-recursion.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unregister.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
+ col="$$grn"; \
else \
- echo "$$red$$dashes"; \
+ col="$$red"; \
fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
test "$$failed" -eq 0; \
else :; fi
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
@DBUS_BUILD_TESTS_TRUE@my-object-marshal.c: Makefile my-object-marshal.list
-@DBUS_BUILD_TESTS_TRUE@ @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body > my-object-marshal.c
+@DBUS_BUILD_TESTS_TRUE@ echo "#include <config.h>" > $@.tmp
+@DBUS_BUILD_TESTS_TRUE@ @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body >> $@.tmp
+@DBUS_BUILD_TESTS_TRUE@ mv $@.tmp $@
@DBUS_BUILD_TESTS_TRUE@my-object-marshal.h: Makefile my-object-marshal.list
@DBUS_BUILD_TESTS_TRUE@ @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header > my-object-marshal.h
--- /dev/null
+/* Feature test for exported object methods raising errors
+ *
+ * Copyright © 2006-2010 Red Hat, Inc.
+ * Copyright © 2006-2010 Collabora Ltd.
+ * Copyright © 2006-2011 Nokia Corporation
+ * Copyright © 2006 Steve Frécinaux
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <config.h>
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include <string.h>
+
+#include "my-object.h"
+#include "test-service-glib-bindings.h"
+
+/* my-object wants this to exist */
+GMainLoop *loop = NULL;
+
+typedef struct {
+ GError *error;
+ gchar *error_name;
+ DBusGConnection *conn;
+ DBusGProxy *proxy;
+ GObject *object;
+} Fixture;
+
+#define assert_contains(haystack, needle) \
+ assert_contains_impl (__FILE__, __LINE__, G_STRINGIFY (haystack), haystack, \
+ G_STRINGIFY (needle), needle)
+
+static void
+assert_contains_impl (const gchar *file,
+ gint line,
+ const gchar *haystack_desc,
+ const gchar *haystack,
+ const gchar *needle_desc,
+ const gchar *needle)
+{
+ if (G_UNLIKELY (strstr (haystack, needle) == NULL))
+ {
+ g_error ("%s:%d: assertion failed: (%s) contains (%s): "
+ "values are \"%s\", \"%s\"",
+ file, line, haystack_desc, needle_desc, haystack, needle);
+ }
+}
+
+static void
+setup (Fixture *f,
+ gconstpointer context)
+{
+ static gsize once = 0;
+
+ dbus_g_type_specialized_init ();
+
+ if (g_once_init_enter (&once))
+ {
+ /* this may only be called once */
+ dbus_g_error_domain_register (MY_OBJECT_ERROR, NULL, MY_TYPE_ERROR);
+
+ g_once_init_leave (&once, 1);
+ }
+
+ f->conn = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &f->error);
+ g_assert_no_error (f->error);
+ g_assert (f->conn != NULL);
+
+ f->object = g_object_new (MY_TYPE_OBJECT, NULL);
+ g_assert (MY_IS_OBJECT (f->object));
+ dbus_g_connection_register_g_object (f->conn, "/com/example/Test/Object",
+ f->object);
+
+ f->proxy = dbus_g_proxy_new_for_name (f->conn,
+ dbus_bus_get_unique_name (dbus_g_connection_get_connection (f->conn)),
+ "/com/example/Test/Object", "org.freedesktop.DBus.GLib.Tests.MyObject");
+ g_assert (f->proxy != NULL);
+}
+
+static void
+throw_error_cb (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data)
+{
+ Fixture *f = user_data;
+
+ g_assert (error != NULL);
+ g_clear_error (&f->error);
+ g_free (f->error_name);
+ f->error = g_error_copy (error);
+
+ if (g_error_matches (error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION))
+ f->error_name = g_strdup (dbus_g_error_get_name (error));
+ else
+ f->error_name = NULL;
+}
+
+static void
+test_async (Fixture *f,
+ gconstpointer context)
+{
+ /* This is equivalent to test_simple but uses a method that's implemented
+ * async at the service side - it's a different calling convention for the
+ * service, but is indistinguishable here. */
+
+ my_object_save_error ((MyObject *) f->object, MY_OBJECT_ERROR,
+ MY_OBJECT_ERROR_FOO, "<foo>");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_async_throw_error_async (
+ f->proxy, throw_error_cb, f))
+ g_error ("Failed to start async AsyncThrowError call");
+
+ while (f->error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (f->error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+ g_assert_cmpstr (f->error_name, ==,
+ "org.freedesktop.DBus.GLib.Tests.MyObject.Foo");
+ assert_contains (f->error->message, "<foo>");
+}
+
+static void
+test_simple (Fixture *f,
+ gconstpointer context)
+{
+ my_object_save_error ((MyObject *) f->object, MY_OBJECT_ERROR,
+ MY_OBJECT_ERROR_FOO, "<foo>");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_async (
+ f->proxy, throw_error_cb, f))
+ g_error ("Failed to start async ThrowError call");
+
+ while (f->error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (f->error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+ g_assert_cmpstr (f->error_name, ==,
+ "org.freedesktop.DBus.GLib.Tests.MyObject.Foo");
+ assert_contains (f->error->message, "<foo>");
+}
+
+static void
+test_builtin (Fixture *f,
+ gconstpointer context)
+{
+ g_test_bug ("16776");
+
+ my_object_save_error ((MyObject *) f->object, DBUS_GERROR,
+ DBUS_GERROR_NOT_SUPPORTED, "<not supported>");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_async (
+ f->proxy, throw_error_cb, f))
+ g_error ("Failed to start async ThrowError call");
+
+ while (f->error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (f->error, DBUS_GERROR, DBUS_GERROR_NOT_SUPPORTED);
+ assert_contains (f->error->message, "<not supported>");
+}
+
+static void
+test_multi_word (Fixture *f,
+ gconstpointer context)
+{
+ /* no bug#, but this is a regression test for commit 3d69cfeab177e */
+
+ my_object_save_error ((MyObject *) f->object, MY_OBJECT_ERROR,
+ MY_OBJECT_ERROR_MULTI_WORD, "this method's error has a hyphen");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_async (
+ f->proxy, throw_error_cb, f))
+ g_error ("Failed to start async ThrowError call");
+
+ while (f->error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (f->error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+ g_assert_cmpstr (f->error_name, ==,
+ "org.freedesktop.DBus.GLib.Tests.MyObject.MultiWord");
+ assert_contains (f->error->message, "this method's error has a hyphen");
+}
+
+static void
+test_underscore (Fixture *f,
+ gconstpointer context)
+{
+ g_test_bug ("30274");
+
+ my_object_save_error ((MyObject *) f->object, MY_OBJECT_ERROR,
+ MY_OBJECT_ERROR_UNDER_SCORE, "this method's error has an underscore");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_async (
+ f->proxy, throw_error_cb, f))
+ g_error ("Failed to start async ThrowError call");
+
+ while (f->error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (f->error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+ g_assert_cmpstr (f->error_name, ==,
+ "org.freedesktop.DBus.GLib.Tests.MyObject.Under_score");
+ assert_contains (f->error->message, "this method's error has an underscore");
+}
+
+static void
+test_unregistered (Fixture *f,
+ gconstpointer context)
+{
+ g_test_bug ("27799");
+
+ my_object_save_error ((MyObject *) f->object, G_IO_ERROR,
+ G_IO_ERROR_NOT_INITIALIZED,
+ "dbus-glib does not know about this error domain");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_async (
+ f->proxy, throw_error_cb, f))
+ g_error ("Failed to start async ThrowError call");
+
+ while (f->error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (f->error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+ assert_contains (f->error->message,
+ "dbus-glib does not know about this error domain");
+}
+
+static void
+teardown (Fixture *f,
+ gconstpointer context G_GNUC_UNUSED)
+{
+ g_free (f->error_name);
+
+ g_clear_error (&f->error);
+
+ if (f->proxy != NULL)
+ {
+ g_object_unref (f->proxy);
+ f->proxy = NULL;
+ }
+
+ if (f->object != NULL)
+ {
+ g_object_unref (f->object);
+ f->object = NULL;
+ }
+
+ if (f->conn != NULL)
+ {
+ dbus_connection_close (dbus_g_connection_get_connection (f->conn));
+ dbus_g_connection_unref (f->conn);
+ f->conn = NULL;
+ }
+}
+
+int
+main (int argc,
+ char **argv)
+{
+ g_test_init (&argc, &argv, NULL);
+ g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
+
+ g_type_init ();
+
+ g_test_add ("/error-mapping/async", Fixture, NULL, setup, test_async,
+ teardown);
+ g_test_add ("/error-mapping/builtin", Fixture, NULL, setup, test_builtin,
+ teardown);
+ g_test_add ("/error-mapping/multi-word", Fixture, NULL, setup,
+ test_multi_word, teardown);
+ g_test_add ("/error-mapping/simple", Fixture, NULL, setup, test_simple,
+ teardown);
+ g_test_add ("/error-mapping/underscore", Fixture, NULL, setup,
+ test_underscore, teardown);
+ g_test_add ("/error-mapping/unregistered", Fixture, NULL, setup,
+ test_unregistered, teardown);
+
+ return g_test_run ();
+}
+#include <config.h>
#ifndef __my_object_marshal_MARSHAL_H__
#define __my_object_marshal_MARSHAL_H__
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
+#define g_marshal_value_peek_char(v) g_value_get_schar (v)
#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
#define g_marshal_value_peek_int(v) g_value_get_int (v)
#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
#endif /* !G_ENABLE_DEBUG */
-/* NONE:STRING,INT,STRING (./my-object-marshal.list:1) */
+/* NONE:STRING,INT,STRING (/home/smcv/src/fdo/dbus-glib/test/core/my-object-marshal.list:1) */
extern void my_object_marshal_VOID__STRING_INT_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
}
#define my_object_marshal_NONE__STRING_INT_STRING my_object_marshal_VOID__STRING_INT_STRING
-/* NONE:STRING,BOXED (./my-object-marshal.list:2) */
+/* NONE:STRING,BOXED (/home/smcv/src/fdo/dbus-glib/test/core/my-object-marshal.list:2) */
extern void my_object_marshal_VOID__STRING_BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
--- /dev/null
+
+#ifndef __my_object_marshal_MARSHAL_H__
+#define __my_object_marshal_MARSHAL_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* NONE:STRING,INT,STRING (/home/smcv/src/fdo/dbus-glib/test/core/my-object-marshal.list:1) */
+extern void my_object_marshal_VOID__STRING_INT_STRING (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+#define my_object_marshal_NONE__STRING_INT_STRING my_object_marshal_VOID__STRING_INT_STRING
+
+/* NONE:STRING,BOXED (/home/smcv/src/fdo/dbus-glib/test/core/my-object-marshal.list:2) */
+extern void my_object_marshal_VOID__STRING_BOXED (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+#define my_object_marshal_NONE__STRING_BOXED my_object_marshal_VOID__STRING_BOXED
+
+G_END_DECLS
+
+#endif /* __my_object_marshal_MARSHAL_H__ */
+
#include "test-service-glib-glue.h"
+void
+my_object_register_marshallers (void)
+{
+ dbus_g_object_register_marshaller (my_object_marshal_VOID__STRING_INT_STRING,
+ G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INVALID);
+
+ dbus_g_object_register_marshaller (my_object_marshal_VOID__STRING_BOXED,
+ G_TYPE_NONE, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
+}
+
/* Properties */
enum
{
enum
{
FROBNICATE,
+ OBJECTIFIED,
SIG0,
SIG1,
SIG2,
MyObject *mobject = MY_OBJECT (object);
g_free (mobject->this_is_a_string);
+ g_clear_error (&mobject->saved_error);
(G_OBJECT_CLASS (my_object_parent_class)->finalize) (object);
}
{
obj->val = 0;
obj->notouching = 42;
+ obj->saved_error = g_error_new_literal (MY_OBJECT_ERROR,
+ MY_OBJECT_ERROR_FOO, "this method always loses");
}
static void
{
GObjectClass *gobject_class = G_OBJECT_CLASS (mobject_class);
+ my_object_register_marshallers ();
+
dbus_g_object_type_install_info (MY_TYPE_OBJECT,
&dbus_glib_my_object_object_info);
g_cclosure_marshal_VOID__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
+ signals[OBJECTIFIED] =
+ g_signal_new ("objectified",
+ G_OBJECT_CLASS_TYPE (mobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, G_TYPE_OBJECT);
+
signals[SIG0] =
g_signal_new ("sig0",
G_OBJECT_CLASS_TYPE (mobject_class),
ENUM_ENTRY (MY_OBJECT_ERROR_FOO, "Foo"),
ENUM_ENTRY (MY_OBJECT_ERROR_BAR, "Bar"),
ENUM_ENTRY (MY_OBJECT_ERROR_MULTI_WORD, "Multi-word"),
+ ENUM_ENTRY (MY_OBJECT_ERROR_UNDER_SCORE, "Under_score"),
{ 0, 0, 0 }
};
return x + 1;
}
-gboolean
-my_object_throw_error (MyObject *obj, GError **error)
-{
- g_set_error (error,
- MY_OBJECT_ERROR,
- MY_OBJECT_ERROR_FOO,
- "%s",
- "this method always loses");
- return FALSE;
-}
-
-gboolean
-my_object_throw_not_supported (MyObject *obj, GError **error)
+void
+my_object_save_error (MyObject *obj,
+ GQuark domain,
+ gint code,
+ const gchar *message)
{
- g_set_error (error,
- DBUS_GERROR,
- DBUS_GERROR_NOT_SUPPORTED,
- "%s",
- "this method always loses");
- return FALSE;
+ g_clear_error (&obj->saved_error);
+ g_set_error_literal (&obj->saved_error, domain, code, message);
}
gboolean
-my_object_throw_error_multi_word (MyObject *obj, GError **error)
+my_object_throw_error (MyObject *obj, GError **error)
{
- g_set_error (error,
- MY_OBJECT_ERROR,
- MY_OBJECT_ERROR_MULTI_WORD,
- "%s",
- "this method's error has a hyphen");
+ g_set_error_literal (error, obj->saved_error->domain,
+ obj->saved_error->code, obj->saved_error->message);
return FALSE;
}
{
/* Unregistered errors shouldn't cause a dbus abort. See
* https://bugzilla.redhat.com/show_bug.cgi?id=581794
+ *
+ * This is arguably invalid usage - a domain of 0 (which stringifies
+ * to NULL) is meaningless. (See GNOME#660731.)
+ *
+ * We can't just use my_object_save_error() and ThrowError() for
+ * this, because g_error_new() is stricter about the domain than
+ * g_error_new_valist(). Perhaps this method should be removed entirely,
+ * though.
*/
g_set_error (error, 0, 0,
"%s",
g_idle_add ((GSourceFunc)do_async_increment, data);
}
+typedef struct {
+ GError *error;
+ DBusGMethodInvocation *context;
+} ErrorData;
+
static gboolean
-do_async_error (IncrementData *data)
+do_async_error (ErrorData *data)
{
- GError *error;
- error = g_error_new (MY_OBJECT_ERROR,
- MY_OBJECT_ERROR_FOO,
- "%s",
- "this method always loses");
- dbus_g_method_return_error (data->context, error);
+ dbus_g_method_return_error (data->context, data->error);
+ g_error_free (data->error);
g_free (data);
return FALSE;
}
void
my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context)
{
- IncrementData *data = g_new0(IncrementData, 1);
+ ErrorData *data = g_new0 (ErrorData, 1);
+
+ data->error = g_error_copy (obj->saved_error);
data->context = context;
- g_idle_add ((GSourceFunc)do_async_error, data);
+ g_idle_add ((GSourceFunc) do_async_error, data);
}
void
g_main_loop_quit (loop);
return TRUE;
}
+
+void
+my_object_emit_objectified (MyObject *obj,
+ GObject *other)
+{
+ g_signal_emit (obj, signals[OBJECTIFIED], 0, other);
+}
typedef struct MyObject MyObject;
typedef struct MyObjectClass MyObjectClass;
+void my_object_register_marshallers (void);
GType my_object_get_type (void);
struct MyObject
{
GObject parent;
+ GError *saved_error;
char *this_is_a_string;
guint notouching;
guint val;
{
MY_OBJECT_ERROR_FOO,
MY_OBJECT_ERROR_BAR,
- MY_OBJECT_ERROR_MULTI_WORD
+ MY_OBJECT_ERROR_MULTI_WORD,
+ MY_OBJECT_ERROR_UNDER_SCORE
} MyObjectError;
#define MY_OBJECT_ERROR (my_object_error_quark ())
void my_object_unsafe_disable_legacy_property_access (MyObject *obj);
+void my_object_emit_objectified (MyObject *obj, GObject *other);
+
+/* Not a D-Bus method. */
+void my_object_save_error (MyObject *obj, GQuark domain, gint code,
+ const gchar *message);
+
#endif
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
--- /dev/null
+/* Regression test for object registration and unregistration
+ *
+ * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright © 2009-2011 Nokia Corporation
+ *
+ * In preparation for dbus-glib relicensing (if it ever happens), this file is
+ * licensed under (at your option) either the AFL v2.1, the GPL v2 or later,
+ * or an MIT/X11-style license:
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include "test/lib/util.h"
+
+GMainLoop *loop = NULL;
+
+typedef struct {
+ DBusGConnection *bus;
+ DBusGConnection *bus2;
+} Fixture;
+
+static void
+setup (Fixture *f,
+ gconstpointer path_to_use)
+{
+ f->bus = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, NULL);
+ g_assert (f->bus != NULL);
+
+ f->bus2 = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, NULL);
+ g_assert (f->bus2 != NULL);
+}
+
+static void
+teardown (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ if (f->bus != NULL)
+ {
+ test_run_until_disconnected (f->bus, NULL);
+ dbus_g_connection_unref (f->bus);
+ }
+
+ if (f->bus2 != NULL)
+ {
+ test_run_until_disconnected (f->bus2, NULL);
+ dbus_g_connection_unref (f->bus2);
+ }
+
+ dbus_shutdown ();
+}
+
+static void
+destroy_cb (DBusGProxy *proxy G_GNUC_UNUSED,
+ gpointer user_data)
+{
+ gboolean *destroyed = user_data;
+
+ *destroyed = TRUE;
+}
+
+static void
+test_name_owner_changed (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ DBusGProxy *peer;
+ DBusGProxy *named;
+ gboolean destroyed = FALSE;
+
+ g_test_bug ("41126");
+
+ /* bus has a proxy for bus2... */
+ named = dbus_g_proxy_new_for_name (f->bus,
+ dbus_bus_get_unique_name (dbus_g_connection_get_connection (f->bus2)),
+ "/", "org.freedesktop.DBus.Peer");
+ /* ... and also a proxy for the peer (i.e. the dbus-daemon) */
+ peer = dbus_g_proxy_new_for_peer (f->bus, "/", "org.freedesktop.DBus.Peer");
+
+ g_signal_connect (G_OBJECT (named), "destroy", G_CALLBACK (destroy_cb),
+ &destroyed);
+
+ /* Disconnect bus2, to provoke a NameOwnerChanged signal on bus */
+ test_run_until_disconnected (f->bus2, NULL);
+ dbus_g_connection_unref (f->bus2);
+ f->bus2 = NULL;
+
+ /* Wait for that NameOwnerChanged to be processed */
+ while (!destroyed)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_signal_handlers_disconnect_by_func (named, destroy_cb, &destroyed);
+
+ /* The first part of the bug was that we'd never get here, because checking
+ * whether 'peer' was affected by the NameOwnerChanged caused a NULL
+ * dereference and segfault. If we get here, all is OK.
+ *
+ * The second part of the bug was that if the last proxy in existence was
+ * for a peer, when it was unregistered there would be no owner_match_rules,
+ * causing a crash. Unref named before peer, to exercise that. */
+
+ g_object_unref (named);
+ g_object_unref (peer);
+}
+
+int
+main (int argc, char **argv)
+{
+ g_setenv ("DBUS_FATAL_WARNINGS", "1", TRUE);
+ g_type_init ();
+ g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
+ dbus_g_type_specialized_init ();
+ g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
+ g_test_init (&argc, &argv, NULL);
+
+ g_test_add ("/peer-on-bus/name-owner-changed", Fixture, NULL,
+ setup, test_name_owner_changed, teardown);
+
+ return g_test_run ();
+}
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
--- /dev/null
+/* Regression tests for using a DBusGProxy on a peer-to-peer connection.
+ *
+ * Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ * Copyright © 2011 Nokia Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <glib.h>
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include "my-object.h"
+
+GMainLoop *loop;
+
+typedef struct {
+ DBusError e;
+
+ DBusServer *server;
+ DBusConnection *server_conn;
+ DBusGConnection *server_gconn;
+
+ DBusConnection *client_conn;
+ DBusGConnection *client_gconn;
+
+ DBusGProxy *proxy;
+ gboolean proxy_destroyed;
+ GObject *object;
+ GHashTable *in_flight;
+ GHashTable *completed;
+} Fixture;
+
+static void
+assert_no_error (const DBusError *e)
+{
+ if (G_UNLIKELY (dbus_error_is_set (e)))
+ g_error ("expected success but got error: %s: %s", e->name, e->message);
+}
+
+static void
+new_conn_cb (DBusServer *server,
+ DBusConnection *server_conn,
+ void *data)
+{
+ Fixture *f = data;
+
+ g_assert (f->server_conn == NULL);
+ f->server_conn = dbus_connection_ref (server_conn);
+ dbus_connection_setup_with_g_main (server_conn, NULL);
+ f->server_gconn = dbus_connection_get_g_connection (server_conn);
+}
+
+static void
+destroy_cb (DBusGProxy *proxy,
+ gpointer user_data)
+{
+ Fixture *f = user_data;
+
+ g_assert (proxy == f->proxy);
+
+ f->proxy_destroyed = TRUE;
+}
+
+static void
+setup (Fixture *f,
+ gconstpointer addr)
+{
+ dbus_error_init (&f->e);
+
+ f->server = dbus_server_listen (addr, &f->e);
+ assert_no_error (&f->e);
+ g_assert (f->server != NULL);
+
+ dbus_server_set_new_connection_function (f->server,
+ new_conn_cb, f, NULL);
+ dbus_server_setup_with_g_main (f->server, NULL);
+
+ g_assert (f->server_conn == NULL);
+
+ f->client_conn = dbus_connection_open_private (
+ dbus_server_get_address (f->server), &f->e);
+ assert_no_error (&f->e);
+ g_assert (f->client_conn != NULL);
+ dbus_connection_setup_with_g_main (f->client_conn, NULL);
+ f->client_gconn = dbus_connection_get_g_connection (f->client_conn);
+
+ while (f->server_conn == NULL)
+ {
+ g_print (".");
+ g_main_context_iteration (NULL, TRUE);
+ }
+
+ f->object = g_object_new (MY_TYPE_OBJECT,
+ NULL);
+ dbus_g_connection_register_g_object (f->server_gconn,
+ "/org/freedesktop/DBus/GLib/Tests/MyTestObject", f->object);
+
+ f->proxy = dbus_g_proxy_new_for_peer (f->client_gconn,
+ "/org/freedesktop/DBus/GLib/Tests/MyTestObject",
+ "org.freedesktop.DBus.GLib.Tests.MyObject");
+ g_assert (f->proxy != NULL);
+ g_assert (DBUS_IS_G_PROXY (f->proxy));
+
+ g_signal_connect (f->proxy, "destroy", G_CALLBACK (destroy_cb), f);
+
+ f->in_flight = g_hash_table_new (NULL, NULL);
+ f->completed = g_hash_table_new (NULL, NULL);
+}
+
+static void
+call_cb (DBusGProxy *proxy,
+ DBusGProxyCall *call,
+ gpointer data)
+{
+ Fixture *f = data;
+ gboolean found;
+
+ found = g_hash_table_remove (f->in_flight, call);
+ g_assert (found);
+ g_hash_table_insert (f->completed, call, call);
+}
+
+static void
+test_method (Fixture *f,
+ gconstpointer addr)
+{
+ GError *error = NULL;
+ gboolean ok;
+ DBusGProxyCall *call;
+
+ call = dbus_g_proxy_begin_call (f->proxy, "DoNothing", call_cb, f, NULL,
+ G_TYPE_INVALID);
+ g_assert (call != NULL);
+ g_hash_table_insert (f->in_flight, call, call);
+
+ while (g_hash_table_size (f->in_flight) > 0)
+ {
+ g_print (".");
+ g_main_context_iteration (NULL, TRUE);
+ }
+
+ ok = g_hash_table_remove (f->completed, call);
+ g_assert (ok);
+ ok = dbus_g_proxy_end_call (f->proxy, call, &error,
+ G_TYPE_INVALID);
+ g_assert_no_error (error);
+ g_assert (ok);
+}
+
+static void
+test_disconnect (Fixture *f,
+ gconstpointer addr)
+{
+ GError *error = NULL;
+ gboolean ok;
+ DBusGProxyCall *fail;
+
+ g_test_bug ("38406");
+
+ dbus_connection_close (f->client_conn);
+ dbus_connection_close (f->server_conn);
+
+ fail = dbus_g_proxy_begin_call (f->proxy, "DoNothing", call_cb, f, NULL,
+ G_TYPE_INVALID);
+ g_assert (fail == NULL);
+
+ ok = dbus_g_proxy_end_call (f->proxy, fail, &error,
+ G_TYPE_INVALID);
+ g_assert_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED);
+ g_assert (!ok);
+ g_clear_error (&error);
+
+ while (!f->proxy_destroyed)
+ {
+ g_print (".");
+ g_main_context_iteration (NULL, TRUE);
+ }
+}
+
+static void
+teardown (Fixture *f,
+ gconstpointer addr G_GNUC_UNUSED)
+{
+ f->client_gconn = NULL;
+ f->server_gconn = NULL;
+
+ if (f->in_flight != NULL)
+ {
+ g_hash_table_unref (f->in_flight);
+ f->in_flight = NULL;
+ }
+
+ if (f->completed != NULL)
+ {
+ g_hash_table_unref (f->completed);
+ f->completed = NULL;
+ }
+
+ if (f->proxy != NULL)
+ {
+ g_signal_handlers_disconnect_by_func (f->proxy, destroy_cb, f);
+ g_object_unref (f->proxy);
+ f->proxy = NULL;
+ }
+
+ if (f->object != NULL)
+ {
+ g_object_unref (f->object);
+ f->object = NULL;
+ }
+
+ if (f->client_conn != NULL)
+ {
+ dbus_connection_close (f->client_conn);
+ dbus_connection_unref (f->client_conn);
+ f->client_conn = NULL;
+ }
+
+ if (f->server_conn != NULL)
+ {
+ dbus_connection_close (f->server_conn);
+ dbus_connection_unref (f->server_conn);
+ f->server_conn = NULL;
+ }
+
+ if (f->server != NULL)
+ {
+ dbus_server_disconnect (f->server);
+ dbus_server_unref (f->server);
+ f->server = NULL;
+ }
+}
+
+int
+main (int argc,
+ char **argv)
+{
+ g_test_init (&argc, &argv, NULL);
+ g_type_init ();
+ dbus_g_type_specialized_init ();
+
+ g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
+
+ g_test_add ("/proxy/method", Fixture, "unix:tmpdir=/tmp", setup,
+ test_method, teardown);
+
+ g_test_add ("/proxy/disconnect", Fixture, "unix:tmpdir=/tmp", setup,
+ test_disconnect, teardown);
+
+ return g_test_run ();
+}
--- /dev/null
+/* Regression test for object registration and unregistration
+ *
+ * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright © 2009-2011 Nokia Corporation
+ *
+ * In preparation for dbus-glib relicensing (if it ever happens), this file is
+ * licensed under (at your option) either the AFL v2.1, the GPL v2 or later,
+ * or an MIT/X11-style license:
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include "my-object.h"
+
+GMainLoop *loop = NULL;
+
+typedef struct {
+ DBusError dbus_error;
+ DBusGConnection *bus;
+ DBusGConnection *bus2;
+ GObject *object;
+ DBusMessage *frobnicate1_message;
+ DBusMessage *frobnicate2_message;
+ gboolean received_objectified;
+} Fixture;
+
+#define assert_no_error(e) _assert_no_error (e, __FILE__, __LINE__)
+static void
+_assert_no_error (const DBusError *e,
+ const char *file,
+ int line)
+{
+ if (G_UNLIKELY (dbus_error_is_set (e)))
+ g_error ("%s:%d: expected success but got error: %s: %s",
+ file, line, e->name, e->message);
+}
+
+static void
+setup (Fixture *f,
+ gconstpointer path_to_use)
+{
+ dbus_error_init (&f->dbus_error);
+
+ f->bus = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, NULL);
+ g_assert (f->bus != NULL);
+
+ f->bus2 = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, NULL);
+ g_assert (f->bus2 != NULL);
+
+ f->object = g_object_new (MY_TYPE_OBJECT, NULL);
+ g_assert (MY_IS_OBJECT (f->object));
+}
+
+static void
+teardown (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ /* we close the connection before releasing the object, to test fd.o #5688
+ * in test_lookup() */
+ if (f->bus != NULL)
+ {
+ dbus_connection_close (dbus_g_connection_get_connection (f->bus));
+ dbus_g_connection_unref (f->bus);
+ }
+
+ if (f->bus2 != NULL)
+ {
+ dbus_connection_close (dbus_g_connection_get_connection (f->bus2));
+ dbus_g_connection_unref (f->bus2);
+ }
+
+ if (f->object != NULL)
+ {
+ g_object_unref (f->object);
+ }
+
+ /* This is safe to call on an initialized-but-unset DBusError, a bit like
+ * g_clear_error */
+ dbus_error_free (&f->dbus_error);
+}
+
+static void
+test_lookup (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ /* teardown() closes the connection before f->object is destroyed, which
+ * used to be broken */
+ g_test_bug ("5688");
+
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+ /* this was briefly broken while fixing fd.o#5688 */
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/bar") == NULL);
+}
+
+static void
+test_unregister (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ /* feature test: objects can be unregistered */
+ g_test_bug ("21219");
+
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+ dbus_g_connection_unregister_g_object (f->bus, f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") == NULL);
+}
+
+static void
+test_unregister_on_last_unref (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ gpointer weak_pointer;
+
+ weak_pointer = f->object;
+ g_object_add_weak_pointer (weak_pointer, &weak_pointer);
+
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+ /* implicit unregistration by the last-unref of the object */
+ g_object_unref (f->object);
+ f->object = NULL;
+
+ g_assert (weak_pointer == NULL);
+
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") == NULL);
+}
+
+static void
+test_unregister_on_forced_dispose (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+ /* implicit unregistration by dispose() of the object (don't try
+ * this at home) */
+ g_object_run_dispose (f->object);
+
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") == NULL);
+}
+
+static void
+test_reregister (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+
+ /* Before 0.82, re-registering the same object path was leaky but successful.
+ * 0.82 disallowed this behaviour. Since 0.84 it was meant to be allowed
+ * again, and a no-op, but it actually had the effect of removing all
+ * record of the registrations (while leaving the object registered with
+ * libdbus). */
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+
+ /* This would critical in 0.84. */
+ dbus_g_connection_unregister_g_object (f->bus, f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") == NULL);
+}
+
+static DBusHandlerResult
+frobnicate_cb (DBusConnection *conn,
+ DBusMessage *message,
+ void *user_data)
+{
+ Fixture *f = user_data;
+
+ if (dbus_message_is_signal (message,
+ "org.freedesktop.DBus.GLib.Tests.MyObject", "Frobnicate"))
+ {
+ const char *sender = dbus_message_get_sender (message);
+ const char *path = dbus_message_get_path (message);
+
+ g_assert (sender != NULL);
+ g_assert (path != NULL);
+
+ if (g_strcmp0 (path, "/foo") == 0)
+ {
+ g_assert_cmpstr (sender, ==, dbus_bus_get_unique_name (
+ dbus_g_connection_get_connection (f->bus)));
+
+ g_assert (f->frobnicate1_message == NULL);
+ f->frobnicate1_message = dbus_message_ref (message);
+ }
+ else
+ {
+ g_assert_cmpstr (path, ==, "/bar");
+ g_assert_cmpstr (sender, ==, dbus_bus_get_unique_name (
+ dbus_g_connection_get_connection (f->bus2)));
+
+ g_assert (f->frobnicate2_message == NULL);
+ f->frobnicate2_message = dbus_message_ref (message);
+ }
+ }
+
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static void
+test_twice (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ dbus_bool_t mem;
+
+ g_test_bug ("32087");
+
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+
+ dbus_g_connection_register_g_object (f->bus2, "/bar", f->object);
+
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus2, "/bar") ==
+ f->object);
+
+ dbus_bus_add_match (dbus_g_connection_get_connection (f->bus),
+ "type='signal'", &f->dbus_error);
+ assert_no_error (&f->dbus_error);
+ mem = dbus_connection_add_filter (dbus_g_connection_get_connection (f->bus),
+ frobnicate_cb, f, NULL);
+ g_assert (mem);
+
+ my_object_emit_frobnicate ((MyObject *) f->object, NULL);
+
+ /* The object should emit the signal once onto each connection,
+ * from the appropriate location */
+ while (f->frobnicate1_message == NULL || f->frobnicate2_message == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ dbus_message_unref (f->frobnicate1_message);
+ f->frobnicate1_message = NULL;
+ dbus_message_unref (f->frobnicate2_message);
+ f->frobnicate2_message = NULL;
+
+ /* try again, to catch any extra emissions, but first unregister one of the
+ * object's locations */
+ dbus_g_connection_unregister_g_object (f->bus, f->object);
+ my_object_emit_frobnicate ((MyObject *) f->object, NULL);
+
+ while (f->frobnicate2_message == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert (f->frobnicate1_message == NULL);
+ dbus_message_unref (f->frobnicate2_message);
+ f->frobnicate2_message = NULL;
+}
+
+static void
+test_clean_slate (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ DBusError e;
+ dbus_bool_t mem;
+
+ dbus_bus_add_match (dbus_g_connection_get_connection (f->bus),
+ "type='signal'", &f->dbus_error);
+ assert_no_error (&f->dbus_error);
+ mem = dbus_connection_add_filter (dbus_g_connection_get_connection (f->bus),
+ frobnicate_cb, f, NULL);
+ g_assert (mem);
+
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+
+ my_object_emit_frobnicate ((MyObject *) f->object, NULL);
+
+ while (f->frobnicate1_message == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ dbus_message_unref (f->frobnicate1_message);
+ f->frobnicate1_message = NULL;
+
+ /* unregister the object from its last object path, then put it back
+ * in the same location */
+ dbus_g_connection_unregister_g_object (f->bus, f->object);
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+
+ /* bug: in 0.92, this would be emitted twice because the hook was added
+ * twice */
+ my_object_emit_frobnicate ((MyObject *) f->object, NULL);
+
+ while (f->frobnicate1_message == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ dbus_message_unref (f->frobnicate1_message);
+ f->frobnicate1_message = NULL;
+
+ /* unregister the object from its last object path, then put it back
+ * at a different location */
+ dbus_g_connection_unregister_g_object (f->bus, f->object);
+ dbus_g_connection_register_g_object (f->bus2, "/bar", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus2, "/bar") ==
+ f->object);
+
+ my_object_emit_frobnicate ((MyObject *) f->object, NULL);
+
+ while (f->frobnicate2_message == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ /* check that this wasn't received anyway, which would indicate that
+ * either unregistration from /foo was unsuccessful, or the double
+ * emission mentioned above was seen */
+ g_assert (f->frobnicate1_message == NULL);
+
+ dbus_message_unref (f->frobnicate2_message);
+ f->frobnicate2_message = NULL;
+}
+
+static DBusHandlerResult
+objectified_cb (DBusConnection *conn,
+ DBusMessage *message,
+ void *user_data)
+{
+ Fixture *f = user_data;
+
+ if (dbus_message_is_signal (message,
+ "org.freedesktop.DBus.GLib.Tests.MyObject", "Objectified"))
+ {
+ const char *sender = dbus_message_get_sender (message);
+ const char *path = dbus_message_get_path (message);
+ dbus_bool_t ok;
+ DBusError e;
+
+ dbus_error_init (&e);
+
+ g_assert (sender != NULL);
+ g_assert (path != NULL);
+
+ g_assert_cmpstr (path, ==, "/foo");
+ g_assert_cmpstr (sender, ==, dbus_bus_get_unique_name (
+ dbus_g_connection_get_connection (f->bus)));
+
+ path = NULL;
+ ok = dbus_message_get_args (message, &e,
+ DBUS_TYPE_OBJECT_PATH, &path,
+ DBUS_TYPE_INVALID);
+
+ if (dbus_error_is_set (&e))
+ g_error ("%s: %s", e.name, e.message);
+
+ g_assert (ok);
+ g_assert_cmpstr (path, ==, "/foo");
+
+ f->received_objectified = TRUE;
+ }
+
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static void
+test_marshal_object (Fixture *f,
+ gconstpointer test_data G_GNUC_UNUSED)
+{
+ dbus_bool_t mem;
+
+ g_test_bug ("37852");
+
+ dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
+ g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
+ f->object);
+
+ dbus_bus_add_match (dbus_g_connection_get_connection (f->bus),
+ "type='signal'", &f->dbus_error);
+ assert_no_error (&f->dbus_error);
+ mem = dbus_connection_add_filter (dbus_g_connection_get_connection (f->bus),
+ objectified_cb, f, NULL);
+ g_assert (mem);
+
+ my_object_emit_objectified ((MyObject *) f->object, f->object);
+
+ while (!f->received_objectified)
+ g_main_context_iteration (NULL, TRUE);
+}
+
+int
+main (int argc, char **argv)
+{
+ loop = g_main_loop_new (NULL, FALSE);
+
+ g_type_init ();
+ g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
+ dbus_g_type_specialized_init ();
+ g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
+ g_test_init (&argc, &argv, NULL);
+
+ g_test_add ("/registrations/lookup", Fixture, NULL,
+ setup, test_lookup, teardown);
+ g_test_add ("/registrations/unregister", Fixture, NULL,
+ setup, test_unregister, teardown);
+ g_test_add ("/registrations/unregister-on-last-unref", Fixture, NULL,
+ setup, test_unregister_on_last_unref, teardown);
+ g_test_add ("/registrations/unregister-on-forced-dispose", Fixture, NULL,
+ setup, test_unregister_on_forced_dispose, teardown);
+ g_test_add ("/registrations/reregister", Fixture, NULL,
+ setup, test_reregister, teardown);
+ g_test_add ("/registrations/twice", Fixture, NULL,
+ setup, test_twice, teardown);
+ g_test_add ("/registrations/clean-slate", Fixture, NULL,
+ setup, test_clean_slate, teardown);
+ g_test_add ("/registrations/marshal-object", Fixture, NULL,
+ setup, test_marshal_object, teardown);
+
+ return g_test_run ();
+}
if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
DBUS_TEST_GLIB_IN_RUN_TEST=1
export DBUS_TEST_GLIB_IN_RUN_TEST
- exec ${SHELL} $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+ exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
fi
if test x$MODE = xprofile ; then
dbus-monitor --session &
fi
${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-types || die "test-types failed"
- ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-5688 || die "test-5688 failed"
- ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-unregister || die "test-unregister failed"
+ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-registrations || die "test-registrations failed"
${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-dbus-glib || die "test-dbus-glib failed"
${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-variant-recursion || die "test-variant-recursion failed"
+ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-gvariant || die "test-gvariant failed"
+ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-30574 || die "test-30574 failed"
+ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-error-mapping || die "test-error-mapping failed"
+ ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-peer-on-bus || die "test-peer-on-bus failed"
fi
+/* General tests for dbus-glib. Please make new tests into a standalone
+ * binary using GTest instead, where feasible.
+ *
+ * Copyright © 2006-2010 Red Hat, Inc.
+ * Copyright © 2006-2010 Collabora Ltd.
+ * Copyright © 2006-2011 Nokia Corporation
+ * Copyright © 2006 Steve Frécinaux
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <config.h>
+
/* -*- mode: C; c-file-style: "gnu" -*- */
#include <dbus/dbus-glib.h>
#include <stdio.h>
#include <dbus/dbus-gparser.h>
#include <glib.h>
#include <glib-object.h>
-#include "my-object-marshal.h"
+#include "my-object.h"
+
+GMainLoop *loop = NULL;
-static GMainLoop *loop = NULL;
static const char *await_terminating_service = NULL;
static int n_times_foo_received = 0;
static int n_times_frobnicate_received = 0;
static DBusGProxy *test_terminate_proxy1 = NULL;
static DBusGProxy *test_terminate_proxy2 = NULL;
-static void lose (const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2);
+#define lose(...) g_error (__VA_ARGS__)
+
static void lose_gerror (const char *prefix, GError *error) G_GNUC_NORETURN;
static void
GError *error = NULL;
GHashTable *hash = NULL;
+ /* g_test_bug (19145); */
+
g_assert (expected_string_value != NULL);
g_assert (object_path != NULL);
GError *error = NULL;
GHashTable *hash = NULL;
+ /* g_test_bug (19145); */
+
g_assert (object_path != NULL);
/* Test GetAll with interfaces on the subclass */
}
static void
-lose (const char *str, ...)
-{
- va_list args;
-
- va_start (args, str);
-
- vfprintf (stderr, str, args);
- fputc ('\n', stderr);
-
- va_end (args);
-
- exit (1);
-}
-
-static void
lose_gerror (const char *prefix, GError *error)
{
if (error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
lose ("%s (%s): %s", prefix, dbus_g_error_get_name (error),
error->message);
else
- lose ("%s: %s", prefix, error->message);
+ lose ("%s: %s#%d: %s", prefix, g_quark_to_string (error->domain),
+ error->code, error->message);
}
static void
increment_received_cb, g_strdup ("moo"), g_free,
G_TYPE_UINT, 42,
G_TYPE_INVALID);
+ if (call == NULL)
+ lose ("Failed to begin Increment call");
+
dbus_g_connection_flush (connection);
exit_timeout = g_timeout_add (5000, timed_exit, loop);
g_main_loop_run (loop);
g_print ("ThrowError failed (as expected) returned error: %s\n", error->message);
g_clear_error (&error);
- g_print ("Calling ThrowNotSupported\n");
- if (dbus_g_proxy_call (proxy, "ThrowNotSupported", &error,
- G_TYPE_INVALID, G_TYPE_INVALID) != FALSE)
- lose ("ThrowNotSupported call unexpectedly succeeded!");
-
- if (error->domain != DBUS_GERROR || error->code != DBUS_GERROR_NOT_SUPPORTED)
- lose ("ThrowNotSupported call returned unexpected error: %s #%u: %s %s",
- g_quark_to_string (error->domain), error->code,
- dbus_g_error_get_name (error), error->message);
-
- g_print ("ThrowNotSupported correctly returned error: %s\n", error->message);
- g_clear_error (&error);
-
- g_print ("Calling ThrowUnregisteredError\n");
- if (dbus_g_proxy_call (proxy, "ThrowUnregisteredError", &error,
- G_TYPE_INVALID, G_TYPE_INVALID) != FALSE)
- lose ("ThrowError call unexpectedly succeeded!");
-
- g_print ("ThrowUnregisteredError failed (as expected) returned error: %s\n", error->message);
- g_clear_error (&error);
-
g_print ("Calling IncrementRetvalError (for error)\n");
error = NULL;
v_UINT32_2 = 0;
g_print ("(wrapped) ThrowError failed (as expected) returned error: %s\n", error->message);
g_clear_error (&error);
-
- g_print ("Calling (wrapped) throw_error_multi_word\n");
- if (org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_multi_word (proxy, &error) != FALSE)
- lose ("(wrapped) ThrowErrorMultiWord call unexpectedly succeeded!");
-
- g_print ("(wrapped) ThrowErrorMultiWord failed (as expected) returned error: %s\n", error->message);
- g_clear_error (&error);
-
- if (org_freedesktop_DBus_GLib_Tests_MyObject_async_throw_error (proxy, &error) != FALSE)
- lose ("(wrapped) AsyncThrowError call unexpectedly succeeded!");
-
- g_print ("(wrapped) AsyncThrowError failed (as expected) returned error: %s\n", error->message);
- g_clear_error (&error);
g_print ("Calling (wrapped) uppercase\n");
if (!org_freedesktop_DBus_GLib_Tests_MyObject_uppercase (proxy, "foobar", &v_STRING_2, &error))
if (proxy == NULL)
lose_gerror ("Failed to create proxy for name owner", error);
- dbus_g_object_register_marshaller (my_object_marshal_VOID__STRING_INT_STRING,
- G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INVALID);
-
- dbus_g_object_register_marshaller (my_object_marshal_VOID__STRING_BOXED,
- G_TYPE_NONE, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
+ my_object_register_marshallers ();
dbus_g_proxy_add_signal (proxy, "Sig0", G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_add_signal (proxy, "Sig1", G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
+/* GVariant to dbus-glib escape hatch
+ *
+ * Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Alternatively, at your option, you can redistribute and/or modify
+ * this single file under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * that license, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include <config.h>
+
#include <dbus/dbus-glib.h>
#include <gio/gio.h>
}
}
+#define assert_g_variant_equivalent(a,e) \
+ assert_g_variant_equivalent_internal (__FILE__, __LINE__, \
+ #a, a, #e, e)
+
+static void
+assert_g_variant_equivalent_internal (
+ const gchar *file, gint line,
+ const gchar *actual_name, GVariant *actual,
+ const gchar *expected_name, GVariant *expected);
+
+static void
+assert_g_variant_equivalent_internal (const gchar *file,
+ gint line,
+ const gchar *actual_name,
+ GVariant *actual,
+ const gchar *expected_name,
+ GVariant *expected)
+{
+ if (!test_g_variant_equivalent (actual, expected))
+ {
+ gchar *a = g_variant_print (actual, TRUE);
+ gchar *e = g_variant_print (expected, TRUE);
+
+ g_error ("%s:%d: Variants should have been equal:\n"
+ "%s = %s\n"
+ "%s = %s", file, line, actual_name, a, expected_name, e);
+ /* no point in freeing the strings, we've just crashed anyway */
+ }
+}
+
/* test_g_variant_equivalent tests */
static void
test_simple_equiv (void)
}
static void
+test_ab (void)
+{
+ GValue v = { 0, };
+ gboolean bools[] = { TRUE, FALSE };
+ GVariantBuilder b;
+ GVariant *var, *varc;
+ GType ab = dbus_g_type_get_collection ("GArray", G_TYPE_BOOLEAN);
+ GArray *array;
+
+ g_value_init (&v, ab);
+ array = dbus_g_type_specialized_construct (ab);
+
+ g_array_append_vals (array, bools, 2);
+ g_assert_cmpint (g_array_index (array, gboolean, 0), ==, TRUE);
+ g_assert_cmpint (g_array_index (array, gboolean, 1), ==, FALSE);
+
+ g_value_take_boxed (&v, array);
+
+ var = dbus_g_value_build_g_variant (&v);
+ g_value_unset (&v);
+
+ g_variant_builder_init (&b, G_VARIANT_TYPE ("ab"));
+ g_variant_builder_add (&b, "b", TRUE);
+ g_variant_builder_add (&b, "b", FALSE);
+ varc = g_variant_builder_end (&b);
+
+ g_assert (test_g_variant_equivalent (var, varc));
+
+ g_variant_unref (var);
+ g_variant_unref (varc);
+}
+
+static void
+test_ai (void)
+{
+ GValue v = { 0, };
+ gint ints[] = { 1984, 1066 };
+ GVariantBuilder b;
+ GVariant *var, *varc;
+ GType ai = dbus_g_type_get_collection ("GArray", G_TYPE_INT);
+ GArray *array;
+
+ g_value_init (&v, ai);
+ array = dbus_g_type_specialized_construct (ai);
+
+ g_array_append_vals (array, ints, 2);
+ g_assert_cmpint (g_array_index (array, gint, 0), ==, 1984);
+ g_assert_cmpint (g_array_index (array, gint, 1), ==, 1066);
+
+ g_value_take_boxed (&v, array);
+
+ var = dbus_g_value_build_g_variant (&v);
+ g_value_unset (&v);
+
+ g_variant_builder_init (&b, G_VARIANT_TYPE ("ai"));
+ g_variant_builder_add (&b, "i", 1984);
+ g_variant_builder_add (&b, "i", 1066);
+ varc = g_variant_builder_end (&b);
+
+ g_assert (test_g_variant_equivalent (var, varc));
+
+ g_variant_unref (var);
+ g_variant_unref (varc);
+}
+
+static void
+test_au (void)
+{
+ GValue v = { 0, };
+ guint uints[] = { 1984, 1066 };
+ GVariantBuilder b;
+ GVariant *var, *varc;
+ GType au = dbus_g_type_get_collection ("GArray", G_TYPE_UINT);
+ GArray *array;
+
+ g_value_init (&v, au);
+ array = dbus_g_type_specialized_construct (au);
+
+ g_array_append_vals (array, uints, 2);
+ g_assert_cmpuint (g_array_index (array, guint, 0), ==, 1984);
+ g_assert_cmpuint (g_array_index (array, guint, 1), ==, 1066);
+
+ g_value_take_boxed (&v, array);
+
+ var = dbus_g_value_build_g_variant (&v);
+ g_value_unset (&v);
+
+ g_variant_builder_init (&b, G_VARIANT_TYPE ("au"));
+ g_variant_builder_add (&b, "u", 1984);
+ g_variant_builder_add (&b, "u", 1066);
+ varc = g_variant_builder_end (&b);
+
+ g_assert (test_g_variant_equivalent (var, varc));
+
+ g_variant_unref (var);
+ g_variant_unref (varc);
+}
+
+static void
+test_ax (void)
+{
+ GValue v = { 0, };
+ gint64 ints[] = { G_GINT64_CONSTANT (-0xAAABBBBCCCCDDDD), 1066 };
+ GVariantBuilder b;
+ GVariant *var, *varc;
+ GType ax = dbus_g_type_get_collection ("GArray", G_TYPE_INT64);
+ GArray *array;
+
+ g_value_init (&v, ax);
+ array = dbus_g_type_specialized_construct (ax);
+
+ g_array_append_vals (array, ints, 2);
+ g_assert_cmpint ((g_array_index (array, gint64, 0)
+ / G_GINT64_CONSTANT (0x100000000)), ==,
+ -0xAAABBBB);
+ g_assert_cmpuint ((-(g_array_index (array, gint64, 0)))
+ % G_GINT64_CONSTANT (0x100000000), ==, 0xCCCCDDDDu);
+ g_assert_cmpint ((g_array_index (array, gint64, 1)
+ / G_GINT64_CONSTANT (0x100000000)), ==, 0);
+ g_assert_cmpuint ((g_array_index (array, gint64, 1))
+ % G_GINT64_CONSTANT (0x100000000), ==, 1066);
+
+ g_value_take_boxed (&v, array);
+
+ var = dbus_g_value_build_g_variant (&v);
+ g_value_unset (&v);
+
+ g_variant_builder_init (&b, G_VARIANT_TYPE ("ax"));
+ g_variant_builder_add (&b, "x", G_GINT64_CONSTANT (-0xAAABBBBCCCCDDDD));
+ g_variant_builder_add (&b, "x", G_GINT64_CONSTANT (1066));
+ varc = g_variant_builder_end (&b);
+
+ g_assert (test_g_variant_equivalent (var, varc));
+
+ g_variant_unref (var);
+ g_variant_unref (varc);
+}
+
+static void
+test_at (void)
+{
+ GValue v = { 0, };
+ guint64 uints[] = { G_GUINT64_CONSTANT (0xAAAABBBBCCCCDDDD), 1066 };
+ GVariantBuilder b;
+ GVariant *var, *varc;
+ GType at = dbus_g_type_get_collection ("GArray", G_TYPE_UINT64);
+ GArray *array;
+
+ g_value_init (&v, at);
+ array = dbus_g_type_specialized_construct (at);
+
+ g_array_append_vals (array, uints, 2);
+ g_assert_cmpuint ((g_array_index (array, guint64, 0)
+ / G_GUINT64_CONSTANT (0x100000000)), ==, 0xAAAABBBBu);
+ g_assert_cmpuint ((g_array_index (array, guint64, 0)
+ % G_GUINT64_CONSTANT (0x100000000)), ==, 0xCCCCDDDDu);
+ g_assert_cmpuint ((g_array_index (array, guint64, 1)
+ / G_GUINT64_CONSTANT (0x100000000)), ==, 0);
+ g_assert_cmpuint ((g_array_index (array, guint64, 1)
+ % G_GUINT64_CONSTANT (0x100000000)), ==, 1066);
+
+ g_value_take_boxed (&v, array);
+
+ var = dbus_g_value_build_g_variant (&v);
+ g_value_unset (&v);
+
+ g_variant_builder_init (&b, G_VARIANT_TYPE ("at"));
+ g_variant_builder_add (&b, "t", G_GUINT64_CONSTANT (0xAAAABBBBCCCCDDDD));
+ g_variant_builder_add (&b, "t", G_GUINT64_CONSTANT (1066));
+ varc = g_variant_builder_end (&b);
+
+ g_assert (test_g_variant_equivalent (var, varc));
+
+ g_variant_unref (var);
+ g_variant_unref (varc);
+}
+
+static void
+test_ay (void)
+{
+ GValue v = { 0, };
+ guchar bytes[] = { 23, 42 };
+ GVariantBuilder b;
+ GVariant *var, *varc;
+ GType ay = dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR);
+ GArray *array;
+
+ g_value_init (&v, ay);
+ array = dbus_g_type_specialized_construct (ay);
+
+ g_array_append_vals (array, bytes, 2);
+ g_assert_cmpint (g_array_index (array, guchar, 0), ==, 23);
+ g_assert_cmpint (g_array_index (array, guchar, 1), ==, 42);
+
+ g_value_take_boxed (&v, array);
+
+ var = dbus_g_value_build_g_variant (&v);
+ g_value_unset (&v);
+
+ g_variant_builder_init (&b, G_VARIANT_TYPE ("ay"));
+ g_variant_builder_add (&b, "y", 23);
+ g_variant_builder_add (&b, "y", 42);
+ varc = g_variant_builder_end (&b);
+
+ g_assert (test_g_variant_equivalent (var, varc));
+
+ g_variant_unref (var);
+ g_variant_unref (varc);
+}
+
+static void
test_g (void)
{
GValue v = { 0, };
g_variant_unref (varc);
}
+static void
+test_roundtrip (gconstpointer user_data)
+{
+ const gchar *text = user_data;
+ GVariant *before, *after;
+ GValue v = { 0 };
+
+ before = g_variant_new_parsed (text);
+ dbus_g_value_parse_g_variant (before, &v);
+ after = dbus_g_value_build_g_variant (&v);
+ g_value_unset (&v);
+ assert_g_variant_equivalent (before, after);
+ g_variant_unref (before);
+ g_variant_unref (after);
+}
+
+static void
+test_parse_basic (void)
+{
+ GVariant *variant;
+ GValue v = { 0 };
+
+ variant = g_variant_new_parsed ("'o hai'");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_STRING));
+ g_assert_cmpstr (g_value_get_string (&v), ==, "o hai");
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("objectpath '/hello/world'");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==,
+ g_type_name (DBUS_TYPE_G_OBJECT_PATH));
+ g_assert_cmpstr ((gchar *) g_value_get_boxed (&v), ==, "/hello/world");
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("signature 'a{sv}'");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==,
+ g_type_name (DBUS_TYPE_G_SIGNATURE));
+ g_assert_cmpstr ((gchar *) g_value_get_boxed (&v), ==, "a{sv}");
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("23.5");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_DOUBLE));
+ /* this is chosen to be exactly representable in binary; we use inequalities
+ * to work around -Wfloat-equal */
+ g_assert_cmpfloat (g_value_get_double (&v), >=, 23.5);
+ g_assert_cmpfloat (g_value_get_double (&v), <=, 23.5);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("byte 42");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_UCHAR));
+ g_assert_cmpuint (g_value_get_uchar (&v), ==, 42);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("uint16 16");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_UINT));
+ g_assert_cmpuint (g_value_get_uint (&v), ==, 16);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("uint32 32");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_UINT));
+ g_assert_cmpuint (g_value_get_uint (&v), ==, 32);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("uint64 64");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_UINT64));
+ g_assert_cmpuint ((guint) g_value_get_uint64 (&v), ==, 64);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("int16 -16");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_INT));
+ g_assert_cmpint (g_value_get_int (&v), ==, -16);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("int32 -32");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_INT));
+ g_assert_cmpint (g_value_get_int (&v), ==, -32);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("int64 -64");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==, g_type_name (G_TYPE_INT64));
+ g_assert_cmpint ((gint) g_value_get_int64 (&v), ==, -64);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+}
+
+static void
+test_parse_array (void)
+{
+ GVariant *variant;
+ GValue v = { 0 };
+ GArray *a;
+
+ /* We can't test the 16-bit cases via a round-trip, because information is
+ * lost. */
+
+ variant = g_variant_new_parsed ("[uint16 16, uint16 1600]");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==,
+ g_type_name (DBUS_TYPE_G_UINT_ARRAY));
+ a = g_value_get_boxed (&v);
+ g_assert_cmpuint (a->len, ==, 2);
+ g_assert_cmpuint (g_array_index (a, guint, 0), ==, 16);
+ g_assert_cmpuint (g_array_index (a, guint, 1), ==, 1600);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("[int16 -16, int16 -1600]");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==,
+ g_type_name (DBUS_TYPE_G_INT_ARRAY));
+ a = g_value_get_boxed (&v);
+ g_assert_cmpuint (a->len, ==, 2);
+ g_assert_cmpint (g_array_index (a, gint, 0), ==, -16);
+ g_assert_cmpint (g_array_index (a, gint, 1), ==, -1600);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("@aq []");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==,
+ g_type_name (DBUS_TYPE_G_UINT_ARRAY));
+ a = g_value_get_boxed (&v);
+ g_assert_cmpuint (a->len, ==, 0);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+
+ variant = g_variant_new_parsed ("@an []");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==,
+ g_type_name (DBUS_TYPE_G_INT_ARRAY));
+ a = g_value_get_boxed (&v);
+ g_assert_cmpuint (a->len, ==, 0);
+ g_value_unset (&v);
+ g_variant_unref (variant);
+}
+
+static void
+test_parse_string_hash (void)
+{
+ GVariant *variant;
+ GHashTable *h;
+ GValue v = { 0 };
+
+ variant = g_variant_new_parsed ("@a{ss} {'foo': 'bar'}");
+ dbus_g_value_parse_g_variant (variant, &v);
+ g_assert_cmpstr (G_VALUE_TYPE_NAME (&v), ==,
+ g_type_name (DBUS_TYPE_G_STRING_STRING_HASHTABLE));
+ h = g_value_get_boxed (&v);
+ g_assert_cmpuint (g_hash_table_size (h), ==, 1);
+ g_assert_cmpstr (g_hash_table_lookup (h, "foo"), ==, "bar");
+ g_value_unset (&v);
+ g_variant_unref (variant);
+}
+
int
main (int argc,
char **argv)
g_test_add_func ("/gvalue-to-gvariant/us", test_us);
g_test_add_func ("/gvalue-to-gvariant/a{os}", test_a_os);
g_test_add_func ("/gvalue-to-gvariant/av", test_av);
+ g_test_add_func ("/gvalue-to-gvariant/ab", test_ab);
+ g_test_add_func ("/gvalue-to-gvariant/ai", test_ai);
+ g_test_add_func ("/gvalue-to-gvariant/au", test_au);
+ g_test_add_func ("/gvalue-to-gvariant/ax", test_ax);
+ g_test_add_func ("/gvalue-to-gvariant/at", test_at);
+ g_test_add_func ("/gvalue-to-gvariant/ay", test_ay);
g_test_add_func ("/gvalue-to-gvariant/g", test_g);
+ /* dbus_g_value_parse_g_variant tests */
+ g_test_add_func ("/parse-gvariant/basic", test_parse_basic);
+ g_test_add_func ("/parse-gvariant/array", test_parse_array);
+ g_test_add_func ("/parse-gvariant/string_hash", test_parse_string_hash);
+
+ /* round-trips */
+ g_test_add_data_func ("/parse-gvariant/roundtrip/u",
+ "@u 42", test_roundtrip);
+ g_test_add_data_func ("/parse-gvariant/roundtrip/non_empty_array",
+ "@ai [23, 42]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_array", "@ai []", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aav", "[[<'bees'>]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aau", "[[uint32 666]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aax", "[[int64 666]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aat", "[[uint64 666]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aas", "[['a', 'b']]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aao",
+ "[[objectpath '/a', objectpath '/b']]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aag", "[[signature 'ab', signature 'g']]",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aad", "[[5.25, 3.5]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aay", "@aay [[1, 2]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aay", "@aay [[]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aab", "[[true, false]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aab", "@aab [[]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/aa_asv", "[[@a{sv} {'x': <'y'>}]]",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_av", "@av []", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_hash", "@a{uu} {}", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/easy_string_hash",
+ "@a{ss} {'foo': 'bar'}", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/non_empty_asv",
+ "@a{sv} {'badger': <42>, 'mushroom': <objectpath '/'>, 'snake': <''>}",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/variant_nesting", "<<<42>>>",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/tuple", "(23, 42, true)",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/nested", "[[[(1, 2)]]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aaa", "@aaav [[]]",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aa_asv", "@aaa{sv} [[]]",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aa_struct", "@aa(us) [[]]",
+ test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aaas", "@aaas [[]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aax", "@aax [[]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aat", "@aat [[]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aad", "@aad [[]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aao", "@aao [[]]", test_roundtrip);
+ g_test_add_data_func ("/roundtrip/empty_aag", "@aag [[]]", test_roundtrip);
+
return g_test_run ();
}
+#include <config.h>
+
/* -*- mode: C; c-file-style: "gnu" -*- */
#include <dbus/dbus-glib.h>
/* NOTE - outside of D-BUS core this would be
#include <string.h>
#include <glib/gi18n.h>
#include <glib-object.h>
-#include <glib/gquark.h>
#include "my-object.h"
#include "my-object-subclass.h"
<method name="ThrowError">
</method>
- <method name="ThrowNotSupported">
- </method>
-
- <method name="ThrowErrorMultiWord">
- </method>
-
<method name="ThrowUnregisteredError">
</method>
<!-- Export signals -->
<signal name="Frobnicate"/>
+ <signal name="Objectified">
+ <arg type="o"/>
+ </signal>
+
<method name="Terminate">
</method>
</interface>
+#include <config.h>
+
#include <glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <stdio.h>
+#include <config.h>
+
#include <glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <stdio.h>
if (strcmp (expected_str, str) != 0)
{
g_print ("Wrong string '%s', expected '%s'\n", str, expected_str);
+ g_free (expected_str);
goto out;
}
g_free (expected_str);
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <dbus-glib.h>
+#include <config.h>
+
/* -*- mode: C; c-file-style: "gnu" -*- */
#include <dbus/dbus-glib.h>
#include <stdio.h>
g_object_unref (G_OBJECT (proxy));
+ g_main_loop_unref (loop);
+
return 0;
}
+++ /dev/null
-/* Feature test for freedesktop.org #21219.
- *
- * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright © 2009 Nokia Corporation
- *
- * In preparation for dbus-glib relicensing (if it ever happens), this file is
- * licensed under (at your option) either the AFL v2.1, the GPL v2 or later,
- * or an MIT/X11-style license:
- *
- * Licensed under the Academic Free License version 2.1
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <dbus/dbus-glib.h>
-
-#include "my-object.h"
-
-GMainLoop *loop;
-
-int
-main (int argc, char **argv)
-{
- DBusGConnection *connection;
- GError *error = NULL;
- GObject *obj;
-
- loop = g_main_loop_new (NULL, FALSE);
-
- g_type_init ();
- g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
-
- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-
- if (connection == NULL)
- g_error ("failed to get bus: %s %d: %s", g_quark_to_string (error->domain),
- error->code, error->message);
-
- obj = g_object_new (MY_TYPE_OBJECT, NULL);
- dbus_g_connection_register_g_object (connection, "/foo", obj);
- g_assert (dbus_g_connection_lookup_g_object (connection, "/foo") == obj);
- dbus_g_connection_unregister_g_object (connection, obj);
- g_assert (dbus_g_connection_lookup_g_object (connection, "/foo") == NULL);
-
- g_object_unref (obj);
-
- return 0;
-}
+++ /dev/null
- /* -*- mode: C; c-file-style: "gnu" -*- */
-/* decode-gcov.c gcov decoder program
- *
- * Copyright (C) 2003 Red Hat Inc.
- *
- * Partially derived from gcov,
- * Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
- * 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- *
- * This file is NOT licensed under the Academic Free License
- * as it is largely derived from gcov.c and gcov-io.h in the
- * gcc source code.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#define DBUS_COMPILATION /* cheat */
-#include <dbus/dbus-list.h>
-#include <dbus/dbus-string.h>
-#include <dbus/dbus-sysdeps.h>
-#include <dbus/dbus-marshal.h>
-#include <dbus/dbus-hash.h>
-#undef DBUS_COMPILATION
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef DBUS_HAVE_INT64
-#error "gcov support can't be built without 64-bit integer support"
-#endif
-
-static void
-die (const char *message)
-{
- fprintf (stderr, "%s", message);
- exit (1);
-}
-
-/* This bizarro function is from gcov-io.h in gcc source tree */
-static int
-fetch_long (long *dest,
- const char *source,
- size_t bytes)
-{
- long value = 0;
- int i;
-
- for (i = bytes - 1; (size_t) i > (sizeof (*dest) - 1); i--)
- if (source[i] & ((size_t) i == (bytes - 1) ? 127 : 255 ))
- return 1;
-
- for (; i >= 0; i--)
- value = value * 256 + (source[i] & ((size_t)i == (bytes - 1) ? 127 : 255));
-
- if ((source[bytes - 1] & 128) && (value > 0))
- value = - value;
-
- *dest = value;
- return 0;
-}
-
-static int
-fetch_long64 (dbus_int64_t *dest,
- const char *source,
- size_t bytes)
-{
- dbus_int64_t value = 0;
- int i;
-
- for (i = bytes - 1; (size_t) i > (sizeof (*dest) - 1); i--)
- if (source[i] & ((size_t) i == (bytes - 1) ? 127 : 255 ))
- return 1;
-
- for (; i >= 0; i--)
- value = value * 256 + (source[i] & ((size_t)i == (bytes - 1) ? 127 : 255));
-
- if ((source[bytes - 1] & 128) && (value > 0))
- value = - value;
-
- *dest = value;
- return 0;
-}
-
-#define BB_FILENAME (-1)
-#define BB_FUNCTION (-2)
-#define BB_ENDOFLIST 0
-
-static dbus_bool_t
-string_get_int (const DBusString *str,
- int start,
- long *val)
-{
- const char *p;
-
- if ((_dbus_string_get_length (str) - start) < 4)
- return FALSE;
-
- p = _dbus_string_get_const_data (str);
-
- p += start;
-
- fetch_long (val, p, 4);
-
- return TRUE;
-}
-
-static dbus_bool_t
-string_get_int64 (const DBusString *str,
- int start,
- dbus_int64_t *val)
-{
- const char *p;
-
- if ((_dbus_string_get_length (str) - start) < 8)
- return FALSE;
-
- p = _dbus_string_get_const_data (str);
-
- p += start;
-
- fetch_long64 (val, p, 8);
-
- return TRUE;
-}
-
-static dbus_bool_t
-string_get_string (const DBusString *str,
- int start,
- long terminator,
- DBusString *val,
- int *end)
-{
- int i;
- long n;
-
- i = start;
- while (string_get_int (str, i, &n))
- {
- unsigned char b;
-
- i += 4;
-
- if (n == terminator)
- break;
-
- b = n & 0xff;
- if (b)
- {
- _dbus_string_append_byte (val, b);
- b = (n >> 8) & 0xff;
- if (b)
- {
- _dbus_string_append_byte (val, b);
- b = (n >> 16) & 0xff;
- if (b)
- {
- _dbus_string_append_byte (val, b);
- b = (n >> 24) & 0xff;
- if (b)
- _dbus_string_append_byte (val, b);
- }
- }
- }
- }
-
- *end = i;
-
- return TRUE;
-}
-
-#ifdef DBUS_HAVE_GCC33_GCOV
-/* In gcc33 .bbg files, there's a function name of the form:
- * -1, length, name (padded to 4), -1, checksum
- */
-static dbus_bool_t
-string_get_function (const DBusString *str,
- int start,
- DBusString *funcname,
- int *checksum,
- int *next)
-{
- int end;
- long val;
- int i;
-
- i = start;
-
- if (!string_get_int (str, i, &val))
- die ("no room for -1 before function name\n");
-
- i += 4;
-
- if (val != -1)
- die ("value before function name is not -1\n");
-
- if (!string_get_int (str, i, &val))
- die ("no length found for function name\n");
-
- i += 4;
-
- end = i + val;
- if (end > _dbus_string_get_length (str))
- die ("Function name length points past end of file\n");
-
- if (!_dbus_string_append (funcname,
- _dbus_string_get_const_data (str) + i))
- die ("no memory\n");
-
- /* skip alignment padding the length doesn't include the nul so add 1
- */
- i = _DBUS_ALIGN_VALUE (end + 1, 4);
-
- if (!string_get_int (str, i, &val) ||
- val != -1)
- die ("-1 at end of function name not found\n");
-
- i += 4;
-
- if (!string_get_int (str, i, &val))
- die ("no checksum found at end of function name\n");
-
- i += 4;
-
- *checksum = val;
-
- *next = i;
-
- return TRUE;
-}
-#endif /* DBUS_HAVE_GCC33_GCOV */
-
-static void
-dump_bb_file (const DBusString *contents)
-{
- int i;
- long val;
- int n_functions;
-
- n_functions = 0;
- i = 0;
- while (string_get_int (contents, i, &val))
- {
- i += 4;
-
- switch (val)
- {
- case BB_FILENAME:
- {
- DBusString f;
-
- if (!_dbus_string_init (&f))
- die ("no memory\n");
-
- if (string_get_string (contents, i,
- BB_FILENAME,
- &f, &i))
- {
- printf ("File %s\n", _dbus_string_get_const_data (&f));
- }
- _dbus_string_free (&f);
- }
- break;
- case BB_FUNCTION:
- {
- DBusString f;
- if (!_dbus_string_init (&f))
- die ("no memory\n");
-
- if (string_get_string (contents, i,
- BB_FUNCTION,
- &f, &i))
- {
- printf ("Function %s\n", _dbus_string_get_const_data (&f));
- }
- _dbus_string_free (&f);
-
- n_functions += 1;
- }
- break;
- case BB_ENDOFLIST:
- printf ("End of block\n");
- break;
- default:
- printf ("Line %ld\n", val);
- break;
- }
- }
-
- printf ("%d functions in file\n", n_functions);
-}
-
-#define FLAG_ON_TREE 0x1
-#define FLAG_FAKE 0x2
-#define FLAG_FALL_THROUGH 0x4
-
-static void
-dump_bbg_file (const DBusString *contents)
-{
- int i;
- long val;
- int n_functions;
- int n_arcs;
- int n_blocks;
- int n_arcs_off_tree;
-
- n_arcs_off_tree = 0;
- n_blocks = 0;
- n_arcs = 0;
- n_functions = 0;
- i = 0;
- while (i < _dbus_string_get_length (contents))
- {
- long n_blocks_in_func;
- long n_arcs_in_func;
- int j;
-
-#ifdef DBUS_HAVE_GCC33_GCOV
- /* In gcc33 .bbg files, there's a function name of the form:
- * -1, length, name (padded to 4), -1, checksum
- * after that header on each function description, it's
- * the same as in gcc32
- */
-
- {
- DBusString funcname;
- int checksum;
-
- if (!_dbus_string_init (&funcname))
- die ("no memory\n");
-
- if (!string_get_function (contents, i,
- &funcname, &checksum, &i))
- die ("could not read function name\n");
-
- printf ("Function name is \"%s\" checksum %d\n",
- _dbus_string_get_const_data (&funcname),
- checksum);
-
- _dbus_string_free (&funcname);
- }
-#endif /* DBUS_HAVE_GCC33_GCOV */
-
- if (!string_get_int (contents, i, &val))
- die ("no count of blocks in func found\n");
-
- i += 4;
-
- n_blocks_in_func = val;
-
- if (!string_get_int (contents, i, &n_arcs_in_func))
- break;
-
- i += 4;
-
- printf ("Function has %ld blocks and %ld arcs\n",
- n_blocks_in_func, n_arcs_in_func);
-
- n_functions += 1;
- n_blocks += n_blocks_in_func;
- n_arcs += n_arcs_in_func;
-
- j = 0;
- while (j < n_blocks_in_func)
- {
- long n_arcs_in_block;
- int k;
-
- if (!string_get_int (contents, i, &n_arcs_in_block))
- break;
-
- i += 4;
-
- printf (" Block has %ld arcs\n", n_arcs_in_block);
-
- k = 0;
- while (k < n_arcs_in_block)
- {
- long destination_block;
- long flags;
-
- if (!string_get_int (contents, i, &destination_block))
- break;
-
- i += 4;
-
- if (!string_get_int (contents, i, &flags))
- break;
-
- i += 4;
-
- printf (" Arc has destination block %ld flags 0x%lx\n",
- destination_block, flags);
-
- if ((flags & FLAG_ON_TREE) == 0)
- n_arcs_off_tree += 1;
-
- ++k;
- }
-
- if (k < n_arcs_in_block)
- break;
-
- ++j;
- }
-
- if (j < n_blocks_in_func)
- break;
-
- if (!string_get_int (contents, i, &val))
- break;
-
- i += 4;
-
- if (val != -1)
- die ("-1 separator not found\n");
- }
-
- printf ("%d functions %d blocks %d arcs %d off-tree arcs in file\n",
- n_functions, n_blocks, n_arcs, n_arcs_off_tree);
-}
-
-#ifndef DBUS_HAVE_GCC33_GCOV
-
-/* gcc 3.2 version:
- * The da file contains first a count of arcs in the file,
- * then a count of executions for all "off tree" arcs
- * in the file.
- */
-static void
-dump_da_file (const DBusString *contents)
-{
- int i;
- dbus_int64_t val;
- int n_arcs;
- int claimed_n_arcs;
-
- i = 0;
- if (!string_get_int64 (contents, i, &val))
- return;
-
- i += 8;
-
- printf ("%ld arcs in file\n", (long) val);
- claimed_n_arcs = val;
-
- n_arcs = 0;
- while (string_get_int64 (contents, i, &val))
- {
- i += 8;
-
- printf ("%ld executions of arc %d\n",
- (long) val, n_arcs);
-
- ++n_arcs;
- }
-
- if (n_arcs != claimed_n_arcs)
- {
- printf ("File claimed to have %d arcs but only had %d\n",
- claimed_n_arcs, n_arcs);
- }
-}
-
-#else /* DBUS_HAVE_GCC33_GCOV */
-
-/* gcc 3.3 version:
- * The da file is more complex than 3.2.
- *
- * We have a magic value of "-123" only it isn't really
- * -123, it's -123 as encoded by the crackass gcov-io.h
- * routines. Anyway, 4 bytes.
- *
- * We then have:
- *
- * - 4 byte count of how many functions in the following list
- * - 4 byte length of random extra data
- * - the random extra data, just skip it, info pages have some
- * details on what might be in there or see __bb_exit_func in gcc
- * - then for each function (number of functions given above):
- * . -1, length, funcname, alignment padding, -1
- * . checksum
- * . 4 byte number of arcs in function
- * . 8 bytes each, a count of execution for each arc
- *
- * Now, the whole thing *starting with the magic* can repeat.
- * This is caused by multiple runs of the profiled app appending
- * to the file.
- */
-static void
-dump_da_file (const DBusString *contents)
-{
- int i;
- dbus_int64_t v64;
- long val;
- int n_sections;
- int total_functions;
-
- total_functions = 0;
- n_sections = 0;
-
- i = 0;
- while (i < _dbus_string_get_length (contents))
- {
- int claimed_n_functions;
- int n_functions;
- int total_arcs;
-
- printf (".da file section %d\n", n_sections);
-
- if (!string_get_int (contents, i, &val))
- die ("no magic found in .da file\n");
-
- i += 4;
-
- if (val != -123)
- die ("wrong file magic in .da file\n");
-
- if (!string_get_int (contents, i, &val))
- die ("no function count in .da file\n");
- i += 4;
- claimed_n_functions = val;
-
- printf ("%d functions expected in section %d of .da file\n",
- claimed_n_functions, n_sections);
-
- if (!string_get_int (contents, i, &val))
- die ("no extra data length in .da file\n");
-
- i += 4;
-
- i += val;
-
- total_arcs = 0;
- n_functions = 0;
- while (n_functions < claimed_n_functions)
- {
- DBusString funcname;
- int checksum;
- int claimed_n_arcs;
- int n_arcs;
-
- if (!_dbus_string_init (&funcname))
- die ("no memory\n");
-
- if (!string_get_function (contents, i,
- &funcname, &checksum, &i))
- die ("could not read function name\n");
-
- if (!string_get_int (contents, i, &val))
- die ("no arc count for function\n");
-
- i += 4;
- claimed_n_arcs = val;
-
- printf (" %d arcs in function %d %s checksum %d\n",
- claimed_n_arcs, n_functions,
- _dbus_string_get_const_data (&funcname),
- checksum);
-
- n_arcs = 0;
- while (n_arcs < claimed_n_arcs)
- {
- if (!string_get_int64 (contents, i, &v64))
- die ("did not get execution count for arc\n");
-
- i += 8;
-
- printf (" %ld executions of arc %d (total arcs %d)\n",
- (long) v64, n_arcs, total_arcs + n_arcs);
-
- ++n_arcs;
- }
-
- _dbus_string_free (&funcname);
-
- total_arcs += n_arcs;
- ++n_functions;
- }
-
- printf ("total of %d functions and %d arcs in section %d\n",
- n_functions, total_arcs, n_sections);
-
- total_functions += n_functions;
- ++n_sections;
- }
-
- printf ("%d total function sections in %d total .da file sections\n",
- total_functions, n_sections);
-}
-
-#endif /* DBUS_HAVE_GCC33_GCOV */
-
-typedef struct Arc Arc;
-typedef struct Block Block;
-typedef struct Function Function;
-typedef struct File File;
-typedef struct Line Line;
-
-struct Arc
-{
- int source;
- int target;
- dbus_int64_t arc_count;
- unsigned int count_valid : 1;
- unsigned int on_tree : 1;
- unsigned int fake : 1;
- unsigned int fall_through : 1;
- Arc *pred_next;
- Arc *succ_next;
-};
-
-struct Block
-{
- Arc *succ;
- Arc *pred;
- dbus_int64_t succ_count;
- dbus_int64_t pred_count;
- dbus_int64_t exec_count;
- DBusList *lines;
- unsigned int count_valid : 1;
- unsigned int on_tree : 1;
- unsigned int inside_dbus_build_tests : 1;
-};
-
-struct Function
-{
- char *name;
- int checksum;
- Block *block_graph;
- int n_blocks;
- /* number of blocks in DBUS_BUILD_TESTS */
- int n_test_blocks;
- int n_test_blocks_executed;
- /* number of blocks outside DBUS_BUILD_TESTS */
- int n_nontest_blocks;
- int n_nontest_blocks_executed;
- /* Summary result flags */
- unsigned int unused : 1;
- unsigned int inside_dbus_build_tests : 1;
- unsigned int partial : 1; /* only some of the blocks were executed */
-};
-
-struct Line
-{
- int number;
- char *text;
- DBusList *blocks;
- unsigned int inside_dbus_build_tests : 1;
- unsigned int partial : 1; /* only some of the blocks were executed */
-};
-
-struct File
-{
- char *name;
- Line *lines;
- int n_lines;
- DBusList *functions;
-};
-
-static void
-function_add_arc (Function *function,
- long source,
- long target,
- long flags)
-{
- Arc *arc;
-
- arc = dbus_new0 (Arc, 1);
- if (arc == NULL)
- die ("no memory\n");
-
- arc->target = target;
- arc->source = source;
-
- arc->succ_next = function->block_graph[source].succ;
- function->block_graph[source].succ = arc;
- function->block_graph[source].succ_count += 1;
-
- arc->pred_next = function->block_graph[target].pred;
- function->block_graph[target].pred = arc;
- function->block_graph[target].pred_count += 1;
-
- if ((flags & FLAG_ON_TREE) != 0)
- arc->on_tree = TRUE;
-
- if ((flags & FLAG_FAKE) != 0)
- arc->fake = TRUE;
-
- if ((flags & FLAG_FALL_THROUGH) != 0)
- arc->fall_through = TRUE;
-}
-
-
-static Arc*
-reverse_arcs (Arc *arc)
-{
- struct Arc *prev = 0;
- struct Arc *next;
-
- for ( ; arc; arc = next)
- {
- next = arc->succ_next;
- arc->succ_next = prev;
- prev = arc;
- }
-
- return prev;
-}
-
-static void
-function_reverse_succ_arcs (Function *func)
-{
- /* Must reverse the order of all succ arcs, to ensure that they match
- * the order of the data in the .da file.
- */
- int i;
-
- for (i = 0; i < func->n_blocks; i++)
- if (func->block_graph[i].succ)
- func->block_graph[i].succ = reverse_arcs (func->block_graph[i].succ);
-}
-
-static void
-get_functions_from_bbg (const DBusString *contents,
- DBusList **functions)
-{
- int i;
- long val;
- int n_functions;
- int n_arcs;
- int n_blocks;
- int n_arcs_off_tree;
-
-#if 0
- printf ("Loading arcs and blocks from .bbg file\n");
-#endif
-
- n_arcs_off_tree = 0;
- n_blocks = 0;
- n_arcs = 0;
- n_functions = 0;
- i = 0;
- while (i < _dbus_string_get_length (contents))
- {
- Function *func;
- long n_blocks_in_func;
- long n_arcs_in_func;
- int j;
-
-#ifdef DBUS_HAVE_GCC33_GCOV
- DBusString funcname;
- int checksum;
-
- /* In gcc33 .bbg files, there's a function name of the form:
- * -1, length, name (padded to 4), -1, checksum
- * after that header on each function description, it's
- * the same as in gcc32
- */
- if (!_dbus_string_init (&funcname))
- die ("no memory\n");
-
- if (!string_get_function (contents, i,
- &funcname, &checksum, &i))
- die ("could not read function name\n");
-#endif /* DBUS_HAVE_GCC33_GCOV */
-
- if (!string_get_int (contents, i, &val))
- break;
-
- n_blocks_in_func = val;
-
- i += 4;
-
- if (!string_get_int (contents, i, &n_arcs_in_func))
- break;
-
- i += 4;
-
- n_functions += 1;
- n_blocks += n_blocks_in_func;
- n_arcs += n_arcs_in_func;
-
- func = dbus_new0 (Function, 1);
- if (func == NULL)
- die ("no memory\n");
-
-#ifdef DBUS_HAVE_GCC33_GCOV
- func->name = _dbus_strdup (_dbus_string_get_const_data (&funcname));
- func->checksum = checksum;
- _dbus_string_free (&funcname);
-#endif
-
- func->block_graph = dbus_new0 (Block, n_blocks_in_func);
- func->n_blocks = n_blocks_in_func;
-
- j = 0;
- while (j < n_blocks_in_func)
- {
- long n_arcs_in_block;
- int k;
-
- if (!string_get_int (contents, i, &n_arcs_in_block))
- break;
-
- i += 4;
-
- k = 0;
- while (k < n_arcs_in_block)
- {
- long destination_block;
- long flags;
-
- if (!string_get_int (contents, i, &destination_block))
- break;
-
- i += 4;
-
- if (!string_get_int (contents, i, &flags))
- break;
-
- i += 4;
-
- if ((flags & FLAG_ON_TREE) == 0)
- n_arcs_off_tree += 1;
-
- function_add_arc (func, j, destination_block,
- flags);
-
- ++k;
- }
-
- if (k < n_arcs_in_block)
- break;
-
- ++j;
- }
-
- if (j < n_blocks_in_func)
- break;
-
- function_reverse_succ_arcs (func);
-
- if (!_dbus_list_append (functions, func))
- die ("no memory\n");
-
- if (!string_get_int (contents, i, &val))
- break;
-
- i += 4;
-
- if (val != -1)
- die ("-1 separator not found in .bbg file\n");
- }
-
-#if 0
- printf ("%d functions %d blocks %d arcs %d off-tree arcs in file\n",
- n_functions, n_blocks, n_arcs, n_arcs_off_tree);
-#endif
-
- _dbus_assert (n_functions == _dbus_list_get_length (functions));
-}
-
-#ifdef DBUS_HAVE_GCC33_GCOV
-static void
-add_counts_from_da (const DBusString *contents,
- DBusList **functions)
-{
- int i;
- dbus_int64_t v64;
- long val;
- int n_sections;
- DBusList *link;
- Function *current_func;
- int current_block;
- Arc *current_arc;
-
- n_sections = 0;
-
- i = 0;
- while (i < _dbus_string_get_length (contents))
- {
- int claimed_n_functions;
- int n_functions;
-
- if (!string_get_int (contents, i, &val))
- die ("no magic found in .da file\n");
-
- i += 4;
-
- if (val != -123)
- die ("wrong file magic in .da file\n");
-
- if (!string_get_int (contents, i, &val))
- die ("no function count in .da file\n");
- i += 4;
- claimed_n_functions = val;
-
- if (!string_get_int (contents, i, &val))
- die ("no extra data length in .da file\n");
-
- i += 4;
-
- i += val;
-
- link = _dbus_list_get_first_link (functions);
- if (link == NULL)
- goto no_more_functions;
-
- n_functions = 0;
- while (n_functions < claimed_n_functions && link != NULL)
- {
- DBusString funcname;
- int checksum;
- int claimed_n_arcs;
- int n_arcs;
-
- current_func = link->data;
- current_block = 0;
- current_arc = current_func->block_graph[current_block].succ;
-
- if (!_dbus_string_init (&funcname))
- die ("no memory\n");
-
- if (!string_get_function (contents, i,
- &funcname, &checksum, &i))
- die ("could not read function name\n");
-
- if (!_dbus_string_equal_c_str (&funcname, current_func->name))
- {
- fprintf (stderr, "Expecting .da info for %s but got %s\n",
- current_func->name,
- _dbus_string_get_const_data (&funcname));
- exit (1);
- }
-
- if (checksum != current_func->checksum)
- die (".da file checksum doesn't match checksum from .bbg file\n");
-
- if (!string_get_int (contents, i, &val))
- die ("no arc count for function\n");
-
- i += 4;
- claimed_n_arcs = val;
-
- /* For each arc in the profile, find the corresponding
- * arc in the function and increment its count
- */
- n_arcs = 0;
- while (n_arcs < claimed_n_arcs)
- {
- if (!string_get_int64 (contents, i, &v64))
- die ("did not get execution count for arc\n");
-
- i += 8;
-
- /* Find the next arc in the function that isn't on tree */
- while (current_arc == NULL ||
- current_arc->on_tree)
- {
- if (current_arc == NULL)
- {
- ++current_block;
-
- if (current_block >= current_func->n_blocks)
- die ("too many blocks in function\n");
-
- current_arc = current_func->block_graph[current_block].succ;
- }
- else
- {
- current_arc = current_arc->succ_next;
- }
- }
-
- _dbus_assert (current_arc != NULL);
- _dbus_assert (!current_arc->on_tree);
-
- current_arc->arc_count = v64;
- current_arc->count_valid = TRUE;
- current_func->block_graph[current_block].succ_count -= 1;
- current_func->block_graph[current_arc->target].pred_count -= 1;
-
- ++n_arcs;
-
- current_arc = current_arc->succ_next;
- }
-
- _dbus_string_free (&funcname);
-
- link = _dbus_list_get_next_link (functions, link);
- ++n_functions;
-
- if (link == NULL && n_functions < claimed_n_functions)
- {
- fprintf (stderr, "Ran out of functions loading .da file\n");
- goto no_more_functions;
- }
- }
-
- no_more_functions:
-
- ++n_sections;
- }
-}
-#else /* DBUS_HAVE_GCC33_GCOV */
-static void
-add_counts_from_da (const DBusString *contents,
- DBusList **functions)
-{
- int i;
- dbus_int64_t val;
- int n_arcs;
- int claimed_n_arcs;
- DBusList *link;
- Function *current_func;
- int current_block;
- Arc *current_arc;
-
-#if 0
- printf ("Loading execution count for each arc from .da file\n");
-#endif
-
- i = 0;
- if (!string_get_int64 (contents, i, &val))
- return;
-
- i += 8;
-
- claimed_n_arcs = val;
-
- link = _dbus_list_get_first_link (functions);
- if (link == NULL)
- goto done;
-
- current_func = link->data;
- current_block = 0;
- current_arc = current_func->block_graph[current_block].succ;
-
- n_arcs = 0;
- while (string_get_int64 (contents, i, &val))
- {
- i += 8;
-
- while (current_arc == NULL ||
- current_arc->on_tree)
- {
- if (current_arc == NULL)
- {
- ++current_block;
-
- if (current_block == current_func->n_blocks)
- {
- link = _dbus_list_get_next_link (functions, link);
- if (link == NULL)
- {
- fprintf (stderr, "Ran out of functions loading .da file\n");
- goto done;
- }
- current_func = link->data;
- current_block = 0;
- }
-
- current_arc = current_func->block_graph[current_block].succ;
- }
- else
- {
- current_arc = current_arc->succ_next;
- }
- }
-
- _dbus_assert (current_arc != NULL);
- _dbus_assert (!current_arc->on_tree);
-
- current_arc->arc_count = val;
- current_arc->count_valid = TRUE;
- current_func->block_graph[current_block].succ_count -= 1;
- current_func->block_graph[current_arc->target].pred_count -= 1;
-
- ++n_arcs;
-
- current_arc = current_arc->succ_next;
- }
-
- done:
-
- if (n_arcs != claimed_n_arcs)
- {
- fprintf (stderr, "File claimed to have %d arcs but only had %d\n",
- claimed_n_arcs, n_arcs);
- exit (1);
- }
-
-#if 0
- printf ("%d arcs in file\n", n_arcs);
-#endif
-}
-#endif
-
-static void
-function_solve_graph (Function *func)
-{
- int passes, changes;
- dbus_int64_t total;
- int i;
- Arc *arc;
- Block *block_graph;
- int n_blocks;
-
-#if 0
- printf ("Solving function graph\n");
-#endif
-
- n_blocks = func->n_blocks;
- block_graph = func->block_graph;
-
- /* For every block in the file,
- - if every exit/entrance arc has a known count, then set the block count
- - if the block count is known, and every exit/entrance arc but one has
- a known execution count, then set the count of the remaining arc
-
- As arc counts are set, decrement the succ/pred count, but don't delete
- the arc, that way we can easily tell when all arcs are known, or only
- one arc is unknown. */
-
- /* The order that the basic blocks are iterated through is important.
- Since the code that finds spanning trees starts with block 0, low numbered
- arcs are put on the spanning tree in preference to high numbered arcs.
- Hence, most instrumented arcs are at the end. Graph solving works much
- faster if we propagate numbers from the end to the start.
-
- This takes an average of slightly more than 3 passes. */
-
- changes = 1;
- passes = 0;
- while (changes)
- {
- passes++;
- changes = 0;
-
- for (i = n_blocks - 1; i >= 0; i--)
- {
- if (! block_graph[i].count_valid)
- {
- if (block_graph[i].succ_count == 0)
- {
- total = 0;
- for (arc = block_graph[i].succ; arc;
- arc = arc->succ_next)
- total += arc->arc_count;
- block_graph[i].exec_count = total;
- block_graph[i].count_valid = 1;
- changes = 1;
- }
- else if (block_graph[i].pred_count == 0)
- {
- total = 0;
- for (arc = block_graph[i].pred; arc;
- arc = arc->pred_next)
- total += arc->arc_count;
- block_graph[i].exec_count = total;
- block_graph[i].count_valid = 1;
- changes = 1;
- }
- }
- if (block_graph[i].count_valid)
- {
- if (block_graph[i].succ_count == 1)
- {
- total = 0;
- /* One of the counts will be invalid, but it is zero,
- so adding it in also doesn't hurt. */
- for (arc = block_graph[i].succ; arc;
- arc = arc->succ_next)
- total += arc->arc_count;
- /* Calculate count for remaining arc by conservation. */
- total = block_graph[i].exec_count - total;
- /* Search for the invalid arc, and set its count. */
- for (arc = block_graph[i].succ; arc;
- arc = arc->succ_next)
- if (! arc->count_valid)
- break;
- if (! arc)
- die ("arc == NULL\n");
- arc->count_valid = 1;
- arc->arc_count = total;
- block_graph[i].succ_count -= 1;
-
- block_graph[arc->target].pred_count -= 1;
- changes = 1;
- }
- if (block_graph[i].pred_count == 1)
- {
- total = 0;
- /* One of the counts will be invalid, but it is zero,
- so adding it in also doesn't hurt. */
- for (arc = block_graph[i].pred; arc;
- arc = arc->pred_next)
- total += arc->arc_count;
- /* Calculate count for remaining arc by conservation. */
- total = block_graph[i].exec_count - total;
- /* Search for the invalid arc, and set its count. */
- for (arc = block_graph[i].pred; arc;
- arc = arc->pred_next)
- if (! arc->count_valid)
- break;
- if (! arc)
- die ("arc == NULL\n");
- arc->count_valid = 1;
- arc->arc_count = total;
- block_graph[i].pred_count -= 1;
-
- block_graph[arc->source].succ_count -= 1;
- changes = 1;
- }
- }
- }
- }
-
- /* If the graph has been correctly solved, every block will have a
- * succ and pred count of zero.
- */
- {
- dbus_bool_t header = FALSE;
- for (i = 0; i < n_blocks; i++)
- {
- if (block_graph[i].succ_count || block_graph[i].pred_count)
- {
- if (!header)
- {
- fprintf (stderr, "WARNING: Block graph solved incorrectly for function %s\n",
- func->name);
- fprintf (stderr, " this error reflects a bug in decode-gcov.c or perhaps bogus data\n");
- header = TRUE;
- }
- fprintf (stderr, " block %d has succ_count = %d pred_count = %d\n",
- i, (int) block_graph[i].succ_count, (int) block_graph[i].pred_count);
- }
- }
- }
-}
-
-static void
-solve_graphs (DBusList **functions)
-{
- DBusList *link;
-
- link = _dbus_list_get_first_link (functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- function_solve_graph (func);
-
- link = _dbus_list_get_next_link (functions, link);
- }
-}
-
-static void
-load_functions_for_c_file (const DBusString *filename,
- DBusList **functions)
-{
- DBusString bbg_filename;
- DBusString da_filename;
- DBusString gcno_filename;
- DBusString gcda_filename;
- DBusString contents;
- DBusString *name;
- DBusError error;
-
- /* With latest gcc it's .gcno instead of .bbg and
- * gcda instead of .da
- */
-
- dbus_error_init (&error);
-
- if (!_dbus_string_init (&bbg_filename) ||
- !_dbus_string_init (&da_filename) ||
- !_dbus_string_init (&gcno_filename) ||
- !_dbus_string_init (&gcda_filename) ||
- !_dbus_string_copy (filename, 0, &bbg_filename, 0) ||
- !_dbus_string_copy (filename, 0, &da_filename, 0) ||
- !_dbus_string_copy (filename, 0, &gcno_filename, 0) ||
- !_dbus_string_copy (filename, 0, &gcda_filename, 0) ||
- !_dbus_string_init (&contents))
- die ("no memory\n");
-
- _dbus_string_shorten (&bbg_filename, 2);
- _dbus_string_shorten (&da_filename, 2);
-
- if (!_dbus_string_append (&bbg_filename, ".bbg") ||
- !_dbus_string_append (&da_filename, ".da") ||
- !_dbus_string_append (&bbg_filename, ".gcno") ||
- !_dbus_string_append (&bbg_filename, ".gcda"))
- die ("no memory\n");
-
- if (_dbus_file_exists (_dbus_string_get_const_data (&gcno_filename)))
- name = &gcno_filename;
- else
- name = &bbg_filename;
-
- if (!_dbus_file_get_contents (&contents, name,
- &error))
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- exit (1);
- }
-
- get_functions_from_bbg (&contents, functions);
-
- _dbus_string_set_length (&contents, 0);
-
- if (_dbus_file_exists (_dbus_string_get_const_data (&gcda_filename)))
- name = &gcda_filename;
- else
- name = &da_filename;
-
- if (!_dbus_file_get_contents (&contents, name,
- &error))
- {
- /* Try .libs/file.da */
- int slash;
-
- if (_dbus_string_find_byte_backward (name,
- _dbus_string_get_length (name),
- '/',
- &slash))
- {
- DBusString libs;
- _dbus_string_init_const (&libs, "/.libs");
-
- if (!_dbus_string_copy (&libs, 0, name, slash))
- die ("no memory");
-
- dbus_error_free (&error);
- if (!_dbus_file_get_contents (&contents, name,
- &error))
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- exit (1);
- }
- }
- else
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- exit (1);
- }
- }
-
- add_counts_from_da (&contents, functions);
-
- solve_graphs (functions);
-
- _dbus_string_free (&contents);
- _dbus_string_free (&da_filename);
- _dbus_string_free (&bbg_filename);
-}
-
-static void
-get_lines_from_bb_file (const DBusString *contents,
- File *fl)
-{
- int i;
- long val;
- int n_functions;
- dbus_bool_t in_our_file;
- DBusList *link;
- Function *func;
- int block;
-
-#if 0
- printf ("Getting line numbers for blocks from .bb file\n");
-#endif
-
- /* There's this "filename" field in the .bb file which
- * mysteriously comes *after* the first function in the
- * file in the .bb file; and every .bb file seems to
- * have only one filename. I don't understand
- * what's going on here, so just set in_our_file = TRUE
- * at the start categorically.
- */
-
- block = 0;
- func = NULL;
- in_our_file = TRUE;
- link = _dbus_list_get_first_link (&fl->functions);
- n_functions = 0;
- i = 0;
- while (string_get_int (contents, i, &val))
- {
- i += 4;
-
- switch (val)
- {
- case BB_FILENAME:
- {
- DBusString f;
-
- if (!_dbus_string_init (&f))
- die ("no memory\n");
-
- if (string_get_string (contents, i,
- BB_FILENAME,
- &f, &i))
- {
- /* fl->name is a full path and the filename in .bb is
- * not.
- */
- DBusString tmp_str;
-
- _dbus_string_init_const (&tmp_str, fl->name);
-
- if (_dbus_string_ends_with_c_str (&tmp_str,
- _dbus_string_get_const_data (&f)))
- in_our_file = TRUE;
- else
- in_our_file = FALSE;
-
-#if 0
- fprintf (stderr,
- "File %s in .bb, looking for %s, in_our_file = %d\n",
- _dbus_string_get_const_data (&f),
- fl->name,
- in_our_file);
-#endif
- }
- _dbus_string_free (&f);
- }
- break;
- case BB_FUNCTION:
- {
- DBusString f;
- if (!_dbus_string_init (&f))
- die ("no memory\n");
-
- if (string_get_string (contents, i,
- BB_FUNCTION,
- &f, &i))
- {
-#if 0
- fprintf (stderr, "Function %s\n", _dbus_string_get_const_data (&f));
-#endif
-
- block = 0;
-
- if (in_our_file)
- {
- if (link == NULL)
- {
- fprintf (stderr, "No function object for function %s\n",
- _dbus_string_get_const_data (&f));
- }
- else
- {
- func = link->data;
- link = _dbus_list_get_next_link (&fl->functions, link);
-
- if (func->name == NULL)
- {
- if (!_dbus_string_copy_data (&f, &func->name))
- die ("no memory\n");
- }
- else
- {
- if (!_dbus_string_equal_c_str (&f, func->name))
- {
- fprintf (stderr, "got function name \"%s\" (%d) from .bbg file, but \"%s\" (%d) from .bb file\n",
- func->name, strlen (func->name),
- _dbus_string_get_const_data (&f),
- _dbus_string_get_length (&f));
-
- }
- }
- }
- }
- }
- _dbus_string_free (&f);
-
- n_functions += 1;
- }
- break;
- case BB_ENDOFLIST:
- block += 1;
- break;
- default:
-#if 0
- fprintf (stderr, "Line %ld\n", val);
-#endif
-
- if (val >= fl->n_lines)
- {
- fprintf (stderr, "Line %ld but file only has %d lines\n",
- val, fl->n_lines);
- }
- else if (func != NULL)
- {
- val -= 1; /* To convert the 1-based line number to 0-based */
- _dbus_assert (val >= 0);
-
- if (block < func->n_blocks)
- {
- if (!_dbus_list_append (&func->block_graph[block].lines,
- &fl->lines[val]))
- die ("no memory\n");
-
-
- if (!_dbus_list_append (&fl->lines[val].blocks,
- &func->block_graph[block]))
- die ("no memory\n");
- }
- else
- {
- fprintf (stderr, "Line number for block %d but function only has %d blocks\n",
- block, func->n_blocks);
- }
- }
- else
- {
- fprintf (stderr, "Line %ld given outside of any function\n",
- val);
- }
-
- break;
- }
- }
-
-#if 0
- printf ("%d functions in file\n", n_functions);
-#endif
-}
-
-
-static void
-load_block_line_associations (const DBusString *filename,
- File *f)
-{
- DBusString bb_filename;
- DBusString contents;
- DBusError error;
-
- dbus_error_init (&error);
-
- if (!_dbus_string_init (&bb_filename) ||
- !_dbus_string_copy (filename, 0, &bb_filename, 0) ||
- !_dbus_string_init (&contents))
- die ("no memory\n");
-
- _dbus_string_shorten (&bb_filename, 2);
-
- if (!_dbus_string_append (&bb_filename, ".bb"))
- die ("no memory\n");
-
- if (!_dbus_file_get_contents (&contents, &bb_filename,
- &error))
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- exit (1);
- }
-
- get_lines_from_bb_file (&contents, f);
-
- _dbus_string_free (&contents);
- _dbus_string_free (&bb_filename);
-}
-
-static int
-count_lines_in_string (const DBusString *str)
-{
- int n_lines;
- const char *p;
- const char *prev;
- const char *end;
- const char *last_line_end;
-
-#if 0
- printf ("Counting lines in source file\n");
-#endif
-
- n_lines = 0;
- prev = NULL;
- p = _dbus_string_get_const_data (str);
- end = p + _dbus_string_get_length (str);
- last_line_end = p;
- while (p != end)
- {
- /* too lazy to handle \r\n as one linebreak */
- if (*p == '\n' || *p == '\r')
- {
- ++n_lines;
- last_line_end = p + 1;
- }
-
- prev = p;
- ++p;
- }
-
- if (last_line_end != p)
- ++n_lines;
-
- return n_lines;
-}
-
-static void
-fill_line_content (const DBusString *str,
- Line *lines)
-{
- int n_lines;
- const char *p;
- const char *prev;
- const char *end;
- const char *last_line_end;
-
-#if 0
- printf ("Saving contents of each line in source file\n");
-#endif
-
- n_lines = 0;
- prev = NULL;
- p = _dbus_string_get_const_data (str);
- end = p + _dbus_string_get_length (str);
- last_line_end = p;
- while (p != end)
- {
- if (*p == '\n' || *p == '\r')
- {
- lines[n_lines].text = dbus_malloc0 (p - last_line_end + 1);
- if (lines[n_lines].text == NULL)
- die ("no memory\n");
-
- memcpy (lines[n_lines].text, last_line_end, p - last_line_end);
- lines[n_lines].number = n_lines + 1;
-
- ++n_lines;
-
- last_line_end = p + 1;
- }
-
- prev = p;
- ++p;
- }
-
- if (p != last_line_end)
- {
- memcpy (lines[n_lines].text, last_line_end, p - last_line_end);
- ++n_lines;
- }
-}
-
-static void
-mark_inside_dbus_build_tests (File *f)
-{
- int i;
- DBusList *link;
- int inside_depth;
-
- inside_depth = 0;
- i = 0;
- while (i < f->n_lines)
- {
- Line *l = &f->lines[i];
- dbus_bool_t is_verbose;
-
- is_verbose = strstr (l->text, "_dbus_verbose") != NULL;
-
- if (inside_depth == 0)
- {
- const char *a, *b;
-
- a = strstr (l->text, "#if");
- b = strstr (l->text, "DBUS_BUILD_TESTS");
- if (a && b && (a < b))
- inside_depth += 1;
- }
- else
- {
- if (strstr (l->text, "#if") != NULL)
- inside_depth += 1;
- else if (strstr (l->text, "#endif") != NULL)
- inside_depth -= 1;
- }
-
- if (inside_depth > 0 || is_verbose)
- {
- /* Mark the line and its blocks */
- DBusList *blink;
-
- l->inside_dbus_build_tests = TRUE;
-
- blink = _dbus_list_get_first_link (&l->blocks);
- while (blink != NULL)
- {
- Block *b = blink->data;
-
- b->inside_dbus_build_tests = TRUE;
-
- blink = _dbus_list_get_next_link (&l->blocks, blink);
- }
- }
-
- ++i;
- }
-
- /* Now mark functions where for all blocks that are associated
- * with a source line, the block is inside_dbus_build_tests.
- */
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- /* The issue is that some blocks aren't associated with a source line.
- * Assume they are inside/outside tests according to the source
- * line of the preceding block. For the first block, make it
- * match the first following block with a line associated.
- */
- if (func->block_graph[0].lines == NULL)
- {
- /* find first following line */
- i = 1;
- while (i < func->n_blocks)
- {
- if (func->block_graph[i].lines != NULL)
- {
- func->block_graph[0].inside_dbus_build_tests =
- func->block_graph[i].inside_dbus_build_tests;
- break;
- }
-
- ++i;
- }
- }
-
- /* Now mark all blocks but the first */
- i = 1;
- while (i < func->n_blocks)
- {
- if (func->block_graph[i].lines == NULL)
- {
- func->block_graph[i].inside_dbus_build_tests =
- func->block_graph[i-1].inside_dbus_build_tests;
- }
-
- ++i;
- }
-
- i = 0;
- while (i < func->n_blocks)
- {
- /* Break as soon as any block is not a test block */
- if (func->block_graph[i].lines != NULL &&
- !func->block_graph[i].inside_dbus_build_tests)
- break;
-
- ++i;
- }
-
- if (i == func->n_blocks)
- func->inside_dbus_build_tests = TRUE;
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-}
-
-static void
-mark_coverage (File *f)
-{
- int i;
- DBusList *link;
-
- i = 0;
- while (i < f->n_lines)
- {
- Line *l = &f->lines[i];
- DBusList *blink;
- int n_blocks;
- int n_blocks_executed;
-
- n_blocks = 0;
- n_blocks_executed = 0;
- blink = _dbus_list_get_first_link (&l->blocks);
- while (blink != NULL)
- {
- Block *b = blink->data;
-
- if (b->exec_count > 0)
- n_blocks_executed += 1;
-
- n_blocks += 1;
-
- blink = _dbus_list_get_next_link (&l->blocks, blink);
- }
-
- if (n_blocks_executed > 0 &&
- n_blocks_executed < n_blocks)
- l->partial = TRUE;
-
- ++i;
- }
-
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
- int i;
- int n_test_blocks;
- int n_test_blocks_executed;
- int n_nontest_blocks;
- int n_nontest_blocks_executed;
-
- n_test_blocks = 0;
- n_test_blocks_executed = 0;
- n_nontest_blocks = 0;
- n_nontest_blocks_executed = 0;
-
- i = 0;
- while (i < func->n_blocks)
- {
- if (!func->block_graph[i].inside_dbus_build_tests)
- {
- n_nontest_blocks += 1;
-
- if (func->block_graph[i].exec_count > 0)
- n_nontest_blocks_executed += 1;
- }
- else
- {
- n_test_blocks += 1;
-
- if (func->block_graph[i].exec_count > 0)
- n_test_blocks_executed += 1;
- }
-
- ++i;
- }
-
- if (n_nontest_blocks_executed > 0 &&
- n_nontest_blocks_executed < n_nontest_blocks)
- func->partial = TRUE;
-
- if (n_nontest_blocks_executed == 0 &&
- n_nontest_blocks > 0)
- func->unused = TRUE;
-
- func->n_test_blocks = n_test_blocks;
- func->n_test_blocks_executed = n_test_blocks_executed;
- func->n_nontest_blocks = n_nontest_blocks;
- func->n_nontest_blocks_executed = n_nontest_blocks_executed;
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-}
-
-static File*
-load_c_file (const DBusString *filename)
-{
- DBusString contents;
- DBusError error;
- File *f;
-
- f = dbus_new0 (File, 1);
- if (f == NULL)
- die ("no memory\n");
-
- if (!_dbus_string_copy_data (filename, &f->name))
- die ("no memory\n");
-
- if (!_dbus_string_init (&contents))
- die ("no memory\n");
-
- dbus_error_init (&error);
-
- if (!_dbus_file_get_contents (&contents, filename,
- &error))
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- dbus_error_free (&error);
- exit (1);
- }
-
- load_functions_for_c_file (filename, &f->functions);
-
- f->n_lines = count_lines_in_string (&contents);
- f->lines = dbus_new0 (Line, f->n_lines);
- if (f->lines == NULL)
- die ("no memory\n");
-
- fill_line_content (&contents, f->lines);
-
- _dbus_string_free (&contents);
-
- load_block_line_associations (filename, f);
-
- mark_inside_dbus_build_tests (f);
- mark_coverage (f);
-
- return f;
-}
-
-typedef struct Stats Stats;
-
-struct Stats
-{
- int n_blocks;
- int n_blocks_executed;
- int n_blocks_inside_dbus_build_tests;
-
- int n_lines; /* lines that have blocks on them */
- int n_lines_executed;
- int n_lines_partial;
- int n_lines_inside_dbus_build_tests;
-
- int n_functions;
- int n_functions_executed;
- int n_functions_partial;
- int n_functions_inside_dbus_build_tests;
-};
-
-static dbus_bool_t
-line_was_executed (Line *l)
-{
- DBusList *link;
-
- link = _dbus_list_get_first_link (&l->blocks);
- while (link != NULL)
- {
- Block *b = link->data;
-
- if (b->exec_count > 0)
- return TRUE;
-
- link = _dbus_list_get_next_link (&l->blocks, link);
- }
-
- return FALSE;
-}
-
-
-static int
-line_exec_count (Line *l)
-{
- DBusList *link;
- dbus_int64_t total;
-
- total = 0;
- link = _dbus_list_get_first_link (&l->blocks);
- while (link != NULL)
- {
- Block *b = link->data;
-
- total += b->exec_count;
-
- link = _dbus_list_get_next_link (&l->blocks, link);
- }
-
- return total;
-}
-
-static void
-merge_stats_for_file (Stats *stats,
- File *f)
-{
- int i;
- DBusList *link;
-
- for (i = 0; i < f->n_lines; ++i)
- {
- Line *l = &f->lines[i];
-
- if (l->inside_dbus_build_tests)
- {
- stats->n_lines_inside_dbus_build_tests += 1;
- continue;
- }
-
- if (line_was_executed (l))
- stats->n_lines_executed += 1;
-
- if (l->blocks != NULL)
- stats->n_lines += 1;
-
- if (l->partial)
- stats->n_lines_partial += 1;
- }
-
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- if (func->inside_dbus_build_tests)
- stats->n_functions_inside_dbus_build_tests += 1;
- else
- {
- stats->n_functions += 1;
-
- if (!func->unused)
- stats->n_functions_executed += 1;
-
- if (func->partial)
- stats->n_functions_partial += 1;
- }
-
- stats->n_blocks_inside_dbus_build_tests +=
- func->n_test_blocks;
-
- stats->n_blocks_executed +=
- func->n_nontest_blocks_executed;
-
- stats->n_blocks +=
- func->n_nontest_blocks;
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-}
-
-/* The output of this matches gcov exactly ("diff" shows no difference) */
-static void
-print_annotated_source_gcov_format (File *f)
-{
- int i;
-
- i = 0;
- while (i < f->n_lines)
- {
- Line *l = &f->lines[i];
-
- if (l->blocks != NULL)
- {
- int exec_count;
-
- exec_count = line_exec_count (l);
-
- if (exec_count > 0)
- printf ("%12d %s\n",
- exec_count, l->text);
- else
- printf (" ###### %s\n", l->text);
- }
- else
- {
- printf ("\t\t%s\n", l->text);
- }
-
- ++i;
- }
-}
-
-static void
-print_annotated_source (File *f)
-{
- int i;
-
- i = 0;
- while (i < f->n_lines)
- {
- Line *l = &f->lines[i];
-
- if (l->inside_dbus_build_tests)
- printf ("*");
- else
- printf (" ");
-
- if (l->blocks != NULL)
- {
- int exec_count;
-
- exec_count = line_exec_count (l);
-
- if (exec_count > 0)
- printf ("%12d %s\n",
- exec_count, l->text);
- else
- printf (" ###### %s\n", l->text);
- }
- else
- {
- printf ("\t\t%s\n", l->text);
- }
-
- ++i;
- }
-}
-
-static void
-print_block_superdetails (File *f)
-{
- DBusList *link;
- int i;
-
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- printf ("=== %s():\n", func->name);
-
- i = 0;
- while (i < func->n_blocks)
- {
- Block *b = &func->block_graph[i];
- DBusList *l;
-
- printf (" %5d executed %d times%s\n", i,
- (int) b->exec_count,
- b->inside_dbus_build_tests ?
- " [inside DBUS_BUILD_TESTS]" : "");
-
- l = _dbus_list_get_first_link (&b->lines);
- while (l != NULL)
- {
- Line *line = l->data;
-
- printf ("4%d\t%s\n", line->number, line->text);
-
- l = _dbus_list_get_next_link (&b->lines, l);
- }
-
- ++i;
- }
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-}
-
-static void
-print_one_file (const DBusString *filename)
-{
- if (_dbus_string_ends_with_c_str (filename, ".bb"))
- {
- DBusString contents;
- DBusError error;
-
- if (!_dbus_string_init (&contents))
- die ("no memory\n");
-
- dbus_error_init (&error);
-
- if (!_dbus_file_get_contents (&contents, filename,
- &error))
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- dbus_error_free (&error);
- exit (1);
- }
-
- dump_bb_file (&contents);
-
- _dbus_string_free (&contents);
- }
- else if (_dbus_string_ends_with_c_str (filename, ".bbg"))
- {
- DBusString contents;
- DBusError error;
-
- if (!_dbus_string_init (&contents))
- die ("no memory\n");
-
- dbus_error_init (&error);
-
- if (!_dbus_file_get_contents (&contents, filename,
- &error))
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- dbus_error_free (&error);
- exit (1);
- }
-
- dump_bbg_file (&contents);
-
- _dbus_string_free (&contents);
- }
- else if (_dbus_string_ends_with_c_str (filename, ".da"))
- {
- DBusString contents;
- DBusError error;
-
- if (!_dbus_string_init (&contents))
- die ("no memory\n");
-
- dbus_error_init (&error);
-
- if (!_dbus_file_get_contents (&contents, filename,
- &error))
- {
- fprintf (stderr, "Could not open file: %s\n",
- error.message);
- dbus_error_free (&error);
- exit (1);
- }
-
- dump_da_file (&contents);
-
- _dbus_string_free (&contents);
- }
- else if (_dbus_string_ends_with_c_str (filename, ".c"))
- {
- File *f;
-
- f = load_c_file (filename);
-
- print_annotated_source (f);
- }
- else
- {
- fprintf (stderr, "Unknown file type %s\n",
- _dbus_string_get_const_data (filename));
- exit (1);
- }
-}
-
-static void
-print_untested_functions (File *f)
-{
- DBusList *link;
- dbus_bool_t found;
-
- found = FALSE;
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- if (func->unused &&
- !func->inside_dbus_build_tests)
- found = TRUE;
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-
- if (!found)
- return;
-
- printf ("Untested functions in %s\n", f->name);
- printf ("=======\n");
-
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- if (func->unused &&
- !func->inside_dbus_build_tests)
- printf (" %s\n", func->name);
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-
- printf ("\n");
-}
-
-static void
-print_poorly_tested_functions (File *f,
- Stats *stats)
-{
- DBusList *link;
- dbus_bool_t found;
-
-#define TEST_FRACTION(function) ((function)->n_nontest_blocks_executed / (double) (function)->n_nontest_blocks)
-
-#define AVERAGE_COVERAGE ((stats)->n_blocks_executed / (double) (stats)->n_blocks)
-
-#define POORLY_TESTED(function) (!(function)->unused && \
- (function)->n_nontest_blocks > 0 && \
- TEST_FRACTION (function) < AVERAGE_COVERAGE)
-
- found = FALSE;
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- if (POORLY_TESTED (func))
- found = TRUE;
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-
- if (!found)
- return;
-
- printf ("Below average functions in %s\n", f->name);
- printf ("=======\n");
-
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- if (POORLY_TESTED (func))
- printf (" %s (%d%%)\n", func->name,
- (int) (TEST_FRACTION (func) * 100));
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-
- printf ("\n");
-}
-
-static int
-func_cmp (const void *a,
- const void *b)
-{
- Function *af = *(Function**) a;
- Function *bf = *(Function**) b;
- int a_untested = af->n_nontest_blocks - af->n_nontest_blocks_executed;
- int b_untested = bf->n_nontest_blocks - bf->n_nontest_blocks_executed;
-
- /* Sort by number of untested blocks */
- return b_untested - a_untested;
-}
-
-static void
-print_n_untested_blocks_by_function (File *f,
- Stats *stats)
-{
- DBusList *link;
- Function **funcs;
- int n_found;
- int i;
-
- n_found = 0;
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- if (func->n_nontest_blocks_executed <
- func->n_nontest_blocks)
- n_found += 1;
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-
- if (n_found == 0)
- return;
-
- /* make an array so we can use qsort */
-
- funcs = dbus_new (Function*, n_found);
- if (funcs == NULL)
- return;
-
- i = 0;
- link = _dbus_list_get_first_link (&f->functions);
- while (link != NULL)
- {
- Function *func = link->data;
-
- if (func->n_nontest_blocks_executed <
- func->n_nontest_blocks)
- {
- funcs[i] = func;
- ++i;
- }
-
- link = _dbus_list_get_next_link (&f->functions, link);
- }
-
- _dbus_assert (i == n_found);
-
- qsort (funcs, n_found, sizeof (Function*),
- func_cmp);
-
- printf ("Incomplete functions in %s\n", f->name);
- printf ("=======\n");
-
- i = 0;
- while (i < n_found)
- {
- Function *func = funcs[i];
-
- printf (" %s (%d/%d untested blocks)\n",
- func->name,
- func->n_nontest_blocks - func->n_nontest_blocks_executed,
- func->n_nontest_blocks);
-
- ++i;
- }
-
- dbus_free (funcs);
-
- printf ("\n");
-}
-
-static void
-print_stats (Stats *stats,
- const char *of_what)
-{
- int completely;
-
- printf ("Summary (%s)\n", of_what);
- printf ("=======\n");
- printf (" %g%% blocks executed (%d of %d)\n",
- (stats->n_blocks_executed / (double) stats->n_blocks) * 100.0,
- stats->n_blocks_executed,
- stats->n_blocks);
-
- printf (" (ignored %d blocks of test-only/debug-only code)\n",
- stats->n_blocks_inside_dbus_build_tests);
-
- printf (" %g%% functions executed (%d of %d)\n",
- (stats->n_functions_executed / (double) stats->n_functions) * 100.0,
- stats->n_functions_executed,
- stats->n_functions);
-
- completely = stats->n_functions_executed - stats->n_functions_partial;
- printf (" %g%% functions completely executed (%d of %d)\n",
- (completely / (double) stats->n_functions) * 100.0,
- completely,
- stats->n_functions);
-
- printf (" (ignored %d functions of test-only/debug-only code)\n",
- stats->n_functions_inside_dbus_build_tests);
-
- printf (" %g%% lines executed (%d of %d)\n",
- (stats->n_lines_executed / (double) stats->n_lines) * 100.0,
- stats->n_lines_executed,
- stats->n_lines);
-
- completely = stats->n_lines_executed - stats->n_lines_partial;
- printf (" %g%% lines completely executed (%d of %d)\n",
- (completely / (double) stats->n_lines) * 100.0,
- completely,
- stats->n_lines);
-
- printf (" (ignored %d lines of test-only/debug-only code)\n",
- stats->n_lines_inside_dbus_build_tests);
-
- printf ("\n");
-}
-
-typedef enum
-{
- MODE_PRINT,
- MODE_REPORT,
- MODE_BLOCKS,
- MODE_GCOV
-} Mode;
-
-int
-main (int argc, char **argv)
-{
- DBusString filename;
- int i;
- Mode m;
-
- if (argc < 2)
- {
- fprintf (stderr, "Must specify files on command line\n");
- return 1;
- }
-
- m = MODE_PRINT;
- i = 1;
-
- if (strcmp (argv[i], "--report") == 0)
- {
- m = MODE_REPORT;
- ++i;
- }
- else if (strcmp (argv[i], "--blocks") == 0)
- {
- m = MODE_BLOCKS;
- ++i;
- }
- else if (strcmp (argv[i], "--gcov") == 0)
- {
- m = MODE_GCOV;
- ++i;
- }
-
-
- if (i == argc)
- {
- fprintf (stderr, "Must specify files on command line\n");
- return 1;
- }
-
- if (m == MODE_PRINT)
- {
- while (i < argc)
- {
- _dbus_string_init_const (&filename, argv[i]);
-
- print_one_file (&filename);
-
- ++i;
- }
- }
- else if (m == MODE_BLOCKS || m == MODE_GCOV)
- {
- while (i < argc)
- {
- File *f;
-
- _dbus_string_init_const (&filename, argv[i]);
-
- f = load_c_file (&filename);
-
- if (m == MODE_BLOCKS)
- print_block_superdetails (f);
- else if (m == MODE_GCOV)
- print_annotated_source_gcov_format (f);
-
- ++i;
- }
- }
- else if (m == MODE_REPORT)
- {
- Stats stats = { 0, };
- DBusList *files;
- DBusList *link;
- DBusHashTable *stats_by_dir;
- DBusHashIter iter;
-
- files = NULL;
- while (i < argc)
- {
- _dbus_string_init_const (&filename, argv[i]);
-
- if (_dbus_string_ends_with_c_str (&filename, ".c"))
- {
- File *f;
-
- f = load_c_file (&filename);
-
- if (!_dbus_list_append (&files, f))
- die ("no memory\n");
- }
- else
- {
- fprintf (stderr, "Unknown file type %s\n",
- _dbus_string_get_const_data (&filename));
- exit (1);
- }
-
- ++i;
- }
-
- link = _dbus_list_get_first_link (&files);
- while (link != NULL)
- {
- File *f = link->data;
-
- merge_stats_for_file (&stats, f);
-
- link = _dbus_list_get_next_link (&files, link);
- }
-
- print_stats (&stats, "all files");
-
- stats_by_dir = _dbus_hash_table_new (DBUS_HASH_STRING,
- dbus_free, dbus_free);
-
- link = _dbus_list_get_first_link (&files);
- while (link != NULL)
- {
- File *f = link->data;
- DBusString dirname;
- char *dirname_c;
- Stats *dir_stats;
-
- _dbus_string_init_const (&filename, f->name);
-
- if (!_dbus_string_init (&dirname))
- die ("no memory\n");
-
- if (!_dbus_string_get_dirname (&filename, &dirname) ||
- !_dbus_string_copy_data (&dirname, &dirname_c))
- die ("no memory\n");
-
- dir_stats = _dbus_hash_table_lookup_string (stats_by_dir,
- dirname_c);
-
- if (dir_stats == NULL)
- {
- dir_stats = dbus_new0 (Stats, 1);
- if (!_dbus_hash_table_insert_string (stats_by_dir, dirname_c,
- dir_stats))
- die ("no memory\n");
- }
- else
- dbus_free (dirname_c);
-
- merge_stats_for_file (dir_stats, f);
-
- link = _dbus_list_get_next_link (&files, link);
- }
-
- _dbus_hash_iter_init (stats_by_dir, &iter);
- while (_dbus_hash_iter_next (&iter))
- {
- const char *dirname = _dbus_hash_iter_get_string_key (&iter);
- Stats *dir_stats = _dbus_hash_iter_get_value (&iter);
-
- print_stats (dir_stats, dirname);
- }
-
- _dbus_hash_table_unref (stats_by_dir);
-
- link = _dbus_list_get_first_link (&files);
- while (link != NULL)
- {
- File *f = link->data;
-
- print_untested_functions (f);
-
- link = _dbus_list_get_next_link (&files, link);
- }
-
- link = _dbus_list_get_first_link (&files);
- while (link != NULL)
- {
- File *f = link->data;
-
- print_poorly_tested_functions (f, &stats);
-
- link = _dbus_list_get_next_link (&files, link);
- }
-
- link = _dbus_list_get_first_link (&files);
- while (link != NULL)
- {
- File *f = link->data;
-
- print_n_untested_blocks_by_function (f, &stats);
-
- link = _dbus_list_get_next_link (&files, link);
- }
- }
-
- return 0;
-}
LDADD = $(DBUS_GLIB_LIBS) \
$(top_builddir)/dbus/libdbus-glib-1.la \
- $(top_builddir)/dbus/libdbus-gtool.la
+ $(top_builddir)/dbus/libdbus-gtool.la \
+ $(top_builddir)/test/lib/libtest.la \
+ $(NULL)
## note that TESTS has special meaning (stuff to use in make check)
## so if adding tests not to be run in make check, don't add them to
## TESTS
if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+TESTS_ENVIRONMENT = \
+ DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) \
+ DBUS_BINDING_TOOL=$(DBUS_BINDING_TOOL) \
+ $(NULL)
TESTS=run-test.sh
else
TESTS=
endif
-EXTRA_DIST=run-test.sh test-goodbye.xml test-hello.xml test-song.xml test-dup-prop-a.xml test-dup-prop-b.xml
+EXTRA_DIST = \
+ invalid-annotated-node.xml \
+ invalid-nested-annotation.xml \
+ run-test.sh \
+ test-goodbye.xml \
+ test-hello.xml \
+ test-song.xml \
+ test-dup-prop-a.xml \
+ test-dup-prop-b.xml \
+ valid-annotations.xml \
+ $(NULL)
if DBUS_BUILD_TESTS
test-dup-prop-a-bindings.h \
test-dup-prop-a-bindings.h \
test-dup-prop-b-bindings.h \
- test-dup-prop-b-bindings.h
+ test-dup-prop-b-bindings.h \
+ valid-annotations-glue.h \
+ valid-annotations-bindings.h \
+ $(NULL)
test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
test-dup-prop-b-bindings.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
$(DBUS_BINDING_TOOL) --prefix=test_dup_prop_b --mode=glib-client --output=test-dup-prop-b-bindings.h $(srcdir)/test-dup-prop-b.xml
+valid-annotations-glue.h: valid-annotations.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+ $(DBUS_BINDING_TOOL) --prefix=test_annotated --mode=glib-server --output=$@ $<
+
+valid-annotations-bindings.h: valid-annotations.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+ $(DBUS_BINDING_TOOL) --prefix=test_annotated --mode=glib-client --output=$@ $<
CLEANFILES = \
$(BUILT_SOURCES) \
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
am__DEPENDENCIES_1 =
test_client_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/dbus/libdbus-glib-1.la \
- $(top_builddir)/dbus/libdbus-gtool.la
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ $(top_builddir)/dbus/libdbus-gtool.la \
+ $(top_builddir)/test/lib/libtest.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__test_service_SOURCES_DIST = test-interfaces.c test-interfaces.h \
test-dup-prop.c test-dup-prop.h test-objects.c test-objects.h \
test_service_LDADD = $(LDADD)
test_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(top_builddir)/dbus/libdbus-glib-1.la \
- $(top_builddir)/dbus/libdbus-gtool.la
+ $(top_builddir)/dbus/libdbus-gtool.la \
+ $(top_builddir)/test/lib/libtest.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(test_client_SOURCES) $(test_service_SOURCES)
DIST_SOURCES = $(am__test_client_SOURCES_DIST) \
$(am__test_service_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
am__tty_colors = \
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
LDADD = $(DBUS_GLIB_LIBS) \
$(top_builddir)/dbus/libdbus-glib-1.la \
- $(top_builddir)/dbus/libdbus-gtool.la
+ $(top_builddir)/dbus/libdbus-gtool.la \
+ $(top_builddir)/test/lib/libtest.la \
+ $(NULL)
+
+@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = \
+@DBUS_BUILD_TESTS_TRUE@ DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR) \
+@DBUS_BUILD_TESTS_TRUE@ DBUS_BINDING_TOOL=$(DBUS_BINDING_TOOL) \
+@DBUS_BUILD_TESTS_TRUE@ $(NULL)
+
+EXTRA_DIST = \
+ invalid-annotated-node.xml \
+ invalid-nested-annotation.xml \
+ run-test.sh \
+ test-goodbye.xml \
+ test-hello.xml \
+ test-song.xml \
+ test-dup-prop-a.xml \
+ test-dup-prop-b.xml \
+ valid-annotations.xml \
+ $(NULL)
-@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
-EXTRA_DIST = run-test.sh test-goodbye.xml test-hello.xml test-song.xml test-dup-prop-a.xml test-dup-prop-b.xml
@DBUS_BUILD_TESTS_TRUE@test_service_SOURCES = \
@DBUS_BUILD_TESTS_TRUE@ test-interfaces.c \
@DBUS_BUILD_TESTS_TRUE@ test-interfaces.h \
@DBUS_BUILD_TESTS_TRUE@ test-dup-prop-a-bindings.h \
@DBUS_BUILD_TESTS_TRUE@ test-dup-prop-a-bindings.h \
@DBUS_BUILD_TESTS_TRUE@ test-dup-prop-b-bindings.h \
-@DBUS_BUILD_TESTS_TRUE@ test-dup-prop-b-bindings.h
+@DBUS_BUILD_TESTS_TRUE@ test-dup-prop-b-bindings.h \
+@DBUS_BUILD_TESTS_TRUE@ valid-annotations-glue.h \
+@DBUS_BUILD_TESTS_TRUE@ valid-annotations-bindings.h \
+@DBUS_BUILD_TESTS_TRUE@ $(NULL)
@DBUS_BUILD_TESTS_TRUE@CLEANFILES = \
@DBUS_BUILD_TESTS_TRUE@ $(BUILT_SOURCES) \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-test-client$(EXEEXT): $(test_client_OBJECTS) $(test_client_DEPENDENCIES)
+test-client$(EXEEXT): $(test_client_OBJECTS) $(test_client_DEPENDENCIES) $(EXTRA_test_client_DEPENDENCIES)
@rm -f test-client$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_client_OBJECTS) $(test_client_LDADD) $(LIBS)
-test-service$(EXEEXT): $(test_service_OBJECTS) $(test_service_DEPENDENCIES)
+test-service$(EXEEXT): $(test_service_OBJECTS) $(test_service_DEPENDENCIES) $(EXTRA_test_service_DEPENDENCIES)
@rm -f test-service$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_service_OBJECTS) $(test_service_LDADD) $(LIBS)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
fi; \
dashes=`echo "$$dashes" | sed s/./=/g`; \
if test "$$failed" -eq 0; then \
- echo "$$grn$$dashes"; \
+ col="$$grn"; \
else \
- echo "$$red$$dashes"; \
+ col="$$red"; \
fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
- echo "$$dashes$$std"; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
test "$$failed" -eq 0; \
else :; fi
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@DBUS_BUILD_TESTS_TRUE@test-dup-prop-b-bindings.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_dup_prop_b --mode=glib-client --output=test-dup-prop-b-bindings.h $(srcdir)/test-dup-prop-b.xml
+@DBUS_BUILD_TESTS_TRUE@valid-annotations-glue.h: valid-annotations.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_annotated --mode=glib-server --output=$@ $<
+
+@DBUS_BUILD_TESTS_TRUE@valid-annotations-bindings.h: valid-annotations.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_annotated --mode=glib-client --output=$@ $<
+
### not building tests
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- /dev/null
+<?xml version="1.0"?><!-- ex:set et ts=2: -->
+<node name="/org/freedesktop/DBus/GLib/Test/Interfaces">
+ <annotation name="com.example.Invalid" value="not allowed here!"/>
+
+ <interface name="org.freedesktop.DBus.GLib.Test.Interfaces.Annotated">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="test_annotated"/>
+ </interface>
+</node>
--- /dev/null
+<?xml version="1.0"?><!-- ex:set et ts=2: -->
+<node name="/org/freedesktop/DBus/GLib/Test/Interfaces">
+ <interface name="org.freedesktop.DBus.GLib.Test.Interfaces.Annotated">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="test_annotated">
+ <annotation name="com.example.Invalid" value="can't nest annotations"/>
+ </annotation>
+ </interface>
+</node>
## so the tests can complain if you fail to use the script to launch them
DBUS_TEST_GLIB_RUN_TEST_SCRIPT=1
export DBUS_TEST_GLIB_RUN_TEST_SCRIPT
-DBUS_TOP_SRCDIR=`dirname "$0"`/../..
+srcdir=`dirname "$0"`
+DBUS_TOP_SRCDIR="$srcdir/../.."
export DBUS_TOP_SRCDIR
# Rerun ourselves with tmp session bus if we're not already
if test -z "$DBUS_TEST_GLIB_IN_RUN_TEST"; then
DBUS_TEST_GLIB_IN_RUN_TEST=1
export DBUS_TEST_GLIB_IN_RUN_TEST
- exec ${SHELL} $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+ exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
fi
+for x in annotated-node nested-annotation; do
+ if ! test -f $srcdir/invalid-$x.xml; then
+ echo "invalid-$x.xml missing">&2
+ exit 1
+ fi
+
+ if $DBUS_BINDING_TOOL --prefix=test_invalid --mode=glib-server \
+ --output=invalid-glue.h $srcdir/invalid-$x.xml ||
+ $DBUS_BINDING_TOOL --prefix=test_invalid --mode=glib-client \
+ --output=invalid-bindings.h $srcdir/invalid-$x.xml; then
+ echo "invalid-$x.xml should not have been processed successfully!">&2
+ exit 1
+ else
+ echo "invalid-$x.xml failed, as expected">&2
+ fi
+done
+
echo "running test-client"
${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/interfaces/test-client || die "test-client failed"
+#include <config.h>
+
#include <stdlib.h>
#include <string.h>
#include "dbus/dbus-gparser.h"
+#include <config.h>
+
#include "test-objects.h"
#include "test-interfaces.h"
+#include <config.h>
+
#include <stdlib.h>
#include "dbus/dbus-glib.h"
#include "tools/dbus-glib-bindings.h"
--- /dev/null
+<?xml version="1.0"?><!-- ex:set et ts=2: -->
+<node name="/org/freedesktop/DBus/GLib/Test/Interfaces">
+ <interface name="org.freedesktop.DBus.GLib.Test.Interfaces.Annotated">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="test_annotated"/>
+ <annotation name="com.example.Annotatable" value="yes"/>
+
+ <method name="DoThings">
+ <annotation name="com.example.Annotatable" value="yeah"/>
+ <arg name="message" type="s" direction="out">
+ <annotation name="com.example.MaybeAnnotatable"
+ value="strictly speaking this isn't meant to be allowed"/>
+ </arg>
+ </method>
+
+ <signal name="ThingsDone">
+ <annotation name="com.example.Annotatable" value="fd.o#27598 says so"/>
+ <arg name="message" type="s">
+ <annotation name="com.example.MaybeAnnotatable"
+ value="strictly speaking this isn't meant to be allowed"/>
+ </arg>
+ </signal>
+
+ <property name="Things" type="s" access="read">
+ <annotation name="com.example.Annotatable" value="hopefully"/>
+ </property>
+ </interface>
+</node>
--- /dev/null
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(NULL)
+
+noinst_LTLIBRARIES = libtest.la
+
+libtest_la_SOURCES = \
+ util.c \
+ util.h \
+ $(NULL)
+
+libtest_la_LIBADD = \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(NULL)
--- /dev/null
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = test/lib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libtest_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_libtest_la_OBJECTS = util.lo
+libtest_la_OBJECTS = $(am_libtest_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+SOURCES = $(libtest_la_SOURCES)
+DIST_SOURCES = $(libtest_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
+DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
+DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
+DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
+DBUS_LIBS = @DBUS_LIBS@
+DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPANDED_BINDIR = @EXPANDED_BINDIR@
+EXPANDED_DATADIR = @EXPANDED_DATADIR@
+EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
+EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
+EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
+FGREP = @FGREP@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_REVISION = @LT_REVISION@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@
+TEST_EXIT_BINARY = @TEST_EXIT_BINARY@
+TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@
+TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@
+TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@
+TEST_SERVICE_DIR = @TEST_SERVICE_DIR@
+TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
+TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
+TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(NULL)
+
+noinst_LTLIBRARIES = libtest.la
+libtest_la_SOURCES = \
+ util.c \
+ util.h \
+ $(NULL)
+
+libtest_la_LIBADD = \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(NULL)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/lib/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu test/lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libtest.la: $(libtest_la_OBJECTS) $(libtest_la_DEPENDENCIES) $(EXTRA_libtest_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(LINK) $(libtest_la_OBJECTS) $(libtest_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- /dev/null
+/* Regression test utilities
+ *
+ * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright © 2009-2011 Nokia Corporation
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <config.h>
+
+#include "util.h"
+
+static void
+destroy_cb (DBusGProxy *proxy G_GNUC_UNUSED,
+ gpointer user_data)
+{
+ gboolean *disconnected = user_data;
+
+ *disconnected = TRUE;
+}
+
+void
+test_run_until_disconnected (DBusGConnection *connection,
+ GMainContext *context)
+{
+ gboolean disconnected = FALSE;
+ DBusGProxy *proxy;
+
+ g_printerr ("Disconnecting... ");
+
+ dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (connection),
+ FALSE);
+
+ /* low-level tests might not have called this yet */
+ g_type_init ();
+
+ proxy = dbus_g_proxy_new_for_peer (connection, "/",
+ "org.freedesktop.DBus.Peer");
+ g_signal_connect (G_OBJECT (proxy), "destroy", G_CALLBACK (destroy_cb),
+ &disconnected);
+
+ dbus_connection_close (dbus_g_connection_get_connection (connection));
+
+ while (!disconnected)
+ {
+ g_printerr (".");
+ g_main_context_iteration (context, TRUE);
+ }
+
+ g_signal_handlers_disconnect_by_func (proxy, destroy_cb, &disconnected);
+ g_object_unref (proxy);
+
+ g_printerr (" disconnected\n");
+}
--- /dev/null
+/* Regression test utilities
+ *
+ * Copyright © 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright © 2009-2011 Nokia Corporation
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef DBUS_GLIB_TEST_UTIL_H
+
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+void test_run_until_disconnected (DBusGConnection *connection,
+ GMainContext *context);
+
+#endif
--- /dev/null
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/test/core \
+ -I$(top_builddir)/test/core \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(NULL)
+
+LDADD = \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(NULL)
+
+noinst_PROGRAMS = \
+ $(NULL)
+
+if DBUS_BUILD_TESTS
+noinst_PROGRAMS += \
+ test-invalid-usage \
+ $(NULL)
+endif
+
+# This "test" exercises invalid usage. It is deliberately not run in
+# TESTS, because it's (by design) full of bugs.
+test_invalid_usage_SOURCES = \
+ ../core/my-object-marshal.c \
+ ../core/my-object-marshal.h \
+ ../core/my-object.c \
+ ../core/my-object.h \
+ invalid-usage.c
--- /dev/null
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = $(am__EXEEXT_1)
+@DBUS_BUILD_TESTS_TRUE@am__append_1 = \
+@DBUS_BUILD_TESTS_TRUE@ test-invalid-usage \
+@DBUS_BUILD_TESTS_TRUE@ $(NULL)
+
+subdir = test/manual
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@DBUS_BUILD_TESTS_TRUE@am__EXEEXT_1 = test-invalid-usage$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am_test_invalid_usage_OBJECTS = my-object-marshal.$(OBJEXT) \
+ my-object.$(OBJEXT) invalid-usage.$(OBJEXT)
+test_invalid_usage_OBJECTS = $(am_test_invalid_usage_OBJECTS)
+test_invalid_usage_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+test_invalid_usage_DEPENDENCIES = \
+ $(top_builddir)/dbus/libdbus-glib-1.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+SOURCES = $(test_invalid_usage_SOURCES)
+DIST_SOURCES = $(test_invalid_usage_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ABSOLUTE_TOP_BUILDDIR = @ABSOLUTE_TOP_BUILDDIR@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
+DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
+DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
+DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
+DBUS_LIBS = @DBUS_LIBS@
+DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPANDED_BINDIR = @EXPANDED_BINDIR@
+EXPANDED_DATADIR = @EXPANDED_DATADIR@
+EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
+EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
+EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
+FGREP = @FGREP@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_REVISION = @LT_REVISION@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CORE_SERVICE_BINARY = @TEST_CORE_SERVICE_BINARY@
+TEST_EXIT_BINARY = @TEST_EXIT_BINARY@
+TEST_INTERFACES_SERVICE_BINARY = @TEST_INTERFACES_SERVICE_BINARY@
+TEST_SEGFAULT_BINARY = @TEST_SEGFAULT_BINARY@
+TEST_SERVICE_BINARY = @TEST_SERVICE_BINARY@
+TEST_SERVICE_DIR = @TEST_SERVICE_DIR@
+TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
+TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
+TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/test/core \
+ -I$(top_builddir)/test/core \
+ $(DBUS_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(NULL)
+
+LDADD = \
+ $(top_builddir)/dbus/libdbus-glib-1.la \
+ $(DBUS_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(NULL)
+
+
+# This "test" exercises invalid usage. It is deliberately not run in
+# TESTS, because it's (by design) full of bugs.
+test_invalid_usage_SOURCES = \
+ ../core/my-object-marshal.c \
+ ../core/my-object-marshal.h \
+ ../core/my-object.c \
+ ../core/my-object.h \
+ invalid-usage.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/manual/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu test/manual/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+test-invalid-usage$(EXEEXT): $(test_invalid_usage_OBJECTS) $(test_invalid_usage_DEPENDENCIES) $(EXTRA_test_invalid_usage_DEPENDENCIES)
+ @rm -f test-invalid-usage$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_invalid_usage_OBJECTS) $(test_invalid_usage_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/invalid-usage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/my-object-marshal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/my-object.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+my-object-marshal.o: ../core/my-object-marshal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT my-object-marshal.o -MD -MP -MF $(DEPDIR)/my-object-marshal.Tpo -c -o my-object-marshal.o `test -f '../core/my-object-marshal.c' || echo '$(srcdir)/'`../core/my-object-marshal.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/my-object-marshal.Tpo $(DEPDIR)/my-object-marshal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../core/my-object-marshal.c' object='my-object-marshal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o my-object-marshal.o `test -f '../core/my-object-marshal.c' || echo '$(srcdir)/'`../core/my-object-marshal.c
+
+my-object-marshal.obj: ../core/my-object-marshal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT my-object-marshal.obj -MD -MP -MF $(DEPDIR)/my-object-marshal.Tpo -c -o my-object-marshal.obj `if test -f '../core/my-object-marshal.c'; then $(CYGPATH_W) '../core/my-object-marshal.c'; else $(CYGPATH_W) '$(srcdir)/../core/my-object-marshal.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/my-object-marshal.Tpo $(DEPDIR)/my-object-marshal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../core/my-object-marshal.c' object='my-object-marshal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o my-object-marshal.obj `if test -f '../core/my-object-marshal.c'; then $(CYGPATH_W) '../core/my-object-marshal.c'; else $(CYGPATH_W) '$(srcdir)/../core/my-object-marshal.c'; fi`
+
+my-object.o: ../core/my-object.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT my-object.o -MD -MP -MF $(DEPDIR)/my-object.Tpo -c -o my-object.o `test -f '../core/my-object.c' || echo '$(srcdir)/'`../core/my-object.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/my-object.Tpo $(DEPDIR)/my-object.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../core/my-object.c' object='my-object.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o my-object.o `test -f '../core/my-object.c' || echo '$(srcdir)/'`../core/my-object.c
+
+my-object.obj: ../core/my-object.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT my-object.obj -MD -MP -MF $(DEPDIR)/my-object.Tpo -c -o my-object.obj `if test -f '../core/my-object.c'; then $(CYGPATH_W) '../core/my-object.c'; else $(CYGPATH_W) '$(srcdir)/../core/my-object.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/my-object.Tpo $(DEPDIR)/my-object.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../core/my-object.c' object='my-object.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o my-object.obj `if test -f '../core/my-object.c'; then $(CYGPATH_W) '../core/my-object.c'; else $(CYGPATH_W) '$(srcdir)/../core/my-object.c'; fi`
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- /dev/null
+/* Manual test for various invalid usages which should not crash us (in order
+ * to be nice to fallible programmers), unless checks have been disabled (in
+ * which case, you asked for it, you got it).
+ *
+ * Copyright © 2006-2010 Red Hat, Inc.
+ * Copyright © 2006-2010 Collabora Ltd.
+ * Copyright © 2006-2011 Nokia Corporation
+ * Copyright © 2006 Steve Frécinaux
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <config.h>
+
+#include <glib.h>
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include <string.h>
+
+#include "my-object.h"
+#include "test-service-glib-bindings.h"
+
+/* my-object wants this to exist */
+GMainLoop *loop = NULL;
+
+typedef struct {
+ GError *error;
+ DBusGConnection *conn;
+ DBusGProxy *proxy;
+ DBusGProxy *proxy_for_self;
+ GObject *object;
+} Fixture;
+
+static void
+setup (Fixture *f,
+ gconstpointer context)
+{
+ /* this test is all about (mostly critical) warnings, so don't crash out on
+ * programming errors */
+ g_setenv ("DBUS_FATAL_WARNINGS", "0", TRUE);
+ g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
+
+ dbus_g_type_specialized_init ();
+
+ /* This is a bug: you're not meant to register any domain more than
+ * once. It shouldn't crash, though. */
+ dbus_g_error_domain_register (MY_OBJECT_ERROR, NULL, MY_TYPE_ERROR);
+
+ f->conn = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, &f->error);
+ g_assert_no_error (f->error);
+ g_assert (f->conn != NULL);
+
+ f->proxy = dbus_g_proxy_new_for_name (f->conn, "com.example.Test",
+ "/com/example/Test/Object", "com.example.Test.Fallible");
+ g_assert (f->proxy != NULL);
+
+ f->object = g_object_new (MY_TYPE_OBJECT, NULL);
+ g_assert (MY_IS_OBJECT (f->object));
+ dbus_g_connection_register_g_object (f->conn, "/com/example/Test/Object",
+ f->object);
+
+ f->proxy_for_self = dbus_g_proxy_new_for_name (f->conn,
+ dbus_bus_get_unique_name (dbus_g_connection_get_connection (f->conn)),
+ "/com/example/Test/Object", "org.freedesktop.DBus.GLib.Tests.MyObject");
+ g_assert (f->proxy_for_self != NULL);
+}
+
+static void
+test_invalid_gtype (Fixture *f,
+ gconstpointer context)
+{
+ /* G_TYPE_GTYPE is not handled by the dbus-glib type system (and would make
+ * no sense anyway) */
+ dbus_g_proxy_call_no_reply (f->proxy, "Fail",
+ G_TYPE_GTYPE, G_TYPE_STRING,
+ G_TYPE_INVALID);
+}
+
+static void
+test_invalid_utf8 (Fixture *f,
+ gconstpointer context)
+{
+ g_test_bug ("30171");
+
+ /* This provokes a libdbus warning, which is fatal-by-default */
+ dbus_g_proxy_call_no_reply (f->proxy, "Fail",
+ G_TYPE_STRING, "\xfe\xfe\xfe",
+ G_TYPE_INVALID);
+}
+
+static void
+test_invalid_bool (Fixture *f,
+ gconstpointer context)
+{
+ g_test_bug ("30171");
+
+ /* This provokes a libdbus warning, which is fatal-by-default */
+ dbus_g_proxy_call_no_reply (f->proxy, "Fail",
+ G_TYPE_BOOLEAN, (gboolean) (-42),
+ G_TYPE_INVALID);
+}
+
+static void
+test_invalid_path (Fixture *f,
+ gconstpointer context)
+{
+ g_test_bug ("30171");
+
+ /* This provokes a libdbus warning, which is fatal-by-default */
+ dbus_g_proxy_call_no_reply (f->proxy, "Fail",
+ DBUS_TYPE_G_OBJECT_PATH, "$%#*!",
+ G_TYPE_INVALID);
+}
+
+static void
+test_invalid_utf8s (Fixture *f,
+ gconstpointer context)
+{
+ gchar *bad_strings[] = { "\xfe\xfe\xfe", NULL };
+ GStrv bad_strv = bad_strings;
+
+ g_test_bug ("30171");
+
+ /* This provokes a libdbus warning, which is fatal-by-default */
+ dbus_g_proxy_call_no_reply (f->proxy, "Fail",
+ G_TYPE_STRV, bad_strv,
+ G_TYPE_INVALID);
+}
+
+static void
+test_invalid_bools (Fixture *f,
+ gconstpointer context)
+{
+ GArray *array;
+ gboolean maybe = (gboolean) (-23);
+
+ g_test_bug ("30171");
+
+ array = g_array_new (FALSE, FALSE, sizeof (gboolean));
+
+ g_array_append_val (array, maybe);
+
+ /* This provokes a libdbus warning, which is fatal-by-default */
+ dbus_g_proxy_call_no_reply (f->proxy, "Fail",
+ dbus_g_type_get_collection ("GArray", G_TYPE_BOOLEAN), array,
+ G_TYPE_INVALID);
+
+ g_array_free (array, TRUE);
+}
+
+static void
+test_invalid_paths (Fixture *f,
+ gconstpointer context)
+{
+ GPtrArray *array;
+
+ g_test_bug ("30171");
+
+ array = g_ptr_array_new ();
+ g_ptr_array_add (array, "bees");
+
+ /* This provokes a libdbus warning, which is fatal-by-default */
+ dbus_g_proxy_call_no_reply (f->proxy, "Fail",
+ dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), array,
+ G_TYPE_INVALID);
+
+ g_ptr_array_free (array, TRUE);
+}
+
+static void
+throw_error_cb (DBusGProxy *proxy,
+ GError *error,
+ gpointer user_data)
+{
+ GError **error_out = user_data;
+
+ g_assert (error != NULL);
+ *error_out = g_error_copy (error);
+}
+
+static void
+test_error_out_of_range (Fixture *f,
+ gconstpointer context)
+{
+ GError *error = NULL;
+
+ g_test_bug ("40151");
+
+ /* This is a bug: -1 isn't a valid code for the domain. */
+ my_object_save_error ((MyObject *) f->object, MY_OBJECT_ERROR, -1,
+ "stop being so negative");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_async (
+ f->proxy_for_self, throw_error_cb, &error))
+ g_error ("Failed to start async ThrowError call");
+
+ while (error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+ g_clear_error (&error);
+
+ /* This is a bug: 666 isn't a valid code for the domain. */
+ my_object_save_error ((MyObject *) f->object, MY_OBJECT_ERROR, 666,
+ "demonic possession detected");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_error_async (
+ f->proxy_for_self, throw_error_cb, &error))
+ g_error ("Failed to start async ThrowError call");
+
+ while (error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+ g_clear_error (&error);
+}
+
+static void
+test_error_domain_0 (Fixture *f,
+ gconstpointer context)
+{
+ /* This throws an error with domain 0 and code 0, which makes no sense.
+ * It's programmer error, really: g_error_new() would critical if given
+ * the same domain and code. See GNOME#660371.
+ *
+ * This was added for fd.o #27799, but there's a difference between
+ * "this is an error domain, but not one registered with dbus-glib" and
+ * "this isn't even an error domain". */
+ g_test_bug ("27799");
+
+ if (!org_freedesktop_DBus_GLib_Tests_MyObject_throw_unregistered_error_async (
+ f->proxy_for_self, throw_error_cb, f))
+ g_error ("Failed to start async ThrowUnregisteredError call");
+
+ while (f->error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+
+ g_assert_error (f->error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
+}
+
+static void
+teardown (Fixture *f,
+ gconstpointer context G_GNUC_UNUSED)
+{
+ g_clear_error (&f->error);
+
+ if (f->proxy != NULL)
+ {
+ g_object_unref (f->proxy);
+ f->proxy = NULL;
+ }
+
+ if (f->object != NULL)
+ {
+ g_object_unref (f->object);
+ f->object = NULL;
+ }
+
+ if (f->proxy_for_self != NULL)
+ {
+ g_object_unref (f->proxy_for_self);
+ f->proxy_for_self = NULL;
+ }
+
+ if (f->conn != NULL)
+ {
+ dbus_connection_close (dbus_g_connection_get_connection (f->conn));
+ dbus_g_connection_unref (f->conn);
+ f->conn = NULL;
+ }
+}
+
+int
+main (int argc,
+ char **argv)
+{
+ g_test_init (&argc, &argv, NULL);
+ g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
+
+ g_type_init ();
+
+ g_test_add ("/invalid/gtype", Fixture, NULL, setup, test_invalid_gtype,
+ teardown);
+ g_test_add ("/invalid/utf8", Fixture, NULL, setup, test_invalid_utf8,
+ teardown);
+ g_test_add ("/invalid/bool", Fixture, NULL, setup, test_invalid_bool,
+ teardown);
+ g_test_add ("/invalid/path", Fixture, NULL, setup, test_invalid_path,
+ teardown);
+ g_test_add ("/invalid/utf8s", Fixture, NULL, setup, test_invalid_utf8s,
+ teardown);
+ g_test_add ("/invalid/bools", Fixture, NULL, setup, test_invalid_bools,
+ teardown);
+ g_test_add ("/invalid/paths", Fixture, NULL, setup, test_invalid_paths,
+ teardown);
+ g_test_add ("/invalid/error/out-of-range", Fixture, NULL, setup,
+ test_error_out_of_range, teardown);
+ g_test_add ("/invalid/error/domain-0", Fixture, NULL, setup,
+ test_error_domain_0, teardown);
+
+ return g_test_run ();
+}
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
char **argv)
{
DBusError error;
- int result;
DBusConnection *connection;
dbus_error_init (&error);
die ("dbus_connection_get_object_path_data() doesn't seem to work right\n");
}
- result = dbus_bus_request_name (connection, "org.freedesktop.DBus.GLib.TestEchoService",
+ dbus_bus_request_name (connection, "org.freedesktop.DBus.GLib.TestEchoService",
0, &error);
if (dbus_error_is_set (&error))
{
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(libdbus_glibdir)"
HEADERS = $(nodist_libdbus_glib_HEADERS)
ETAGS = etags
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_GLIB_THREADS_CFLAGS = @DBUS_GLIB_THREADS_CFLAGS@
DBUS_GLIB_THREADS_LIBS = @DBUS_GLIB_THREADS_LIBS@
DBUS_GLIB_TOOL_CFLAGS = @DBUS_GLIB_TOOL_CFLAGS@
DBUS_GLIB_TOOL_LIBS = @DBUS_GLIB_TOOL_LIBS@
-DBUS_INCLUDEDIR = @DBUS_INCLUDEDIR@
DBUS_LIBS = @DBUS_LIBS@
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
GTKDOC_MKPDF = @GTKDOC_MKPDF@
GTKDOC_REBASE = @GTKDOC_REBASE@
HTML_DIR = @HTML_DIR@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
TEST_SHELL_SERVICE_BINARY = @TEST_SHELL_SERVICE_BINARY@
TEST_SLEEP_FOREVER_BINARY = @TEST_SLEEP_FOREVER_BINARY@
TEST_SOCKET_DIR = @TEST_SOCKET_DIR@
-USE_NLS = @USE_NLS@
VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-rm -rf .libs _libs
install-nodist_libdbus_glibHEADERS: $(nodist_libdbus_glib_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(libdbus_glibdir)" || $(MKDIR_P) "$(DESTDIR)$(libdbus_glibdir)"
@list='$(nodist_libdbus_glib_HEADERS)'; test -n "$(libdbus_glibdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdbus_glibdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdbus_glibdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@$(NORMAL_UNINSTALL)
@list='$(nodist_libdbus_glib_HEADERS)'; test -n "$(libdbus_glibdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(libdbus_glibdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(libdbus_glibdir)" && rm -f $$files
+ dir='$(DESTDIR)$(libdbus_glibdir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
--- /dev/null
+# Copyright © 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+#
+# Licensed under the Academic Free License version 2.1
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Alternatively, at your option, you can redistribute and/or modify
+# this single file under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1 of
+# that license, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+lcov-reset:
+ lcov --directory @top_srcdir@ --zerocounters
+
+lcov-report:
+ lcov --directory @top_srcdir@ --capture \
+ --output-file @top_builddir@/lcov.info.tmp
+ lcov --directory @top_srcdir@ --output-file @top_builddir@/lcov.info \
+ --remove @top_builddir@/lcov.info.tmp '*-scan.c'
+ rm @top_builddir@/lcov.info.tmp
+ $(mkdir_p) @top_builddir@/lcov.html
+ git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\
+ genhtml --title "@PACKAGE_STRING@ $$git_commit" \
+ --output-directory @top_builddir@/lcov.html lcov.info
+ @echo
+ @echo 'lcov report can be found in:'
+ @echo 'file://@abs_top_builddir@/lcov.html/index.html'
+ @echo
+
+lcov-check:
+ $(MAKE) lcov-reset
+ $(MAKE) check $(LCOV_CHECK_ARGS)
+ $(MAKE) lcov-report
+
+## vim:set ft=automake:
projects / external / dbus-glib.git / commitdiff