X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-text-utils.h;h=07b1c66038defc88ddffb4bc4baf66ed81cc4b66;hb=2c504ca99667e77ebdd378643a1c442d2029db79;hp=555e08c6a2d938a9b218eab626f323c6dc28841a;hpb=556398d85f1803ab8d4871a107bc4b8938c444ae;p=modest

diff --git a/src/modest-text-utils.h b/src/modest-text-utils.h
index 555e08c..07b1c66 100644
--- a/src/modest-text-utils.h
+++ b/src/modest-text-utils.h
@@ -35,8 +35,10 @@
 
 #include <time.h>
 #include <glib.h>
+#include <gdk/gdkcolor.h>
 
 #define _FM(str) dgettext("hildon-fm",str)
+#define _CS(str) dgettext("hildon-common-strings",str)
 
 /**
  * modest_text_utils_derived_subject:
@@ -60,6 +62,7 @@ gchar* modest_text_utils_derived_subject (const gchar *subject,
  * @content_type: the non-NULL content type for the quoting, e.g. "text/html"
  * @signature: NULL or the signature to add
  * @sent_date: sent date/time of the original message
+ * @attachments: a #GList of the attachments
  * @limit: specifies the maximum characters per line in the quoted text
  * 
  * quote an existing message
@@ -71,6 +74,7 @@ gchar* modest_text_utils_quote (const gchar *text,
 				const gchar *signature,
 			        const gchar *from,
 			        const time_t sent_date, 
+				GList *attachments,
 				int limit);
 
 
@@ -189,8 +193,11 @@ size_t modest_text_utils_strftime(char *s, size_t max, const char  *fmt, time_t
  * ie. removes "<...>" and "(...)" parts
  * the change is in-place; removes leading/trailing whitespace
  * 
- * Returns: the new address. The string is *not* newly allocated.
- * NULL in case of error
+ * Returns: the new address of the string; this new string
+ * is _NOT_ newly allocated, so should not be freed. (remember
+ * the old address of the parameter if that one needs to be freed)
+ * 
+ * NULL in case of error or if address == NULL
  */
 gchar* modest_text_utils_get_display_address (gchar *address);
 
@@ -242,7 +249,7 @@ gchar* modest_text_utils_get_display_date (time_t date);
  * Returns: the newly allocated display string for the
  * size in bytes. must be freed.
  */
-gchar * modest_text_utils_get_display_size (guint size);
+gchar * modest_text_utils_get_display_size (guint64 size);
 
 
 /**
@@ -292,4 +299,15 @@ GSList      *modest_text_utils_split_addresses_list (const gchar *addresses);
  **/
 void         modest_text_utils_get_addresses_indexes (const gchar *addresses, GSList **start_indexes, GSList **end_indexes);
 
+/**
+ * modest_text_utils_get_color_string:
+ * @color: a #GdkColor
+ *
+ * Obtains a proper markup string for @color, in the format used
+ * by Pango and HTML.
+ *
+ * Returns: a newly allocated string
+ */
+gchar *      modest_text_utils_get_color_string (GdkColor *color);
+
 #endif /* __MODEST_TEXT_UTILS_H__ */