#include <glib/gi18n.h>
#include <regex.h>
#include <modest-tny-platform-factory.h>
-#include "modest-text-utils.h"
+#include <modest-text-utils.h>
+#include <modest-runtime.h>
#ifdef HAVE_CONFIG_H
#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
g_return_val_if_fail (text, NULL);
g_return_val_if_fail (content_type, NULL);
- g_return_val_if_fail (from, NULL);
cited = cite (sent_date, from);
{
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);
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));
+ modest_text_utils_strftime (sent_str, 100, "%c", sent_date);
if (!strcmp (content_type, "text/html"))
/* TODO: extract the <body> of the HTML and pass it to
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;
+
+ /* FIXME: deprecated in newer glib versions */
+ g_date_set_time (&date, (GTime) timet);
+ return g_date_strftime (s, max, fmt, (const GDate*) &date);
}
gchar *
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);
}
} else {
do {
breakpoint =
- get_breakpoint (remaining-> str,
+ get_breakpoint (remaining->str,
rem_indent,
limit);
append_quoted (q, rem_indent,
/* 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) {
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)
/* make a list of our matches (<offset, len, prefix> 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;
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.
/* the prefix is NULL: use the one that is already there */
repl = g_strdup_printf ("<a href=\"%s%s\">%s</a>",
- match->prefix ? match->prefix : "", url, url);
+ match->prefix ? match->prefix : EMPTY_STRING,
+ url, url);
/* replace the old thing with our hyperlink
* replacement thing */
g_free (url);
g_free (repl);
- g_free (cursor->data);
+ g_slice_free (url_match_t, match);
}
g_slist_free (match_list);
/* 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);
return result;
}
-static GHashTable*
-get_display_date_cache (void)
-{
- TnyPlatformFactory *fakt;
- ModestCacheMgr *cache_mgr;
-
- fakt = modest_tny_platform_factory_get_instance ();
-
- cache_mgr = modest_tny_platform_factory_get_cache_mgr_instance
- (MODEST_TNY_PLATFORM_FACTORY(fakt));
-
- return modest_cache_mgr_get_cache (cache_mgr,
- MODEST_CACHE_MGR_CACHE_TYPE_DATE_STRING);
-}
-
-
-const gchar*
+gchar*
modest_text_utils_get_display_date (time_t date)
{
- static GHashTable *date_cache = NULL;
-
- struct tm date_tm, now_tm;
time_t now;
-
const guint BUF_SIZE = 64;
gchar date_buf[BUF_SIZE];
gchar now_buf [BUF_SIZE];
- gchar* cached_val;
- if (G_UNLIKELY(!date_cache))
- date_cache = get_display_date_cache ();
-
- cached_val = g_hash_table_lookup (date_cache, &date);
- if (cached_val)
- return cached_val;
-
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);
-
- cached_val = g_strdup(date_buf);
- g_hash_table_insert (date_cache, (gpointer)&date, (gpointer)cached_val);
+ modest_text_utils_strftime (date_buf, BUF_SIZE, _("%X"), date);
- return cached_val;
+ return g_strdup(date_buf);
}
gboolean
const guint TB=1024 * GB;
if (size < KB)
- return g_strdup_printf (_("%0.2f Kb"), (double)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)
projects / modest / blobdiff