X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=0a84acf73403d0b7255a61cc68599cb2ea10f33d;hp=e7a3209c7fdbd60aae2afd98785ce7fbfa71d10b;hb=dd00071e3b3dba6e7d35f7142ba61a89c8f205c3;hpb=2671dbb64b4a9771d58835cbb2d7f2804c0f0ed2 diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index e7a3209..0a84acf 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -33,7 +33,9 @@ #include #include #include -#include "modest-text-utils.h" +#include +#include +#include #ifdef HAVE_CONFIG_H @@ -46,6 +48,7 @@ #define SENT_STRING _("Sent:") #define TO_STRING _("To:") #define SUBJECT_STRING _("Subject:") +#define EMPTY_STRING "" /* * we need these regexps to find URLs in plain text e-mails @@ -117,15 +120,18 @@ modest_text_utils_quote (const gchar *text, { gchar *retval, *cited; - cited = cite (sent_date, from); + g_return_val_if_fail (text, NULL); + g_return_val_if_fail (content_type, NULL); - if (!strcmp (content_type, "text/html")) + cited = cite (sent_date, from); + + if (content_type && strcmp (content_type, "text/html") == 0) /* TODO: extract the of the HTML and pass it to the function */ retval = modest_text_utils_quote_html (text, cited, limit); else retval = modest_text_utils_quote_plain_text (text, cited, limit); - + g_free (cited); return retval; @@ -140,6 +146,9 @@ modest_text_utils_cite (const gchar *text, { gchar *tmp, *retval; + g_return_val_if_fail (text, NULL); + g_return_val_if_fail (content_type, NULL); + tmp = cite (sent_date, from); retval = g_strdup_printf ("%s%s\n", tmp, text); g_free (tmp); @@ -166,7 +175,11 @@ modest_text_utils_inline (const gchar *text, "

