[Telepathy-commits] [telepathy-gabble/master] invert sense of the if (priv->invited)
Robert McQueen
robert.mcqueen at collabora.co.uk
Tue Aug 19 10:54:04 PDT 2008
20080727001933-418b8-ebe152e1540229f191ac074d964b1f67382cb903.gz
---
src/muc-channel.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/muc-channel.c b/src/muc-channel.c
index fd2a79d..97e1b41 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -358,22 +358,7 @@ gabble_muc_channel_constructor (GType type, guint n_props,
tp_group_mixin_add_handle_owner (obj, self_handle, conn->self_handle);
- if (!priv->invited)
- {
- /* not invited: add ourselves to members (and hence join immediately) */
- GError *error = NULL;
- GArray *members = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
-
- g_assert (priv->initiator == conn->self_handle);
- g_assert (priv->invitation_message == NULL);
-
- g_array_append_val (members, self_handle);
- tp_group_mixin_add_members (obj, members,
- "", &error);
- g_assert (error == NULL);
- g_array_free (members, TRUE);
- }
- else
+ if (priv->invited)
{
/* invited: add ourself to local pending and the inviter to members */
TpIntSet *set_members, *set_pending;
@@ -402,6 +387,21 @@ gabble_muc_channel_constructor (GType type, guint n_props,
/* mark channel ready so NewChannel is emitted immediately */
priv->ready = TRUE;
}
+ else
+ {
+ /* not invited: add ourselves to members (and hence join immediately) */
+ GError *error = NULL;
+ GArray *members = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
+
+ g_assert (priv->initiator == conn->self_handle);
+ g_assert (priv->invitation_message == NULL);
+
+ g_array_append_val (members, self_handle);
+ tp_group_mixin_add_members (obj, members,
+ "", &error);
+ g_assert (error == NULL);
+ g_array_free (members, TRUE);
+ }
tp_handle_unref (contact_handles, self_handle);
--
1.5.6.3
More information about the Telepathy-commits
mailing list