[Telepathy-commits] [telepathy-gabble/master] rename MUC "invite-self" property to "invited" with the inverse sense, because I have no idea what "invite-self" is meant to mean

[Robert McQueen]

20080727000105-418b8-90d6353dc24ae944cd5b87715dc16f9c3534cd85.gz
---
 src/muc-channel.c |   22 +++++++++++-----------
 src/muc-factory.c |   18 +++++++++---------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/muc-channel.c b/src/muc-channel.c
index 2f2f64f..8fef897 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -107,7 +107,7 @@ enum
   PROP_REQUESTED,
   PROP_CONNECTION,
   PROP_STATE,
-  PROP_INVITE_SELF,
+  PROP_INVITED,
   PROP_INVITATION_MESSAGE,
   PROP_INTERFACES,
   PROP_INITIATOR_HANDLE,
@@ -244,7 +244,7 @@ struct _GabbleMucChannelPrivate
   gboolean closed;
   gboolean dispose_has_run;
 
-  gboolean invite_self;
+  gboolean invited;
   gchar *invitation_message;
 
   /* Aggregate all presences when joining the chatroom */
@@ -362,7 +362,7 @@ gabble_muc_channel_constructor (GType type, guint n_props,
   tp_group_mixin_add_handle_owner (obj, self_handle, conn->self_handle);
 
   /* add ourselves to members if we initiated the join */
-  if (priv->invite_self)
+  if (!priv->invited)
     {
       GError *error = NULL;
       GArray *members = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
@@ -871,8 +871,8 @@ gabble_muc_channel_set_property (GObject     *object,
         channel_state_changed (chan, prev_state, priv->state);
 
       break;
-    case PROP_INVITE_SELF:
-      priv->invite_self = g_value_get_boolean (value);
+    case PROP_INVITED:
+      priv->invited = g_value_get_boolean (value);
       break;
     case PROP_INITIATOR_HANDLE:
       priv->initiator = g_value_get_uint (value);
@@ -969,11 +969,11 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
                                   G_PARAM_STATIC_BLURB);
   g_object_class_install_property (object_class, PROP_STATE, param_spec);
 
-  param_spec = g_param_spec_boolean ("invite-self", "Invite self",
-      "Whether the user should be added to members list.", FALSE,
+  param_spec = g_param_spec_boolean ("invited", "Invited?",
+      "Whether the user has been invited to the channel.", FALSE,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME |
       G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_INVITE_SELF, param_spec);
+  g_object_class_install_property (object_class, PROP_INVITED, param_spec);
 
   param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
       "Additional Channel.Interface.* interfaces",
@@ -2532,9 +2532,9 @@ gabble_muc_channel_add_member (GObject *obj,
           conn->self_handle);
       tp_group_mixin_change_members (obj, "", NULL, set_remove_members,
           NULL, set_remote_pending, 0,
-          priv->invite_self
-            ? TP_CHANNEL_GROUP_CHANGE_REASON_NONE
-            : TP_CHANNEL_GROUP_CHANGE_REASON_INVITED);
+          priv->invited
+            ? TP_CHANNEL_GROUP_CHANGE_REASON_INVITED
+            : TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
 
       tp_intset_destroy (set_remove_members);
       tp_intset_destroy (set_remote_pending);
diff --git a/src/muc-factory.c b/src/muc-factory.c
index c0662f6..902b1f5 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -329,7 +329,7 @@ muc_join_error_cb (GabbleMucChannel *chan,
 static GabbleMucChannel *
 new_muc_channel (GabbleMucFactory *fac,
                  TpHandle handle,
-                 gboolean invite_self,
+                 gboolean invited,
                  TpHandle inviter,
                  const gchar *message)
 {
@@ -341,15 +341,15 @@ new_muc_channel (GabbleMucFactory *fac,
   g_assert (g_hash_table_lookup (priv->text_channels,
         GINT_TO_POINTER (handle)) == NULL);
 
-  if (invite_self)
+  if (invited)
     {
-      g_assert (inviter == conn->self_handle);
-      g_assert (message == NULL);
+      g_assert (inviter != 0);
+      g_assert (message != NULL);
     }
   else
     {
-      g_assert (inviter != 0);
-      g_assert (message != NULL);
+      g_assert (inviter == conn->self_handle);
+      g_assert (message == NULL);
     }
 
   object_path = g_strdup_printf ("%s/MucChannel%u",
@@ -361,7 +361,7 @@ new_muc_channel (GabbleMucFactory *fac,
       "connection", priv->conn,
        "object-path", object_path,
        "handle", handle,
-       "invite-self", invite_self,
+       "invited", invited,
        "initiator-handle", inviter,
        "invitation-message", message,
        NULL);
@@ -448,7 +448,7 @@ do_invite (GabbleMucFactory *fac,
   if (g_hash_table_lookup (priv->text_channels,
         GUINT_TO_POINTER (room_handle)) == NULL)
     {
-      new_muc_channel (fac, room_handle, FALSE, inviter_handle, reason);
+      new_muc_channel (fac, room_handle, TRUE, inviter_handle, reason);
     }
   else
     {
@@ -1132,7 +1132,7 @@ ensure_muc_channel (GabbleMucFactory *fac,
 
   if (*ret == NULL)
     {
-      *ret = new_muc_channel (fac, handle, TRUE, base_conn->self_handle, NULL);
+      *ret = new_muc_channel (fac, handle, FALSE, base_conn->self_handle, NULL);
       return FALSE;
     }
 
-- 
1.5.6.3