diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-28 17:49:54 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-03 16:11:15 +0100 |
| commit | e9c73ea3f027d2f156bcbcabab722e17221afbed (patch) | |
| tree | eb5167282470998392bbe9f8a40c9116e5e37bb6 /src/mcd-master.c | |
| parent | 289c461e9c5020a4da70dc12d066a61af2276b41 (diff) | |
| download | telepathy-mission-control-e9c73ea3f027d2f156bcbcabab722e17221afbed.tar.gz | |
McdMaster: remove support for writing account-manager property
Nothing constructs a McdMaster with a non-default McdAccountManager.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68712
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'src/mcd-master.c')
| -rw-r--r-- | src/mcd-master.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mcd-master.c b/src/mcd-master.c index 415a4cc9..b5b8f7b6 100644 --- a/src/mcd-master.c +++ b/src/mcd-master.c @@ -300,10 +300,6 @@ _mcd_master_set_property (GObject *obj, guint prop_id, g_assert (priv->dbus_daemon == NULL); priv->dbus_daemon = g_value_dup_object (val); break; - case PROP_ACCOUNT_MANAGER: - g_assert (priv->account_manager == NULL); - priv->account_manager = g_value_dup_object (val); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec); break; @@ -370,9 +366,7 @@ mcd_master_constructor (GType type, guint n_params, #endif priv->client_factory = tp_simple_client_factory_new (priv->dbus_daemon); - - if (!priv->account_manager) - priv->account_manager = mcd_account_manager_new (priv->client_factory); + priv->account_manager = mcd_account_manager_new (priv->client_factory); priv->dispatcher = mcd_dispatcher_new (priv->dbus_daemon, master); g_assert (MCD_IS_DISPATCHER (priv->dispatcher)); @@ -433,7 +427,7 @@ mcd_master_class_init (McdMasterClass * klass) g_param_spec_object ("account-manager", "AccountManager", "AccountManager", MCD_TYPE_ACCOUNT_MANAGER, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READABLE)); } static void |