diff options
author | Hans Petter Jansson <hpj@ximian.com> | 2003-12-05 07:53:06 +0000 |
---|---|---|
committer | Hans Petter <hansp@src.gnome.org> | 2003-12-05 07:53:06 +0000 |
commit | 3196f071bb9cac949a1aecbe83df5f641287be35 (patch) | |
tree | 651bf0a0db0805af1dca32fa00570fb4aa465eb3 /addressbook | |
parent | e3696d2d2947f01e1780e217f738c4a1da40bd4c (diff) | |
download | evolution-data-server-3196f071bb9cac949a1aecbe83df5f641287be35.tar.gz |
Return boxed type for struct. (e_contact_name_from_string): Never pass
2003-12-05 Hans Petter Jansson <hpj@ximian.com>
* libebook/e-contact.c (e_contact_get_property): Return boxed type
for struct.
(e_contact_name_from_string): Never pass NULL to
e_name_western_parse ().
Diffstat (limited to 'addressbook')
-rw-r--r-- | addressbook/ChangeLog | 7 | ||||
-rw-r--r-- | addressbook/libebook/e-contact.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 9783e2ca3..0c79412c9 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2003-12-05 Hans Petter Jansson <hpj@ximian.com> + + * libebook/e-contact.c (e_contact_get_property): Return boxed type + for struct. + (e_contact_name_from_string): Never pass NULL to + e_name_western_parse (). + 2003-12-04 Chris Toshok <toshok@ximian.com> * tests/ebook/test-ebook.c (print_email): print out the diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c index 901846796..d9187593b 100644 --- a/addressbook/libebook/e-contact.c +++ b/addressbook/libebook/e-contact.c @@ -982,7 +982,7 @@ e_contact_get_property (GObject *object, else { /* struct */ gpointer rv = info->struct_getter (contact, attr); - g_value_set_pointer (value, rv); + g_value_set_boxed (value, rv); } } @@ -1218,7 +1218,9 @@ EContactName* e_contact_name_from_string (const char *name_str) { EContactName *name = e_contact_name_new(); - ENameWestern *western = e_name_western_parse (name_str); + ENameWestern *western; + + western = e_name_western_parse (name_str ? name_str : ""); name->prefixes = g_strdup (western->prefix); name->given = g_strdup (western->first ); |