diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-09-28 04:20:56 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-09-28 04:20:56 +0800 |
| commit | 7352689ab7e6cfa835d52035f76756879306cfa9 (patch) | |
| tree | ece92aafcc46ee9be4a6dcde5273aaedca7517b4 /mail/em-migrate.c | |
| parent | e2e5e8d754f24a9f5c1ed0434c83dcd486a356eb (diff) | |
| download | gsoc2013-evolution-7352689ab7e6cfa835d52035f76756879306cfa9.tar.gz gsoc2013-evolution-7352689ab7e6cfa835d52035f76756879306cfa9.tar.zst gsoc2013-evolution-7352689ab7e6cfa835d52035f76756879306cfa9.zip | |
** Fixes part of bug #474000
2007-09-27 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #474000
* addressbook/importers/evolution-ldif-importer.c:
Remove redundant Base64 codec implementation. Use GLib's.
* mail/em-format-html.c (efh_format_headers):
* mail/em-migrate.c (upgrade_passwords_1_2):
* plugins/face/face.c:
Use GLib's Base64 API instead of Camel's.
svn path=/trunk/; revision=34325
Diffstat (limited to 'mail/em-migrate.c')
| -rw-r--r-- | mail/em-migrate.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 6df7e109c1..2fc53ebf5f 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -778,10 +778,13 @@ upgrade_passwords_1_2(void) if (namep && valuep) { char *value = e_bconf_hex_decode(valuep); + guchar *decoded; char *p, *new; - size_t len; + gsize len; - len = camel_base64_decode_simple(namep, strlen(namep)); + decoded = g_base64_decode (namep, &len); + memcpy (namep, decoded, len); + g_free (decoded); namep[len] = 0; p = namep; |