* renamed modest-tny-msg-action.[ch] => modest-tny-msg.[ch]

[modest] / src / modest-text-utils.c

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index e5712ed..e1f82cc 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -34,7 +34,8 @@
 #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
@@ -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,7 +181,6 @@ 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", sent_date);
 
@@ -522,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,
@@ -766,15 +770,7 @@ modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insens
 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,
+       return modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr (),
                                           MODEST_CACHE_MGR_CACHE_TYPE_DATE_STRING);
 }