[Telepathy-commits] [telepathy-glib/master] tp_group_mixin_class_always_allow_removing_self: shorten to ...allow_self_removal

[Simon McVittie]

---
 docs/reference/telepathy-glib-sections.txt |    2 +-
 examples/cm/callable/media-channel.c       |    2 +-
 telepathy-glib/group-mixin.c               |   10 +++++-----
 telepathy-glib/group-mixin.h               |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 24b62b6..c6ff19e 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -1351,7 +1351,7 @@ TpGroupMixinRemMemberWithReasonFunc
 TpGroupMixin
 TpGroupMixinClass
 tp_group_mixin_class_init
-tp_group_mixin_class_always_allow_removing_self
+tp_group_mixin_class_allow_self_removal
 tp_group_mixin_class_set_remove_with_reason_func
 tp_group_mixin_init
 tp_group_mixin_finalize
diff --git a/examples/cm/callable/media-channel.c b/examples/cm/callable/media-channel.c
index 5bed551..5f305cf 100644
--- a/examples/cm/callable/media-channel.c
+++ b/examples/cm/callable/media-channel.c
@@ -599,7 +599,7 @@ example_callable_media_channel_class_init (ExampleCallableMediaChannelClass *kla
       G_STRUCT_OFFSET (ExampleCallableMediaChannelClass, group_class),
       add_member,
       NULL);
-  tp_group_mixin_class_always_allow_removing_self (object_class);
+  tp_group_mixin_class_allow_self_removal (object_class);
   tp_group_mixin_class_set_remove_with_reason_func (object_class,
       remove_member_with_reason);
   tp_group_mixin_init_dbus_properties (object_class);
diff --git a/telepathy-glib/group-mixin.c b/telepathy-glib/group-mixin.c
index f77d02b..54088df 100644
--- a/telepathy-glib/group-mixin.c
+++ b/telepathy-glib/group-mixin.c
@@ -146,7 +146,7 @@ local_pending_info_free (LocalPendingInfo *info)
 
 struct _TpGroupMixinClassPrivate {
     TpGroupMixinRemMemberWithReasonFunc remove_with_reason;
-    unsigned always_allow_removing_self : 1;
+    unsigned allow_self_removal : 1;
 };
 
 struct _TpGroupMixinPrivate {
@@ -251,7 +251,7 @@ tp_group_mixin_class_init (GObjectClass *obj_cls,
 }
 
 /**
- * tp_group_mixin_class_always_allow_removing_self:
+ * tp_group_mixin_class_allow_self_removal:
  * @obj_cls: The class of an object implementing the group interface using this
  *  mixin
  *
@@ -276,11 +276,11 @@ tp_group_mixin_class_init (GObjectClass *obj_cls,
  * Since: 0.7.UNRELEASED
  */
 void
-tp_group_mixin_class_always_allow_removing_self (GObjectClass *obj_cls)
+tp_group_mixin_class_allow_self_removal (GObjectClass *obj_cls)
 {
   TpGroupMixinClass *mixin_cls = TP_GROUP_MIXIN_CLASS (obj_cls);
 
-  mixin_cls->priv->always_allow_removing_self = TRUE;
+  mixin_cls->priv->allow_self_removal = TRUE;
 }
 
 /**
@@ -678,7 +678,7 @@ tp_group_mixin_remove_members_with_reason (GObject *obj,
     {
       handle = g_array_index (contacts, TpHandle, i);
 
-      if (mixin_cls->priv->always_allow_removing_self &&
+      if (mixin_cls->priv->allow_self_removal &&
           handle == mixin->self_handle &&
           (tp_handle_set_is_member (mixin->members, handle) ||
            tp_handle_set_is_member (mixin->remote_pending, handle) ||
diff --git a/telepathy-glib/group-mixin.h b/telepathy-glib/group-mixin.h
index 06a0562..cdd15ad 100644
--- a/telepathy-glib/group-mixin.h
+++ b/telepathy-glib/group-mixin.h
@@ -165,7 +165,7 @@ GQuark tp_group_mixin_get_offset_quark (void);
 void tp_group_mixin_class_init (GObjectClass *obj_cls,
     glong offset, TpGroupMixinAddMemberFunc add_func,
     TpGroupMixinRemMemberFunc rem_func);
-void tp_group_mixin_class_always_allow_removing_self (GObjectClass *obj_cls);
+void tp_group_mixin_class_allow_self_removal (GObjectClass *obj_cls);
 
 void tp_group_mixin_init (GObject *obj, glong offset,
     TpHandleRepoIface *handle_repo, TpHandle self_handle);
-- 
1.5.6.5