diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-09-10 01:51:27 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-09-10 01:51:27 +0800 |
| commit | 34fbdf1c779d47615d961fe2d76ac243ce26a40d (patch) | |
| tree | 3c1ed092fed4aa99a48f815f77efdae25aa0dfdc /mail | |
| parent | f24263267d664ee1413a54386f95910c9eb30b3a (diff) | |
| download | gsoc2013-evolution-34fbdf1c779d47615d961fe2d76ac243ce26a40d.tar gsoc2013-evolution-34fbdf1c779d47615d961fe2d76ac243ce26a40d.tar.gz gsoc2013-evolution-34fbdf1c779d47615d961fe2d76ac243ce26a40d.tar.bz2 gsoc2013-evolution-34fbdf1c779d47615d961fe2d76ac243ce26a40d.tar.lz gsoc2013-evolution-34fbdf1c779d47615d961fe2d76ac243ce26a40d.tar.xz gsoc2013-evolution-34fbdf1c779d47615d961fe2d76ac243ce26a40d.tar.zst gsoc2013-evolution-34fbdf1c779d47615d961fe2d76ac243ce26a40d.zip | |
Don't look for an end quote, instead look for </item> to terminate the
2002-09-09 Jeffrey Stedfast <fejj@ximian.com>
* upgrade-mailer.c (shortcuts_upgrade_xml_file): Don't look for an
end quote, instead look for </item> to terminate the uri.
svn path=/trunk/; revision=18021
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/upgrade-mailer.c | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6e3e0d629f..93a83341cc 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,9 +1,7 @@ 2002-09-09 Jeffrey Stedfast <fejj@ximian.com> - * upgrade-mailer.c (shortcuts_upgrade_uri): Hex decode imap folder - names too. - (shortcuts_upgrade_xml_file): Don't look for an end quote, instead - look for </item> to terminate the uri. + * upgrade-mailer.c (shortcuts_upgrade_xml_file): Don't look for an + end quote, instead look for </item> to terminate the uri. 2002-09-08 Dan Winship <danw@ximian.com> diff --git a/mail/upgrade-mailer.c b/mail/upgrade-mailer.c index abcc827891..ff87eb11c5 100644 --- a/mail/upgrade-mailer.c +++ b/mail/upgrade-mailer.c @@ -597,36 +597,32 @@ mailer_upgrade_xml_file (GHashTable *imap_sources, const char *filename) static char * shortcuts_upgrade_uri (GHashTable *accounts, GHashTable *imap_sources, const char *account, const char *folder) { - char *url, *decoded, *new = NULL; + char *url, *name, *decoded, *new = NULL; struct _storeinfo *si; int type; - decoded = hex_decode (folder, strlen (folder)); - type = GPOINTER_TO_INT ((si = g_hash_table_lookup (accounts, account))); if (type == 1) { /* exchange */ - new = g_strdup_printf ("personal/%s", decoded); + decoded = hex_decode (folder, strlen (folder)); + name = g_strdup_printf ("personal/%s", decoded); g_free (decoded); - return new; + return name; } else { /* imap */ - url = g_strdup_printf ("%s/%s", si->base_url, decoded); + url = g_strdup_printf ("%s/%s", si->base_url, folder); new = imap_url_upgrade (imap_sources, url); - g_free (decoded); g_free (url); if (new) { - url = g_strdup (new + strlen (si->base_url) + 1); + name = g_strdup (new + strlen (si->base_url) + 1); g_free (new); - return url; + return name; } } - g_free (decoded); - return NULL; } |