Attachment 19196 Details for Bug 17769 – a patch in the vague direction of what should change

[patch] a patch in the vague direction of what should change

muc-flags.diff (text/plain), 1.41 KB, created by Will Thompson on 2008-09-25 07:01:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2008-09-25 07:01:13 UTC

Size: 1.41 KB

patch

obsolete

>diff --git a/src/muc-channel.c b/src/muc-channel.c
>index 5a5d3a9..fa08c45 100644
>--- a/src/muc-channel.c
>+++ b/src/muc-channel.c
>@@ -345,8 +345,7 @@ gabble_muc_channel_constructor (GType type, guint n_props,
>   tp_group_mixin_change_flags (obj,
>       TP_CHANNEL_GROUP_FLAG_PROPERTIES |
>       TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES |
>-      TP_CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE |
>-      TP_CHANNEL_GROUP_FLAG_CAN_ADD,
>+      TP_CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE,
>       0);
> 
>   /* initialize properties mixin */
>@@ -2557,9 +2556,6 @@ gabble_muc_channel_add_member (GObject *obj,
>                     (result) ? MUC_STATE_INITIATED : MUC_STATE_ENDED,
>                     NULL);
> 
>-      /* deny adding */
>-      tp_group_mixin_change_flags (obj, 0, TP_CHANNEL_GROUP_FLAG_CAN_ADD);
>-
>       return result;
>     }
> 
>diff --git a/tests/twisted/muc/test-muc.py b/tests/twisted/muc/test-muc.py
>index 02cc2a1..aa69804 100644
>--- a/tests/twisted/muc/test-muc.py
>+++ b/tests/twisted/muc/test-muc.py
>@@ -37,7 +37,7 @@ def test(q, bus, conn, stream):
>         EventPattern('dbus-signal', signal='MembersChanged',
>             args=[u'', [], [], [], [2], 0, 0]),
>         EventPattern('stream-presence', to='chat@conf.localhost/test'))
>-    assert gfc.args[1] == 0
>+    # FIXME: check that CanAdd is not in the group flags
> 
>     # Send presence for other member of room.
>     presence = domish.Element((None, 'presence'))

Actions: View | Splinter Review

Attachments on bug 17769: 19196

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.