summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2001-03-15 22:57:08 +0000
committerJeffrey Stedfast <fejj@src.gnome.org>2001-03-15 22:57:08 +0000
commit1bffacb986c320a5488014c42c3cac9b5e57302c (patch)
treedea48a3f6c4849341858b10caa8f0e46d1efa659
parent9321c5e7622cfd025890c115e48cfd0e06697d13 (diff)
downloadgmime-1bffacb986c320a5488014c42c3cac9b5e57302c.tar.gz
oops.
-rw-r--r--gmime/internet-address.c12
-rw-r--r--internet-address.c12
2 files changed, 10 insertions, 14 deletions
diff --git a/gmime/internet-address.c b/gmime/internet-address.c
index 92523e30..308327c5 100644
--- a/gmime/internet-address.c
+++ b/gmime/internet-address.c
@@ -170,15 +170,13 @@ internet_address_new_from_string (const gchar *string)
/* recreate the name from the tokens */
if (tokens->len) {
char *token = tokens->pdata[0];
+ char *end = token + strlen (token) - 1;
- if (*token == '(') {
- char *p, *q;
+ if (*token == '(' && *end == ')') {
+ token++;
+ *end = '\0';
- p = tokens->pdata[0] + 1;
- q = p + strlen (p) - 1;
- *q = '\0';
-
- name = g_mime_utils_8bit_header_decode (p);
+ name = g_mime_utils_8bit_header_decode (token);
} else {
name = g_strjoinv (" ", (gchar **) tokens->pdata);
}
diff --git a/internet-address.c b/internet-address.c
index 92523e30..308327c5 100644
--- a/internet-address.c
+++ b/internet-address.c
@@ -170,15 +170,13 @@ internet_address_new_from_string (const gchar *string)
/* recreate the name from the tokens */
if (tokens->len) {
char *token = tokens->pdata[0];
+ char *end = token + strlen (token) - 1;
- if (*token == '(') {
- char *p, *q;
+ if (*token == '(' && *end == ')') {
+ token++;
+ *end = '\0';
- p = tokens->pdata[0] + 1;
- q = p + strlen (p) - 1;
- *q = '\0';
-
- name = g_mime_utils_8bit_header_decode (p);
+ name = g_mime_utils_8bit_header_decode (token);
} else {
name = g_strjoinv (" ", (gchar **) tokens->pdata);
}