From 33894cdb24a4d7f8aaf7b2cb11b00bfd2a600ea1 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 6 Dec 2001 08:20:11 +0000
Subject: [PATCH] sync with sylpheed 0.6.5cvs22

---
 ChangeLog            | 5 +++++
 ChangeLog.claws      | 5 +++++
 ChangeLog.jp         | 5 +++++
 configure.in         | 2 +-
 src/prefs_template.c | 5 ++++-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee17922eb..386c7f4a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-06
+
+	* src/prefs_template.c: prefs_template_window_create(): supported
+	  address completion on the To: entry.
+
 2001-12-04
 
 	* src/folder.c:
diff --git a/ChangeLog.claws b/ChangeLog.claws
index f54c6aea7..020bb05fc 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-12-06 [paul]	0.6.5claws54
+
+	* sync with sylpheed 0.6.5cvs22
+        	see ChangeLog entry 2001-12-06
+
 2001-12-05 [alfons]	0.6.5claws53
 
 	* src/inc.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index e737c950b..c28657ac5 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2001-12-06
+
+	* src/prefs_template.c: prefs_template_window_create(): To:
+	  ¥¨¥ó¥È¥ê¤Ç¥¢¥É¥ì¥¹Êä´°¤ËÂбþ¡£
+
 2001-12-04
 
 	* src/folder.c:
diff --git a/configure.in b/configure.in
index c56489019..512fd4f0b 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws53
+EXTRA_VERSION=claws54
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/prefs_template.c b/src/prefs_template.c
index 6250aae1e..f5004b51d 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -37,6 +37,7 @@
 #include "manage_window.h"
 #include "prefs_common.h"
 #include "compose.h"
+#include "addr_compl.h"
 #include "quote_fmt.h"
 
 static struct Templates {
@@ -150,7 +151,6 @@ static void prefs_template_window_create(void)
 	hbox1 = gtk_hbox_new(FALSE, 8);
 	gtk_widget_show(hbox1);
 	gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(hbox1), 2);
 
 	label1 = gtk_label_new(_("Template name"));
 	gtk_widget_show(label1);
@@ -168,6 +168,7 @@ static void prefs_template_window_create(void)
 	gtk_table_set_col_spacings(GTK_TABLE(table), 4);
 
 	ADD_ENTRY(entry_to, _("To:"), 0);
+	address_completion_register_entry(GTK_ENTRY(entry_to));
 	ADD_ENTRY(entry_subject, _("Subject:"), 1);
 
 #undef ADD_ENTRY
@@ -275,6 +276,8 @@ static void prefs_template_window_create(void)
 	gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
 			    GTK_SIGNAL_FUNC(prefs_template_cancel_cb), NULL);
 
+	address_completion_start(window);
+
 	templates.window = window;
 	templates.ok_btn = ok_btn;
 	templates.clist_tmpls = clist_tmpls;
-- 
2.25.1