callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Same.

Browse Source 
2004-01-16  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-mime-message.c (camel_mime_message_build_mbox_from): Same.

	* camel-internet-address.c (internet_decode): Same.

	* camel-mime-utils.[c,h]: Namespaced camel_header_address_t enums
	s/HEADER_ADDRESS_/CAMEL_HEADER_ADDRESS_/g

svn path=/trunk/; revision=24281
This commit is contained in:
Jeffrey Stedfast
2004-01-16 18:13:04 +00:00
committed by Jeffrey Stedfast
parent a2381f4039
commit 72ef7b0b47
5 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
camel/ChangeLog
View File

@ -1,11 +1,22 @@
2004-01-16 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-message.c (camel_mime_message_build_mbox_from): Same.
* camel-internet-address.c (internet_decode): Same.
* camel-mime-utils.[c,h]: Namespaced camel_header_address_t enums
s/HEADER_ADDRESS_/CAMEL_HEADER_ADDRESS_/g
2004-01-16 Sivaiah Nallagatla <snallagatla@novell.com>
* providers/groupwise/camel-groupwise-provider.c: added some conf entries for
LDAP address setup
* providers/groupwise/camel-gw-listener.c: added add_ldap_addressbook_source,
modify_ldap_addressbook_source, remove_ldap_addressbook_source functions for
setting up LDAP address book. Also setting "username" property on cal/tasks ESources
* providers/groupwise/camel-groupwise-provider.c: added some conf
entries for LDAP address setup
* providers/groupwise/camel-gw-listener.c: added
add_ldap_addressbook_source, modify_ldap_addressbook_source,
remove_ldap_addressbook_source functions for setting up LDAP
address book. Also setting "username" property on cal/tasks
ESources
2004-01-15 Not Zed <NotZed@Ximian.com>

6
camel/camel-internet-address.c
View File

