aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2002-09-10 02:18:27 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-09-10 02:18:27 +0800
commit6db8b43826423d1f99f7647bafeb773fec3f1826 (patch)
treefe702675d47cb81ab1079a1e9924807023cb7c07 /mail
parent1aba02dd7c98f34e0539d2b3279363511365c2d4 (diff)
downloadgsoc2013-evolution-6db8b43826423d1f99f7647bafeb773fec3f1826.tar
gsoc2013-evolution-6db8b43826423d1f99f7647bafeb773fec3f1826.tar.gz
gsoc2013-evolution-6db8b43826423d1f99f7647bafeb773fec3f1826.tar.bz2
gsoc2013-evolution-6db8b43826423d1f99f7647bafeb773fec3f1826.tar.lz
gsoc2013-evolution-6db8b43826423d1f99f7647bafeb773fec3f1826.tar.xz
gsoc2013-evolution-6db8b43826423d1f99f7647bafeb773fec3f1826.tar.zst
gsoc2013-evolution-6db8b43826423d1f99f7647bafeb773fec3f1826.zip
revert an earlier change that used the full account name as the folder name (oops)
: ---------------------------------------------------------------------- svn path=/trunk/; revision=18023
Diffstat (limited to 'mail')
-rw-r--r--mail/upgrade-mailer.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/mail/upgrade-mailer.c b/mail/upgrade-mailer.c
index 7f62e654e5..42bdd27ca6 100644
--- a/mail/upgrade-mailer.c
+++ b/mail/upgrade-mailer.c
@@ -630,7 +630,7 @@ shortcuts_upgrade_uri (GHashTable *accounts, GHashTable *imap_sources, const cha
static int
shortcuts_upgrade_xml_file (GHashTable *accounts, GHashTable *imap_sources, const char *filename)
{
- unsigned char *buffer, *inptr, *start, *folder, *new, *p, *account = NULL;
+ unsigned char *buffer, *inptr, *start, *folder, *new, *account = NULL;
ssize_t nread = 0, nwritten, n;
gboolean url_need_upgrade;
struct stat st;
@@ -682,11 +682,12 @@ shortcuts_upgrade_xml_file (GHashTable *accounts, GHashTable *imap_sources, cons
inptr = strstr (inptr, ">evolution:/");
if (inptr) {
inptr += 12;
- p = account = inptr;
- while (*p && *p != '/')
- p++;
+ account = inptr;
+ while (*inptr && *inptr != '/')
+ inptr++;
- account = g_strndup (account, p - account);
+ account = g_strndup (account, inptr - account);
+ inptr++;
url_need_upgrade = GPOINTER_TO_INT (g_hash_table_lookup (accounts, account));
}
@@ -767,11 +768,12 @@ shortcuts_upgrade_xml_file (GHashTable *accounts, GHashTable *imap_sources, cons
inptr = strstr (inptr, ">evolution:/");
if (inptr) {
inptr += 12;
- p = account = inptr;
- while (*p && *p != '/')
- p++;
+ account = inptr;
+ while (*inptr && *inptr != '/')
+ inptr++;
- account = g_strndup (account, p - account);
+ account = g_strndup (account, inptr - account);
+ inptr++;
url_need_upgrade = GPOINTER_TO_INT (g_hash_table_lookup (accounts, account));
}