The first commit, on the 'stored' branch, just adds the 'stored' list (the original scope of this bug).

Subsequent commits require my telepathy-glib branch from Bug #31997 (and an extra commit to bump the dependency), but I think they're ready for a conditional-on-tp-glib review.

+static void
+haze_contact_list_remove_contacts_async (TpBaseContactList *cl,
+    TpHandleSet *contacts,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
...
+  tp_simple_async_report_success_in_idle ((GObject *) self, callback,
+      user_data, haze_contact_list_request_subscription_async);

bzzt.

Otherwise this looks okay.

(In reply to comment #2)
> bzzt.

Oops, fixed.

Ship it. I believe this will work as well as the current implementation does.

Thanks! This is now only blocked by Bug #31997.

commit c5d4b95649e5c4263f1d199760de492084f77fec
Merge: a4a52af fb71058
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   Thu Dec 2 12:35:23 2010 +0000

    Merge branch 'base-contact-list'

    Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19902