@ -92,12 +92,12 @@ internet_decode (CamelAddress *a, const char *raw)
if (ha) {
n = ha;
while (n) {
if (n->type == HEADER_ADDRESS_NAME) {
if (n->type == CAMEL_HEADER_ADDRESS_NAME) {
camel_internet_address_add((CamelInternetAddress *)a, n->name, n->v.addr);
} else if (n->type == HEADER_ADDRESS_GROUP) {
} else if (n->type == CAMEL_HEADER_ADDRESS_GROUP) {
struct _camel_header_address *g = n->v.members;
while (g) {
if (g->type == HEADER_ADDRESS_NAME)
if (g->type == CAMEL_HEADER_ADDRESS_NAME)
camel_internet_address_add((CamelInternetAddress *)a, g->name, g->v.addr);
/* otherwise, it's an error, infact */
g = g->next;

2
camel/camel-mime-message.c
View File

@ -925,7 +925,7 @@ camel_mime_message_build_mbox_from (CamelMimeMessage *message)
tmp = NULL;
if (addr) {
if (addr->type == HEADER_ADDRESS_NAME) {
if (addr->type == CAMEL_HEADER_ADDRESS_NAME) {
g_string_append (out, addr->v.addr);
tmp = "";
}

32
camel/camel-mime-utils.c
View File

@ -3919,7 +3919,7 @@ camel_header_address_new (void)
{
struct _camel_header_address *h;
h = g_malloc0(sizeof(*h));
h->type = HEADER_ADDRESS_NONE;
h->type = CAMEL_HEADER_ADDRESS_NONE;
h->refcount = 1;
return h;
}
@ -3929,7 +3929,7 @@ camel_header_address_new_name(const char *name, const char *addr)
{
struct _camel_header_address *h;
h = camel_header_address_new();
h->type = HEADER_ADDRESS_NAME;
h->type = CAMEL_HEADER_ADDRESS_NAME;
h->name = g_strdup(name);
h->v.addr = g_strdup(addr);
return h;
@ -3941,7 +3941,7 @@ camel_header_address_new_group (const char *name)
struct _camel_header_address *h;
h = camel_header_address_new();
h->type = HEADER_ADDRESS_GROUP;
h->type = CAMEL_HEADER_ADDRESS_GROUP;
h->name = g_strdup(name);
return h;
}
@ -3958,9 +3958,9 @@ camel_header_address_unref(struct _camel_header_address *h)
{
if (h) {
if (h->refcount <= 1) {
if (h->type == HEADER_ADDRESS_GROUP) {
if (h->type == CAMEL_HEADER_ADDRESS_GROUP) {
camel_header_address_list_clear(&h->v.members);
} else if (h->type == HEADER_ADDRESS_NAME) {
} else if (h->type == CAMEL_HEADER_ADDRESS_NAME) {
g_free(h->v.addr);
}
g_free(h->name);
@ -3984,9 +3984,9 @@ void
camel_header_address_set_addr(struct _camel_header_address *h, const char *addr)
{
if (h) {
if (h->type == HEADER_ADDRESS_NAME
|| h->type == HEADER_ADDRESS_NONE) {
h->type = HEADER_ADDRESS_NAME;
if (h->type == CAMEL_HEADER_ADDRESS_NAME
|| h->type == CAMEL_HEADER_ADDRESS_NONE) {
h->type = CAMEL_HEADER_ADDRESS_NAME;
g_free(h->v.addr);
h->v.addr = g_strdup(addr);
} else {
@ -3999,9 +3999,9 @@ void
camel_header_address_set_members(struct _camel_header_address *h, struct _camel_header_address *group)
{
if (h) {
if (h->type == HEADER_ADDRESS_GROUP
|| h->type == HEADER_ADDRESS_NONE) {
h->type = HEADER_ADDRESS_GROUP;
if (h->type == CAMEL_HEADER_ADDRESS_GROUP
|| h->type == CAMEL_HEADER_ADDRESS_NONE) {
h->type = CAMEL_HEADER_ADDRESS_GROUP;
camel_header_address_list_clear(&h->v.members);
/* should this ref them? */
h->v.members = group;
@ -4015,9 +4015,9 @@ void
camel_header_address_add_member(struct _camel_header_address *h, struct _camel_header_address *member)
{
if (h) {
if (h->type == HEADER_ADDRESS_GROUP
|| h->type == HEADER_ADDRESS_NONE) {
h->type = HEADER_ADDRESS_GROUP;
if (h->type == CAMEL_HEADER_ADDRESS_GROUP
|| h->type == CAMEL_HEADER_ADDRESS_NONE) {
h->type = CAMEL_HEADER_ADDRESS_GROUP;
camel_header_address_list_append(&h->v.members, member);
}
}
@ -4067,7 +4067,7 @@ header_address_list_encode_append (GString *out, int encode, struct _camel_heade
while (a) {
switch (a->type) {
case HEADER_ADDRESS_NAME:
case CAMEL_HEADER_ADDRESS_NAME:
if (encode)
text = camel_header_encode_phrase (a->name);
else
@ -4079,7 +4079,7 @@ header_address_list_encode_append (GString *out, int encode, struct _camel_heade
if (encode)
g_free (text);
break;
case HEADER_ADDRESS_GROUP:
case CAMEL_HEADER_ADDRESS_GROUP:
if (encode)
text = camel_header_encode_phrase (a->name);
else

6
camel/camel-mime-utils.h
View File

@ -90,9 +90,9 @@ typedef struct _CamelContentDisposition {
} CamelContentDisposition;
enum _camel_header_address_t {
HEADER_ADDRESS_NONE, /* uninitialised */
HEADER_ADDRESS_NAME,
HEADER_ADDRESS_GROUP
CAMEL_HEADER_ADDRESS_NONE, /* uninitialised */
CAMEL_HEADER_ADDRESS_NAME,
CAMEL_HEADER_ADDRESS_GROUP
};
struct _camel_header_address {