2007-04-20 [colin] 2.9.1cvs6

* src/compose.c
		Fix bug 1187, 'Reply-to addressee disappears
		when reply-to text box is clicked...' (Maemo)
This commit is contained in:
Colin Leroy 2007-04-20 15:54:57 +00:00
parent 351b1b34f7
commit b4fc125798
4 changed files with 23 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2007-04-20 [colin] 2.9.1cvs6
* src/compose.c
Fix bug 1187, 'Reply-to addressee disappears
when reply-to text box is clicked...' (Maemo)
2007-04-20 [wwp] 2.9.1cvs5
* po/POTFILES.in

View file

@ -2533,3 +2533,4 @@
( cvs diff -u -r 1.75.2.39 -r 1.75.2.40 src/matcher.c; ) > 2.9.1cvs3.patchset
( cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/quicksearch.h; ) > 2.9.1cvs4.patchset
( cvs diff -u -r 1.53.2.25 -r 1.53.2.26 po/POTFILES.in; cvs diff -u -r 1.60.2.86 -r 1.60.2.87 src/addressbook.c; cvs diff -u -r 1.382.2.370 -r 1.382.2.371 src/compose.c; cvs diff -u -r 1.60.2.31 -r 1.60.2.32 src/filtering.c; cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/headerview.c; cvs diff -u -r 1.75.2.40 -r 1.75.2.41 src/matcher.c; cvs diff -u -r 1.204.2.130 -r 1.204.2.131 src/prefs_common.c; cvs diff -u -r 1.103.2.80 -r 1.103.2.81 src/prefs_common.h; cvs diff -u -r 1.16.2.28 -r 1.16.2.29 src/prefs_display_header.c; cvs diff -u -r 1.43.2.56 -r 1.43.2.57 src/prefs_matcher.c; cvs diff -u -r 1.395.2.296 -r 1.395.2.297 src/summaryview.c; diff -u /dev/null src/gtk/headers.h; cvs diff -u -r 1.1.2.67 -r 1.1.2.68 src/gtk/quicksearch.c; ) > 2.9.1cvs5.patchset
( cvs diff -u -r 1.382.2.371 -r 1.382.2.372 src/compose.c; ) > 2.9.1cvs6.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=5
EXTRA_VERSION=6
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -5798,6 +5798,12 @@ static void compose_create_header_entry(Compose *compose)
compose->header_nextrow++;
compose->header_last = headerentry;
if (!compose->first_combo)
compose->first_combo = combo;
if (!compose->first_entry)
compose->first_entry = entry;
}
static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text)
@ -5816,10 +5822,19 @@ 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;
compose->header_nextrow = 1;