added border around header fields

keep header type when new field is added

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3db664773eb12d83db35d3d72df70bbbe5a888e6..bc2cde2c935350f1ecc828207a1b4082dc44d35f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-09-21 [christoph]
+
+       * src/compose.c
+               added border around header fields
+               keep header type when new field is added
+
 2001-09-20 [christoph]
 
        * src/utils.[ch]

diff --git a/src/compose.c b/src/compose.c
index f06fb8901883f7cea8e88c11ca05ba5941325467..5ad53380eea9bdbc61e9943d611232511234b1de 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3229,15 +3229,17 @@ static void compose_create_header_entry(Compose *compose) {
        gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), FALSE);
        gtk_widget_show(combo);
        gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
-
-       /* Set Type of new Entry */
-       switch(compose->account->protocol) {
-               case A_NNTP:
-                       header = _("Newsgroups:");
-                       break;
-               default:
-                       header = _("To:");
-                       break;
+       if(compose->header_last) {      
+               header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+       } else {
+               switch(compose->account->protocol) {
+                       case A_NNTP:
+                               header = _("Newsgroups:");
+                               break;
+                       default:
+                               header = _("To:");
+                               break;
+               }                                                                   
        }
        gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
 
@@ -3264,7 +3266,7 @@ static void compose_add_header_entry(Compose *compose, gchar *header, gchar *tex
        compose_headerentry *last_header;
        
        last_header = compose->header_last;
-
+       
        gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(last_header->combo)->entry), header);
        gtk_entry_set_text(GTK_ENTRY(last_header->entry), text);
 }
@@ -3400,6 +3402,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        header_table = gtk_table_new(2, 2, FALSE);
        gtk_widget_show(header_table);
+       gtk_container_set_border_width(GTK_CONTAINER(header_table), 2);
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
        count = 0;