2007-04-25 [colin] 2.9.1cvs24

	* src/compose.c
		Fix bug 1198, 'Reply-all "disappearing" address bug
		persists...'

diff --git a/ChangeLog b/ChangeLog
index ee87e64cdd9de7943071024da861b222c93b4901..564b39f54ca74eb57cccadeaaf464a29c648a1a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-25 [colin]     2.9.1cvs24
+
+       * src/compose.c
+               Fix bug 1198, 'Reply-all "disappearing" address bug 
+               persists...'
+
 2007-04-24 [colin]     2.9.1cvs23
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 715d23873e9c3647b0a011862da41de517672f1c..e36439b072f49ac3c41861928e985a83722f3521 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2551,3 +2551,4 @@
 ( cvs diff -u -r 1.155.2.62 -r 1.155.2.63 src/Makefile.am;  cvs diff -u -r 1.25.2.37 -r 1.25.2.38 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.26 -r 1.18.2.27 src/stock_pixmap.h;  ) > 2.9.1cvs21.patchset
 ( cvs diff -u -r 1.382.2.373 -r 1.382.2.374 src/compose.c;  ) > 2.9.1cvs22.patchset
 ( cvs diff -u -r 1.207.2.161 -r 1.207.2.162 src/folderview.c;  ) > 2.9.1cvs23.patchset
+( cvs diff -u -r 1.382.2.374 -r 1.382.2.375 src/compose.c;  ) > 2.9.1cvs24.patchset

diff --git a/configure.ac b/configure.ac
index 088c8db6febf332a315db078684dd1b5c943d6b7..5690a82ff6491d4b62f1a1485334220ca6a5f8f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index c5831da98c058f0bc47848c66cd18fa840ff669a..7ebe66e7f7cd04240733ec078659ab28cc538846 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5798,13 +5798,10 @@ static void compose_create_header_entry(Compose *compose)
         headerentry->headernum = compose->header_nextrow;
 
         compose->header_nextrow++;
-       compose->header_last = headerentry;
-       
-       if (!compose->first_combo)
-               compose->first_combo = combo;
-       if (!compose->first_entry)
-               compose->first_entry = entry;
-               
+       compose->header_last = headerentry;             
+       compose->header_list =
+               g_slist_append(compose->header_list,
+                              headerentry);
 }
 
 static void compose_add_header_entry(Compose *compose, const gchar *header, gchar *text) 
@@ -5812,7 +5809,7 @@ static void compose_add_header_entry(Compose *compose, const gchar *header, gcha
        ComposeHeaderEntry *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);
 }
@@ -5823,18 +5820,10 @@ static void compose_remove_header_entries(Compose *compose)
        for (list = compose->header_list; list; list = list->next) {
                ComposeHeaderEntry *headerentry = 
                        (ComposeHeaderEntry *)list->data;
-               if (headerentry->combo == compose->first_combo)
-                       compose->first_combo = NULL;
-               if (headerentry->entry == compose->first_entry)
-                       compose->first_entry = NULL;
                gtk_widget_destroy(headerentry->combo);
                gtk_widget_destroy(headerentry->entry);
                g_free(headerentry);
        }
-       if (compose->first_combo)
-               gtk_widget_destroy(compose->first_combo);
-       if (compose->first_entry)
-               gtk_widget_destroy(compose->first_entry);
        compose->header_last = NULL;
        g_slist_free(compose->header_list);
        compose->header_list = NULL;
@@ -9373,10 +9362,6 @@ static gboolean compose_headerentry_changed_cb(GtkWidget *entry,
                                    ComposeHeaderEntry *headerentry)
 {
        if (strlen(gtk_entry_get_text(GTK_ENTRY(entry))) != 0) {
-               headerentry->compose->header_list =
-                       g_slist_append(headerentry->compose->header_list,
-                                      headerentry);
-               
                compose_create_header_entry(headerentry->compose);
                g_signal_handlers_disconnect_matched
                        (G_OBJECT(entry), G_SIGNAL_MATCH_DATA,