last header entry should default to "To:" or "Newsgroups:" and not copy the last...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d76506c46ba562ef9dff53f6f4f3dbfb249426e9..3678f01aeb00707c1db56ef745a970a9be6c4dc5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-10-19 [christoph] 0.6.3claws26
+
+       * src/compose.c
+               last header entry should default to "To:" or
+               "Newsgroups:" and not copy the last entry line
+               in a new compose window (closes bug #472686)
+
 2001-10-19 [paul]      0.6.3claws25
 
        * sync with Sylpheed 0.6.3cvs8

diff --git a/configure.in b/configure.in
index 33885e58bb6d103507d191667e2095c502dfdf5b..56169849e0926774c73c16de1093bb4b325948be 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index b5a085961cfd05f7d10619636f2b7f17d3917c69..9976a14d8b87fc9dcd3642188204cd78c358252d 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -526,13 +526,8 @@ Compose * compose_generic_new(PrefsAccount *account, const gchar *to, FolderItem
        if (account->protocol != A_NNTP) {
                if (to) {
                        compose_entry_append(compose, to, COMPOSE_TO);
-                       gtk_widget_grab_focus(compose->subject_entry);
-               } else {
-                       if(item && item->prefs->enable_default_to) {
-                               compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
-                       } else {
-                               gtk_widget_grab_focus(compose->header_last->entry);
-                       }
+               } else if(item && item->prefs->enable_default_to) {
+                       compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
                }
                if (item && item->ret_rcpt) {
                        GtkItemFactory *ifactory;
@@ -543,10 +538,9 @@ Compose * compose_generic_new(PrefsAccount *account, const gchar *to, FolderItem
        } else {
                if (to) {
                        compose_entry_append(compose, to, COMPOSE_NEWSGROUPS);
-                       gtk_widget_grab_focus(compose->subject_entry);
-               } else
-                       gtk_widget_grab_focus(compose->header_last->entry);
+               }
        }
+       gtk_widget_grab_focus(compose->subject_entry);
 
        if (prefs_common.auto_exteditor)
                compose_exec_ext_editor(compose);
@@ -1045,6 +1039,7 @@ Compose *compose_forward(PrefsAccount * account, MsgInfo *msginfo,
        else
                gtk_widget_grab_focus(compose->newsgroups_entry);
 #endif
+       gtk_widget_grab_focus(compose->header_last->entry);
 
        if (prefs_common.auto_exteditor)
                compose_exec_ext_editor(compose);
@@ -4133,6 +4128,12 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
                                   account->auto_replyto);
 #endif
        }
+       if (account->protocol != A_NNTP) {
+               gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("To:"));
+       } else {
+               gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("Newsgroups:"));
+       }
+
        menuitem = gtk_item_factory_get_item(ifactory, "/Tool/Show ruler");
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_ruler);