From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 17 Mar 2006 08:09:45 +0000 (+0000)
Subject: 2006-03-17 [paul]	2.0.0cvs145
X-Git-Tag: REL_2_1_0~47
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=fce74ca975ac1b4ead0fd041afd5b884db306d69

2006-03-17 [paul]	2.0.0cvs145

	* src/main.c
		addressbook_read_file() was called twice
	* src/textview.c
		X-Mailer highlighting
---

diff --git a/ChangeLog b/ChangeLog
index f651f61f4..fe41b1283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-17 [paul]	2.0.0cvs145
+
+	* src/main.c
+		addressbook_read_file() was called twice
+	* src/textview.c
+		X-Mailer highlighting
+
 2006-03-16 [colin]	2.0.0cvs144
 
 	* src/sourcewindow.c
diff --git a/PATCHSETS b/PATCHSETS
index 576f9a716..d35eb6015 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1330,3 +1330,4 @@
 ( cvs diff -u -r 1.94.2.81 -r 1.94.2.82 src/messageview.c;  ) > 2.0.0cvs142.patchset
 ( cvs diff -u -r 1.382.2.250 -r 1.382.2.251 src/compose.c;  cvs diff -u -r 1.50.2.22 -r 1.50.2.23 src/compose.h;  ) > 2.0.0cvs143.patchset
 ( cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/sourcewindow.c;  cvs diff -u -r 1.1.1.1.16.2 -r 1.1.1.1.16.3 src/sourcewindow.h;  ) > 2.0.0cvs144.patchset
+( cvs diff -u -r 1.115.2.77 -r 1.115.2.78 src/main.c;  cvs diff -u -r 1.96.2.101 -r 1.96.2.102 src/textview.c;  ) > 2.0.0cvs145.patchset
diff --git a/configure.ac b/configure.ac
index 3d1bb8765..efd3d8f9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=144
+EXTRA_VERSION=145
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
index e48435e40..ed2f3e9e8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -496,8 +496,6 @@ int main(int argc, char *argv[])
 	/* make the crash-indicator file */
 	str_write_to_file("foo", get_crashfile_name());
 
-	addressbook_read_file();
-
 	inc_autocheck_timer_init(mainwin);
 
 	/* ignore SIGPIPE signal for preventing sudden death of program */
diff --git a/src/textview.c b/src/textview.c
index 5042251bc..06af6f725 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1410,7 +1410,7 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
 		if ((procheader_headername_equal(header->name, "X-Mailer") ||
 		     procheader_headername_equal(header->name,
 						 "X-Newsreader")) &&
-		    strstr(header->body, "Sylpheed") != NULL) {
+		    strstr(header->body, "Sylpheed-Claws") != NULL) {
 			gtk_text_buffer_get_end_iter (buffer, &iter);
 			gtk_text_buffer_insert_with_tags_by_name
 				(buffer, &iter, header->body, -1,