2010-11-17 [colin] 3.7.6cvs65

* src/common/utils.c
		Separate email address from timestamp with a dot.
		Fix coding style.
This commit is contained in:
Colin Leroy 2010-11-17 19:39:20 +00:00
parent a9a30e9f42
commit 77acde5414
4 changed files with 15 additions and 13 deletions

View file

@ -1,3 +1,9 @@
2010-11-17 [colin] 3.7.6cvs65
* src/common/utils.c
Separate email address from timestamp with a dot.
Fix coding style.
2010-11-17 [colin] 3.7.6cvs64
* src/common/utils.c

View file

@ -4060,3 +4060,4 @@
( cvs diff -u -r 1.60.2.55 -r 1.60.2.56 src/filtering.c; ) > 3.7.6cvs62.patchset
( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 manual/es/advanced.xml; ) > 3.7.6cvs63.patchset
( cvs diff -u -r 1.36.2.187 -r 1.36.2.188 src/common/utils.c; ) > 3.7.6cvs64.patchset
( cvs diff -u -r 1.36.2.188 -r 1.36.2.189 src/common/utils.c; ) > 3.7.6cvs65.patchset

View file

@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=6
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=64
EXTRA_VERSION=65
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -3854,20 +3854,15 @@ gchar *generate_msgid(gchar *buf, gint len, gchar *user_addr)
lt = localtime_r(&t, &buft);
if (strcmp(buf, "") == 0) {
if (user_addr != NULL) {
addr = g_strconcat(user_addr, "@", get_domain_name(), NULL);
}
else {
if (user_addr != NULL)
addr = g_strconcat(".", user_addr, "@", get_domain_name(), NULL);
else
addr = g_strconcat("@", get_domain_name(), NULL);
}
}
else {
if (user_addr != NULL) {
addr = g_strconcat(user_addr, "@", buf, NULL);
}
else {
} else {
if (user_addr != NULL)
addr = g_strconcat(".", user_addr, "@", buf, NULL);
else
addr = g_strconcat("@", buf, NULL);
}
}
/* Replace all @ but the last one in addr, with underscores.