aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Reitter <travis.reitter@collabora.co.uk>2011-06-02 01:54:40 +0800
committerTravis Reitter <travis.reitter@collabora.co.uk>2011-06-07 00:30:52 +0800
commit202af99a8fe154b9d03c2d569287fa01f70c0bc6 (patch)
treea65195bb5213bd9db329bbdd487488f9d8867d10
parent736b4f3d04f1e826dd8252fed88a7445b52ad461 (diff)
downloadgsoc2013-empathy-202af99a8fe154b9d03c2d569287fa01f70c0bc6.tar
gsoc2013-empathy-202af99a8fe154b9d03c2d569287fa01f70c0bc6.tar.gz
gsoc2013-empathy-202af99a8fe154b9d03c2d569287fa01f70c0bc6.tar.bz2
gsoc2013-empathy-202af99a8fe154b9d03c2d569287fa01f70c0bc6.tar.lz
gsoc2013-empathy-202af99a8fe154b9d03c2d569287fa01f70c0bc6.tar.xz
gsoc2013-empathy-202af99a8fe154b9d03c2d569287fa01f70c0bc6.tar.zst
gsoc2013-empathy-202af99a8fe154b9d03c2d569287fa01f70c0bc6.zip
Adapt to API change in FolksIndividual constructor.
Helps: bgo#648822 - Port Empathy to Folks 0.5.1
-rw-r--r--src/empathy-invite-participant-dialog.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 539f3679d..1551b475d 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -304,7 +304,8 @@ get_contacts_cb (TpConnection *connection,
TpAccount *account;
TpfPersonaStore *store;
FolksIndividual *individual;
- GList *personas = NULL;
+ TpfPersona *persona_new;
+ GeeSet *personas;
if (self->priv->add_temp_ctx != ctx)
/* another request has been started */
@@ -316,7 +317,12 @@ get_contacts_cb (TpConnection *connection,
account = g_object_get_data (G_OBJECT (connection), "account");
store = tpf_persona_store_new (account);
- personas = g_list_append (personas, tpf_persona_new (contacts[0], store));
+ personas = GEE_SET (
+ gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
+ g_direct_hash, g_direct_equal));
+ persona_new = tpf_persona_new (contacts[0], store);
+ gee_collection_add (GEE_COLLECTION (personas),
+ tpf_persona_new (contacts[0], store));
individual = folks_individual_new (personas);
@@ -325,7 +331,8 @@ get_contacts_cb (TpConnection *connection,
individual_store_add_individual_and_connect (self->priv->store, individual);
- g_list_free_full (personas, g_object_unref);
+ g_clear_object (&persona_new);
+ g_clear_object (&personas);
g_object_unref (store);
}