%s"; const gchar *format; - modest_text_utils_strftime (sent_str, 100, "%c", localtime (&sent_date)); + g_return_val_if_fail (text, NULL); + g_return_val_if_fail (content_type, NULL); + g_return_val_if_fail (text, NULL); + + modest_text_utils_strftime (sent_str, 100, "%c", sent_date); if (!strcmp (content_type, "text/html")) /* TODO: extract the of the HTML and pass it to @@ -177,20 +190,27 @@ modest_text_utils_inline (const gchar *text, return g_strdup_printf (format, FORWARD_STRING, - FROM_STRING, from, + FROM_STRING, (from) ? from : EMPTY_STRING, SENT_STRING, sent_str, - TO_STRING, to, - SUBJECT_STRING, subject, + TO_STRING, (to) ? to : EMPTY_STRING, + SUBJECT_STRING, (subject) ? subject : EMPTY_STRING, text); } /* just to prevent warnings: * warning: `%x' yields only last 2 digits of year in some locales */ -size_t -modest_text_utils_strftime(char *s, size_t max, const char *fmt, const struct tm *tm) +gsize +modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet) { - return strftime(s, max, fmt, tm); + static GDate date; + +#if MODEST_PLATFORM_ID==1 /* gtk */ + g_date_set_time_t (&date, timet); +#elif MODEST_PLATFORM_ID==2 /* hildon (maemo) */ + g_date_set_time (&date, (GTime) timet); +#endif + return g_date_strftime (s, max, fmt, (const GDate*) &date); } gchar * @@ -313,6 +333,50 @@ modest_text_utils_convert_to_html (const gchar *data) return g_string_free (html, FALSE); } +GSList * +modest_text_utils_split_addresses_list (const gchar *addresses) +{ + gchar *current, *start, *last_blank; + GSList *result = NULL; + + start = (gchar *) addresses; + current = start; + last_blank = start; + + while (*current != '\0') { + if ((start == current)&&((*current == ' ')||(*current == ','))) { + start++; + last_blank = current; + } else if (*current == ',') { + gchar *new_address = NULL; + new_address = g_strndup (start, current - last_blank); + result = g_slist_prepend (result, new_address); + start = current + 1; + last_blank = start; + } else if (*current == '\"') { + if (current == start) { + current++; + start++; + } + while ((*current != '\"')&&(*current != '\0')) + current++; + } + + current++; + } + + if (start != current) { + gchar *new_address = NULL; + new_address = g_strndup (start, current - last_blank); + result = g_slist_prepend (result, new_address); + } + + result = g_slist_reverse (result); + return result; + +} + + /* ******************************************************************* */ /* ************************* UTILIY FUNCTIONS ************************ */ /* ******************************************************************* */ @@ -466,8 +530,10 @@ cite (const time_t sent_date, const gchar *from) gchar sent_str[101]; /* format sent_date */ - modest_text_utils_strftime (sent_str, 100, "%c", localtime (&sent_date)); - return g_strdup_printf (N_("On %s, %s wrote:\n"), sent_str, from); + modest_text_utils_strftime (sent_str, 100, "%c", sent_date); + return g_strdup_printf (N_("On %s, %s wrote:\n"), + sent_str, + (from) ? from : EMPTY_STRING); } @@ -480,7 +546,6 @@ modest_text_utils_quote_plain_text (const gchar *text, gint indent, breakpoint, rem_indent = 0; GString *q, *l, *remaining; gsize len; - gchar *tmp; /* remaining will store the rest of the line if we have to break it */ q = g_string_new (cite); @@ -501,7 +566,7 @@ modest_text_utils_quote_plain_text (const gchar *text, } else { do { breakpoint = - get_breakpoint (remaining-> str, + get_breakpoint (remaining->str, rem_indent, limit); append_quoted (q, rem_indent, @@ -575,9 +640,11 @@ get_url_matches (GString *txt) /* initalize the regexps */ for (i = 0; i != pattern_num; ++i) { - patterns[i].preg = g_new0 (regex_t,1); - g_assert(regcomp (patterns[i].preg, patterns[i].regex, - REG_ICASE|REG_EXTENDED|REG_NEWLINE) == 0); + patterns[i].preg = g_slice_new0 (regex_t); + + /* this should not happen */ + g_return_val_if_fail (regcomp (patterns[i].preg, patterns[i].regex, + REG_ICASE|REG_EXTENDED|REG_NEWLINE) == 0, NULL); } /* find all the matches */ for (i = 0; i != pattern_num; ++i) { @@ -585,7 +652,7 @@ get_url_matches (GString *txt) while (1) { int test_offset; if ((rv = regexec (patterns[i].preg, txt->str + offset, 1, &rm, 0)) != 0) { - g_assert (rv == REG_NOMATCH); /* this should not happen */ + g_return_val_if_fail (rv == REG_NOMATCH, NULL); /* this should not happen */ break; /* try next regexp */ } if (rm.rm_so == -1) @@ -599,7 +666,7 @@ get_url_matches (GString *txt) /* make a list of our matches ( tupels)*/ if (test_offset != -1) { - url_match_t *match = g_new (url_match_t,1); + url_match_t *match = g_slice_new (url_match_t); match->offset = offset + rm.rm_so; match->len = rm.rm_eo - rm.rm_so; match->prefix = patterns[i].prefix; @@ -611,7 +678,7 @@ get_url_matches (GString *txt) for (i = 0; i != pattern_num; ++i) { regfree (patterns[i].preg); - g_free (patterns[i].preg); + g_slice_free (regex_t, patterns[i].preg); } /* don't free patterns itself -- it's static */ /* now sort the list, so the matches are in reverse order of occurence. @@ -640,7 +707,8 @@ hyperlinkify_plain_text (GString *txt) /* the prefix is NULL: use the one that is already there */ repl = g_strdup_printf ("%s", - match->prefix ? match->prefix : "", url, url); + match->prefix ? match->prefix : EMPTY_STRING, + url, url); /* replace the old thing with our hyperlink * replacement thing */ @@ -650,7 +718,7 @@ hyperlinkify_plain_text (GString *txt) g_free (url); g_free (repl); - g_free (cursor->data); + g_slice_free (url_match_t, match); } g_slist_free (match_list); @@ -726,17 +794,13 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens /* work even when s1 and/or s2 == NULL */ if (G_UNLIKELY(s1 == s2)) return 0; - if (G_UNLIKELY(!s1)) - return -1; - if (G_UNLIKELY(!s2)) - return 1; /* if it's not case sensitive */ if (!insensitive) - return strcmp (s1, s2); + return strcmp (s1 ? s1 : "", s2 ? s2 : ""); - n1 = g_utf8_collate_key (s1, -1); - n2 = g_utf8_collate_key (s2, -1); + n1 = g_utf8_collate_key (s1 ? s1 : "", -1); + n2 = g_utf8_collate_key (s2 ? s2 : "", -1); result = strcmp (n1, n2); @@ -747,29 +811,102 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens } -const gchar* +gchar* modest_text_utils_get_display_date (time_t date) { - struct tm date_tm, now_tm; time_t now; - - const gint buf_size = 64; - static gchar date_buf[64]; /* buf_size is not ... */ - static gchar now_buf[64]; /* ...const enough... */ + const guint BUF_SIZE = 64; + gchar date_buf[BUF_SIZE]; + gchar now_buf [BUF_SIZE]; now = time (NULL); - - localtime_r(&now, &now_tm); - localtime_r(&date, &date_tm); - - /* get today's date */ - modest_text_utils_strftime (date_buf, buf_size, "%x", &date_tm); - modest_text_utils_strftime (now_buf, buf_size, "%x", &now_tm); - /* today */ + modest_text_utils_strftime (date_buf, BUF_SIZE, "%x", date); + modest_text_utils_strftime (now_buf, BUF_SIZE, "%x", now); /* today */ + /* if this is today, get the time instead of the date */ if (strcmp (date_buf, now_buf) == 0) - strftime (date_buf, buf_size, _("%X"), &date_tm); - - return date_buf; + modest_text_utils_strftime (date_buf, BUF_SIZE, _("%X"), date); + + return g_strdup(date_buf); +} + +gboolean +modest_text_utils_validate_email_address (const gchar *email_address) +{ + int count = 0; + const gchar *c = NULL, *domain = NULL; + static gchar *rfc822_specials = "()<>@,;:\\\"[]"; + + /* first we validate the name portion (name@domain) */ + for (c = email_address; *c; c++) { + if (*c == '\"' && + (c == email_address || + *(c - 1) == '.' || + *(c - 1) == '\"')) { + while (*++c) { + if (*c == '\"') + break; + if (*c == '\\' && (*++c == ' ')) + continue; + if (*c <= ' ' || *c >= 127) + return FALSE; + } + if (!*c++) + return FALSE; + if (*c == '@') + break; + if (*c != '.') + return FALSE; + continue; + } + if (*c == '@') + break; + if (*c <= ' ' || *c >= 127) + return FALSE; + if (strchr(rfc822_specials, *c)) + return FALSE; + } + if (c == email_address || *(c - 1) == '.') + return FALSE; + + /* next we validate the domain portion (name@domain) */ + if (!*(domain = ++c)) + return FALSE; + do { + if (*c == '.') { + if (c == domain || *(c - 1) == '.') + return FALSE; + count++; + } + if (*c <= ' ' || *c >= 127) + return FALSE; + if (strchr(rfc822_specials, *c)) + return FALSE; + } while (*++c); + + return (count >= 1) ? TRUE : FALSE; +} + + + + +gchar * +modest_text_utils_get_display_size (guint size) +{ + const guint KB=1024; + const guint MB=1024 * KB; + const guint GB=1024 * MB; + const guint TB=1024 * GB; + + if (size < KB) + return g_strdup_printf (_("%0.1f Kb"), (double)size / KB); + else if (size < MB) + return g_strdup_printf (_("%d Kb"), size / KB); + else if (size < GB) + return g_strdup_printf (_("%d Mb"), size / MB); + else if (size < TB) + return g_strdup_printf (_("%d Gb"), size/ GB); + else + return g_strdup_printf (_("Very big")); }