fix the last commit to use proper API to release the VCardAttributes so we
2007-08-21 Jens Granseuer <jensgr@gmx.net> * gnome-about-me.c: (about_me_setup_email): fix the last commit to use proper API to release the VCardAttributes so we don't crash with newer e-d-s (bug #468848) svn path=/trunk/; revision=8031
This commit is contained in:
parent
18a834a559
commit
47d57ac310
2 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2007-08-21 Jens Granseuer <jensgr@gmx.net>
|
||||||
|
|
||||||
|
* gnome-about-me.c: (about_me_setup_email): fix the last commit to use
|
||||||
|
proper API to release the VCardAttributes so we don't crash with newer
|
||||||
|
e-d-s (bug #468848)
|
||||||
|
|
||||||
2007-08-21 Jens Granseuer <jensgr@gmx.net>
|
2007-08-21 Jens Granseuer <jensgr@gmx.net>
|
||||||
|
|
||||||
* gnome-about-me.c: honour mail address attributes when setting
|
* gnome-about-me.c: honour mail address attributes when setting
|
||||||
|
|
|
@ -390,16 +390,18 @@ about_me_setup_email (EContact *contact)
|
||||||
attrs = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
|
attrs = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
|
||||||
|
|
||||||
for (a = attrs, cid = E_CONTACT_EMAIL_1; a; a = a->next, ++cid) {
|
for (a = attrs, cid = E_CONTACT_EMAIL_1; a; a = a->next, ++cid) {
|
||||||
|
EVCardAttribute *att = (EVCardAttribute *) a->data;
|
||||||
|
|
||||||
if (!has_home &&
|
if (!has_home &&
|
||||||
e_vcard_attribute_has_type ((EVCardAttribute *)a->data, ATTRIBUTE_HOME)) {
|
e_vcard_attribute_has_type (att, ATTRIBUTE_HOME)) {
|
||||||
has_home = TRUE;
|
has_home = TRUE;
|
||||||
ids[EMAIL_HOME].cid = cid;
|
ids[EMAIL_HOME].cid = cid;
|
||||||
} else if (!has_work &&
|
} else if (!has_work &&
|
||||||
e_vcard_attribute_has_type ((EVCardAttribute *)a->data, ATTRIBUTE_WORK)) {
|
e_vcard_attribute_has_type (att, ATTRIBUTE_WORK)) {
|
||||||
has_work = TRUE;
|
has_work = TRUE;
|
||||||
ids[EMAIL_WORK].cid = cid;
|
ids[EMAIL_WORK].cid = cid;
|
||||||
}
|
}
|
||||||
g_free (a->data);
|
e_vcard_attribute_free (att);
|
||||||
}
|
}
|
||||||
|
|
||||||
g_list_free (attrs);
|
g_list_free (attrs);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue