2007-05-23 [wwp] 2.9.2cvs11
[claws.git] / src / compose.c
index 4190805ccce968f134a124c47521c6436e57e323..9cdec9daacbacb4c5def156c1dccaadc05e3beb4 100644 (file)
@@ -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();