* Add a new widget ModestProgressBarWidget to work as observer
[modest] / src / modest-text-utils.c
index 1d3c6e7..e2dcf79 100644 (file)
@@ -48,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
@@ -121,7 +122,6 @@ modest_text_utils_quote (const gchar *text,
 
        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);
        
@@ -148,7 +148,6 @@ modest_text_utils_cite (const gchar *text,
 
        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);
@@ -178,9 +177,7 @@ modest_text_utils_inline (const gchar *text,
 
        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);
        
        modest_text_utils_strftime (sent_str, 100, "%c", sent_date);
 
@@ -193,10 +190,10 @@ 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);
 }
 
@@ -206,17 +203,14 @@ modest_text_utils_inline (const gchar *text,
 gsize
 modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet)
 {
-       /* 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 tm;
+
+       /* does not work on old maemo glib: 
+        *   g_date_set_time_t (&date, timet);
         */
+       localtime_r (&timet, &tm);
 
-       struct tm *time_tm;
-       time_tm = localtime (&timet);
-       
-       return strftime (s, max, fmt, time_tm);
+       return strftime(s, max, fmt, &tm);
 }
 
 gchar *
@@ -278,58 +272,54 @@ modest_text_utils_remove_address (const gchar *address_list, const gchar *addres
        return result;
 }
 
+
 gchar*
 modest_text_utils_convert_to_html (const gchar *data)
 {
        guint            i;
-       gboolean         first_space = TRUE;
+       gboolean        space_seen = FALSE;
        GString         *html;      
        gsize           len;
-
+       
        if (!data)
                return NULL;
 
        len = strlen (data);
-       html = g_string_sized_new (len + 100);  /* just a  guess... */
-       
+       html = g_string_sized_new (1.5 * len);  /* just a  guess... */
+
        g_string_append_printf (html,
-                               "<html>"
-                               "<head>"
-                               "<meta http-equiv=\"content-type\""
-                               " content=\"text/html; charset=utf8\">"
+                               "<html><head>"
+                               "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf8\">"
                                "</head>"
                                "<body><tt>");
        
        /* replace with special html chars where needed*/
        for (i = 0; i != len; ++i)  {
-               char    kar = data[i]; 
+               char kar = data[i];
+               
+               if (space_seen && kar != ' ') {
+                       g_string_append_c (html, ' ');
+                       space_seen = FALSE;
+               }
+               
                switch (kar) {
-                       
                case 0:  break; /* ignore embedded \0s */       
-               case '<' : g_string_append   (html, "&lt;"); break;
-               case '>' : g_string_append   (html, "&gt;"); break;
-               case '&' : g_string_append   (html, "&quot;"); break;
-               case '\n': g_string_append   (html, "<br>\n"); break;
+               case '<'  : g_string_append (html, "&lt;");   break;
+               case '>'  : g_string_append (html, "&gt;");   break;
+               case '&'  : g_string_append (html, "&amp;");  break;
+               case '"'  : g_string_append (html, "&quot;");  break;
+               case '\'' : g_string_append (html, "&apos;"); break;
+               case '\n' : g_string_append (html, "<br>\n");  break;
+               case '\t' : g_string_append (html, "&nbsp;&nbsp;&nbsp; "); break; /* note the space at the end*/
+               case ' ':
+                       if (space_seen) { /* second space in a row */
+                               g_string_append (html, "&nbsp ");
+                               space_seen = FALSE;
+                       } else
+                               space_seen = TRUE;
+                       break;
                default:
-                       if (kar == ' ') {
-                               g_string_append (html, first_space ? " " : "&nbsp;");
-                               first_space = FALSE;
-                       } else  if (kar == '\t')
-                               g_string_append (html, "&nbsp; &nbsp;&nbsp;");
-                       else {
-                               int charnum = 0;
-                               first_space = TRUE;
-                               /* optimization trick: accumulate 'normal' chars, then copy */
-                               do {
-                                       kar = data [++charnum + i];
-                                       
-                               } while ((i + charnum < len) &&
-                                        (kar > '>' || (kar != '<' && kar != '>'
-                                                       && kar != '&' && kar !=  ' '
-                                                       && kar != '\n' && kar != '\t')));
-                               g_string_append_len (html, &data[i], charnum);
-                               i += (charnum  - 1);
-                       }
+                       g_string_append_c (html, kar);
                }
        }
        
@@ -339,6 +329,88 @@ 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;
+
+}
+
+void
+modest_text_utils_address_range_at_position (const gchar *recipients_list,
+                                            gint position,
+                                            gint *start,
+                                            gint *end)
+{
+       gchar *current = NULL;
+       gint range_start = 0;
+       gint range_end = 0;
+       gint index;
+       gboolean is_quoted = FALSE;
+
+       index = 0;
+       for (current = (gchar *) recipients_list; *current != '\0'; current = g_utf8_find_next_char (current, NULL)) {
+               gunichar c = g_utf8_get_char (current);
+
+               if ((c == ',') && (!is_quoted)) {
+                       if (index < position) {
+                               range_start = index + 1;
+                       } else {
+                               break;
+                       }
+               } else if (c == '\"') {
+                       is_quoted = !is_quoted;
+               } else if ((c == ' ') &&(range_start == index)) {
+                       range_start ++;
+               }
+               index ++;
+               range_end = index;
+       }
+
+       if (start)
+               *start = range_start;
+       if (end)
+               *end = range_end;
+}
+
+
 /* ******************************************************************* */
 /* ************************* UTILIY FUNCTIONS ************************ */
 /* ******************************************************************* */
@@ -493,7 +565,9 @@ cite (const time_t sent_date, const gchar *from)
 
        /* format 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);
+       return g_strdup_printf (N_("On %s, %s wrote:\n"), 
+                               sent_str, 
+                               (from) ? from : EMPTY_STRING);
 }
 
 
@@ -667,7 +741,8 @@ hyperlinkify_plain_text (GString *txt)
 
                /* 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 */
@@ -780,12 +855,12 @@ modest_text_utils_get_display_date (time_t date)
        
        now = time (NULL);
 
-       modest_text_utils_strftime (date_buf, BUF_SIZE, "%x", date);
-       modest_text_utils_strftime (now_buf,  BUF_SIZE, "%x",  now); /* today */
+       modest_text_utils_strftime (date_buf, BUF_SIZE, "%d/%m/%Y", date);
+       modest_text_utils_strftime (now_buf,  BUF_SIZE, "%d/%m/%Y",  now); /* today */
        
        /* if this is today, get the time instead of the date */
        if (strcmp (date_buf, now_buf) == 0)
-               modest_text_utils_strftime (date_buf, BUF_SIZE, _("%X"), date);
+               modest_text_utils_strftime (date_buf, BUF_SIZE, "%H:%M %P", date);
        
        return g_strdup(date_buf);
 }
@@ -794,7 +869,7 @@ gboolean
 modest_text_utils_validate_email_address (const gchar *email_address)
 {
        int count = 0;
-       const gchar *c, *domain;
+       const gchar *c = NULL, *domain = NULL;
        static gchar *rfc822_specials = "()<>@,;:\\\"[]";
 
        /* first we validate the name portion (name@domain) */