Fix for bug NB#81584.

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

diff --git a/src/modest-text-utils.h b/src/modest-text-utils.h
index 4077bab..b2e56ea 100644 (file)
--- a/src/modest-text-utils.h
+++ b/src/modest-text-utils.h
@@ -37,6 +37,7 @@
 #include <glib.h>
 #include <gdk/gdkcolor.h>
 #include <gtk/gtktextbuffer.h>
 #include <glib.h>
 #include <gdk/gdkcolor.h>
 #include <gtk/gtktextbuffer.h>

+#include <gtk/gtklabel.h>

 
 #define _FM(str) dgettext("hildon-fm",str)
 #define _CS(str) dgettext("hildon-common-strings",str)
 
 #define _FM(str) dgettext("hildon-fm",str)
 #define _CS(str) dgettext("hildon-common-strings",str)

@@ -128,11 +129,11 @@ gchar*   modest_text_utils_inline (const gchar *text,
 
 /**
  * modest_text_utils_remove_address
 
 /**
  * modest_text_utils_remove_address

- * @address_list: none-NULL string with a comma-separated list of email addresses
+ * @address_list: non-NULL string with a comma-separated list of email addresses

  * @address: an specific e-mail address 
  *
  * remove a specific address from a list of email addresses; if @address
  * @address: an specific e-mail address 
  *
  * remove a specific address from a list of email addresses; if @address

- * is NULL, returns an unchanged @address_list
+ * is NULL, returns an unchanged (but newly allocated) @address_list

  * 
  * Returns: a newly allocated string containing the new list, or NULL
  * in case of error or the original @address_list was NULL
  * 
  * Returns: a newly allocated string containing the new list, or NULL
  * in case of error or the original @address_list was NULL

@@ -140,6 +141,20 @@ gchar*   modest_text_utils_inline (const gchar *text,
 gchar*   modest_text_utils_remove_address (const gchar *address_list, 
                                           const gchar *address);
 
 gchar*   modest_text_utils_remove_address (const gchar *address_list, 
                                           const gchar *address);
 

+
+/**
+ * modest_text_utils_remove_duplicate_addresses
+ * @address_list: non-NULL string with a comma-separated list of email addresses
+ *
+ * remove duplicate addresses from a list of email addresses
+ * 
+ * Returns: a newly allocated string containing the new list, or NULL
+ * in case of error or the original @address_list was NULL
+ */
+gchar*   modest_text_utils_remove_duplicate_addresses (const gchar *address_list); 
+                                                   
+
+

 /**
  * modest_text_utils_address_range_at_position:
  * @address_list: non-NULL utf8 string containing a list of addresses
 /**
  * modest_text_utils_address_range_at_position:
  * @address_list: non-NULL utf8 string containing a list of addresses

@@ -352,10 +367,11 @@ gboolean     modest_text_utils_validate_recipient (const gchar *recipient,
  * obtains a GSList of addresses from a string of addresses
  * in the format understood by email protocols
  *
  * obtains a GSList of addresses from a string of addresses
  * in the format understood by email protocols
  *

- * Returns: a GSList of strings
+ * Returns: a newly allocated GSList of strings

  **/
 GSList      *modest_text_utils_split_addresses_list (const gchar *addresses);
 
  **/
 GSList      *modest_text_utils_split_addresses_list (const gchar *addresses);
 

+

 /**
  * modest_text_utils_get_addresses_indexes:
  * @addresses: a string
 /**
  * modest_text_utils_get_addresses_indexes:
  * @addresses: a string

@@ -370,6 +386,16 @@ 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);
 
 /**
 void         modest_text_utils_get_addresses_indexes (const gchar *addresses, GSList **start_indexes, GSList **end_indexes);
 
 /**

+ * modest_text_utils_address_with_standard_length:
+ * @recipients_list: a string
+ *
+ * obtains the list of recipients, but making sure that lines are not longer than 1000 chars
+ *
+ * Returns: a newly allocated string
+ */
+gchar *      modest_text_utils_address_with_standard_length (const gchar *recipients_list);
+
+/**

  * modest_text_utils_get_color_string:
  * @color: a #GdkColor
  *
  * modest_text_utils_get_color_string:
  * @color: a #GdkColor
  *

@@ -397,6 +423,15 @@ typedef enum {
        USER_NAME_FORBIDDEN_NAMES,
 } ModestTextUtilsForbiddenCharType;
 
        USER_NAME_FORBIDDEN_NAMES,
 } ModestTextUtilsForbiddenCharType;
 

+/**
+ * modest_text_utils_label_get_selection:
+ * @label: a #GtkLabel
+ *
+ * Obtain the current selection of @label
+ *
+ * Returns: a string with current selection, or %NULL if no selection in @label
+ */
+gchar *      modest_text_utils_label_get_selection (GtkLabel *label);

 
 /**
  * modest_text_utils_is_forbidden_char:
 
 /**
  * modest_text_utils_is_forbidden_char:

@@ -410,5 +445,26 @@ typedef enum {
 gboolean     modest_text_utils_is_forbidden_char (const gchar character,
                                                  ModestTextUtilsForbiddenCharType type);
 
 gboolean     modest_text_utils_is_forbidden_char (const gchar character,
                                                  ModestTextUtilsForbiddenCharType type);
 

+/**
+ * modest_text_utils_buffer_selection_is_valid:
+ * @buffer: a #GtkTextBuffer
+ *
+ * Checks if @buffer contains a valid selection for cut/copy. This means it's
+ * not empty, and no images are in the selection.
+ *
+ * Returns: %TRUE if there's a valid selection, false otherwise.
+ */
+gboolean     modest_text_utils_buffer_selection_is_valid (GtkTextBuffer *buffer);
+
+/**
+ * modest_text_utils_escape_mnemonics:
+ * @text: a string
+ *
+ * obtains the representation of text, but escaping mnemonics (we duplicate _)
+ *
+ * Returns: a newly allocated string
+ */
+gchar *modest_text_utils_escape_mnemonics (const gchar *text);
+

 
 #endif /* __MODEST_TEXT_UTILS_H__ */
 
 #endif /* __MODEST_TEXT_UTILS_H__ */