diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-11 19:11:07 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 18:20:58 +0000 |
| commit | bdac09e71fdbde731c005ff1ad13eed6aafed414 (patch) | |
| tree | 862e5fa2679cadf49a0e9bfb07d3ac73024eeed8 | |
| parent | 8910d6bdd114f21dc3670934dffc490b83bd12e4 (diff) | |
tp_proxy_get_interface_by_id: remove from core library
With GDBus, the generated code won't need it.
| -rw-r--r-- | telepathy-glib/core-proxy.c | 10 | ||||
| -rw-r--r-- | telepathy-glib/proxy-internal.h | 8 | ||||
| -rw-r--r-- | telepathy-glib/proxy.c | 5 |
3 files changed, 1 insertions, 22 deletions
diff --git a/telepathy-glib/core-proxy.c b/telepathy-glib/core-proxy.c index c84102243..5abc6e2d0 100644 --- a/telepathy-glib/core-proxy.c +++ b/telepathy-glib/core-proxy.c @@ -31,15 +31,6 @@ static TpProxyImplementation _tp_proxy_implementation = { NULL }; -GDBusProxy * -tp_proxy_get_interface_by_id (gpointer proxy, - GQuark iface, - GError **error) -{ - g_assert (_tp_proxy_implementation.version != NULL); - return _tp_proxy_implementation.get_interface_by_id (proxy, iface, error); -} - gboolean tp_proxy_check_interface_by_id (gpointer proxy, GQuark iface, @@ -127,7 +118,6 @@ tp_private_proxy_set_implementation (TpProxyImplementation *impl) g_assert (g_str_equal (g_type_name (impl->type), "TpProxy")); g_assert (_tp_proxy_implementation.version == NULL); - g_assert (impl->get_interface_by_id != NULL); g_assert (impl->check_interface_by_id != NULL); g_assert (impl->pending_call_new != NULL); g_assert (impl->pending_call_take_pending_call != NULL); diff --git a/telepathy-glib/proxy-internal.h b/telepathy-glib/proxy-internal.h index 2007f538d..cae4d8ed9 100644 --- a/telepathy-glib/proxy-internal.h +++ b/telepathy-glib/proxy-internal.h @@ -28,10 +28,6 @@ typedef struct { const gchar *version; gsize size; - GDBusProxy *(*get_interface_by_id) (TpProxy *, - GQuark, - GError **); - gboolean (*check_interface_by_id) (TpProxy *, GQuark, GError **); @@ -70,10 +66,6 @@ typedef struct { GType type; } TpProxyImplementation; -DBusGProxy *_tp_proxy_get_interface_by_id (TpProxy *self, - GQuark iface, - GError **error); - gboolean _tp_proxy_check_interface_by_id (TpProxy *self, GQuark iface, GError **error); diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c index 65823eba8..ab3cb57a1 100644 --- a/telepathy-glib/proxy.c +++ b/telepathy-glib/proxy.c @@ -407,11 +407,8 @@ static guint signals[N_SIGNALS] = {0}; * * Since: 0.19.9 */ - -/* that's implemented in the core library, but it calls this: */ - GDBusProxy * -_tp_proxy_get_interface_by_id (TpProxy *self, +tp_proxy_get_interface_by_id (TpProxy *self, GQuark iface, GError **error) { |