From da4a6ce1091c9ea8997f9d34ce22f7a560c3d73a Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 25 Apr 2007 16:32:14 +0000 Subject: [PATCH] 2007-04-25 [colin] 2.9.1cvs24 * src/compose.c Fix bug 1198, 'Reply-all "disappearing" address bug persists...' --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 25 +++++-------------------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee87e64cd..564b39f54 100644 --- 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 715d23873..e36439b07 100644 --- 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 088c8db6f..5690a82ff 100644 --- 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 c5831da98..7ebe66e7f 100644 --- 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, -- 2.25.1