Attachment 84855 Details for Bug 68712 – 06/16] McdMaster: remove support for writing account-manager property

[patch] 06/16] McdMaster: remove support for writing account-manager property

0006-McdMaster-remove-support-for-writing-account-manager.patch (text/plain), 1.76 KB, created by Simon McVittie on 2013-08-29 16:06:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-08-29 16:06:07 UTC

Size: 1.76 KB

patch

obsolete

>From c96de7a5f8f8d66c5a3083b81a81a66acc97821f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 28 Aug 2013 17:49:54 +0100
>Subject: [PATCH 06/16] McdMaster: remove support for writing account-manager
> property
>
>Nothing constructs a McdMaster with a non-default McdAccountManager.
>---
> src/mcd-master.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
>diff --git a/src/mcd-master.c b/src/mcd-master.c
>index 415a4cc..b5b8f7b 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
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68712: 84850 | 84851 | 84852 | 84853 | 84854 | 84855 | 84856 | 84857 | 84858 | 84859 | 84860 | 84861 | 84862 | 84863 | 84864 | 84865 | 85130 | 85131

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.