2007-05-02 Murray Cumming <murrayc@murrayc.com>

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

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 60ee401..de8b38f 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -976,7 +976,74 @@ modest_text_utils_validate_email_address (const gchar *email_address)
        return (count >= 1) ? TRUE : FALSE;
 }
 
+gboolean 
+modest_text_utils_validate_recipient (const gchar *recipient)
+{
+       gchar *stripped;
+       gchar *right_part;
+       gint i = 0;
+       gboolean has_error = FALSE;
+
+       if (modest_text_utils_validate_email_address (recipient))
+               return TRUE;
+       stripped = g_strdup (recipient);
+       stripped = g_strstrip (stripped);
+
+       if (stripped[0] == '\0') {
+               g_free (stripped);
+               return FALSE;
+       }
+
+       /* quoted string */
+       if (stripped[0] == '\"') {
+               i = 1;
+               has_error = TRUE;
+               for (i = 1; stripped[i] != '\0'; i++) {
+                       if (stripped[i] == '\\') {
+                               if (stripped[i+1] >=0) {
+                                       i++;
+                               } else {
+                                       has_error = TRUE;
+                                       break;
+                               }
+                       } else if (stripped[i] == '\"') {
+                               has_error = FALSE;
+                               break;
+                       }
+               }
+       } else {
+               has_error = TRUE;
+               for (i = 0; stripped[i] != '\0'; i++) {
+                       if (stripped[i] == ' ') {
+                               has_error = FALSE;
+                               break;
+                       }
+               }
+       }
+               
+       if (has_error) {
+               g_free (stripped);
+               return FALSE;
+       }
 
+       right_part = g_strdup (stripped + i);
+       g_free (stripped);
+       right_part = g_strstrip (right_part);
+       if (g_str_has_prefix (right_part, "<") &&
+           g_str_has_suffix (right_part, ">")) {
+               gchar *address;
+               gboolean valid;
+
+               address = g_strndup (right_part+1, strlen (right_part) - 2);
+               g_free (right_part);
+               valid = modest_text_utils_validate_email_address (address);
+               g_free (address);
+               return valid;
+       } else {
+               g_free (right_part);
+               return FALSE;
+       }
+}
 
 
 gchar *
@@ -985,16 +1052,19 @@ modest_text_utils_get_display_size (guint size)
        const guint KB=1024;
        const guint MB=1024 * KB;
        const guint GB=1024 * MB;
-       const guint TB=1024 * GB;
-
-       if (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)
-               return g_strdup_printf (_("%d Mb"), size / MB);
-       else if (size < TB)
-               return g_strdup_printf (_("%d Gb"), size/ GB);
+
+       g_message ("SIZE: %d",size);
+
+       if (0 < size && size < KB)
+               return g_strdup_printf (_FM("sfil_li_size_kb"), 1);
+       else if (KB <= size && size < 100 * KB)
+               return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);
+       else if (100*KB <= size && size < MB)
+               return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), size / MB);
+       else if (MB <= size && size < 10*MB)
+               return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), size / MB);
+       else if (10*MB <= size && size < GB)
+               return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), size / MB);
        else
-               return g_strdup_printf (_("Very big"));
+               return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), size / GB); 
 }