diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-05-07 21:24:13 +0800 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-05-07 21:24:13 +0800 |
| commit | 10983e93f69ddcc048cc582d777433ca2c7a2b39 (patch) | |
| tree | 1b84157572eb93f90af25e2c88442d72f0def40e | |
| parent | 87d26a13dcafdbd1a2f19817a987ad43b2a5336d (diff) | |
| parent | add79d54e3c0149a2c336077d1e37c60d54c5ace (diff) | |
| download | gsoc2013-empathy-10983e93f69ddcc048cc582d777433ca2c7a2b39.tar gsoc2013-empathy-10983e93f69ddcc048cc582d777433ca2c7a2b39.tar.gz gsoc2013-empathy-10983e93f69ddcc048cc582d777433ca2c7a2b39.tar.bz2 gsoc2013-empathy-10983e93f69ddcc048cc582d777433ca2c7a2b39.tar.lz gsoc2013-empathy-10983e93f69ddcc048cc582d777433ca2c7a2b39.tar.xz gsoc2013-empathy-10983e93f69ddcc048cc582d777433ca2c7a2b39.tar.zst gsoc2013-empathy-10983e93f69ddcc048cc582d777433ca2c7a2b39.zip | |
Merge branch 'gnome-3-8'
| -rw-r--r-- | libempathy-gtk/empathy-user-info.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c index e63f320fe..451caec8e 100644 --- a/libempathy-gtk/empathy-user-info.c +++ b/libempathy-gtk/empathy-user-info.c @@ -192,6 +192,17 @@ fill_contact_info_grid (EmpathyUserInfo *self) { TpContactInfoField *field = l->data; + /* For some reason it can happen that the vCard contains fields the CM + * claims to be not supported. This is a workaround for gabble bug + * https://bugs.freedesktop.org/show_bug.cgi?id=64319. But we shouldn't + * crash on buggy CM anyway. */ + if (get_spec_from_list (specs, field->field_name) == NULL) + { + DEBUG ("Buggy CM: self's vCard contains %s field but it is not in " + "Connection' supported fields", field->field_name); + continue; + } + /* make a copy for the details_to_set list */ field = tp_contact_info_field_copy (field); DEBUG ("Field %s is in our vCard", field->field_name); |