Fix bug 3251, 'A translated In-Reply-To header is sent translated'

by making sure we're always storing untranslated headers.
Optimize and sanitize a bit the code around it, too.

diff --git a/src/compose.c b/src/compose.c
index dfd0d2266d79606d59156c6dc3d9795f2308a9e9..25390c623b8adc523960a00047e54b1a956081cc 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -106,6 +106,7 @@
 #include "timing.h"
 #include "autofaces.h"
 #include "spell_entry.h"
 #include "timing.h"
 #include "autofaces.h"
 #include "spell_entry.h"

+#include "headers.h"

 
 enum
 {
 
 enum
 {


@@ -6423,6 +6424,41 @@ static gchar *compose_quote_list_of_addresses(gchar *str)
        (compose->account->add_customhdr && \
         custom_header_find(compose->account->customhdr_list, header) != NULL)
 
        (compose->account->add_customhdr && \
         custom_header_find(compose->account->customhdr_list, header) != NULL)
 

+static const gchar *compose_untranslated_header_name(gchar *header_name)
+{
+       /* return the untranslated header name, if header_name is a known
+          header name, in either its translated or untranslated form, with
+          or without trailing colon. return NULL if no matching header name
+          is found or if header_name is NULL. */
+       gchar *translated_header_name;
+       gchar *translated_header_name_wcolon;
+       const gchar *untranslated_header_name;
+       const gchar *untranslated_header_name_wcolon;
+       gint i;
+
+       cm_return_val_if_fail(header_name != NULL, NULL);
+
+       for (i = 0; HEADERS[i].header_name != NULL; i++) {
+               untranslated_header_name = HEADERS[i].header_name;
+               untranslated_header_name_wcolon = HEADERS[i].header_name_w_colon;
+
+               translated_header_name = gettext(untranslated_header_name);
+               translated_header_name_wcolon = gettext(untranslated_header_name_wcolon);
+
+               if (!strcmp(header_name, untranslated_header_name) ||
+                       !strcmp(header_name, translated_header_name)) {
+                       return untranslated_header_name;
+               } else {
+                       if (!strcmp(header_name, untranslated_header_name_wcolon) ||
+                               !strcmp(header_name, translated_header_name_wcolon)) {
+                               return untranslated_header_name_wcolon;
+                       }
+               }
+       }
+       debug_print("compose_untranslated_header_name: unknown header '%s'\n", header_name);
+       return NULL;
+}
+

 static void compose_add_headerfield_from_headerlist(Compose *compose, 
                                                    GString *header, 
                                                    const gchar *fieldname,
 static void compose_add_headerfield_from_headerlist(Compose *compose, 
                                                    GString *header, 
                                                    const gchar *fieldname,


@@ -6781,16 +6817,22 @@ static gchar *compose_get_header(Compose *compose)
                Xstrdup_a(headervalue, entry_str, return NULL);
                subst_char(headervalue, '\r', ' ');
                subst_char(headervalue, '\n', ' ');
                Xstrdup_a(headervalue, entry_str, return NULL);
                subst_char(headervalue, '\r', ' ');
                subst_char(headervalue, '\n', ' ');

-               string = std_headers;
-               while (*string != NULL) {
-                       headername_trans = prefs_common_translated_header_name(*string);
-                       if (!strcmp(headername_trans, headername_wcolon))
-                               standard_header = TRUE;
-                       string++;
-               }
-               if (!standard_header && !IS_IN_CUSTOM_HEADER(headername))
-                       g_string_append_printf(header, "%s %s\n", headername_wcolon, headervalue);
-                               
+               g_strstrip(headervalue);
+               if (*headervalue != '\0') {
+                       string = std_headers;
+                       while (*string != NULL && !standard_header) {
+                               headername_trans = prefs_common_translated_header_name(*string);
+                               /* support mixed translated and untranslated headers */
+                               if (!strcmp(headername_trans, headername_wcolon) || !strcmp(*string, headername_wcolon))
+                                       standard_header = TRUE;
+                               string++;
+                       }
+                       if (!standard_header && !IS_IN_CUSTOM_HEADER(headername)) {
+                               /* store untranslated header name */
+                               g_string_append_printf(header, "%s %s\n",
+                                               compose_untranslated_header_name(headername_wcolon), headervalue);
+                       }
+               }                               

                g_free(headername);
                g_free(headername_wcolon);              
        }
                g_free(headername);
                g_free(headername_wcolon);              
        }

diff --git a/src/gtk/headers.h b/src/gtk/headers.h
index 0a4c2e10e556a7a9efb84a6e95dbeaa851d2c325..8e0b4472aab991ccdec2ec971e2d4ff30da85ed1 100644 (file)
--- a/src/gtk/headers.h
+++ b/src/gtk/headers.h
@@ -63,4 +63,6 @@ static struct {
        { N_("In reply to"),                              N_("In reply to:") },
        { N_("To or Cc"),                                         N_("To or Cc:") },
        { N_("From, To or Subject"),              N_("From, To or Subject:") },
        { N_("In reply to"),                              N_("In reply to:") },
        { N_("To or Cc"),                                         N_("To or Cc:") },
        { N_("From, To or Subject"),              N_("From, To or Subject:") },

+
+       { NULL, NULL }

 };
 };