X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.h;h=c11f3a7b5cc9e37968cc5eacfd6cb99ba66a8f99;hp=9526a3c32cc3997adc001652fbb7a6e9135f1d1d;hb=3449c1e0b6acdd87e28263928d9cf079f075e06f;hpb=4917dae327fb275f620961d4009762cd22b7e71e

diff --git a/src/modest-tny-folder.h b/src/modest-tny-folder.h
index 9526a3c..c11f3a7 100644
--- a/src/modest-tny-folder.h
+++ b/src/modest-tny-folder.h
@@ -53,13 +53,7 @@ typedef enum {
  * functions for working with a TnyFolder. tinymail does not seem to offer any 
  * easy way to cause derived TnyFolders to be instantiated.
  */
- 
-/* TODO: These "const TnyFolder*" arguments will eventually need to 
- * be "TnyFolder*". C cannot support constness for complex objects like C++ 
- * can, because it lacks the mutable keyword and doesn't allow both const 
- * and non-const get function overloads.
- */
- 
+  
 /**
  * modest_tny_folder_guess_type:
  * @folder: a valid tnymail folder
@@ -70,7 +64,7 @@ typedef enum {
  *  
  * Returns: the folder type, or TNY_FOLDER_TYPE_UNKNOWN
  */
-TnyFolderType  modest_tny_folder_guess_folder_type   (const TnyFolder *folder);
+TnyFolderType  modest_tny_folder_guess_folder_type   (TnyFolder *folder);
 
 
 
@@ -138,7 +132,7 @@ ModestTnyFolderRules  modest_tny_folder_get_rules   (TnyFolder *folder);
  *  
  * Returns: get the help_id for this folder, or NULL in case of error
  */
-const gchar* modest_tny_folder_get_help_id (const TnyFolder *folder);
+const gchar* modest_tny_folder_get_help_id (TnyFolder *folder);
 
 
 /**
@@ -184,6 +178,8 @@ gchar* modest_tny_folder_get_header_unique_id (TnyHeader *header);
  * modest_tny_folder_has_subfolder_with_name:
  * @folder: a #TnyFolderStore 
  * @name: the name to check into subfolders.
+ * @nonstrict: if TRUE, also match on different-case and current-locale
+ * display versions of the name
  *   
  * This function check if subfolders of @folder has the same
  * name as @name.
@@ -191,7 +187,8 @@ gchar* modest_tny_folder_get_header_unique_id (TnyHeader *header);
  * Returns: TRUE if some subfolder has the name @name.
  **/
 gboolean modest_tny_folder_has_subfolder_with_name (TnyFolderStore *folder,
-						    const gchar *name);
+						    const gchar *name,
+						    gboolean nonstrict);
 
 /**
  * modest_tny_folder_is_ancestor:
@@ -206,6 +203,16 @@ gboolean modest_tny_folder_has_subfolder_with_name (TnyFolderStore *folder,
 gboolean modest_tny_folder_is_ancestor (TnyFolder *folder,
 					TnyFolderStore *ancestor);
 
+/**
+ * modest_tny_folder_get_display_name:
+ * @folder: a #TnyFolder
+ *
+ * obtain the display name for @folder
+ *
+ * Returns: a newly allocated string
+ */
+gchar * modest_tny_folder_get_display_name (TnyFolder *folder);
+
 G_END_DECLS
 
 #endif /* __MODEST_TNY_FOLDER_H__*/