fix encoding

[claws.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index a16551180b0a14c19df81f996af2473bcd2f6d7c..f4ec081fb6b12a21dbca0dc9b0ccd2acd5970cf2 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1166,8 +1166,8 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars)
                if (strchr(quote_chars, *p))
                        quote_level++;
                else if (*p != '-' && !g_ascii_isspace(*p) && p <= last_pos) {
-                       /* any characters are allowed except '-' and space */
-                       while (*p != '-'
+                       /* any characters are allowed except '-','<' and space */
+                       while (*p != '-' && *p != '<'
                               && !strchr(quote_chars, *p)
                               && !g_ascii_isspace(*p)
                               && p < last_pos)
@@ -1635,13 +1635,8 @@ gint scan_mailto_url(const gchar *mailto, gchar **from, gchar **to, gchar **cc,
                        *body = decode_uri_gdup(value);
                } else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
                        gchar *tmp = decode_uri_gdup(value);
-<<<<<<< utils.c
-                       if (!g_file_get_contents(value, body, NULL, NULL)) {
-                               g_warning("Error: couldn't set insert file '%s' in body\n", value);
-=======
                        if (!g_file_get_contents(tmp, body, NULL, NULL)) {
                                g_warning("Error: couldn't set insert file '%s' in body\n", value);
->>>>>>> 1.36.2.176
                        }
                        g_free(tmp);
                        tmp = NULL;
@@ -1998,6 +1993,16 @@ const gchar *get_cert_file(void)
 }
 #endif
 
+/* Return the filepath of the claws-mail.desktop file */
+const gchar *get_desktop_file(void)
+{
+#ifdef DESKTOPFILEPATH
+  return DESKTOPFILEPATH;
+#else
+  return NULL;
+#endif
+}
+
 /* Return the default directory for Plugins. */
 const gchar *get_plugin_dir(void)
 {
@@ -3724,7 +3729,7 @@ int subject_get_prefix_length(const gchar *subject)
                "Vs\\:",                        /* "Vs" (Norwegian) */
                "Ad\\:",                        /* "Ad" (Norwegian) */
                "\347\255\224\345\244\215\\:",  /* "Re" (Chinese, UTF-8) */
-               "R\303\251f\\. \\:",    /* "Réf. :" (French Lotus Notes) */
+               "R\303\251f\\. \\:",            /* "Réf. :" (French Lotus Notes) */
                "Re \\:",                       /* "Re :" (French Yahoo Mail) */
                /* add more */
        };
@@ -4264,7 +4269,7 @@ gboolean get_uri_part(const gchar *start, const gchar *scanpos,
         * should pass some URI type to this function and decide on that whether
         * to perform punctuation stripping */
 
-#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-)", ch))
+#define IS_REAL_PUNCT(ch)      (g_ascii_ispunct(ch) && !strchr("/?=-_)", ch))
 
        for (; ep_ - 1 > scanpos + 1 &&
               IS_REAL_PUNCT(*(ep_ - 1));