TpHandleSet: add convenience constructors from TpIntset and TpHandle

3 files changed, 54 insertions, 3 deletions

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index e4086d935..a09f024a8 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -242,7 +242,9 @@ TpHandleSet
 TP_TYPE_HANDLE_SET
 TpHandleSetMemberFunc
 tp_handle_set_new
+tp_handle_set_new_containing
 tp_handle_set_new_from_array
+tp_handle_set_new_from_intset
 tp_handle_set_copy
 tp_handle_set_clear
 tp_handle_set_destroy
diff --git a/telepathy-glib/handle-repo.h b/telepathy-glib/handle-repo.h
index 4fe996764..376cd50eb 100644
--- a/telepathy-glib/handle-repo.h
+++ b/telepathy-glib/handle-repo.h
@@ -115,6 +115,11 @@ TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo)
   G_GNUC_WARN_UNUSED_RESULT;
 TpHandleSet *tp_handle_set_copy (const TpHandleSet *other)
   G_GNUC_WARN_UNUSED_RESULT;
+TpHandleSet *tp_handle_set_new_from_intset (TpHandleRepoIface *repo,
+    const TpIntset *intset);
+TpHandleSet *tp_handle_set_new_containing (TpHandleRepoIface *repo,
+    TpHandle handle);
+
 void tp_handle_set_clear (TpHandleSet *set);
 void tp_handle_set_destroy (TpHandleSet *set);
 
diff --git a/telepathy-glib/handle-set.c b/telepathy-glib/handle-set.c
index ce6c6d076..86554df18 100644
--- a/telepathy-glib/handle-set.c
+++ b/telepathy-glib/handle-set.c
@@ -336,13 +336,57 @@ ref_one (guint handle, gpointer data)
 TpHandleSet *
 tp_handle_set_copy (const TpHandleSet *other)
 {
+  g_return_val_if_fail (other != NULL, NULL);
+
+  return tp_handle_set_new_from_intset (other->repo, other->intset);
+}
+
+/**
+ * tp_handle_set_new_containing:
+ * @repo: #TpHandleRepoIface that holds the handles to be reffed by this set
+ * @handle: a valid handle
+ *
+ * Creates a new #TpHandleSet from a specified handle repository and single
+ * handle.
+ *
+ * Returns: A new #TpHandleSet
+ *
+ * Since: 0.13.UNRELEASED
+ */
+TpHandleSet *
+tp_handle_set_new_containing (TpHandleRepoIface *repo,
+    TpHandle handle)
+{
+  TpHandleSet *set = tp_handle_set_new (repo);
+
+  tp_handle_set_add (set, handle);
+  return set;
+}
+
+/**
+ * tp_handle_set_new_from_intset:
+ * @repo: #TpHandleRepoIface that holds the handles to be reffed by this set
+ * @intset: a set of handles, which must all be valid
+ *
+ * Creates a new #TpHandleSet from a specified handle repository and
+ * set of handles.
+ *
+ * Returns: A new #TpHandleSet
+ *
+ * Since: 0.13.UNRELEASED
+ */
+TpHandleSet *
+tp_handle_set_new_from_intset (TpHandleRepoIface *repo,
+    const TpIntset *intset)
+{
   TpHandleSet *set;
 
-  g_return_val_if_fail (other != NULL, NULL);
+  g_return_val_if_fail (repo != NULL, NULL);
+  g_return_val_if_fail (intset != NULL, NULL);
 
   set = g_slice_new0 (TpHandleSet);
-  set->repo = other->repo;
-  set->intset = tp_intset_copy (other->intset);
+  set->repo = repo;
+  set->intset = tp_intset_copy (intset);
   tp_intset_foreach (set->intset, ref_one, set);
   return set;
 }