* all:

[modest] / src / modest-tny-folder.c

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index e42d3e3..8ef6a4c 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -84,10 +84,14 @@ modest_tny_folder_guess_folder_type (const TnyFolder *folder)
 
        g_return_val_if_fail (folder, TNY_FOLDER_TYPE_UNKNOWN);
 
-       type = tny_folder_get_folder_type ((TnyFolder*)folder); /* FIXME: cast tinymail */
+       type = tny_folder_get_folder_type (TNY_FOLDER (folder));
        
-       if (type == TNY_FOLDER_TYPE_UNKNOWN)
-               type =  modest_tny_folder_guess_folder_type_from_name (tny_folder_get_name (folder));
+       if (type == TNY_FOLDER_TYPE_UNKNOWN) {
+               const gchar *folder_name;
+
+               folder_name = tny_folder_get_name (TNY_FOLDER (folder));
+               type =  modest_tny_folder_guess_folder_type_from_name (folder_name);
+       }
 
        return type;
 }