diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-02-02 21:36:40 +0000 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-02-02 21:36:40 +0000 |
| commit | e8800b47ce0947538624f76b5a6c024e155e829c (patch) | |
| tree | 148b1e660a111ecfb1a1b514f3d144a54e137565 /addressbook | |
| parent | 4934cfe819fa8c38af08c133e4384632b58ffa80 (diff) | |
| download | evolution-data-server-e8800b47ce0947538624f76b5a6c024e155e829c.tar.gz | |
clear attr->encoding_set and attr->encoding, since that is just cached
2004-02-02 Chris Toshok <toshok@ximian.com>
* libebook/e-vcard.c (e_vcard_attribute_remove_params): clear
attr->encoding_set and attr->encoding, since that is just cached
information from the attribute parameters. Fixes a spurious
g_warning.
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/libebook/e-vcard.c | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 6181de1c0..ebbfd2eb7 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,12 @@ 2004-02-02 Chris Toshok <toshok@ximian.com> + * libebook/e-vcard.c (e_vcard_attribute_remove_params): clear + attr->encoding_set and attr->encoding, since that is just cached + information from the attribute parameters. Fixes a spurious + g_warning. + +2004-02-02 Chris Toshok <toshok@ximian.com> + * libebook/e-vcard.c (e_vcard_attribute_remove_values): make sure to set attr->decoded_values to NULL as well. fixes oddness when overwriting the PHOTO attribute. diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c index e922524cd..d45290503 100644 --- a/addressbook/libebook/e-vcard.c +++ b/addressbook/libebook/e-vcard.c @@ -1011,6 +1011,10 @@ e_vcard_attribute_remove_params (EVCardAttribute *attr) g_list_foreach (attr->params, (GFunc)e_vcard_attribute_param_free, NULL); g_list_free (attr->params); attr->params = NULL; + + /* also remove the cached encoding on this attribute */ + attr->encoding_set = FALSE; + attr->encoding = EVC_ENCODING_RAW; } EVCardAttributeParam* |