sync with sylpheed 0.6.5cvs22

diff --git a/ChangeLog b/ChangeLog
index ee17922ebf91c95d55c8cd3c3b78efbd6cc6c32c..386c7f4a99c39d2c1703065cd2bc12f3b4a07a55 100644 (file)
--- 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 f54c6aea728c238344f66b0f32e9611fbc2b51c9..020bb05fc5be100f0732498616856772db29c0e9 100644 (file)
--- 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 e737c950b63d520e960080988f86629f613f1e7d..c28657ac5996f063ad2f64aa54bf008c61200f69 100644 (file)
--- 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 c56489019952231626ea0a15094e6a867c42b5c8..512fd4f0b29b19ce10251e194f780bc75724ae3b 100644 (file)
--- 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 6250aae1e619da2e05cc264f3da4545a522c698c..f5004b51d869816616edf90ceedd5c79cbc7129c 100644 (file)
--- 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;