Attachment 47137 Details for Bug 37360 – textchan-group: implement Password

[patch] textchan-group: implement Password

textchan-group-implement-Password.patch (text/plain), 4.19 KB, created by Guillaume Desmottes on 2011-05-25 05:08:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2011-05-25 05:08:38 UTC

Size: 4.19 KB

patch

obsolete

>From 9e8045db1bfeac0b0d67bc65eaec4318f9474876 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Wed, 25 May 2011 14:02:11 +0200
>Subject: [PATCH] textchan-group: implement Password
>
>---
> tests/lib/textchan-group.c |   71 ++++++++++++++++++++++++++++++++++++++++++++
> tests/lib/textchan-group.h |    3 ++
> 2 files changed, 74 insertions(+), 0 deletions(-)
>
>diff --git a/tests/lib/textchan-group.c b/tests/lib/textchan-group.c
>index dbeb2ab..25c4697 100644
>--- a/tests/lib/textchan-group.c
>+++ b/tests/lib/textchan-group.c
>@@ -20,17 +20,21 @@
> #include <telepathy-glib/svc-generic.h>
> 
> static void text_iface_init (gpointer iface, gpointer data);
>+static void password_iface_init (gpointer iface, gpointer data);
> 
> G_DEFINE_TYPE_WITH_CODE (TpTestsTextChannelGroup,
>     tp_tests_text_channel_group, TP_TYPE_BASE_CHANNEL,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT, text_iface_init);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>       tp_group_mixin_iface_init);
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD,
>+      password_iface_init);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>       tp_dbus_properties_mixin_iface_init))
> 
> static const char *text_channel_group_interfaces[] = {
>     TP_IFACE_CHANNEL_INTERFACE_GROUP,
>+    TP_IFACE_CHANNEL_INTERFACE_PASSWORD,
>     NULL
> };
> 
>@@ -50,6 +54,8 @@ struct _TpTestsTextChannelGroupPrivate
> 
>   gboolean closed;
>   gboolean disposed;
>+
>+  gchar *password;
> };
> 
> 
>@@ -215,9 +221,13 @@ dispose (GObject *object)
> static void
> finalize (GObject *object)
> {
>+  TpTestsTextChannelGroup *self = TP_TESTS_TEXT_CHANNEL_GROUP (object);
>+
>   tp_text_mixin_finalize (object);
>   tp_group_mixin_finalize (object);
> 
>+  tp_clear_pointer (&self->priv->password, g_free);
>+
>   ((GObjectClass *) tp_tests_text_channel_group_parent_class)->finalize (object);
> }
> 
>@@ -321,3 +331,64 @@ tp_tests_text_channel_group_join (TpTestsTextChannelGroup *self)
>   tp_intset_destroy (add);
>   tp_intset_destroy (empty);
> }
>+
>+void
>+tp_tests_text_channel_set_password (TpTestsTextChannelGroup *self,
>+    const gchar *password)
>+{
>+  gboolean pass_was_needed, pass_needed;
>+
>+  pass_was_needed = (self->priv->password != NULL);
>+
>+  tp_clear_pointer (&self->priv->password, g_free);
>+
>+  self->priv->password = g_strdup (password);
>+
>+  pass_needed = (self->priv->password != NULL);
>+
>+  if (pass_needed == pass_was_needed)
>+    return;
>+
>+  if (pass_needed)
>+    tp_svc_channel_interface_password_emit_password_flags_changed (self,
>+        TP_CHANNEL_PASSWORD_FLAG_PROVIDE, 0);
>+  else
>+    tp_svc_channel_interface_password_emit_password_flags_changed (self,
>+        0, TP_CHANNEL_PASSWORD_FLAG_PROVIDE);
>+}
>+
>+static void
>+password_get_password_flags (TpSvcChannelInterfacePassword *chan,
>+    DBusGMethodInvocation *context)
>+{
>+  TpTestsTextChannelGroup *self = (TpTestsTextChannelGroup *) chan;
>+  TpChannelPasswordFlags flags = 0;
>+
>+  if (self->priv->password != NULL)
>+    flags |= TP_CHANNEL_PASSWORD_FLAG_PROVIDE;
>+
>+  tp_svc_channel_interface_password_return_from_get_password_flags (context,
>+      flags);
>+}
>+
>+static void
>+password_provide_password (TpSvcChannelInterfacePassword *chan,
>+    const gchar *password,
>+    DBusGMethodInvocation *context)
>+{
>+  TpTestsTextChannelGroup *self = (TpTestsTextChannelGroup *) chan;
>+
>+  tp_svc_channel_interface_password_return_from_provide_password (context,
>+      !tp_strdiff (password, self->priv->password));
>+}
>+
>+static void
>+password_iface_init (gpointer iface, gpointer data)
>+{
>+  TpSvcChannelInterfacePasswordClass *klass = iface;
>+
>+#define IMPLEMENT(x) tp_svc_channel_interface_password_implement_##x (klass, password_##x)
>+  IMPLEMENT (get_password_flags);
>+  IMPLEMENT (provide_password);
>+#undef IMPLEMENT
>+}
>diff --git a/tests/lib/textchan-group.h b/tests/lib/textchan-group.h
>index fb3dc2e..b33a5d3 100644
>--- a/tests/lib/textchan-group.h
>+++ b/tests/lib/textchan-group.h
>@@ -68,6 +68,9 @@ struct _TpTestsTextChannelGroup {
> 
> void tp_tests_text_channel_group_join (TpTestsTextChannelGroup *self);
> 
>+void tp_tests_text_channel_set_password (TpTestsTextChannelGroup *self,
>+    const gchar *password);
>+
> G_END_DECLS
> 
> #endif /* #ifndef __TEST_TEXT_CHANNEL_GROUP_H__ */
>-- 
>1.7.4.1

Actions: View | Splinter Review

Attachments on bug 37360: 47137 | 47138 | 47139

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.