X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-text-utils.c;h=1d3c6e730b997e092c796e432e8dc0d9a45e36f8;hb=b54ca9c03e98c7cf3baa11d452cee75f6bb79d9c;hp=1d6db0fcddded9a0e6e94ffe1faef0047c15df31;hpb=476fcdad90d5da94ce7d42d821d7bd9b885a2d01;p=modest diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index 1d6db0f..1d3c6e7 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -34,7 +34,8 @@ #include #include #include -#include "modest-text-utils.h" +#include +#include #ifdef HAVE_CONFIG_H @@ -145,6 +146,10 @@ 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); + g_return_val_if_fail (from, NULL); + tmp = cite (sent_date, from); retval = g_strdup_printf ("%s%s\n", tmp, text); g_free (tmp); @@ -176,9 +181,8 @@ modest_text_utils_inline (const gchar *text, 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 of the HTML and pass it to @@ -199,10 +203,20 @@ modest_text_utils_inline (const gchar *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); + /* only since Gtk 2.10 + * + *static GDate date; + *g_date_set_time_t (&date, timet); + *return g_date_strftime (s, max, fmt, (const GDate*) &date); + */ + + struct tm *time_tm; + time_tm = localtime (&timet); + + return strftime (s, max, fmt, time_tm); } gchar * @@ -478,7 +492,7 @@ 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)); + modest_text_utils_strftime (sent_str, 100, "%c", sent_date); return g_strdup_printf (N_("On %s, %s wrote:\n"), sent_str, from); } @@ -512,7 +526,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, @@ -586,9 +600,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) { @@ -596,7 +612,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) @@ -610,7 +626,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; @@ -622,7 +638,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. @@ -661,7 +677,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); @@ -737,17 +753,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); @@ -757,61 +769,25 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens 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 @@ -883,7 +859,7 @@ modest_text_utils_get_display_size (guint size) 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)