[next] telepathy-glib: Fold the core library into the dbus library

Simon McVittie smcv at kemper.freedesktop.org
Thu Apr 3 12:39:36 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 68fb34700c39ba7acec1b73f8138b33e2132f522
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=68fb34700c39ba7acec1b73f8138b33e2132f522

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Apr  3 13:07:10 2014 +0100

Fold the core library into the dbus library

tp_dbus_g_method_return_not_implemented is non-essential, so we can
easily put it in the -dbus library.

tp_proxy_check_interface_by_id should be available in the high-level
API, but with a couple of #define hacks we can make it available to
generated code in the -dbus library under the same name.

tp_proxy_pending_call_v1_new and tp_proxy_signal_connection_v1_new
can safely go in the -dbus library: they don't deserve to be part of
the high-level API.

This reduces us to one shared library per level of API stability,
which is exactly the right number.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=76855
Reviewed-by: Xavier Claessens

---

 configure.ac                                       |    4 +-
 docs/reference/libtelepathy-logger/Makefile.am     |    1 -
 docs/reference/telepathy-farstream/Makefile.am     |    1 -
 docs/reference/telepathy-glib/Makefile.am          |    1 -
 examples/client/Makefile.am                        |    1 -
 examples/client/dbus-tubes/Makefile.am             |    1 -
 examples/client/stream-tubes/Makefile.am           |    1 -
 examples/cm/call/Makefile.am                       |    1 -
 examples/cm/channelspecific/Makefile.am            |    1 -
 examples/cm/contactlist/Makefile.am                |    1 -
 examples/cm/echo-message-parts/Makefile.am         |    1 -
 examples/cm/extended/Makefile.am                   |    1 -
 examples/cm/no-protocols/Makefile.am               |    1 -
 examples/extensions/Makefile.am                    |    1 -
 telepathy-farstream/Makefile.am                    |    1 -
 telepathy-farstream/examples/Makefile.am           |    1 -
 telepathy-glib/Makefile.am                         |   29 +++---------
 telepathy-glib/abi.am                              |   28 -----------
 telepathy-glib/base-client.c                       |    1 +
 telepathy-glib/base-connection.c                   |    1 +
 telepathy-glib/base-protocol.c                     |    1 +
 telepathy-glib/cli-channel.c                       |    4 ++
 telepathy-glib/cli-connection.c                    |    4 ++
 telepathy-glib/cli-misc.c                          |    4 ++
 telepathy-glib/cli-proxy.h                         |   50 ++++++++++++++++++++
 telepathy-glib/codegen.am                          |    1 -
 telepathy-glib/core-dbus.c                         |   39 ---------------
 telepathy-glib/core-proxy.c                        |    2 +-
 telepathy-glib/dbus.h                              |    2 -
 telepathy-glib/gnio-util.h                         |    2 +-
 telepathy-glib/introspection.am                    |    5 +-
 telepathy-glib/message-mixin.c                     |    1 +
 telepathy-glib/proxy-internal.h                    |   11 +++--
 telepathy-glib/proxy-methods.c                     |    6 +--
 telepathy-glib/proxy-signals.c                     |    2 +-
 telepathy-glib/proxy-subclass.h                    |   16 -------
 telepathy-glib/proxy.c                             |   10 ++--
 telepathy-glib/proxy.h                             |    2 +-
 telepathy-glib/reentrants.c                        |    1 +
 telepathy-glib/svc-interface.c                     |   14 ++++++
 telepathy-glib/svc-interface.h                     |    2 +
 .../telepathy-glib-1-dbus-uninstalled.pc.in        |    2 +-
 telepathy-glib/telepathy-glib-1-dbus.pc.in         |    2 +-
 telepathy-glib/telepathy-glib-1-uninstalled.pc.in  |    2 +-
 telepathy-glib/telepathy-glib-1.pc.in              |    2 +-
 telepathy-glib/telepathy-glib-dbus.h               |    1 +
 telepathy-glib/versions/core-1.0.abi               |    9 ----
 telepathy-glib/versions/main-1.0.abi               |    1 +
 telepathy-logger/Makefile.am                       |    2 -
 tests/Makefile.am                                  |    7 ---
 tests/dbus/Makefile.am                             |    5 --
 tests/lib/Makefile.am                              |    2 -
 tests/logger/Makefile.am                           |    1 -
 53 files changed, 116 insertions(+), 177 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-glib/diff/?id=68fb34700c39ba7acec1b73f8138b33e2132f522


More information about the telepathy-commits mailing list