Attachment 56541 Details for Bug 45554 – [1/7] TpTestsSimpleAccount: add Avatar interface

[patch] [1/7] TpTestsSimpleAccount: add Avatar interface

0001-TpTestsSimpleAccount-add-Avatar-interface.patch (text/plain), 3.18 KB, created by Simon McVittie on 2012-02-02 09:28:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-02-02 09:28:20 UTC

Size: 3.18 KB

patch

obsolete

>From b95373754288224353a85fc4654c5292080dce5f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 1 Feb 2012 20:22:56 +0000
>Subject: [PATCH 1/7] TpTestsSimpleAccount: add Avatar interface
>
>---
> tests/lib/simple-account.c |   37 ++++++++++++++++++++++++++++++++++++-
> 1 files changed, 36 insertions(+), 1 deletions(-)
>
>diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c
>index ce08468..adc395c 100644
>--- a/tests/lib/simple-account.c
>+++ b/tests/lib/simple-account.c
>@@ -26,6 +26,8 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccount,
>     G_TYPE_OBJECT,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT,
>         account_iface_init);
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR,
>+        NULL);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_ADDRESSING,
>         NULL);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE,
>@@ -63,7 +65,8 @@ enum
>   PROP_STORAGE_PROVIDER,
>   PROP_STORAGE_IDENTIFIER,
>   PROP_STORAGE_SPECIFIC_INFORMATION,
>-  PROP_STORAGE_RESTRICTIONS
>+  PROP_STORAGE_RESTRICTIONS,
>+  PROP_AVATAR
> };
> 
> struct _TpTestsSimpleAccountPrivate
>@@ -185,6 +188,21 @@ tp_tests_simple_account_get_property (GObject *object,
>     case PROP_URI_SCHEMES:
>       g_value_set_boxed (value, uri_schemes);
>       break;
>+    case PROP_AVATAR:
>+        {
>+          GArray *arr = g_array_new (FALSE, FALSE, sizeof (char));
>+
>+          /* includes NUL for simplicity */
>+          g_array_append_vals (arr, ":-)", 4);
>+
>+          g_value_take_boxed (value,
>+              tp_value_array_build (2,
>+                TP_TYPE_UCHAR_ARRAY, arr,
>+                G_TYPE_STRING, "text/plain",
>+                G_TYPE_INVALID));
>+          g_array_unref (arr);
>+        }
>+      break;
>     default:
>       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, spec);
>       break;
>@@ -237,6 +255,11 @@ tp_tests_simple_account_class_init (TpTestsSimpleAccountClass *klass)
>         { NULL },
>   };
> 
>+  static TpDBusPropertiesMixinPropImpl avatar_props[] = {
>+        { "Avatar", "avatar", NULL },
>+        { NULL },
>+  };
>+
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>         { TP_IFACE_ACCOUNT,
>           tp_dbus_properties_mixin_getter_gobject_properties,
>@@ -255,6 +278,11 @@ tp_tests_simple_account_class_init (TpTestsSimpleAccountClass *klass)
>           NULL,
>           aia_props
>         },
>+        { TP_IFACE_ACCOUNT_INTERFACE_AVATAR,
>+          tp_dbus_properties_mixin_getter_gobject_properties,
>+          NULL,
>+          avatar_props
>+        },
>         { NULL },
>   };
> 
>@@ -399,6 +427,13 @@ tp_tests_simple_account_class_init (TpTestsSimpleAccountClass *klass)
>       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
>   g_object_class_install_property (object_class, PROP_URI_SCHEMES, param_spec);
> 
>+  param_spec = g_param_spec_boxed ("avatar",
>+      "Avatar", "Avatar",
>+      TP_STRUCT_TYPE_AVATAR,
>+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
>+  g_object_class_install_property (object_class,
>+      PROP_AVATAR, param_spec);
>+
>   klass->dbus_props_class.interfaces = prop_interfaces;
>   tp_dbus_properties_mixin_class_init (object_class,
>       G_STRUCT_OFFSET (TpTestsSimpleAccountClass, dbus_props_class));
>-- 
>1.7.9
>

Actions: View | Splinter Review

Attachments on bug 45554: 56541 | 56542 | 56543 | 56544 | 56545 | 56546 | 56547 | 59796 | 59798

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.