{
gchar *retval, *cited;
- cited = cite (sent_date, from);
+ g_return_val_if_fail (text, NULL);
+ g_return_val_if_fail (content_type, NULL);
+ g_return_val_if_fail (from, NULL);
- if (!strcmp (content_type, "text/html"))
+ cited = cite (sent_date, from);
+
+ if (content_type && strcmp (content_type, "text/html") == 0)
/* TODO: extract the <body> 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;
"<br><br>%s";
const gchar *format;
+ g_return_val_if_fail (text, NULL);
+ g_return_val_if_fail (content_type, NULL);
+ g_return_val_if_fail (from, NULL);
+ g_return_val_if_fail (text, NULL);
+ g_return_val_if_fail (to, NULL);
+ g_return_val_if_fail (subject, NULL);
+
modest_text_utils_strftime (sent_str, 100, "%c", localtime (&sent_date));
if (!strcmp (content_type, "text/html"))
{
gchar *tmp;
+ g_return_val_if_fail (prefix, NULL);
+
if (!subject)
- return g_strdup_printf ("%s ", prefix);
+ return g_strdup (prefix);
tmp = g_strchug (g_strdup (subject));
}
}
-gchar *
+gchar*
modest_text_utils_remove_address (const gchar *address_list, const gchar *address)
{
- char *dup, *token, *ptr, *result;
+ gchar *dup, *token, *ptr, *result;
GString *filtered_emails;
- if (!address_list)
- return NULL;
+ g_return_val_if_fail (address_list, NULL);
- /* Search for substring */
+ if (!address)
+ return g_strdup (address_list);
+
+ /* search for substring */
if (!strstr ((const char *) address_list, (const char *) address))
return g_strdup (address_list);
/* Add to list if not found */
if (!strstr ((const char *) token, (const char *) address)) {
if (filtered_emails->len == 0)
- g_string_append_printf (filtered_emails, "%s", token);
+ g_string_append_printf (filtered_emails, "%s", g_strstrip (token));
else
- g_string_append_printf (filtered_emails, ",%s", token);
+ g_string_append_printf (filtered_emails, ",%s", g_strstrip (token));
}
token = strtok_r (NULL, ",", &ptr);
}
gchar*
-modest_text_utils_display_address (gchar *address)
+modest_text_utils_get_display_address (gchar *address)
{
gchar *cursor;
g_return_val_if_fail (g_utf8_validate (address, -1, NULL), NULL);
- /* simplistic --> remove <email@address> from display name */
+ g_strchug (address); /* remove leading whitespace */
+
+ /* <email@address> from display name */
cursor = g_strstr_len (address, strlen(address), "<");
+ if (cursor == address) /* there's nothing else? leave it */
+ return address;
if (cursor)
cursor[0]='\0';
- /* simplistic --> remove (bla bla) from display name */
+ /* remove (bla bla) from display name */
cursor = g_strstr_len (address, strlen(address), "(");
+ if (cursor == address) /* there's nothing else? leave it */
+ return address;
if (cursor)
cursor[0]='\0';
-
+
+ g_strchomp (address); /* remove trailing whitespace */
+
return address;
}
+
+
+gint
+modest_text_utils_get_subject_prefix_len (const gchar *sub)
+{
+ gint i;
+ static const gchar* prefix[] = {
+ "Re:", "RE:", "Fwd:", "FWD:", "FW:", NULL
+ };
+
+ if (!sub || (sub[0] != 'R' && sub[0] != 'F')) /* optimization */
+ return 0;
+
+ i = 0;
+
+ while (prefix[i]) {
+ if (g_str_has_prefix(sub, prefix[i])) {
+ int prefix_len = strlen(prefix[i]);
+ if (sub[prefix_len] == ' ')
+ ++prefix_len; /* ignore space after prefix as well */
+ return prefix_len;
+ }
+ ++i;
+ }
+ return 0;
+}
+
+
+gint
+modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insensitive)
+{
+ gint result = 0;
+ gchar *n1, *n2;
+
+ /* 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);
+
+ n1 = g_utf8_collate_key (s1, -1);
+ n2 = g_utf8_collate_key (s2, -1);
+
+ result = strcmp (n1, n2);
+
+ g_free (n1);
+ g_free (n2);
+
+ return result;
+}
+
+
+const 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... */
+
+ 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 */
+
+ /* 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;
+}
projects / modest / blobdiff