talons

commit 77acde541470fe569cce9c7e36338c32e2c798a2
parent a9a30e9f42f3e44a35e60fa05caaec77b596a7f7
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 17 Nov 2010 19:39:20 +0000

2010-11-17 [colin]	3.7.6cvs65

	* src/common/utils.c
		Separate email address from timestamp with a dot.
		Fix coding style.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/utils.c
 | 
19
+++++++------------

4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/PATCHSETS b/PATCHSETS
@@ -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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -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.