Mercurial > pidgin.yaz
changeset 8474:8b62cc40069b
[gaim-migrate @ 9207]
A gevolution patch from Chris Toshok of Evolution fame:
"Just a couple of small patches, noticed a g_warning when adding a new
contact, and we've changed the uri for the personal (local) addressbook,
but there's an api call to load it."
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Fri, 19 Mar 2004 20:07:11 +0000 |
| parents | 12fe38c195a6 |
| children | 06f57183e29f |
| files | COPYRIGHT plugins/gevolution/gevo-util.c plugins/gevolution/new_person_dialog.c |
| diffstat | 3 files changed, 3 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Fri Mar 19 17:34:33 2004 +0000 +++ b/COPYRIGHT Fri Mar 19 20:07:11 2004 +0000 @@ -122,6 +122,7 @@ Stu Tomlinson Bill Tompkins Tom Tromey +Chris Toshok Junichi Uekawa Bjoern Voigt Nathan Walp
--- a/plugins/gevolution/gevo-util.c Fri Mar 19 17:34:33 2004 +0000 +++ b/plugins/gevolution/gevo-util.c Fri Mar 19 20:07:11 2004 +0000 @@ -129,24 +129,13 @@ gboolean gevo_load_addressbook(EBook **book, GError **error) { - char *filename; - char *uri; gboolean result; g_return_val_if_fail(book != NULL, FALSE); *book = e_book_new(); - filename = g_build_filename(g_get_home_dir(), - ".evolution/addressbook/local/OnThisComputer/Personal", NULL); - - uri = g_strdup_printf("file://%s", filename); - - g_free(filename); - - result = e_book_load_uri(*book, uri, FALSE, error); - - g_free(uri); + result = e_book_load_local_addressbook (*book, error); if (!result) {
--- a/plugins/gevolution/new_person_dialog.c Fri Mar 19 17:34:33 2004 +0000 +++ b/plugins/gevolution/new_person_dialog.c Fri Mar 19 20:07:11 2004 +0000 @@ -129,7 +129,7 @@ else file_as = g_strdup(firstname); - e_contact_set(contact, E_CONTACT_FILE_AS, file_as); + e_contact_set(dialog->contact, E_CONTACT_FILE_AS, file_as); g_free(file_as);