[Pkg-telepathy-commits] [telepathy-mission-control-6] 67/90: Remove references to TpDBusDaemon
Simon McVittie
smcv at debian.org
Wed May 14 12:09:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.
commit 1735c79109e8ade53709c72144e74caaa9c54c40
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Apr 1 15:16:30 2014 +0100
Remove references to TpDBusDaemon
---
src/mcd-account-manager.c | 45 ++++++++---------------------------------
src/mcd-account.c | 25 +++--------------------
src/mcd-client.c | 2 --
src/mcd-dispatch-operation.c | 4 ++--
src/mcd-dispatcher.c | 25 +++++------------------
src/mcd-manager.c | 5 +----
src/mcd-master.c | 30 ++++++++-------------------
src/mcd-master.h | 2 +-
src/mcd-service.c | 16 +++++++--------
src/request.c | 12 ++++++-----
tests/twisted/mc-debug-server.c | 6 ------
11 files changed, 43 insertions(+), 129 deletions(-)
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 908fe02..efeb97d 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -79,7 +79,6 @@ G_DEFINE_TYPE_WITH_CODE (McdAccountManager, mcd_account_manager, G_TYPE_OBJECT,
struct _McdAccountManagerPrivate
{
- TpDBusDaemon *dbus_daemon;
TpClientFactory *client_factory;
McdConnectivityMonitor *minotaur;
@@ -129,7 +128,6 @@ typedef struct
enum
{
PROP_0,
- PROP_DBUS_DAEMON,
PROP_CLIENT_FACTORY
};
@@ -1416,7 +1414,8 @@ _mcd_account_manager_setup (McdAccountManager *account_manager)
priv->setup_lock = 1; /* will be released at the end of this function */
- g_dbus_connection_call (tp_proxy_get_dbus_connection (priv->dbus_daemon),
+ g_dbus_connection_call (
+ tp_client_factory_get_dbus_connection (priv->client_factory),
"org.freedesktop.DBus", "/org/freedesktop/DBus",
"org.freedesktop.DBus", "ListNames",
NULL,
@@ -1520,13 +1519,13 @@ register_dbus_service (McdAccountManager *account_manager)
if (priv->dbus_registered)
return;
- tp_dbus_daemon_register_object (priv->dbus_daemon,
- TP_ACCOUNT_MANAGER_OBJECT_PATH,
- account_manager);
+ tp_dbus_connection_register_object (
+ tp_client_factory_get_dbus_connection (priv->client_factory),
+ TP_ACCOUNT_MANAGER_OBJECT_PATH, account_manager);
- if (!tp_dbus_daemon_request_name (priv->dbus_daemon,
- TP_ACCOUNT_MANAGER_BUS_NAME,
- TRUE /* idempotent */, &error))
+ if (!tp_dbus_connection_request_name (
+ tp_client_factory_get_dbus_connection (priv->client_factory),
+ TP_ACCOUNT_MANAGER_BUS_NAME, TRUE /* idempotent */, &error))
{
/* FIXME: put in proper error handling when MC gains the ability to
* be the AM or the CD but not both */
@@ -1551,9 +1550,6 @@ set_property (GObject *obj, guint prop_id,
case PROP_CLIENT_FACTORY:
g_assert (priv->client_factory == NULL); /* construct-only */
priv->client_factory = TP_CLIENT_FACTORY (g_value_dup_object (val));
- priv->dbus_daemon =
- tp_client_factory_get_dbus_daemon (priv->client_factory);
- g_object_ref (priv->dbus_daemon);
break;
default:
@@ -1563,23 +1559,6 @@ set_property (GObject *obj, guint prop_id,
}
static void
-get_property (GObject *obj, guint prop_id,
- GValue *val, GParamSpec *pspec)
-{
- McdAccountManagerPrivate *priv = MCD_ACCOUNT_MANAGER_PRIV (obj);
-
- switch (prop_id)
- {
- case PROP_DBUS_DAEMON:
- g_value_set_object (val, priv->dbus_daemon);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
- break;
- }
-}
-
-static void
_mcd_account_manager_finalize (GObject *object)
{
McdAccountManagerPrivate *priv = MCD_ACCOUNT_MANAGER_PRIV (object);
@@ -1599,7 +1578,6 @@ _mcd_account_manager_dispose (GObject *object)
{
McdAccountManagerPrivate *priv = MCD_ACCOUNT_MANAGER_PRIV (object);
- tp_clear_object (&priv->dbus_daemon);
tp_clear_object (&priv->client_factory);
tp_clear_object (&priv->minotaur);
@@ -1615,16 +1593,9 @@ mcd_account_manager_class_init (McdAccountManagerClass *klass)
object_class->dispose = _mcd_account_manager_dispose;
object_class->finalize = _mcd_account_manager_finalize;
object_class->set_property = set_property;
- object_class->get_property = get_property;
object_class->constructed = _mcd_account_manager_constructed;
g_object_class_install_property
- (object_class, PROP_DBUS_DAEMON,
- g_param_spec_object ("dbus-daemon", "DBus daemon", "DBus daemon",
- TP_TYPE_DBUS_DAEMON,
- G_PARAM_READABLE));
-
- g_object_class_install_property
(object_class, PROP_CLIENT_FACTORY,
g_param_spec_object ("client-factory",
"Client factory",
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 2d28e0e..8033e34 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -107,7 +107,6 @@ struct _McdAccountPrivate
McdStorage *storage;
TpClientFactory *factory;
- TpDBusDaemon *dbus_daemon;
McdConnectivityMonitor *connectivity;
McdAccountConnectionContext *connection_context;
@@ -171,7 +170,6 @@ struct _McdAccountPrivate
enum
{
PROP_0,
- PROP_DBUS_DAEMON,
PROP_CONNECTIVITY_MONITOR,
PROP_STORAGE,
PROP_STORAGE_PLUGIN,
@@ -2735,8 +2733,6 @@ register_dbus_service (McdAccount *self,
const GError *error,
gpointer unused G_GNUC_UNUSED)
{
- TpDBusDaemon *dbus_daemon;
-
if (error != NULL)
{
/* due to some tangled error handling, the McdAccount might already
@@ -2754,11 +2750,9 @@ register_dbus_service (McdAccount *self,
g_assert (self->priv->storage != NULL);
g_assert (self->priv->object_path != NULL);
- dbus_daemon = self->priv->dbus_daemon;
- g_return_if_fail (dbus_daemon != NULL);
-
- tp_dbus_daemon_register_object (dbus_daemon, self->priv->object_path,
- self);
+ tp_dbus_connection_register_object (
+ tp_client_factory_get_dbus_connection (self->priv->factory),
+ self->priv->object_path, self);
}
/*
@@ -3119,8 +3113,6 @@ set_property (GObject *obj, guint prop_id,
case PROP_FACTORY:
g_assert (priv->factory == NULL);
priv->factory = g_value_dup_object (val);
- priv->dbus_daemon = tp_client_factory_get_dbus_daemon (priv->factory);
- g_object_ref (priv->dbus_daemon);
break;
case PROP_CONNECTIVITY_MONITOR:
@@ -3147,10 +3139,6 @@ get_property (GObject *obj, guint prop_id,
switch (prop_id)
{
- case PROP_DBUS_DAEMON:
- g_value_set_object (val, priv->dbus_daemon);
- break;
-
case PROP_FACTORY:
g_value_set_object (val, priv->factory);
break;
@@ -3237,7 +3225,6 @@ _mcd_account_dispose (GObject *object)
tp_clear_object (&priv->manager);
tp_clear_object (&priv->storage_plugin);
tp_clear_object (&priv->storage);
- tp_clear_object (&priv->dbus_daemon);
tp_clear_object (&priv->factory);
tp_clear_object (&priv->self_contact);
tp_clear_object (&priv->connectivity);
@@ -3367,12 +3354,6 @@ mcd_account_class_init (McdAccountClass * klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
- (object_class, PROP_DBUS_DAEMON,
- g_param_spec_object ("dbus-daemon", "DBus daemon", "DBus daemon",
- TP_TYPE_DBUS_DAEMON,
- G_PARAM_READABLE));
-
- g_object_class_install_property
(object_class, PROP_CONNECTIVITY_MONITOR,
g_param_spec_object ("connectivity monitor",
"Connectivity monitor",
diff --git a/src/mcd-client.c b/src/mcd-client.c
index ca69024..ff3ea1e 100644
--- a/src/mcd-client.c
+++ b/src/mcd-client.c
@@ -1240,8 +1240,6 @@ _mcd_client_proxy_new (TpClientFactory *factory,
self = g_object_new (MCD_TYPE_CLIENT_PROXY,
"factory", factory,
- "dbus-daemon",
- tp_client_factory_get_dbus_daemon (factory),
"object-path", object_path,
"bus-name", well_known_name,
"unique-name", unique_name_if_known,
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 3851502..db74e5d 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -1113,8 +1113,8 @@ mcd_dispatch_operation_constructor (GType type, guint n_params,
"factory", &factory,
NULL);
- tp_dbus_daemon_register_object (
- tp_client_factory_get_dbus_daemon (factory), priv->object_path,
+ tp_dbus_connection_register_object (
+ tp_client_factory_get_dbus_connection (factory), priv->object_path,
object);
g_object_unref (factory);
}
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index df377f7..88995f2 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -113,7 +113,6 @@ struct _McdDispatcherPrivate
GList *operations;
TpClientFactory *factory;
- TpDBusDaemon *dbus_daemon;
/* hash table containing clients
* char *bus_name -> McdClientProxy */
@@ -145,7 +144,6 @@ struct cancel_call_data
enum
{
PROP_0,
- PROP_DBUS_DAEMON,
PROP_FACTORY,
PROP_MCD_MASTER,
PROP_INTERFACES,
@@ -335,10 +333,7 @@ _mcd_dispatcher_set_property (GObject * obj, guint prop_id,
{
case PROP_FACTORY:
g_assert (priv->factory == NULL); /* construct-only */
- g_assert (priv->dbus_daemon == NULL);
priv->factory = TP_CLIENT_FACTORY (g_value_dup_object (val));
- priv->dbus_daemon = tp_client_factory_get_dbus_daemon (priv->factory);
- g_object_ref (priv->dbus_daemon);
break;
case PROP_MCD_MASTER:
@@ -372,10 +367,6 @@ _mcd_dispatcher_get_property (GObject * obj, guint prop_id,
switch (prop_id)
{
- case PROP_DBUS_DAEMON:
- g_value_set_object (val, priv->dbus_daemon);
- break;
-
case PROP_FACTORY:
g_value_set_object (val, priv->factory);
break;
@@ -749,7 +740,6 @@ _mcd_dispatcher_dispose (GObject * object)
tp_clear_pointer (&priv->connections, g_hash_table_unref);
tp_clear_object (&priv->master);
- tp_clear_object (&priv->dbus_daemon);
tp_clear_object (&priv->factory);
G_OBJECT_CLASS (mcd_dispatcher_parent_class)->dispose (object);
@@ -803,12 +793,13 @@ mcd_dispatcher_constructed (GObject *object)
G_CALLBACK (mcd_dispatcher_client_registry_ready_cb),
object);
- tp_dbus_daemon_register_object (priv->dbus_daemon,
+ tp_dbus_connection_register_object (
+ tp_client_factory_get_dbus_connection (priv->factory),
TP_CHANNEL_DISPATCHER_OBJECT_PATH, object);
- if (!tp_dbus_daemon_request_name (priv->dbus_daemon,
- TP_CHANNEL_DISPATCHER_BUS_NAME,
- TRUE /* idempotent */, &error))
+ if (!tp_dbus_connection_request_name (
+ tp_client_factory_get_dbus_connection (priv->factory),
+ TP_CHANNEL_DISPATCHER_BUS_NAME, TRUE /* idempotent */, &error))
{
/* FIXME: put in proper error handling when MC gains the ability to
* be the AM or the CD but not both */
@@ -860,12 +851,6 @@ mcd_dispatcher_class_init (McdDispatcherClass * klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
- (object_class, PROP_DBUS_DAEMON,
- g_param_spec_object ("dbus-daemon", "DBus daemon", "DBus daemon",
- TP_TYPE_DBUS_DAEMON,
- G_PARAM_READABLE));
-
- g_object_class_install_property
(object_class, PROP_MCD_MASTER,
g_param_spec_object ("mcd-master", "McdMaster", "McdMaster",
MCD_TYPE_MASTER,
diff --git a/src/mcd-manager.c b/src/mcd-manager.c
index e3b1bdd..7319801 100644
--- a/src/mcd-manager.c
+++ b/src/mcd-manager.c
@@ -57,7 +57,6 @@ G_DEFINE_TYPE (McdManager, mcd_manager, MCD_TYPE_OPERATION);
struct _McdManagerPrivate
{
gchar *name;
- TpDBusDaemon *dbus_daemon;
TpClientFactory *client_factory;
McdDispatcher *dispatcher;
@@ -124,7 +123,6 @@ _mcd_manager_dispose (GObject * object)
tp_clear_object (&priv->dispatcher);
tp_clear_object (&priv->tp_conn_mgr);
tp_clear_object (&priv->client_factory);
- tp_clear_object (&priv->dbus_daemon);
tp_clear_object (&priv->slacker);
G_OBJECT_CLASS (mcd_manager_parent_class)->dispose (object);
@@ -168,6 +166,7 @@ mcd_manager_setup (McdManager *manager)
priv->tp_conn_mgr = tp_client_factory_ensure_connection_manager (
priv->client_factory, priv->name, NULL, &error);
+
if (error)
{
g_warning ("%s, cannot create manager %s: %s", G_STRFUNC,
@@ -234,8 +233,6 @@ _mcd_manager_set_property (GObject * obj, guint prop_id,
case PROP_CLIENT_FACTORY:
g_assert (priv->client_factory == NULL); /* construct-only */
priv->client_factory = g_value_dup_object (val);
- priv->dbus_daemon = g_object_ref (
- tp_client_factory_get_dbus_daemon (priv->client_factory));
break;
default:
diff --git a/src/mcd-master.c b/src/mcd-master.c
index f3d4bd2..dccc7f0 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -88,7 +88,6 @@ struct _McdMasterPrivate
McdDispatcher *dispatcher;
/* We create these for our member objects */
- TpDBusDaemon *dbus_daemon;
TpClientFactory *client_factory;
/* Current pending sleep timer */
@@ -104,7 +103,6 @@ enum
PROP_0,
PROP_PRESENCE_FRAME,
PROP_DBUS_CONNECTION,
- PROP_DBUS_DAEMON,
PROP_DISPATCHER,
PROP_ACCOUNT_MANAGER,
PROP_FACTORY,
@@ -128,14 +126,11 @@ _mcd_master_get_property (GObject * obj, guint prop_id,
g_value_set_object (val, priv->dispatcher);
break;
case PROP_FACTORY:
- g_value_set_object (val, priv->client_factory);
- break;
- case PROP_DBUS_DAEMON:
- g_value_set_object (val, priv->dbus_daemon);
+ g_value_set_object (val, priv->client_factory);
break;
case PROP_DBUS_CONNECTION:
- g_value_set_pointer (val, tp_proxy_get_dbus_connection (
- TP_PROXY (priv->dbus_daemon)));
+ g_value_set_pointer (val, tp_client_factory_get_dbus_connection (
+ priv->client_factory));
break;
case PROP_ACCOUNT_MANAGER:
g_value_set_object (val, priv->account_manager);
@@ -157,8 +152,6 @@ _mcd_master_set_property (GObject *obj, guint prop_id,
case PROP_FACTORY:
g_assert (priv->client_factory == NULL);
priv->client_factory = g_value_dup_object (val);
- priv->dbus_daemon = tp_client_factory_get_dbus_daemon (
- priv->client_factory);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -178,7 +171,6 @@ _mcd_master_dispose (GObject * object)
priv->is_disposed = TRUE;
tp_clear_object (&priv->account_manager);
- tp_clear_object (&priv->dbus_daemon);
tp_clear_object (&priv->dispatcher);
tp_clear_object (&priv->client_factory);
@@ -245,12 +237,6 @@ mcd_master_class_init (McdMasterClass * klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
- (object_class, PROP_DBUS_DAEMON,
- g_param_spec_object ("dbus-daemon", "DBus daemon", "DBus daemon",
- TP_TYPE_DBUS_DAEMON,
- G_PARAM_READABLE));
-
- g_object_class_install_property
(object_class, PROP_DBUS_CONNECTION,
g_param_spec_pointer ("dbus-connection",
"D-Bus Connection",
@@ -331,16 +317,16 @@ _mcd_master_lookup_manager (McdMaster *master,
}
/**
- * mcd_master_get_dbus_daemon:
+ * mcd_master_get_factory:
* @master: the #McdMaster.
*
- * Returns: the #TpDBusDaemon.
+ * Returns: the #TpClientFactory.
*/
-TpDBusDaemon *
-mcd_master_get_dbus_daemon (McdMaster *master)
+TpClientFactory *
+mcd_master_get_factory (McdMaster *master)
{
g_return_val_if_fail (MCD_IS_MASTER (master), NULL);
- return master->priv->dbus_daemon;
+ return master->priv->client_factory;
}
/* Milliseconds to wait for Connectivity coming back up before exiting MC */
diff --git a/src/mcd-master.h b/src/mcd-master.h
index 185b760..f727ca9 100644
--- a/src/mcd-master.h
+++ b/src/mcd-master.h
@@ -58,7 +58,7 @@ struct _McdMasterClass
GType mcd_master_get_type (void);
McdMaster *mcd_master_get_default (void);
-TpDBusDaemon *mcd_master_get_dbus_daemon (McdMaster *master);
+TpClientFactory *mcd_master_get_factory (McdMaster *master);
void mcd_master_shutdown (McdMaster *self, const gchar *reason);
G_END_DECLS
diff --git a/src/mcd-service.c b/src/mcd-service.c
index 705298f..6633013 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -82,9 +82,10 @@ mcd_service_obtain_bus_name (McdService * obj)
DEBUG ("Requesting MC dbus service");
- if (!tp_dbus_daemon_request_name (mcd_master_get_dbus_daemon (master),
- MISSION_CONTROL_DBUS_SERVICE,
- TRUE /* idempotent */, &error))
+ if (!tp_dbus_connection_request_name (
+ tp_client_factory_get_dbus_connection (
+ mcd_master_get_factory (master)),
+ MISSION_CONTROL_DBUS_SERVICE, TRUE /* idempotent */, &error))
{
g_warning ("Failed registering '%s' service: %s",
MISSION_CONTROL_DBUS_SERVICE, error->message);
@@ -170,25 +171,24 @@ McdService *
mcd_service_new (void)
{
McdService *obj;
- TpDBusDaemon *dbus_daemon;
TpClientFactory *factory;
GError *error = NULL;
+ GDBusConnection *conn;
/* Initialize DBus connection */
- dbus_daemon = tp_dbus_daemon_dup (&error);
+ conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
- if (dbus_daemon == NULL)
+ if (conn == NULL)
{
g_printerr ("Failed to open connection to bus: %s", error->message);
g_error_free (error);
return NULL;
}
- factory = tp_client_factory_new (dbus_daemon);
+ factory = tp_client_factory_new (conn);
obj = g_object_new (MCD_TYPE_SERVICE,
"factory", factory,
NULL);
g_object_unref (factory);
- g_object_unref (dbus_daemon);
return obj;
}
diff --git a/src/request.c b/src/request.c
index 6e9adef..f022fac 100644
--- a/src/request.c
+++ b/src/request.c
@@ -57,7 +57,7 @@ struct _McdRequest {
gboolean use_existing;
McdClientRegistry *clients;
- TpDBusDaemon *dbus_daemon;
+ TpClientFactory *factory;
McdAccount *account;
GHashTable *properties;
gint64 user_action_time;
@@ -132,9 +132,10 @@ _mcd_request_constructed (GObject *object)
g_return_if_fail (self->account != NULL);
g_return_if_fail (self->clients != NULL);
- self->dbus_daemon = tp_client_factory_get_dbus_daemon (
- _mcd_client_registry_get_factory (self->clients));
- tp_dbus_daemon_register_object (self->dbus_daemon, self->object_path, self);
+ self->factory = _mcd_client_registry_get_factory (self->clients);
+ tp_dbus_connection_register_object (
+ tp_client_factory_get_dbus_connection (self->factory),
+ self->object_path, self);
}
static void
@@ -799,7 +800,8 @@ static void
_mcd_request_clean_up (McdRequest *self)
{
tp_clear_object (&self->predicted_handler);
- tp_dbus_daemon_unregister_object (self->dbus_daemon, self);
+ tp_dbus_connection_unregister_object (
+ tp_client_factory_get_dbus_connection (self->factory), self);
}
void
diff --git a/tests/twisted/mc-debug-server.c b/tests/twisted/mc-debug-server.c
index 8497c02..644dd40 100644
--- a/tests/twisted/mc-debug-server.c
+++ b/tests/twisted/mc-debug-server.c
@@ -37,7 +37,6 @@
#include "mcd-service.h"
-TpDBusDaemon *bus_daemon = NULL;
static McdService *mcd = NULL;
static void
@@ -216,10 +215,6 @@ main (int argc, char **argv)
g_signal_connect (gdbus_system, "closed", G_CALLBACK (bus_closed),
"system");
- bus_daemon = tp_dbus_daemon_dup (&error);
- g_assert_no_error (error);
- g_assert (bus_daemon != NULL);
-
test_interface_id = g_dbus_connection_register_object (gdbus,
TP_ACCOUNT_MANAGER_OBJECT_PATH, &test_interface,
&test_interface_vtable, NULL, NULL, &error);
@@ -259,7 +254,6 @@ main (int argc, char **argv)
tp_clear_object (&gdbus);
tp_clear_object (&gdbus_system);
- tp_clear_object (&bus_daemon);
g_message ("Exiting with %d", ret);
tp_clear_object (&debug_sender);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git
More information about the Pkg-telepathy-commits
mailing list