From: Tristan Chabredier Date: Tue, 21 Nov 2006 09:26:14 +0000 (+0000) Subject: 2006-11-21 [wwp] 2.6.0cvs57 X-Git-Tag: rel_2_7_0~150 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=37d2ca16e8ffe1f49317fed789908205cefddf53 2006-11-21 [wwp] 2.6.0cvs57 * src/compose.c fix spelling menu when replying (same as 2.3.1cvs39): discrepancy between context menu and top menu when folder's dictionary isn't the default one. --- diff --git a/ChangeLog b/ChangeLog index a9d668356..a1c2e9c95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-11-21 [wwp] 2.6.0cvs57 + + * src/compose.c + fix spelling menu when replying (same as 2.3.1cvs39): + discrepancy between context menu and top menu when + folder's dictionary isn't the default one. + 2006-11-19 [paul] 2.6.0cvs56 * src/summaryview.c diff --git a/PATCHSETS b/PATCHSETS index fbd1a0c55..1318e95a3 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2081,3 +2081,4 @@ ( cvs diff -u -r 1.4.2.42 -r 1.4.2.43 src/gtk/about.c; ) > 2.6.0cvs54.patchset ( cvs diff -u -r 1.100.2.45 -r 1.100.2.46 AUTHORS; cvs diff -u -r 1.8.2.25 -r 1.8.2.26 README; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 debian/copyright; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/ack.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/ack.xml; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/fr/ack.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/pl/ack.xml; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/gtk/authors.h; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/icon_legend.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/icon_legend.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/OOo2claws-mail.pl; cvs diff -u -r 1.30.2.12 -r 1.30.2.13 tools/README; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/acroread2claws-mail.pl; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 tools/claws.i18n.status.pl; cvs diff -u -r 1.16.2.4 -r 1.16.2.5 tools/filter_conv.pl; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/filter_conv_new.pl; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 tools/freshmeat_search.pl; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 tools/google_search.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/kmail2claws-mail.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/kmail2claws-mail_v2.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/maildir2claws-mail.pl; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/make.themes.project; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 tools/multiwebsearch.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/outlook2claws-mail.pl; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/tb2claws-mail; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 tools/kdeservicemenu/README; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/kdeservicemenu/claws-mail-kdeservicemenu.pl; ) > 2.6.0cvs55.patchset ( cvs diff -u -r 1.395.2.266 -r 1.395.2.267 src/summaryview.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/bogofilter/bogofilter.c; ) > 2.6.0cvs56.patchset +( cvs diff -u -r 1.382.2.332 -r 1.382.2.333 src/compose.c; ) > 2.6.0cvs57.patchset diff --git a/configure.ac b/configure.ac index a2b9748c6..fbfc0e416 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=56 +EXTRA_VERSION=57 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 92afe0835..f44e023c7 100644 --- a/src/compose.c +++ b/src/compose.c @@ -973,10 +973,11 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI undo_block(compose->undostruct); #ifdef USE_ASPELL if (item && item->prefs && item->prefs->enable_default_dictionary && - compose->gtkaspell) + compose->gtkaspell) { gtkaspell_change_dict(compose->gtkaspell, item->prefs->default_dictionary); - compose_spell_menu_changed(compose); + compose_spell_menu_changed(compose); + } #endif if (account->auto_sig) @@ -1410,9 +1411,11 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote, if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs && msginfo->folder->prefs->enable_default_dictionary && - compose->gtkaspell) + compose->gtkaspell) { gtkaspell_change_dict(compose->gtkaspell, msginfo->folder->prefs->default_dictionary); + compose_spell_menu_changed(compose); + } #endif if (quote) {