diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-11 11:03:18 +0100 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-05-11 11:03:18 +0100 |
| commit | 36d503aaffffde7c795f62b77dbad61f48c55f23 (patch) | |
| tree | 2fc5601d18e8926d8973ef6fda3120283aa4747b /libempathy/empathy-contact.c | |
| parent | 2ef5340f19483a5845976332706886d60eea38dd (diff) | |
| parent | f4e2fc16b56fb94b896014692e5bf0eba402ffe3 (diff) | |
| download | empathy-36d503aaffffde7c795f62b77dbad61f48c55f23.tar.gz | |
Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skype
Conflicts:
libempathy/empathy-contact.c
Diffstat (limited to 'libempathy/empathy-contact.c')
| -rw-r--r-- | libempathy/empathy-contact.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 0cb3d0a95..42faad483 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -665,8 +665,8 @@ empathy_contact_from_tpl_contact (TpAccount *account, is_user = (TPL_ENTITY_SELF == tpl_entity_get_entity_type (tpl_entity)); retval = g_object_new (EMPATHY_TYPE_CONTACT, - "id", tpl_entity_get_alias (tpl_entity), - "alias", tpl_entity_get_identifier (tpl_entity), + "id", tpl_entity_get_identifier (tpl_entity), + "alias", tpl_entity_get_alias (tpl_entity), "account", account, "is-user", is_user, NULL); |