[Pkg-telepathy-commits] [telepathy-glib-1] 84/212: Remove TpDBusDaemon object
Simon McVittie
smcv at debian.org
Wed May 14 12:08:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-glib-1.
commit 975dc76acba0dec8c29e0252ad8ad5ccf22d50d0
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date: Sun Mar 30 22:52:15 2014 -0400
Remove TpDBusDaemon object
---
.../telepathy-glib/telepathy-glib-sections.txt | 56 +-------
telepathy-glib/cli-misc.c | 1 -
telepathy-glib/cli-misc.h | 1 -
telepathy-glib/codegen.am | 9 --
telepathy-glib/dbus-daemon.c | 144 ---------------------
telepathy-glib/dbus-daemon.h | 26 ----
telepathy-glib/dbus-daemon.xml | 80 ------------
telepathy-glib/dbus-internal.h | 2 -
telepathy-glib/proxy.c | 22 +---
telepathy-glib/proxy.h | 2 -
telepathy-glib/reentrants.c | 1 -
telepathy-glib/reentrants.h | 1 -
telepathy-glib/stable-interfaces.xml | 1 -
telepathy-glib/telepathy-glib-dbus.h | 1 -
telepathy-glib/versions/dbus-1.0.abi | 20 ---
telepathy-glib/versions/main-1.0.abi | 3 -
16 files changed, 7 insertions(+), 363 deletions(-)
diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 5f278ff..4cd1ba5 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -1924,10 +1924,6 @@ tp_g_value_slice_new_object_path
tp_g_value_slice_new_static_object_path
tp_g_value_slice_new_take_object_path
<SUBSECTION>
-TpDBusDaemon
-TpDBusDaemonClass
-tp_dbus_daemon_dup
-tp_dbus_daemon_new
tp_dbus_daemon_get_unique_name
tp_dbus_daemon_release_name
tp_dbus_daemon_request_name
@@ -1936,14 +1932,6 @@ tp_dbus_daemon_try_register_object
tp_dbus_daemon_unregister_object
<SUBSECTION Standard>
tp_dbus_name_type_get_type
-tp_dbus_daemon_get_type
-TP_DBUS_DAEMON
-TP_DBUS_DAEMON_CLASS
-TP_DBUS_DAEMON_GET_CLASS
-TP_IS_DBUS_DAEMON
-TP_IS_DBUS_DAEMON_CLASS
-TP_TYPE_DBUS_DAEMON
-TpDBusDaemonPrivate
</SECTION>
<SECTION>
@@ -2303,8 +2291,6 @@ TP_IFACE_ACCOUNT_MANAGER
TP_IFACE_QUARK_ACCOUNT_MANAGER
TP_IFACE_AUTHENTICATION_TLS_CERTIFICATE
TP_IFACE_QUARK_AUTHENTICATION_TLS_CERTIFICATE
-TP_IFACE_DBUS_DAEMON
-TP_IFACE_QUARK_DBUS_DAEMON
TP_IFACE_DBUS_INTROSPECTABLE
TP_IFACE_QUARK_DBUS_INTROSPECTABLE
TP_IFACE_DBUS_PEER
@@ -2948,47 +2934,7 @@ tp_cli_dbus_properties_callback_for_get_all
tp_cli_dbus_properties_callback_for_set
tp_cli_dbus_properties_signal_callback_properties_changed
tp_cli_dbus_properties_connect_to_properties_changed
-<SUBSECTION>
-tp_cli_dbus_daemon_call_add_match
-tp_cli_dbus_daemon_call_get_connection_se_linux_security_context
-tp_cli_dbus_daemon_call_get_connection_unix_process_id
-tp_cli_dbus_daemon_call_get_connection_unix_user
-tp_cli_dbus_daemon_call_get_id
-tp_cli_dbus_daemon_call_get_name_owner
-tp_cli_dbus_daemon_call_hello
-tp_cli_dbus_daemon_call_list_activatable_names
-tp_cli_dbus_daemon_call_list_names
-tp_cli_dbus_daemon_call_list_queued_owners
-tp_cli_dbus_daemon_call_name_has_owner
-tp_cli_dbus_daemon_call_release_name
-tp_cli_dbus_daemon_call_reload_config
-tp_cli_dbus_daemon_call_remove_match
-tp_cli_dbus_daemon_call_request_name
-tp_cli_dbus_daemon_call_start_service_by_name
-tp_cli_dbus_daemon_callback_for_add_match
-tp_cli_dbus_daemon_callback_for_get_connection_se_linux_security_context
-tp_cli_dbus_daemon_callback_for_get_connection_unix_process_id
-tp_cli_dbus_daemon_callback_for_get_connection_unix_user
-tp_cli_dbus_daemon_callback_for_get_id
-tp_cli_dbus_daemon_callback_for_get_name_owner
-tp_cli_dbus_daemon_callback_for_hello
-tp_cli_dbus_daemon_callback_for_list_activatable_names
-tp_cli_dbus_daemon_callback_for_list_names
-tp_cli_dbus_daemon_callback_for_list_queued_owners
-tp_cli_dbus_daemon_callback_for_name_has_owner
-tp_cli_dbus_daemon_callback_for_release_name
-tp_cli_dbus_daemon_callback_for_reload_config
-tp_cli_dbus_daemon_callback_for_remove_match
-tp_cli_dbus_daemon_callback_for_request_name
-tp_cli_dbus_daemon_callback_for_start_service_by_name
-tp_cli_dbus_daemon_connect_to_name_acquired
-tp_cli_dbus_daemon_connect_to_name_lost
-tp_cli_dbus_daemon_connect_to_name_owner_changed
-tp_cli_dbus_daemon_signal_callback_name_acquired
-tp_cli_dbus_daemon_signal_callback_name_lost
-tp_cli_dbus_daemon_signal_callback_name_owner_changed
-<SUBSECTION Standard>
-tp_cli_dbus_daemon_add_signals
+<SUBSECTION Standard>
tp_cli_generic_add_signals
</SECTION>
diff --git a/telepathy-glib/cli-misc.c b/telepathy-glib/cli-misc.c
index 42c7f84..b9b7016 100644
--- a/telepathy-glib/cli-misc.c
+++ b/telepathy-glib/cli-misc.c
@@ -41,7 +41,6 @@
#include "telepathy-glib/_gen/tp-cli-channel-request-body.h"
#include "telepathy-glib/_gen/tp-cli-client-body.h"
#include "telepathy-glib/_gen/tp-cli-connection-manager-body.h"
-#include "telepathy-glib/_gen/tp-cli-dbus-daemon-body.h"
#include "telepathy-glib/_gen/tp-cli-debug-body.h"
#include "telepathy-glib/_gen/tp-cli-generic-body.h"
#include "telepathy-glib/_gen/tp-cli-protocol-body.h"
diff --git a/telepathy-glib/cli-misc.h b/telepathy-glib/cli-misc.h
index 997504c..c9443f8 100644
--- a/telepathy-glib/cli-misc.h
+++ b/telepathy-glib/cli-misc.h
@@ -42,7 +42,6 @@
#include <telepathy-glib/_gen/tp-cli-channel-request.h>
#include <telepathy-glib/_gen/tp-cli-client.h>
#include <telepathy-glib/_gen/tp-cli-connection-manager.h>
-#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
#include <telepathy-glib/_gen/tp-cli-debug.h>
#include <telepathy-glib/_gen/tp-cli-generic.h>
#include <telepathy-glib/_gen/tp-cli-protocol.h>
diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
index 00ccb9e..ac14156 100644
--- a/telepathy-glib/codegen.am
+++ b/telepathy-glib/codegen.am
@@ -15,7 +15,6 @@ codegen_extra_dist = \
debug.xml \
connection.xml \
connection-manager.xml \
- dbus-daemon.xml \
dbus-introspectable.xml \
dbus-peer.xml \
dbus-properties.xml \
@@ -63,7 +62,6 @@ nodist_gendbusinclude_HEADERS += \
_gen/tp-cli-client.h \
_gen/tp-cli-connection.h \
_gen/tp-cli-connection-manager.h \
- _gen/tp-cli-dbus-daemon.h \
_gen/tp-cli-debug.h \
_gen/tp-cli-generic.h \
_gen/tp-cli-protocol.h \
@@ -116,7 +114,6 @@ nodist_libtelepathy_glib_dbus_internal_la_SOURCES += \
_gen/tp-cli-client-body.h \
_gen/tp-cli-connection-body.h \
_gen/tp-cli-connection-manager-body.h \
- _gen/tp-cli-dbus-daemon-body.h \
_gen/tp-cli-debug-body.h \
_gen/tp-cli-generic-body.h \
_gen/tp-cli-protocol-body.h \
@@ -152,7 +149,6 @@ nodist_libtelepathy_glib_reentrants_la_SOURCES = \
_gen/tp-cli-client-reentrant-body.h \
_gen/tp-cli-connection-reentrant-body.h \
_gen/tp-cli-connection-manager-reentrant-body.h \
- _gen/tp-cli-dbus-daemon-reentrant-body.h \
_gen/tp-cli-generic-reentrant-body.h \
_gen/tp-cli-protocol-reentrant-body.h \
_gen/tp-cli-account-reentrant.h \
@@ -164,7 +160,6 @@ nodist_libtelepathy_glib_reentrants_la_SOURCES = \
_gen/tp-cli-client-reentrant.h \
_gen/tp-cli-connection-reentrant.h \
_gen/tp-cli-connection-manager-reentrant.h \
- _gen/tp-cli-dbus-daemon-reentrant.h \
_gen/tp-cli-generic-reentrant.h \
_gen/tp-cli-protocol-reentrant.h
@@ -313,10 +308,6 @@ _gen/tp-cli-%-body.h: _gen/tp-spec-%.xml \
subclass=--subclass=TpConnection; \
subclass_assert=--subclass-assert=TP_IS_CONNECTION; \
;; \
- dbus-daemon) \
- subclass=--subclass=TpDBusDaemon; \
- subclass_assert=--subclass-assert=TP_IS_DBUS_DAEMON; \
- ;; \
debug) \
subclass=--subclass=TpDebugClient; \
subclass_assert=--subclass-assert=TP_IS_DEBUG_CLIENT; \
diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
index ffcd576..cadc860 100644
--- a/telepathy-glib/dbus-daemon.c
+++ b/telepathy-glib/dbus-daemon.c
@@ -37,113 +37,6 @@
#define DEBUG_FLAG TP_DEBUG_PROXY
#include "debug-internal.h"
-/**
- * TpDBusDaemonClass:
- *
- * The class of #TpDBusDaemon.
- *
- * Since: 0.7.1
- */
-struct _TpDBusDaemonClass
-{
- /*<private>*/
- TpProxyClass parent_class;
- gpointer priv;
-};
-
-/**
- * TpDBusDaemon:
- *
- * A subclass of #TpProxy that represents the D-Bus daemon. It mainly provides
- * functionality to manage well-known names on the bus.
- *
- * Since: 0.7.1
- */
-struct _TpDBusDaemon
-{
- /*<private>*/
- TpProxy parent;
-
- TpDBusDaemonPrivate *priv;
-};
-
-struct _TpDBusDaemonPrivate
-{
- gpointer dummy;
-};
-
-G_DEFINE_TYPE (TpDBusDaemon, tp_dbus_daemon, TP_TYPE_PROXY)
-
-static gpointer default_bus_daemon = NULL;
-
-/**
- * tp_dbus_daemon_dup:
- * @error: Used to indicate error if %NULL is returned
- *
- * Returns a proxy for signals and method calls on the D-Bus daemon on which
- * this process was activated (if it was launched by D-Bus service
- * activation), or the session bus (otherwise).
- *
- * If it is not possible to connect to the appropriate bus, raise an error
- * and return %NULL.
- *
- * The returned #TpDBusDaemon is cached; the same #TpDBusDaemon object will
- * be returned by this function repeatedly, as long as at least one reference
- * exists.
- *
- * Returns: (transfer full): a reference to a proxy for signals and method
- * calls on the bus daemon, or %NULL
- *
- * Since: 0.7.26
- */
-TpDBusDaemon *
-tp_dbus_daemon_dup (GError **error)
-{
- GDBusConnection *conn;
-
- if (default_bus_daemon != NULL)
- return g_object_ref (default_bus_daemon);
-
- conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
-
- if (conn == NULL)
- return NULL;
-
- default_bus_daemon = tp_dbus_daemon_new (conn);
- g_assert (default_bus_daemon != NULL);
- g_object_add_weak_pointer (default_bus_daemon, &default_bus_daemon);
-
- return default_bus_daemon;
-}
-
-/**
- * tp_dbus_daemon_new: (skip)
- * @connection: a connection to D-Bus
- *
- * Returns a proxy for signals and method calls on a particular bus
- * connection.
- *
- * Use tp_dbus_daemon_dup() instead if you just want a connection to the
- * session bus (which is almost always the right thing for
- * Telepathy).
- *
- * Returns: a new proxy for signals and method calls on the bus daemon
- * to which @connection is connected
- *
- * Since: 0.7.1
- */
-TpDBusDaemon *
-tp_dbus_daemon_new (GDBusConnection *connection)
-{
- g_return_val_if_fail (connection != NULL, NULL);
-
- return TP_DBUS_DAEMON (g_object_new (TP_TYPE_DBUS_DAEMON,
- "dbus-connection", connection,
- "bus-name", DBUS_SERVICE_DBUS,
- "object-path", DBUS_PATH_DBUS,
- NULL));
-}
-
/* for internal use (TpChannel, TpConnection _new convenience functions) */
gboolean
_tp_dbus_daemon_get_name_owner (GDBusConnection *dbus_connection,
@@ -584,40 +477,3 @@ tp_dbus_daemon_get_unique_name (GDBusConnection *dbus_connection)
return g_dbus_connection_get_unique_name (dbus_connection);
}
-
-static void
-tp_dbus_daemon_constructed (GObject *object)
-{
- TpDBusDaemon *self = TP_DBUS_DAEMON (object);
-
- G_OBJECT_CLASS (tp_dbus_daemon_parent_class)->constructed (object);
-
- g_assert (!tp_strdiff (tp_proxy_get_bus_name (self), DBUS_SERVICE_DBUS));
- g_assert (!tp_strdiff (tp_proxy_get_object_path (self), DBUS_PATH_DBUS));
-}
-
-static void
-tp_dbus_daemon_init (TpDBusDaemon *self)
-{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TYPE_DBUS_DAEMON,
- TpDBusDaemonPrivate);
-}
-
-static void
-tp_dbus_daemon_class_init (TpDBusDaemonClass *klass)
-{
- TpProxyClass *proxy_class = (TpProxyClass *) klass;
- GObjectClass *object_class = (GObjectClass *) klass;
-
- g_type_class_add_private (klass, sizeof (TpDBusDaemonPrivate));
-
- object_class->constructed = tp_dbus_daemon_constructed;
-
- proxy_class->interface = TP_IFACE_QUARK_DBUS_DAEMON;
-}
-
-gboolean
-_tp_dbus_daemon_is_the_shared_one (TpDBusDaemon *self)
-{
- return (self != NULL && self == default_bus_daemon);
-}
diff --git a/telepathy-glib/dbus-daemon.h b/telepathy-glib/dbus-daemon.h
index 6acc8f8..b30644f 100644
--- a/telepathy-glib/dbus-daemon.h
+++ b/telepathy-glib/dbus-daemon.h
@@ -31,32 +31,6 @@
G_BEGIN_DECLS
-/* TpDBusDaemon is typedef'd in proxy.h */
-typedef struct _TpDBusDaemonPrivate TpDBusDaemonPrivate;
-typedef struct _TpDBusDaemonClass TpDBusDaemonClass;
-GType tp_dbus_daemon_get_type (void);
-
-#define TP_TYPE_DBUS_DAEMON \
- (tp_dbus_daemon_get_type ())
-#define TP_DBUS_DAEMON(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_DBUS_DAEMON, \
- TpDBusDaemon))
-#define TP_DBUS_DAEMON_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_DBUS_DAEMON, \
- TpDBusDaemonClass))
-#define TP_IS_DBUS_DAEMON(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_DBUS_DAEMON))
-#define TP_IS_DBUS_DAEMON_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_DBUS_DAEMON))
-#define TP_DBUS_DAEMON_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_DBUS_DAEMON, \
- TpDBusDaemonClass))
-
-TpDBusDaemon *tp_dbus_daemon_dup (GError **error) G_GNUC_WARN_UNUSED_RESULT;
-
-TpDBusDaemon *tp_dbus_daemon_new (GDBusConnection *connection)
- G_GNUC_WARN_UNUSED_RESULT;
-
gboolean tp_dbus_daemon_request_name (GDBusConnection *dbus_connection,
const gchar *well_known_name, gboolean idempotent, GError **error);
gboolean tp_dbus_daemon_release_name (GDBusConnection *dbus_connection,
diff --git a/telepathy-glib/dbus-daemon.xml b/telepathy-glib/dbus-daemon.xml
deleted file mode 100644
index c6fd4b6..0000000
--- a/telepathy-glib/dbus-daemon.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<tp:spec
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-
- <tp:title>D-Bus Daemon</tp:title>
-
- <node name="/DBus_Daemon">
- <interface name="org.freedesktop.DBus">
- <method name="Hello" tp:name-for-bindings="Hello">
- <arg direction="out" type="s"/>
- </method>
- <method name="RequestName" tp:name-for-bindings="Request_Name">
- <arg direction="in" type="s"/>
- <arg direction="in" type="u"/>
- <arg direction="out" type="u"/>
- </method>
- <method name="ReleaseName" tp:name-for-bindings="Release_Name">
- <arg direction="in" type="s"/>
- <arg direction="out" type="u"/>
- </method>
- <method name="StartServiceByName" tp:name-for-bindings="Start_Service_By_Name">
- <arg direction="in" type="s"/>
- <arg direction="in" type="u"/>
- <arg direction="out" type="u"/>
- </method>
- <method name="NameHasOwner" tp:name-for-bindings="Name_Has_Owner">
- <arg direction="in" type="s"/>
- <arg direction="out" type="b"/>
- </method>
- <method name="ListNames" tp:name-for-bindings="List_Names">
- <arg direction="out" type="as"/>
- </method>
- <method name="ListActivatableNames" tp:name-for-bindings="List_Activatable_Names">
- <arg direction="out" type="as"/>
- </method>
- <method name="AddMatch" tp:name-for-bindings="Add_Match">
- <arg direction="in" type="s"/>
- </method>
- <method name="RemoveMatch" tp:name-for-bindings="Remove_Match">
- <arg direction="in" type="s"/>
- </method>
- <method name="GetNameOwner" tp:name-for-bindings="Get_Name_Owner">
- <arg direction="in" type="s"/>
- <arg direction="out" type="s"/>
- </method>
- <method name="ListQueuedOwners" tp:name-for-bindings="List_Queued_Owners">
- <arg direction="in" type="s"/>
- <arg direction="out" type="as"/>
- </method>
- <method name="GetConnectionUnixUser" tp:name-for-bindings="Get_Connection_Unix_User">
- <arg direction="in" type="s"/>
- <arg direction="out" type="u"/>
- </method>
- <method name="GetConnectionUnixProcessID" tp:name-for-bindings="Get_Connection_Unix_Process_ID">
- <arg direction="in" type="s"/>
- <arg direction="out" type="u"/>
- </method>
- <method name="GetConnectionSELinuxSecurityContext" tp:name-for-bindings="Get_Connection_SE_Linux_Security_Context">
- <arg direction="in" type="s"/>
- <arg direction="out" type="ay"/>
- </method>
- <method name="ReloadConfig" tp:name-for-bindings="Reload_Config">
- </method>
- <method name="GetId" tp:name-for-bindings="Get_Id">
- <arg direction="out" type="s"/>
- </method>
- <signal name="NameOwnerChanged" tp:name-for-bindings="Name_Owner_Changed">
- <arg type="s"/>
- <arg type="s"/>
- <arg type="s"/>
- </signal>
- <signal name="NameLost" tp:name-for-bindings="Name_Lost">
- <arg type="s"/>
- </signal>
- <signal name="NameAcquired" tp:name-for-bindings="Name_Acquired">
- <arg type="s"/>
- </signal>
- </interface>
- </node>
-
-</tp:spec>
diff --git a/telepathy-glib/dbus-internal.h b/telepathy-glib/dbus-internal.h
index 992abf3..9908af5 100644
--- a/telepathy-glib/dbus-internal.h
+++ b/telepathy-glib/dbus-internal.h
@@ -31,8 +31,6 @@ gboolean _tp_dbus_daemon_get_name_owner (GDBusConnection *dbus_connection,
gint timeout_ms, const gchar *well_known_name, gchar **unique_name,
GError **error);
-gboolean _tp_dbus_daemon_is_the_shared_one (TpDBusDaemon *self);
-
G_END_DECLS
#endif /* __TP_INTERNAL_DBUS_GLIB_H__ */
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index af35ab9..2270cd6 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -868,6 +868,7 @@ tp_proxy_constructed (GObject *object)
GType proxy_parent_type = G_TYPE_FROM_CLASS (tp_proxy_parent_class);
GType ancestor_type;
GType type = G_TYPE_FROM_INSTANCE (object);
+ GDBusConnection *dbus_connection;
G_OBJECT_CLASS (tp_proxy_parent_class)->constructed (object);
@@ -882,23 +883,12 @@ tp_proxy_constructed (GObject *object)
if (klass->must_have_unique_name)
g_assert (g_dbus_is_unique_name (self->priv->bus_name));
- if (!TP_IS_DBUS_DAEMON (self))
- {
- GDBusConnection *dbus_connection;
-
- g_assert (self->priv->factory != NULL);
- dbus_connection = tp_client_factory_get_dbus_connection (
- self->priv->factory);
-
- if (self->priv->dbus_connection == NULL)
- self->priv->dbus_connection = g_object_ref (dbus_connection);
- else
- g_assert (self->priv->dbus_connection == dbus_connection);
- }
+ g_assert (self->priv->factory != NULL);
+ dbus_connection = tp_client_factory_get_dbus_connection (self->priv->factory);
+ if (self->priv->dbus_connection == NULL)
+ self->priv->dbus_connection = g_object_ref (dbus_connection);
else
- {
- g_assert (self->priv->dbus_connection != NULL);
- }
+ g_assert (self->priv->dbus_connection == dbus_connection);
DEBUG ("%s:%s -> %s %p", self->priv->bus_name, self->priv->object_path,
G_OBJECT_TYPE_NAME (self), self);
diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
index b363aa4..97925db 100644
--- a/telepathy-glib/proxy.h
+++ b/telepathy-glib/proxy.h
@@ -33,8 +33,6 @@
G_BEGIN_DECLS
-/* Forward declaration of a subclass - from dbus.h */
-typedef struct _TpDBusDaemon TpDBusDaemon;
/* Forward declaration - from client-factory.h */
typedef struct _TpClientFactory TpClientFactory;
diff --git a/telepathy-glib/reentrants.c b/telepathy-glib/reentrants.c
index 5ee6c75..e51a29a 100644
--- a/telepathy-glib/reentrants.c
+++ b/telepathy-glib/reentrants.c
@@ -14,6 +14,5 @@
#include <telepathy-glib/_gen/tp-cli-client-reentrant-body.h>
#include <telepathy-glib/_gen/tp-cli-connection-reentrant-body.h>
#include <telepathy-glib/_gen/tp-cli-connection-manager-reentrant-body.h>
-#include <telepathy-glib/_gen/tp-cli-dbus-daemon-reentrant-body.h>
#include <telepathy-glib/_gen/tp-cli-generic-reentrant-body.h>
#include <telepathy-glib/_gen/tp-cli-protocol-reentrant-body.h>
diff --git a/telepathy-glib/reentrants.h b/telepathy-glib/reentrants.h
index e1ff718..9eeee06 100644
--- a/telepathy-glib/reentrants.h
+++ b/telepathy-glib/reentrants.h
@@ -14,6 +14,5 @@
#include <telepathy-glib/_gen/tp-cli-client-reentrant.h>
#include <telepathy-glib/_gen/tp-cli-connection-reentrant.h>
#include <telepathy-glib/_gen/tp-cli-connection-manager-reentrant.h>
-#include <telepathy-glib/_gen/tp-cli-dbus-daemon-reentrant.h>
#include <telepathy-glib/_gen/tp-cli-generic-reentrant.h>
#include <telepathy-glib/_gen/tp-cli-protocol-reentrant.h>
diff --git a/telepathy-glib/stable-interfaces.xml b/telepathy-glib/stable-interfaces.xml
index 585d542..fcebb23 100644
--- a/telepathy-glib/stable-interfaces.xml
+++ b/telepathy-glib/stable-interfaces.xml
@@ -9,7 +9,6 @@
<xi:include href="connection.xml"/>
<xi:include href="channel.xml"/>
<xi:include href="generic.xml"/>
-<xi:include href="dbus-daemon.xml"/>
<xi:include href="account-manager.xml"/>
<xi:include href="account.xml"/>
diff --git a/telepathy-glib/telepathy-glib-dbus.h b/telepathy-glib/telepathy-glib-dbus.h
index f3e63af..7a7e825 100644
--- a/telepathy-glib/telepathy-glib-dbus.h
+++ b/telepathy-glib/telepathy-glib-dbus.h
@@ -43,7 +43,6 @@
#include <telepathy-glib/_gen/tp-cli-client.h>
#include <telepathy-glib/_gen/tp-cli-connection.h>
#include <telepathy-glib/_gen/tp-cli-connection-manager.h>
-#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
#include <telepathy-glib/_gen/tp-cli-debug.h>
#include <telepathy-glib/_gen/tp-cli-generic.h>
#include <telepathy-glib/_gen/tp-cli-protocol.h>
diff --git a/telepathy-glib/versions/dbus-1.0.abi b/telepathy-glib/versions/dbus-1.0.abi
index f7595d6..300860e 100644
--- a/telepathy-glib/versions/dbus-1.0.abi
+++ b/telepathy-glib/versions/dbus-1.0.abi
@@ -238,25 +238,6 @@ tp_cli_connection_interface_service_point1_connect_to_service_points_changed
tp_cli_connection_interface_sidecars1_call_ensure_sidecar
tp_cli_connection_manager_call_request_connection
tp_cli_connection_manager_connect_to_new_connection
-tp_cli_dbus_daemon_call_add_match
-tp_cli_dbus_daemon_call_get_connection_se_linux_security_context
-tp_cli_dbus_daemon_call_get_connection_unix_process_id
-tp_cli_dbus_daemon_call_get_connection_unix_user
-tp_cli_dbus_daemon_call_get_id
-tp_cli_dbus_daemon_call_get_name_owner
-tp_cli_dbus_daemon_call_hello
-tp_cli_dbus_daemon_call_list_activatable_names
-tp_cli_dbus_daemon_call_list_names
-tp_cli_dbus_daemon_call_list_queued_owners
-tp_cli_dbus_daemon_call_name_has_owner
-tp_cli_dbus_daemon_call_release_name
-tp_cli_dbus_daemon_call_reload_config
-tp_cli_dbus_daemon_call_remove_match
-tp_cli_dbus_daemon_call_request_name
-tp_cli_dbus_daemon_call_start_service_by_name
-tp_cli_dbus_daemon_connect_to_name_acquired
-tp_cli_dbus_daemon_connect_to_name_lost
-tp_cli_dbus_daemon_connect_to_name_owner_changed
tp_cli_dbus_introspectable_call_introspect
tp_cli_dbus_peer_call_get_machine_id
tp_cli_dbus_peer_call_ping
@@ -356,7 +337,6 @@ tp_iface_quark_connection_interface_requests
tp_iface_quark_connection_interface_service_point1
tp_iface_quark_connection_interface_sidecars1
tp_iface_quark_connection_manager
-tp_iface_quark_dbus_daemon
tp_iface_quark_dbus_introspectable
tp_iface_quark_dbus_peer
tp_iface_quark_dbus_properties
diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi
index f11699a..f8d4ff5 100644
--- a/telepathy-glib/versions/main-1.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -786,10 +786,7 @@ tp_dbus_check_valid_bus_name
tp_dbus_check_valid_interface_name
tp_dbus_check_valid_member_name
tp_dbus_check_valid_object_path
-tp_dbus_daemon_dup
-tp_dbus_daemon_get_type
tp_dbus_daemon_get_unique_name
-tp_dbus_daemon_new
tp_dbus_daemon_register_object
tp_dbus_daemon_release_name
tp_dbus_daemon_request_name
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git
More information about the Pkg-telepathy-commits
mailing list