gchar*
-modest_text_utils_display_address (gchar *address)
+modest_text_utils_get_display_address (gchar *address)
{
gchar *cursor;
return address;
}
+
+
+gint
+modest_text_utils_get_subject_prefix_len (const gchar *sub)
+{
+ gint i;
+ static const gchar* prefix[] = {
+ "Re:", "RE:", "Fwd:", "FWD:", "FW:", NULL
+ };
+
+ if (!sub || (sub[0] != 'R' && sub[0] != 'F')) /* optimization */
+ return 0;
+
+ i = 0;
+
+ while (prefix[i]) {
+ if (g_str_has_prefix(sub, prefix[i])) {
+ int prefix_len = strlen(prefix[i]);
+ if (sub[prefix_len] == ' ')
+ ++prefix_len; /* ignore space after prefix as well */
+ return prefix_len;
+ }
+ ++i;
+ }
+ return 0;
+}
+
+
+gint
+modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insensitive)
+{
+ gint result = 0;
+ gchar *n1, *n2;
+
+ /* 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);
+
+ n1 = g_utf8_collate_key (s1, -1);
+ n2 = g_utf8_collate_key (s2, -1);
+
+ result = strcmp (n1, n2);
+
+ g_free (n1);
+ g_free (n2);
+
+ return result;
+}
+
+
+const gchar*
+modest_text_utils_get_display_date (time_t date)
+{
+ struct tm date_tm, now_tm;
+ time_t now;
+
+ const gint buf_size = 64;
+ static gchar date_buf[64]; /* buf_size is not ... */
+ static gchar now_buf[64]; /* ...const enough... */
+
+ 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 */
+
+ /* 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);
+
+ return date_buf;
+}
/**
- * modest_text_utils_display_addres:
+ * modest_text_utils_get_display_addres:
* @address: original address (UTF8 string)
*
* make a 'display address' from an address:
* Returns: the new address. The string is *not* newly allocated.
* NULL in case of error
*/
-gchar* modest_text_utils_display_address (gchar *address);
+gchar* modest_text_utils_get_display_address (gchar *address);
+/**
+ * modest_text_utils_get_subject_prefix_len:
+ * @subject: original subject (UTF8 string)
+ *
+ * determine the length of the "Re:/RE:/Fwd:" prefix in an e-mail address
+ *
+ * Returns: the length of the prefix, or 0 if there is none
+ */
+gint modest_text_utils_get_subject_prefix_len (const gchar *sub);
+
+
+/**
+ * modest_text_utils_utf8_strcmp:
+ * @s1: the first string
+ * @s2: the second string
+ * @insensitive: should the comparison be case-insensitive?
+ *
+ * a strcmp that is NULL-safe, can deal with UTF8 and case-insensitive comparison
+ *
+ * Returns: an integer less than, equal to, or greater than zero if s1 is found,
+ * respectively, to be less than, to match, or be greater than s2.
+ */
+gint modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insensitive);
+
+
+
+/**
+ * modest_text_utils_get_display_date:
+ * @date: the date to display
+ *
+ * get a string representation for a date.
+ *
+ *
+ * Returns: the new display date. The string is *not* newly allocated,
+ * but is a static buffer (for optimization reasons). Therefore, when
+ * you call this function, you will loose the data.
+ */
+const gchar* modest_text_utils_get_display_date (time_t date);
+
#endif /* __MODEST_TEXT_UTILS_H__ */
&flags, -1);
if (flags & TNY_HEADER_FLAG_DELETED)
- pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_DELETED);
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_DELETED);
else if (flags & TNY_HEADER_FLAG_SEEN)
- pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_READ);
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_READ);
else
- pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_UNREAD);
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_UNREAD);
g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
}
g_object_set (G_OBJECT(renderer),
"text",
- modest_text_utils_display_address (address),
+ modest_text_utils_get_display_address (address),
"weight",
(flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800,
"style",
g_free (address);
}
-
-
-
-/* not reentrant/thread-safe */
-const gchar*
-display_date (time_t date)
-{
- struct tm date_tm, now_tm;
- time_t now;
-
- const gint buf_size = 64;
- static gchar date_buf[64]; /* buf_size is not ... */
- static gchar now_buf[64]; /* ...const enough... */
-
- 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 */
-
- /* 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);
-
- return date_buf;
-}
-
-
static void
compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
rendobj = G_OBJECT(renderer);
header = g_strdup_printf ("%s %s\n%s",
- modest_text_utils_display_address (from),
- display_date(date),
+ modest_text_utils_get_display_address (from),
+ modest_text_utils_get_display_date (date),
subject);
g_object_set (G_OBJECT(renderer),
GtkTreeViewColumn *column;
column = gtk_tree_view_column_new_with_attributes(name, renderer, NULL);
- gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_column_set_resizable (column, resizable);
if (resizable)
}
-
-/* get the length of any prefix that should be ignored for sorting */
-static inline int
-get_prefix_len (const gchar *sub)
-{
- gint i;
- static const gchar* prefix[] = {
- "Re:", "RE:", "Fwd:", "FWD:", "FW:", NULL
- };
-
- if (!sub || (sub[0] != 'R' && sub[0] != 'F')) /* optimization */
- return 0;
-
- i = 0;
-
- while (prefix[i]) {
- if (g_str_has_prefix(sub, prefix[i])) {
- int prefix_len = strlen(prefix[i]);
- if (sub[prefix_len] == ' ')
- ++prefix_len; /* ignore space after prefix as well */
- return prefix_len;
- }
- ++i;
- }
- return 0;
-}
-
-
-
-/* a strcmp that is case insensitive and NULL-safe */
-static gint
-cmp_insensitive_str (const gchar* s1, const gchar *s2)
-{
- gint result = 0;
- gchar *n1, *n2;
-
- /* work even when s1 and/or s2 == NULL */
- if (s1 == s2)
- return 0;
- if (!s1)
- return -1;
- if (!s2)
- return 1;
-
- n1 = g_utf8_collate_key (s1, -1);
- n2 = g_utf8_collate_key (s2, -1);
-
- result = strcmp (n1, n2);
-
- g_free (n1);
- g_free (n2);
-
- return result;
-}
-
-
static gint
cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
gpointer user_data)
-1);
/* the prefix ('Re:', 'Fwd:' etc.) we ignore */
- cmp = cmp_insensitive_str (s1 + get_prefix_len(s1), s2 + get_prefix_len(s2));
+ cmp = modest_text_utils_utf8_strcmp (s1 + modest_text_utils_get_subject_prefix_len(s1),
+ s2 + modest_text_utils_get_subject_prefix_len(s2),
+ TRUE);
g_free (s1);
g_free (s2);
TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
- cmp = cmp_insensitive_str (s1, s2);
+ cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
g_free (s1);
g_free (s2);
TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
- cmp = cmp_insensitive_str (s1, s2);
+ cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
g_free (s1);
g_free (s2);
projects / modest / commitdiff