From: Tristan Chabredier Date: Wed, 23 May 2007 07:51:42 +0000 (+0000) Subject: 2007-05-23 [wwp] 2.9.2cvs11 X-Git-Tag: rel_2_10_0~70 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a38d4b6a5cb9935c50a5d53820d08fd0a39649cb 2007-05-23 [wwp] 2.9.2cvs11 * src/compose.c * src/prefs_template.c * src/quote_fmt.h * src/quote_fmt_parse.y Fix 2.9.2cvs10, which broke --disable-aspell. --- diff --git a/ChangeLog b/ChangeLog index 1cbf08aff..33109988d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-05-23 [wwp] 2.9.2cvs11 + + * src/compose.c + * src/prefs_template.c + * src/quote_fmt.h + * src/quote_fmt_parse.y + Fix 2.9.2cvs10, which broke --disable-aspell. + 2007-05-22 [wwp] 2.9.2cvs10 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 8d007495c..becec6845 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2586,3 +2586,4 @@ ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/xml2pdf; ) > 2.9.2cvs8.patchset ( cvs diff -u -r 1.213.2.144 -r 1.213.2.145 src/folder.c; cvs diff -u -r 1.87.2.40 -r 1.87.2.41 src/folder.h; cvs diff -u -r 1.115.2.152 -r 1.115.2.153 src/main.c; cvs diff -u -r 1.7.2.10 -r 1.7.2.11 src/main.h; cvs diff -u -r 1.94.2.133 -r 1.94.2.134 src/messageview.c; cvs diff -u -r 1.204.2.134 -r 1.204.2.135 src/prefs_common.c; cvs diff -u -r 1.103.2.82 -r 1.103.2.83 src/prefs_common.h; cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/prefs_summaries.c; cvs diff -u -r 1.395.2.302 -r 1.395.2.303 src/summaryview.c; ) > 2.9.2cvs9.patchset ( cvs diff -u -r 1.382.2.377 -r 1.382.2.378 src/compose.c; cvs diff -u -r 1.12.2.41 -r 1.12.2.42 src/prefs_template.c; cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/quote_fmt.c; cvs diff -u -r 1.5.12.6 -r 1.5.12.7 src/quote_fmt.h; cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/quote_fmt_lex.l; cvs diff -u -r 1.22.2.28 -r 1.22.2.29 src/quote_fmt_parse.y; cvs diff -u -r 1.9.2.50 -r 1.9.2.51 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/gtkaspell.h; ) > 2.9.2cvs10.patchset +( cvs diff -u -r 1.382.2.378 -r 1.382.2.379 src/compose.c; cvs diff -u -r 1.12.2.42 -r 1.12.2.43 src/prefs_template.c; cvs diff -u -r 1.5.12.7 -r 1.5.12.8 src/quote_fmt.h; cvs diff -u -r 1.22.2.29 -r 1.22.2.30 src/quote_fmt_parse.y; ) > 2.9.2cvs11.patchset diff --git a/configure.ac b/configure.ac index 0a063a412..c16709855 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=10 +EXTRA_VERSION=11 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 4190805cc..9cdec9daa 100644 --- a/src/compose.c +++ b/src/compose.c @@ -1041,8 +1041,12 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI pref_get_unescaped_pref(tmp, prefs_common.compose_subject_format); subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1); +#ifdef USE_ASPELL quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account, compose->gtkaspell); +#else + quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account); +#endif quote_fmt_scan_string(tmp); quote_fmt_parse(); @@ -2534,8 +2538,12 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo, } if (qmark != NULL) { +#ifdef USE_ASPELL quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, compose->gtkaspell); +#else + quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account); +#endif quote_fmt_scan_string(qmark); quote_fmt_parse(); @@ -2552,8 +2560,12 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo, while (*trimmed_body == '\n') trimmed_body++; +#ifdef USE_ASPELL quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account, compose->gtkaspell); +#else + quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account); +#endif if (need_unescape) { gchar *tmp = NULL; @@ -7153,8 +7165,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl) } if (tmpl->to && *tmpl->to != '\0') { +#ifdef USE_ASPELL quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, compose->gtkaspell); +#else + quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account); +#endif quote_fmt_scan_string(tmpl->to); quote_fmt_parse(); @@ -7167,8 +7183,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl) } if (tmpl->cc && *tmpl->cc != '\0') { +#ifdef USE_ASPELL quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, compose->gtkaspell); +#else + quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account); +#endif quote_fmt_scan_string(tmpl->cc); quote_fmt_parse(); @@ -7181,8 +7201,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl) } if (tmpl->bcc && *tmpl->bcc != '\0') { +#ifdef USE_ASPELL quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, compose->gtkaspell); +#else + quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account); +#endif quote_fmt_scan_string(tmpl->bcc); quote_fmt_parse(); @@ -7196,8 +7220,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl) /* process the subject */ if (tmpl->subject && *tmpl->subject != '\0') { +#ifdef USE_ASPELL quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, compose->gtkaspell); +#else + quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account); +#endif quote_fmt_scan_string(tmpl->subject); quote_fmt_parse(); diff --git a/src/prefs_template.c b/src/prefs_template.c index 569536996..2813d8f55 100644 --- a/src/prefs_template.c +++ b/src/prefs_template.c @@ -557,7 +557,11 @@ gboolean prefs_template_string_is_valid(gchar *string) MsgInfo dummyinfo; memset(&dummyinfo, 0, sizeof(MsgInfo)); +#ifdef USE_ASPELL quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, NULL, NULL); +#else + quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, NULL); +#endif quote_fmt_scan_string(string); quote_fmt_parse(); parsed_buf = quote_fmt_get_buffer(); diff --git a/src/quote_fmt.h b/src/quote_fmt.h index 8e43d3cdb..975dfcfa0 100644 --- a/src/quote_fmt.h +++ b/src/quote_fmt.h @@ -2,17 +2,25 @@ #define __QUOTE_FMT_H__ +#ifdef USE_ASPELL #include "gtkaspell.h" +#endif #define quote_fmt_parse quote_fmtparse void quote_fmt_quote_description(void); gchar *quote_fmt_get_buffer(void); +#ifdef USE_ASPELL void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str, const gchar *my_body, gboolean my_dry_run, PrefsAccount *account, GtkAspell *gtkaspell); +#else +void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str, + const gchar *my_body, gboolean my_dry_run, + PrefsAccount *account); +#endif gint quote_fmtparse(void); void quote_fmt_scan_string(const gchar *str); void quote_fmt_reset_vartable(void); diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y index 4fc60904b..3919a5e3d 100644 --- a/src/quote_fmt_parse.y +++ b/src/quote_fmt_parse.y @@ -47,7 +47,9 @@ int yylex(void); static MsgInfo *msginfo = NULL; static PrefsAccount *account = NULL; +#ifdef USE_ASPELL static gchar default_dictionary[BUFFSIZE]; +#endif static gboolean *visible = NULL; static gboolean dry_run = FALSE; static gint maxsize = 0; @@ -161,20 +163,28 @@ void quote_fmt_reset_vartable(void) } } +#ifdef USE_ASPELL void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str, const gchar *my_body, gboolean my_dry_run, - PrefsAccount *compose_account, - GtkAspell *compose_gtkaspell) + PrefsAccount *account, + GtkAspell *gtkaspell); +#else +void quote_fmt_init(MsgInfo *info, const gchar *my_quote_str, + const gchar *my_body, gboolean my_dry_run, + PrefsAccount *compose_account) +#endif { - gchar *dict = gtkaspell_get_default_dictionary(compose_gtkaspell); quote_str = my_quote_str; body = my_body; msginfo = info; account = compose_account; +#ifdef USE_ASPELL + gchar *dict = gtkaspell_get_default_dictionary(compose_gtkaspell); if (dict) strncpy2(default_dictionary, dict, sizeof(default_dictionary)); else *default_dictionary = '\0'; +#endif dry_run = my_dry_run; stacksize = 0; add_visibility(TRUE); @@ -747,15 +757,19 @@ special: } | SHOW_ACCOUNT_DICT { +#ifdef USE_ASPELL if (account && account->enable_default_dictionary) { gchar *dictname = g_path_get_basename(account->default_dictionary); INSERT(dictname); g_free(dictname); } +#endif } | SHOW_DICT { +#ifdef USE_ASPELL INSERT(default_dictionary); +#endif } | SHOW_BACKSLASH { @@ -916,8 +930,12 @@ query: } | QUERY_ACCOUNT_DICT { +#ifdef USE_ASPELL add_visibility(account != NULL && account->enable_default_dictionary == TRUE && account->default_dictionary != NULL && *account->default_dictionary != '\0'); +#else + add_visibility(FALSE); +#endif } OPARENT quote_fmt CPARENT { @@ -925,7 +943,11 @@ query: } | QUERY_DICT { +#ifdef USE_ASPELL add_visibility(*default_dictionary != '\0'); +#else + add_visibility(FALSE); +#endif } OPARENT quote_fmt CPARENT { @@ -1060,8 +1082,12 @@ query_not: } | QUERY_NOT_ACCOUNT_DICT { +#ifdef USE_ASPELL add_visibility(account == NULL || account->enable_default_dictionary == FALSE || *account->default_dictionary == '\0'); +#else + add_visibility(FALSE); +#endif } OPARENT quote_fmt CPARENT { @@ -1069,7 +1095,11 @@ query_not: } | QUERY_NOT_DICT { +#ifdef USE_ASPELL add_visibility(*default_dictionary == '\0'); +#else + add_visibility(FALSE); +#endif } OPARENT quote_fmt CPARENT {