Changeset 843

Show
Ignore:
Timestamp:
08/30/06 22:36:25
Author:
pvanhoof
Message:

Renamed TnyFolder to TnyCamelFolder

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r841 r843  
    1111        * Renamed TnyMimePart to TnyCamelMimePart 
    1212        * Renamed TnyMsg to TnyCamelMsg 
    13          
     13        * Renamed TnyFolder to TnyCamelFolder 
     14 
    14152006-08-29  Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> 
    1516         

  • trunk/libtinymail-camel/Makefile.am

    r841 r843  
    1010        tny-camel-header.h                      \ 
    1111        tny-camel-msg.h                         \ 
    12         tny-folder.h                          \ 
     12        tny-camel-folder.h                    \ 
    1313        tny-camel-account.h                     \ 
    1414        tny-camel-store-account.h               \ 
    …… 
    2727        tny-camel-msg-priv.h                    \ 
    2828        tny-camel-header-priv.h                 \ 
    29         tny-folder-priv.h                     \ 
     29        tny-camel-folder-priv.h                       \ 
    3030        $(libtinymail_camel_1_0_headers)        \ 
    3131        tny-camel-msg.c                         \ 
    …… 
    3333        tny-camel-mime-part-priv.h              \ 
    3434        tny-camel-mime-part.c                   \ 
    35         tny-folder.c                          \ 
     35        tny-camel-folder.c                    \ 
    3636        tny-camel-account.c                     \ 
    3737        tny-camel-store-account.c               \ 

  • trunk/libtinymail-camel/tny-camel-account.c

    r826 r843  
    2929#include <tny-account-store.h> 
    3030#include <tny-folder-iface.h> 
    31 #include <tny-folder.h> 
     31#include <tny-camel-folder.h> 
    3232 
    3333#include <camel/camel.h> 

  • trunk/libtinymail-camel/tny-camel-common-priv.h

    r770 r843  
    2828#include <camel/camel-folder-summary.h> 
    2929#include <camel/camel-store.h> 
    30 #include <tny-folder.h> 
     30#include <tny-camel-folder.h> 
    3131 
    3232void _string_to_camel_inet_addr (gchar *tok, CamelInternetAddress *target); 

  • trunk/libtinymail-camel/tny-camel-folder-priv.h

    r839 r843  
    1 #ifndef TNY_FOLDER_PRIV_H 
    2 #define TNY_FOLDER_PRIV_H 
     1#ifndef TNY_CAMEL_FOLDER_PRIV_H 
     2#define TNY_CAMEL_FOLDER_PRIV_H 
    33 
    44/* libtinymail-camel - The Tiny Mail base library for Camel 
    …… 
    2626#include <tny-folder-iface.h> 
    2727 
    28 typedef struct _TnyFolderPriv TnyFolderPriv; 
     28typedef struct _TnyCamelFolderPriv TnyCamelFolderPriv; 
    2929 
    30 struct _TnyFolderPriv 
     30struct _TnyCamelFolderPriv 
    3131{ 
    3232        gboolean loaded; 
    …… 
    4747}; 
    4848 
    49 CamelFolder* _tny_folder_get_camel_folder (TnyFolderIface *self); 
    50 void _tny_folder_set_id (TnyFolder *self, const gchar *id); 
    51 void _tny_folder_set_subscribed (TnyFolder *self, gboolean subscribed); 
    52 void _tny_folder_set_name (TnyFolder *self, const gchar *name); 
    53 void _tny_folder_set_folder_type (TnyFolder *folder, CamelFolderInfo *folder_info); 
    54 void _tny_folder_set_unread_count (TnyFolder *self, guint len); 
    55 void _tny_folder_set_all_count (TnyFolder *self, guint len); 
    56 void _tny_folder_check_uncache (TnyFolder *self, TnyFolderPriv *priv); 
    57 void _tny_folder_set_iter (TnyFolder *folder, CamelFolderInfo *iter); 
    58 void _tny_folder_set_account (TnyFolder *self, TnyStoreAccountIface *account); 
     49CamelFolder* _tny_camel_folder_get_camel_folder (TnyCamelFolder *self); 
     50void _tny_camel_folder_set_id (TnyCamelFolder *self, const gchar *id); 
     51void _tny_camel_folder_set_subscribed (TnyCamelFolder *self, gboolean subscribed); 
     52void _tny_camel_folder_set_name (TnyCamelFolder *self, const gchar *name); 
     53void _tny_camel_folder_set_folder_type (TnyCamelFolder *folder, CamelFolderInfo *folder_info); 
     54void _tny_camel_folder_set_unread_count (TnyCamelFolder *self, guint len); 
     55void _tny_camel_folder_set_all_count (TnyCamelFolder *self, guint len); 
     56void _tny_camel_folder_check_uncache (TnyCamelFolder *self, TnyCamelFolderPriv *priv); 
     57void _tny_camel_folder_set_iter (TnyCamelFolder *folder, CamelFolderInfo *iter); 
     58void _tny_camel_folder_set_account (TnyCamelFolder *self, TnyStoreAccountIface *account); 
    5959 
    60 #define TNY_FOLDER_GET_PRIVATE(o)     \ 
    61         (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_FOLDER, TnyFolderPriv)) 
     60#define TNY_CAMEL_FOLDER_GET_PRIVATE(o)       \ 
     61        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_CAMEL_FOLDER, TnyCamelFolderPriv)) 
    6262 
    6363#endif 

  • trunk/libtinymail-camel/tny-camel-folder.c

    r841 r843  
    2626#include <tny-folder-store-iface.h> 
    2727#include <tny-folder-iface.h> 
    28 #include <tny-folder.h> 
     28#include <tny-camel-folder.h> 
    2929#include <tny-msg-iface.h> 
    3030#include <tny-header-iface.h> 
    …… 
    4747#include "tny-camel-account-priv.h" 
    4848#include "tny-camel-store-account-priv.h" 
    49 #include "tny-folder-priv.h" 
     49#include "tny-camel-folder-priv.h" 
    5050#include "tny-camel-header-priv.h" 
    5151#include "tny-camel-msg-priv.h" 
    …… 
    7272 
    7373static void 
    74 unload_folder_no_lock (TnyFolderPriv *priv, gboolean destroy) 
     74unload_folder_no_lock (TnyCamelFolderPriv *priv, gboolean destroy) 
    7575{ 
    7676        if (G_LIKELY (priv->folder)) 
    …… 
    9494 
    9595static void  
    96 unload_folder (TnyFolderPriv *priv, gboolean destroy) 
     96unload_folder (TnyCamelFolderPriv *priv, gboolean destroy) 
    9797{ 
    9898        g_mutex_lock (priv->folder_lock); 
    …… 
    103103 
    104104static void 
    105 load_folder_no_lock (TnyFolderPriv *priv) 
     105load_folder_no_lock (TnyCamelFolderPriv *priv) 
    106106{ 
    107107        if (!priv->folder && !priv->loaded) 
    …… 
    134134 
    135135static void 
    136 load_folder (TnyFolderPriv *priv) 
     136load_folder (TnyCamelFolderPriv *priv) 
    137137{ 
    138138        g_mutex_lock (priv->folder_lock); 
    …… 
    145145 
    146146static void  
    147 tny_folder_remove_message (TnyFolderIface *self, TnyHeaderIface *header) 
    148 { 
    149         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     147tny_camel_folder_remove_message (TnyFolderIface *self, TnyHeaderIface *header) 
     148{ 
     149        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    150150        const gchar *id; 
    151151 
    …… 
    164164 
    165165static void  
    166 tny_folder_expunge (TnyFolderIface *self) 
    167 { 
    168         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     166tny_camel_folder_expunge (TnyFolderIface *self) 
     167{ 
     168        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    169169        CamelException ex = CAMEL_EXCEPTION_INITIALISER; 
    170170 
    …… 
    183183 
    184184CamelFolder* 
    185 _tny_folder_get_camel_folder (TnyFolderIface *self) 
    186 { 
    187         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     185_tny_camel_folder_get_camel_folder (TnyCamelFolder *self) 
     186{ 
     187        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    188188        CamelFolder *retval; 
    189189 
    …… 
    197197 
    198198static gboolean 
    199 tny_folder_get_subscribed (TnyFolderIface *self) 
    200 { 
    201         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     199tny_camel_folder_get_subscribed (TnyFolderIface *self) 
     200{ 
     201        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    202202        gboolean retval; 
    203203 
    …… 
    210210 
    211211void 
    212 _tny_folder_set_subscribed (TnyFolder *self, gboolean subscribed) 
    213 { 
    214         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (self); 
     212_tny_camel_folder_set_subscribed (TnyCamelFolder *self, gboolean subscribed) 
     213{ 
     214        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    215215 
    216216        g_mutex_lock (priv->folder_lock); 
    …… 
    222222 
    223223static void 
    224 tny_folder_set_subscribed (TnyFolderIface *self, gboolean subscribed) 
    225 { 
    226         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     224tny_camel_folder_set_subscribed (TnyFolderIface *self, gboolean subscribed) 
     225{ 
     226        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    227227 
    228228        /* These will synchronize me using _tny_folder_set_subscribed_priv */ 
    …… 
    239239 
    240240static guint 
    241 tny_folder_get_unread_count (TnyFolderIface *self) 
    242 { 
    243         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     241tny_camel_folder_get_unread_count (TnyFolderIface *self) 
     242{ 
     243        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    244244        guint retval; 
    245245 
    …… 
    252252 
    253253void 
    254 _tny_folder_set_unread_count (TnyFolder *self, guint len) 
    255 { 
    256         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     254_tny_camel_folder_set_unread_count (TnyCamelFolder *self, guint len) 
     255{ 
     256        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    257257        priv->unread_length = len; 
    258258        return; 
    …… 
    260260 
    261261void 
    262 _tny_folder_set_all_count (TnyFolder *self, guint len) 
    263 { 
    264         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     262_tny_camel_folder_set_all_count (TnyCamelFolder *self, guint len) 
     263{ 
     264        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    265265        priv->cached_length = len; 
    266266        return; 
    …… 
    269269 
    270270static guint 
    271 tny_folder_get_all_count (TnyFolderIface *self) 
    272 { 
    273         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     271tny_camel_folder_get_all_count (TnyFolderIface *self) 
     272{ 
     273        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    274274        guint retval; 
    275275 
    …… 
    283283 
    284284static TnyStoreAccountIface*   
    285 tny_folder_get_account (TnyFolderIface *self) 
    286 { 
    287         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     285tny_camel_folder_get_account (TnyFolderIface *self) 
     286{ 
     287        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    288288 
    289289        return priv->account; 
    …… 
    291291 
    292292void 
    293 _tny_folder_set_account (TnyFolder *self, TnyStoreAccountIface *account) 
    294 { 
    295         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (self); 
     293_tny_camel_folder_set_account (TnyCamelFolder *self, TnyStoreAccountIface *account) 
     294{ 
     295        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    296296        priv->account = TNY_STORE_ACCOUNT_IFACE (account); 
    297297 
    …… 
    302302{       /* This is a speedup trick */ 
    303303        TnyFolderIface *self; 
    304         TnyFolderPriv *priv; 
     304        TnyCamelFolderPriv *priv; 
    305305        TnyListIface *headers; 
    306306} FldAndPriv; 
    …… 
    315315        /* Unpack speedup trick */ 
    316316        TnyFolderIface *self = ptr->self; 
    317         TnyFolderPriv *priv = ptr->priv; 
     317        TnyCamelFolderPriv *priv = ptr->priv; 
    318318        TnyListIface *headers = ptr->headers; 
    319         CamelFolder *cfol = _tny_folder_get_camel_folder (self); 
     319        CamelFolder *cfol = _tny_camel_folder_get_camel_folder (TNY_CAMEL_FOLDER (self)); 
    320320        CamelMessageInfo *mi = camel_folder_get_message_info (cfol, uid); 
    321321 
    322322        /* TODO: Proxy instantiation (happens a lot, could use a pool) */ 
    323         header = TNY_HEADER_IFACE (tny_camel_header_new ()); 
    324  
    325         _tny_camel_header_set_folder (TNY_CAMEL_HEADER (header), TNY_FOLDER (self), priv); 
     323        header = tny_camel_header_new (); 
     324 
     325        _tny_camel_header_set_folder (TNY_CAMEL_HEADER (header), TNY_CAMEL_FOLDER (self), priv); 
    326326        _tny_camel_header_set_camel_message_info (TNY_CAMEL_HEADER (header), mi, FALSE); 
    327327 
    …… 
    351351 
    352352static void 
    353 tny_folder_refresh_async_destroyer (gpointer thr_user_data) 
     353tny_camel_folder_refresh_async_destroyer (gpointer thr_user_data) 
    354354{ 
    355355 
    …… 
    365365 
    366366static gboolean 
    367 tny_folder_refresh_async_callback (gpointer thr_user_data) 
     367tny_camel_folder_refresh_async_callback (gpointer thr_user_data) 
    368368{ 
    369369        RefreshFolderInfo *info = thr_user_data; 
    …… 
    417417 
    418418static void 
    419 tny_folder_refresh_async_status (struct _CamelOperation *op, const char *what, int pc, void *thr_user_data) 
     419tny_camel_folder_refresh_async_status (struct _CamelOperation *op, const char *what, int pc, void *thr_user_data) 
    420420{ 
    421421        RefreshFolderInfo *oinfo = thr_user_data; 
    …… 
    450450 
    451451static gpointer  
    452 tny_folder_refresh_async_thread (gpointer thr_user_data) 
     452tny_camel_folder_refresh_async_thread (gpointer thr_user_data) 
    453453{ 
    454454        RefreshFolderInfo *info = thr_user_data; 
    455455        TnyFolderIface *self = info->self; 
    456         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     456        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    457457        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account); 
    458458        gchar *str; 
    …… 
    468468        str = g_strdup_printf (_("Reading folder `%s'"), priv->folder->full_name); 
    469469        _tny_camel_account_start_camel_operation (TNY_CAMEL_ACCOUNT (priv->account),  
    470                 tny_folder_refresh_async_status, info, str); 
     470                tny_camel_folder_refresh_async_status, info, str); 
    471471        g_free (str); 
    472472        camel_folder_refresh_info (priv->folder, ex); 
    …… 
    492492                { 
    493493                        g_idle_add_full (G_PRIORITY_HIGH,  
    494                                 tny_folder_refresh_async_callback,  
    495                                 info, tny_folder_refresh_async_destroyer); 
     494                                tny_camel_folder_refresh_async_callback,  
     495                                info, tny_camel_folder_refresh_async_destroyer); 
    496496                } else { 
    497                         tny_folder_refresh_async_callback (info); 
    498                         tny_folder_refresh_async_destroyer (info); 
     497                        tny_camel_folder_refresh_async_callback (info); 
     498                        tny_camel_folder_refresh_async_destroyer (info); 
    499499                } 
    500500        } 
    …… 
    506506 
    507507static void 
    508 tny_folder_refresh_async (TnyFolderIface *self, TnyRefreshFolderCallback callback, TnyRefreshFolderStatusCallback status_callback, gpointer user_data) 
     508tny_camel_folder_refresh_async (TnyFolderIface *self, TnyRefreshFolderCallback callback, TnyRefreshFolderStatusCallback status_callback, gpointer user_data) 
    509509{ 
    510510        RefreshFolderInfo *info = g_new0 (RefreshFolderInfo, 1); 
    …… 
    520520        g_object_ref (G_OBJECT (self)); 
    521521 
    522         thread = g_thread_create (tny_folder_refresh_async_thread, 
     522        thread = g_thread_create (tny_camel_folder_refresh_async_thread, 
    523523                        info, FALSE, NULL); 
    524524 
    …… 
    527527 
    528528static void  
    529 tny_folder_refresh (TnyFolderIface *self) 
    530 { 
    531         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     529tny_camel_folder_refresh (TnyFolderIface *self) 
     530{ 
     531        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    532532        CamelException *ex = camel_exception_new (); 
    533533 
    …… 
    541541                NULL, NULL, NULL); 
    542542        camel_folder_refresh_info (priv->folder, ex); 
    543         priv->cached_length = camel_folder_get_message_count (priv->folder); 
    544      
     543        _tny_camel_account_stop_camel_operation (TNY_CAMEL_ACCOUNT (priv->account)); 
     544 
     545        priv->cached_length = camel_folder_get_message_count (priv->folder);     
    545546        if (G_LIKELY (priv->folder) && G_LIKELY (priv->has_summary_cap)) 
    546547                priv->unread_length = (guint)camel_folder_get_unread_message_count (priv->folder); 
    547         camel_exception_free (ex); 
    548         _tny_camel_account_stop_camel_operation (TNY_CAMEL_ACCOUNT (priv->account)); 
    549  
    550         g_mutex_unlock (priv->folder_lock); 
    551  
    552         return; 
    553 } 
    554  
    555 static void 
    556 tny_folder_get_headers (TnyFolderIface *self, TnyListIface *headers, gboolean refresh) 
    557 { 
    558         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     548        camel_exception_free (ex);       
     549 
     550        g_mutex_unlock (priv->folder_lock); 
     551 
     552        return; 
     553} 
     554 
     555static void 
     556tny_camel_folder_get_headers (TnyFolderIface *self, TnyListIface *headers, gboolean refresh) 
     557{ 
     558        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    559559        GPtrArray *uids = NULL; 
    560560        CamelException ex; 
    …… 
    577577                camel_folder_refresh_info (priv->folder, &ex); 
    578578                priv->cached_length = camel_folder_get_message_count (priv->folder); 
    579  
    580579                if (G_LIKELY (priv->folder) && G_LIKELY (priv->has_summary_cap)) 
    581580                        priv->unread_length = (guint)camel_folder_get_unread_message_count (priv->folder); 
    582581        } 
     582     
    583583        priv->cached_length = 0; 
    584584        uids = camel_folder_get_uids (priv->folder); 
    …… 
    587587 
    588588        camel_folder_free_uids (priv->folder, uids);  
    589  
    590589        g_object_unref (G_OBJECT (headers)); 
    591  
    592         g_mutex_unlock (priv->folder_lock); 
    593  
     590        g_mutex_unlock (priv->folder_lock); 
    594591 
    595592        return; 
    …… 
    598595 
    599596static TnyMsgIface* 
    600 tny_folder_get_message (TnyFolderIface *self, TnyHeaderIface *header) 
    601 { 
    602         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     597tny_camel_folder_get_message (TnyFolderIface *self, TnyHeaderIface *header) 
     598{ 
     599        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    603600        TnyMsgIface *message = NULL; 
    604601        CamelMimeMessage *camel_message = NULL; 
    …… 
    631628                _tny_camel_msg_set_folder (TNY_CAMEL_MSG (message), self); 
    632629                _tny_camel_msg_set_camel_mime_message (TNY_CAMEL_MSG (message), camel_message);  
    633              
    634630                /* Also check out tny-msg.c: tny_msg_finalize (read the stupid hack) */ 
    635631                _tny_camel_header_set_camel_mime_message (TNY_CAMEL_HEADER (nheader), camel_message); 
    636              
    637632                tny_msg_iface_set_header (message, nheader); 
    638633                g_object_unref (G_OBJECT (nheader));   
    …… 
    653648 
    654649static const gchar* 
    655 tny_folder_get_name (TnyFolderIface *self) 
    656 { 
    657         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     650tny_camel_folder_get_name (TnyFolderIface *self) 
     651{ 
     652        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    658653        const gchar *name = NULL; 
    659654         
    …… 
    670665 
    671666static TnyFolderType 
    672 tny_folder_get_folder_type (TnyFolderIface *self) 
    673 { 
    674         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     667tny_camel_folder_get_folder_type (TnyFolderIface *self) 
     668{ 
     669        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    675670 
    676671        return priv->cached_folder_type; 
    …… 
    679674 
    680675static const gchar* 
    681 tny_folder_get_id (TnyFolderIface *self) 
    682 { 
    683         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     676tny_camel_folder_get_id (TnyFolderIface *self) 
     677{ 
     678        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    684679 
    685680        return priv->folder_name; 
    …… 
    687682 
    688683void 
    689 _tny_folder_set_id (TnyFolder *self, const gchar *id) 
    690 { 
    691         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     684_tny_camel_folder_set_id (TnyCamelFolder *self, const gchar *id) 
     685{ 
     686        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    692687 
    693688        g_mutex_lock (priv->folder_lock); 
    …… 
    707702 
    708703void 
    709 _tny_folder_set_name (TnyFolder *self, const gchar *name) 
    710 { 
    711         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     704_tny_camel_folder_set_name (TnyCamelFolder *self, const gchar *name) 
     705{ 
     706        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    712707 
    713708        if (G_UNLIKELY (priv->cached_name)) 
    …… 
    720715 
    721716static void 
    722 tny_folder_set_name (TnyFolderIface *self, const gchar *name) 
    723 { 
    724         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     717tny_camel_folder_set_name (TnyFolderIface *self, const gchar *name) 
     718{ 
     719        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    725720 
    726721        load_folder (priv); 
    …… 
    737732 
    738733/** 
    739  * tny_folder_set_folder: 
    740  * @self: A #TnyFolder object 
     734 * tny_camel_folder_set_folder: 
     735 * @self: A #TnyCamelFolder object 
    741736 * @camel_folder: The #CamelFolder instance to play proxy for 
    742737 * 
    743738 **/ 
    744739void 
    745 tny_folder_set_folder (TnyFolder *self, CamelFolder *camel_folder) 
    746 { 
    747         _tny_folder_set_id (self, camel_folder_get_full_name (camel_folder)); 
     740tny_camel_folder_set_folder (TnyCamelFolder *self, CamelFolder *camel_folder) 
     741{ 
     742        _tny_camel_folder_set_id (self, camel_folder_get_full_name (camel_folder)); 
     743     
    748744        return; 
    749745} 
    750746 
    751747/** 
    752  * tny_folder_get_folder: 
    753  * @self: A #TnyFolder object 
     748 * tny_camel_folder_get_folder: 
     749 * @self: A #TnyCamelFolder object 
    754750 * 
    755751 * Return value: The CamelFolder instance to play proxy for 
    756752 **/ 
    757753CamelFolder* 
    758 tny_folder_get_folder (TnyFolder *self) 
    759 { 
    760         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     754tny_camel_folder_get_folder (TnyCamelFolder *self) 
     755{ 
     756        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    761757        CamelFolder *retval = NULL; 
    762758 
    …… 
    769765 
    770766/** 
    771  * tny_folder_new_with_folder: 
     767 * tny_camel_folder_new_with_folder: 
    772768 * @camel_folder: CamelFolder instance to play proxy for  
    773769 * 
    774  * The #TnyFolder implementation is actually a proxy for #CamelFolder 
     770 * The #TnyCamelFolder implementation is actually a proxy for #CamelFolder 
    775771 * 
    776772 * Return value: A new #TnyFolderIface instance implemented for Camel 
    777773 **/ 
    778 TnyFolder* 
    779 tny_folder_new_with_folder (CamelFolder *camel_folder) 
    780 { 
    781         TnyFolder *self = g_object_new (TNY_TYPE_FOLDER, NULL); 
    782         tny_folder_set_folder (self, camel_folder); 
    783  
    784         return self; 
     774TnyFolderIface* 
     775tny_camel_folder_new_with_folder (CamelFolder *camel_folder) 
     776{ 
     777        TnyCamelFolder *self = g_object_new (TNY_TYPE_CAMEL_FOLDER, NULL); 
     778     
     779        tny_camel_folder_set_folder (self, camel_folder); 
     780 
     781        return TNY_FOLDER_IFACE (self); 
    785782} 
    786783 
    787784 
    788785/** 
    789  * tny_folder_new: 
     786 * tny_camel_folder_new: 
    790787 *  
    791  * The #TnyFolder implementation is actually a proxy for #CamelFolder. 
     788 * The #TnyCamelFolder implementation is actually a proxy for #CamelFolder. 
    792789 * You need to set the #CamelFolder after using this constructor using 
    793  * tny_folder_set_folder 
     790 * tny_camel_folder_set_folder 
    794791 * 
    795792 * Return value: A new #TnyFolderIface instance implemented for Camel 
    796793 **/ 
    797 TnyFolder* 
    798 tny_folder_new (void) 
    799 { 
    800         TnyFolder *self = g_object_new (TNY_TYPE_FOLDER, NULL); 
    801  
    802         return self; 
    803 } 
    804  
    805  
    806 static void 
    807 tny_folder_finalize (GObject *object) 
    808 { 
    809         TnyFolder *self = (TnyFolder*) object; 
    810         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (self); 
     794TnyFolderIface* 
     795tny_camel_folder_new (void) 
     796{ 
     797        TnyCamelFolder *self = g_object_new (TNY_TYPE_CAMEL_FOLDER, NULL); 
     798 
     799        return TNY_FOLDER_IFACE (self); 
     800} 
     801 
     802 
     803static void 
     804tny_camel_folder_finalize (GObject *object) 
     805{ 
     806        TnyCamelFolder *self = (TnyCamelFolder*) object; 
     807        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    811808 
    812809        g_mutex_lock (priv->folder_lock); 
    …… 
    849846 
    850847static void 
    851 tny_folder_uncache (TnyFolderIface *self) 
    852 { 
    853         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (self); 
     848tny_camel_folder_uncache (TnyCamelFolder *self) 
     849{ 
     850        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    854851 
    855852        if (G_LIKELY (priv->folder != NULL)) 
    …… 
    861858 
    862859void  
    863 _tny_folder_check_uncache (TnyFolder *self, TnyFolderPriv *priv) 
     860_tny_camel_folder_check_uncache (TnyCamelFolder *self, TnyCamelFolderPriv *priv) 
    864861{     
    865862        if (priv->headers_managed == 0) 
    866                 tny_folder_uncache (TNY_FOLDER_IFACE (self)); 
     863                tny_camel_folder_uncache (self); 
    867864} 
    868865 
    …… 
    873870        TnyFolderIfaceClass *klass = (TnyFolderIfaceClass *)g_iface; 
    874871 
    875         klass->get_headers_func = tny_folder_get_headers; 
    876         klass->get_message_func = tny_folder_get_message; 
    877         klass->get_id_func = tny_folder_get_id; 
    878         klass->set_name_func = tny_folder_set_name; 
    879         klass->get_name_func = tny_folder_get_name; 
    880         klass->get_folder_type_func = tny_folder_get_folder_type; 
    881         klass->get_unread_count_func = tny_folder_get_unread_count; 
    882         klass->get_all_count_func = tny_folder_get_all_count; 
    883         klass->get_account_func = tny_folder_get_account; 
    884         klass->get_subscribed_func = tny_folder_get_subscribed; 
    885         klass->set_subscribed_func = tny_folder_set_subscribed; 
    886         klass->refresh_async_func = tny_folder_refresh_async; 
    887         klass->refresh_func = tny_folder_refresh; 
    888         klass->remove_message_func = tny_folder_remove_message; 
    889         klass->expunge_func = tny_folder_expunge; 
     872        klass->get_headers_func = tny_camel_folder_get_headers; 
     873        klass->get_message_func = tny_camel_folder_get_message; 
     874        klass->get_id_func = tny_camel_folder_get_id; 
     875        klass->set_name_func = tny_camel_folder_set_name; 
     876        klass->get_name_func = tny_camel_folder_get_name; 
     877        klass->get_folder_type_func = tny_camel_folder_get_folder_type; 
     878        klass->get_unread_count_func = tny_camel_folder_get_unread_count; 
     879        klass->get_all_count_func = tny_camel_folder_get_all_count; 
     880        klass->get_account_func = tny_camel_folder_get_account; 
     881        klass->get_subscribed_func = tny_camel_folder_get_subscribed; 
     882        klass->set_subscribed_func = tny_camel_folder_set_subscribed; 
     883        klass->refresh_async_func = tny_camel_folder_refresh_async; 
     884        klass->refresh_func = tny_camel_folder_refresh; 
     885        klass->remove_message_func = tny_camel_folder_remove_message; 
     886        klass->expunge_func = tny_camel_folder_expunge; 
    890887 
    891888        return; 
    …… 
    894891 
    895892static void  
    896 tny_folder_remove_folder (TnyFolderStoreIface *self, TnyFolderIface *folder) 
     893tny_camel_folder_remove_folder (TnyFolderStoreIface *self, TnyFolderIface *folder) 
    897894{ 
    898895        /* TODO */ 
    …… 
    904901 
    905902static TnyFolderIface* 
    906 tny_folder_create_folder (TnyFolderStoreIface *self, const gchar *name) 
     903tny_camel_folder_create_folder (TnyFolderStoreIface *self, const gchar *name) 
    907904{ 
    908905        /* TODO */ 
    …… 
    910907        g_critical ("TODO: The create_folder method is unimplemented in this TnyFolderStoreIface implementation (TnyFolder)\n"); 
    911908 
    912         return TNY_FOLDER_IFACE (tny_folder_new ()); 
     909        return TNY_FOLDER_IFACE (tny_camel_folder_new ()); 
    913910} 
    914911 
    915912 
    916913void  
    917 _tny_folder_set_folder_type (TnyFolder *folder, CamelFolderInfo *folder_info) 
    918 { 
    919         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (folder)); 
     914_tny_camel_folder_set_folder_type (TnyCamelFolder *folder, CamelFolderInfo *folder_info) 
     915{ 
     916        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder); 
    920917 
    921918        if (!folder_info) 
    …… 
    947944 
    948945void  
    949 _tny_folder_set_iter (TnyFolder *folder, CamelFolderInfo *iter) 
    950 { 
    951         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (folder); 
     946_tny_camel_folder_set_iter (TnyCamelFolder *folder, CamelFolderInfo *iter) 
     947{ 
     948        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder); 
     949     
    952950        priv->iter = iter; 
    953951        priv->iter_parented = TRUE; 
     952     
    954953        return; 
    955954} 
    …… 
    957956 
    958957static void  
    959 tny_folder_get_folders (TnyFolderStoreIface *self, TnyListIface *list, TnyFolderStoreQuery *query) 
    960 { 
    961         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
     958tny_camel_folder_get_folders (TnyFolderStoreIface *self, TnyListIface *list, TnyFolderStoreQuery *query) 
     959{ 
     960        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    962961        TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account); 
    963962        CamelFolderInfo *iter; 
    …… 
    981980                if (_tny_folder_store_query_passes (query, iter)) 
    982981                { 
    983                         TnyFolder *folder = tny_folder_new (); 
    984                         _tny_folder_set_id (folder, iter->full_name); 
    985                         _tny_folder_set_folder_type (folder, iter); 
    986                         _tny_folder_set_unread_count (folder, iter->unread); 
    987                         _tny_folder_set_all_count (folder, iter->total); 
    988                         _tny_folder_set_name (folder, iter->name); 
    989                         _tny_folder_set_iter (folder, iter); 
     982                        TnyCamelFolder *folder = TNY_CAMEL_FOLDER (tny_camel_folder_new ()); 
     983                     
     984                        _tny_camel_folder_set_id (folder, iter->full_name); 
     985                        _tny_camel_folder_set_folder_type (folder, iter); 
     986                        _tny_camel_folder_set_unread_count (folder, iter->unread); 
     987                        _tny_camel_folder_set_all_count (folder, iter->total); 
     988                        _tny_camel_folder_set_name (folder, iter->name); 
     989                        _tny_camel_folder_set_iter (folder, iter); 
    990990                         
    991991                        apriv->managed_folders = g_list_prepend (apriv->managed_folders, folder); 
    992992                         
    993                         _tny_folder_set_account (folder, 
     993                        _tny_camel_folder_set_account (folder, 
    994994                                                 TNY_STORE_ACCOUNT_IFACE (priv->account)); 
    995995 
    …… 
    10151015 
    10161016static void 
    1017 tny_folder_get_folders_async_destroyer (gpointer thr_user_data) 
     1017tny_camel_folder_get_folders_async_destroyer (gpointer thr_user_data) 
    10181018{ 
    10191019        GetFoldersInfo *info = thr_user_data; 
    …… 
    10291029 
    10301030static gboolean 
    1031 tny_folder_get_folders_async_callback (gpointer thr_user_data) 
     1031tny_camel_folder_get_folders_async_callback (gpointer thr_user_data) 
    10321032{ 
    10331033        GetFoldersInfo *info = thr_user_data; 
    …… 
    10401040 
    10411041static gpointer  
    1042 tny_folder_get_folders_async_thread (gpointer thr_user_data) 
     1042tny_camel_folder_get_folders_async_thread (gpointer thr_user_data) 
    10431043{ 
    10441044        GetFoldersInfo *info = (GetFoldersInfo*) thr_user_data; 
    10451045     
    1046         tny_folder_get_folders (info->self, info->list, info->query); 
     1046        tny_camel_folder_get_folders (info->self, info->list, info->query); 
    10471047     
    10481048        if (info->query) 
    …… 
    10621062                { 
    10631063                        g_idle_add_full (G_PRIORITY_HIGH,  
    1064                                 tny_folder_get_folders_async_callback,  
    1065                                 info, tny_folder_get_folders_async_destroyer); 
     1064                                tny_camel_folder_get_folders_async_callback,  
     1065                                info, tny_camel_folder_get_folders_async_destroyer); 
    10661066                } else { 
    1067                         tny_folder_get_folders_async_callback (info); 
    1068                         tny_folder_get_folders_async_destroyer (info); 
     1067                        tny_camel_folder_get_folders_async_callback (info); 
     1068                        tny_camel_folder_get_folders_async_destroyer (info); 
    10691069                } 
    10701070        } 
    …… 
    10771077 
    10781078static void  
    1079 tny_folder_get_folders_async (TnyFolderStoreIface *self, TnyListIface *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
     1079tny_camel_folder_get_folders_async (TnyFolderStoreIface *self, TnyListIface *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data) 
    10801080{ 
    10811081        GetFoldersInfo *info = g_new0 (GetFoldersInfo, 1); 
    …… 
    10951095                g_object_ref (G_OBJECT (info->query)); 
    10961096     
    1097         thread = g_thread_create (tny_folder_get_folders_async_thread, 
     1097        thread = g_thread_create (tny_camel_folder_get_folders_async_thread, 
    10981098                        info, FALSE, NULL);     
    10991099 
    …… 
    11071107        TnyFolderStoreIfaceClass *klass = (TnyFolderStoreIfaceClass *)g_iface; 
    11081108 
    1109         klass->remove_folder_func = tny_folder_remove_folder; 
    1110         klass->create_folder_func = tny_folder_create_folder; 
    1111         klass->get_folders_func = tny_folder_get_folders; 
    1112         klass->get_folders_async_func = tny_folder_get_folders_async; 
     1109        klass->remove_folder_func = tny_camel_folder_remove_folder; 
     1110        klass->create_folder_func = tny_camel_folder_create_folder; 
     1111        klass->get_folders_func = tny_camel_folder_get_folders; 
     1112        klass->get_folders_async_func = tny_camel_folder_get_folders_async; 
    11131113                                         
    11141114        return; 
    …… 
    11161116 
    11171117static void  
    1118 tny_folder_class_init (TnyFolderClass *class) 
     1118tny_camel_folder_class_init (TnyCamelFolderClass *class) 
    11191119{ 
    11201120        GObjectClass *object_class; 
    …… 
    11221122        parent_class = g_type_class_peek_parent (class); 
    11231123        object_class = (GObjectClass*) class; 
    1124         object_class->finalize = tny_folder_finalize; 
    1125         g_type_class_add_private (object_class, sizeof (TnyFolderPriv)); 
    1126  
    1127         return; 
    1128 } 
    1129  
    1130  
    1131  
    1132 static void 
    1133 tny_folder_instance_init (GTypeInstance *instance, gpointer g_class) 
    1134 { 
    1135         TnyFolder *self = (TnyFolder *)instance; 
    1136         TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (self); 
     1124        object_class->finalize = tny_camel_folder_finalize; 
     1125        g_type_class_add_private (object_class, sizeof (TnyCamelFolderPriv)); 
     1126 
     1127        return; 
     1128} 
     1129 
     1130 
     1131 
     1132static void 
     1133tny_camel_folder_instance_init (GTypeInstance *instance, gpointer g_class) 
     1134{ 
     1135        TnyCamelFolder *self = (TnyCamelFolder *)instance; 
     1136        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    11371137 
    11381138        priv->iter = NULL; 
    …… 
    11501150 
    11511151GType  
    1152 tny_folder_get_type (void) 
     1152tny_camel_folder_get_type (void) 
    11531153{ 
    11541154        static GType type = 0; 
    …… 
    11671167                static const GTypeInfo info =  
    11681168                { 
    1169                   sizeof (TnyFolderClass), 
     1169                  sizeof (TnyCamelFolderClass), 
    11701170                  NULL,   /* base_init */ 
    11711171                  NULL,   /* base_finalize */ 
    1172                   (GClassInitFunc) tny_folder_class_init,   /* class_init */ 
     1172                  (GClassInitFunc) tny_camel_folder_class_init,   /* class_init */ 
    11731173                  NULL,   /* class_finalize */ 
    11741174                  NULL,   /* class_data */ 
    1175                   sizeof (TnyFolder), 
     1175