From 04b9ec51d45f2efb3b8118eef99c7592ba269792 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 26 Aug 2003 18:16:51 +0000 Subject: temporarily reverting my camel namespace patches until after we merge in some of the other branches svn path=/trunk/; revision=22373 --- camel/camel-internet-address.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'camel/camel-internet-address.c') diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c index bc65ea71ea..80b68ab053 100644 --- a/camel/camel-internet-address.c +++ b/camel/camel-internet-address.c @@ -84,18 +84,18 @@ camel_internet_address_get_type(void) static int internet_decode (CamelAddress *a, const char *raw) { - struct _camel_header_address *ha, *n; + struct _header_address *ha, *n; int count = a->addresses->len; /* Should probably use its own decoder or something */ - ha = camel_header_address_decode(raw, NULL); + ha = header_address_decode(raw, NULL); if (ha) { n = ha; while (n) { if (n->type == HEADER_ADDRESS_NAME) { camel_internet_address_add((CamelInternetAddress *)a, n->name, n->v.addr); } else if (n->type == HEADER_ADDRESS_GROUP) { - struct _camel_header_address *g = n->v.members; + struct _header_address *g = n->v.members; while (g) { if (g->type == HEADER_ADDRESS_NAME) camel_internet_address_add((CamelInternetAddress *)a, g->name, g->v.addr); @@ -105,7 +105,7 @@ internet_decode (CamelAddress *a, const char *raw) } n = n->next; } - camel_header_address_list_clear(&ha); + header_address_list_clear(&ha); } return a->addresses->len - count; @@ -413,7 +413,7 @@ camel_internet_address_find_address(CamelInternetAddress *a, const char *address char * camel_internet_address_encode_address(int *inlen, const char *real, const char *addr) { - char *name = camel_header_encode_phrase(real); + char *name = header_encode_phrase(real); char *ret = NULL, *addra = NULL; int len = *inlen; GString *out = g_string_new(""); @@ -422,7 +422,7 @@ camel_internet_address_encode_address(int *inlen, const char *real, const char * if (name && name[0]) { if (strlen(name) + len > CAMEL_FOLD_SIZE) { - char *folded = camel_header_address_fold(name, len); + char *folded = header_address_fold(name, len); char *last; g_string_append(out, folded); g_free(folded); -- cgit v1.2.3