Changeset 715

Show
Ignore:
Timestamp:
08/05/06 11:26:28
Author:
pvanhoof
Message:

Renaming TnyMsgHeader? to TnyHeader

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r690 r715  
    1818        * libtinymailui-gtk/tny-account-tree-model-priv.h, libtinymailui-gtk/ 
    1919        tny-account-tree-model.h, libtinymailui-gtk/ 
    20         tny-msg-header-list-model-priv.h: Forward typedefs don't work well 
     20        tny-header-list-model-priv.h: Forward typedefs don't work well 
    2121        with the python binding generator 
    2222 

  • trunk/bindings/python/Makefile.am

    r711 r715  
    7878        $(top_srcdir)/libtinymail/tny-list-iface.h              \ 
    7979        $(top_srcdir)/libtinymail/tny-folder-iface.h            \ 
    80         $(top_srcdir)/libtinymail/tny-msg-header-iface.h      \ 
     80        $(top_srcdir)/libtinymail/tny-header-iface.h          \ 
    8181        $(top_srcdir)/libtinymail/tny-msg-iface.h               \ 
    8282        $(top_srcdir)/libtinymail/tny-mime-part-iface.h         \ 
    …… 
    9090        $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py                     \ 
    9191        $(top_srcdir)/libtinymailui/tny-account-store-view-iface.h \ 
    92         $(top_srcdir)/libtinymailui/tny-msg-header-view-iface.h          \ 
     92        $(top_srcdir)/libtinymailui/tny-header-view-iface.h      \ 
    9393        $(top_srcdir)/libtinymailui/tny-msg-view-iface.h           \ 
    9494        $(top_srcdir)/libtinymailui/tny-msg-window-iface.h         \ 
    …… 
    103103        $(top_srcdir)/libtinymailui-gtk/tny-account-tree-model.h        \ 
    104104        $(top_srcdir)/libtinymailui-gtk/tny-attach-list-model.h         \ 
    105         $(top_srcdir)/libtinymailui-gtk/tny-msg-header-list-model.h   \ 
    106         $(top_srcdir)/libtinymailui-gtk/tny-msg-header-view.h         \ 
     105        $(top_srcdir)/libtinymailui-gtk/tny-header-list-model.h               \ 
     106        $(top_srcdir)/libtinymailui-gtk/tny-header-view.h             \ 
    107107        $(top_srcdir)/libtinymailui-gtk/tny-msg-view.h                  \ 
    108108        $(top_srcdir)/libtinymailui-gtk/tny-msg-window.h                \ 

  • trunk/bindings/python/tinymail-platform.override

    r711 r715  
    1212#include <tny-list-iface.h> 
    1313#include <tny-folder-iface.h> 
    14 #include <tny-msg-header-iface.h> 
     14#include <tny-header-iface.h> 
    1515#include <tny-msg-iface.h> 
    1616#include <tny-mime-part-iface.h> 
    …… 
    2121 
    2222#include <tny-account-store-view-iface.h> 
    23 #include <tny-msg-header-view-iface.h> 
     23#include <tny-header-view-iface.h> 
    2424#include <tny-msg-view-iface.h> 
    2525#include <tny-msg-window-iface.h> 

  • trunk/bindings/python/tinymail.defs.extra

    r700 r715  
    5757) 
    5858 
    59 (define-enum MsgHeaderFlags 
     59(define-enum HeaderFlags 
    6060  (in-module "Tny") 
    61   (c-name "TnyMsgHeaderFlags") 
    62   (gtype-id "TNY_TYPE_MSG_HEADER_FLAGS") 
     61  (c-name "TnyHeaderFlags") 
     62  (gtype-id "TNY_TYPE_HEADER_FLAGS") 
    6363  (values 
    64     '("answered" "TNY_MSG_HEADER_FLAG_ANSWERED") 
    65     '("deleted" "TNY_MSG_HEADER_FLAG_DELETED") 
    66     '("draft" "TNY_MSG_HEADER_FLAG_DRAFT") 
    67     '("flagged" "TNY_MSG_HEADER_FLAG_FLAGGED") 
    68     '("seen" "TNY_MSG_HEADER_FLAG_SEEN") 
    69     '("attachments" "TNY_MSG_HEADER_FLAG_ATTACHMENTS") 
    70     '("answered_all" "TNY_MSG_HEADER_FLAG_ANSWERED_ALL") 
    71     '("junk" "TNY_MSG_HEADER_FLAG_JUNK") 
    72     '("secure" "TNY_MSG_HEADER_FLAG_SECURE") 
    73     '("flagged" "TNY_MSG_HEADER_FLAG_FLAGGED") 
    74     '("learn" "TNY_MSG_HEADER_FLAG_LEARN") 
    75     '("user" "TNY_MSG_HEADER_FLAG_USER") 
     64    '("answered" "TNY_HEADER_FLAG_ANSWERED") 
     65    '("deleted" "TNY_HEADER_FLAG_DELETED") 
     66    '("draft" "TNY_HEADER_FLAG_DRAFT") 
     67    '("flagged" "TNY_HEADER_FLAG_FLAGGED") 
     68    '("seen" "TNY_HEADER_FLAG_SEEN") 
     69    '("attachments" "TNY_HEADER_FLAG_ATTACHMENTS") 
     70    '("answered_all" "TNY_HEADER_FLAG_ANSWERED_ALL") 
     71    '("junk" "TNY_HEADER_FLAG_JUNK") 
     72    '("secure" "TNY_HEADER_FLAG_SECURE") 
     73    '("flagged" "TNY_HEADER_FLAG_FLAGGED") 
     74    '("learn" "TNY_HEADER_FLAG_LEARN") 
     75    '("user" "TNY_HEADER_FLAG_USER") 
    7676  ) 
    7777) 

  • trunk/bindings/python/tinymail.override

    r711 r715  
    1212#include <tny-list-iface.h> 
    1313#include <tny-folder-iface.h> 
    14 #include <tny-msg-header-iface.h> 
     14#include <tny-header-iface.h> 
    1515#include <tny-msg-iface.h> 
    1616#include <tny-mime-part-iface.h> 

  • trunk/bindings/python/tinymailui-gtk.defs.extra

    r664 r715  
    1414 
    1515 
    16 (define-enum MsgHeaderListModelColumn 
     16(define-enum HeaderListModelColumn 
    1717  (in-module "Tny") 
    18   (c-name "TnyMsgHeaderListModelColumn") 
    19   (gtype-id "TNY_TYPE_MSG_HEADER_LIST_MODEL_COLUMN") 
     18  (c-name "TnyHeaderListModelColumn") 
     19  (gtype-id "TNY_TYPE_HEADER_LIST_MODEL_COLUMN") 
    2020  (values 
    21     '("from" "TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN") 
    22     '("to" "TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN") 
    23     '("subject" "TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN") 
    24     '("cc" "TNY_MSG_HEADER_LIST_MODEL_CC_COLUMN") 
    25     '("date_sent" "TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN") 
    26     '("date_received_t" "TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN") 
    27     '("date_sent_t" "TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN") 
    28     '("date_received" "TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN") 
    29     '("instance" "TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN") 
    30     '("flags" "TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN") 
    31     '("n" "TNY_MSG_HEADER_LIST_MODEL_N_COLUMNS") 
     21    '("from" "TNY_HEADER_LIST_MODEL_FROM_COLUMN") 
     22    '("to" "TNY_HEADER_LIST_MODEL_TO_COLUMN") 
     23    '("subject" "TNY_HEADER_LIST_MODEL_SUBJECT_COLUMN") 
     24    '("cc" "TNY_HEADER_LIST_MODEL_CC_COLUMN") 
     25    '("date_sent" "TNY_HEADER_LIST_MODEL_DATE_SENT_COLUMN") 
     26    '("date_received_t" "TNY_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN") 
     27    '("date_sent_t" "TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN") 
     28    '("date_received" "TNY_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN") 
     29    '("instance" "TNY_HEADER_LIST_MODEL_INSTANCE_COLUMN") 
     30    '("flags" "TNY_HEADER_LIST_MODEL_FLAGS_COLUMN") 
     31    '("n" "TNY_HEADER_LIST_MODEL_N_COLUMNS") 
    3232  ) 
    3333) 

  • trunk/bindings/python/tinymailui-gtk.override

    r710 r715  
    1111#include <tny-account-tree-model.h> 
    1212#include <tny-attach-list-model.h> 
    13 #include <tny-msg-header-list-model.h> 
    14 #include <tny-msg-header-view.h> 
     13#include <tny-header-list-model.h> 
     14#include <tny-header-view.h> 
    1515#include <tny-msg-view.h> 
    1616#include <tny-msg-window.h> 

  • trunk/bindings/python/tinymailui.override

    r710 r715  
    55 
    66#include <tny-account-store-view-iface.h> 
    7 #include <tny-msg-header-view-iface.h> 
     7#include <tny-header-view-iface.h> 
    88#include <tny-msg-view-iface.h> 
    99#include <tny-msg-window-iface.h> 
    …… 
    2424 
    2525%% 
    26 import tinymail.MsgHeaderIface as PyTnyMsgHeaderIface_Type 
     26import tinymail.HeaderIface as PyTnyHeaderIface_Type 
    2727import tinymail.MsgIface as PyTnyMsgIface_Type 
    2828import tinymail.MsgMimePartIface as PyTnyMimePartIface_Type 

  • trunk/libtinymail-camel/Makefile.am

    r711 r715  
    88libtinymail_camel_1_0_headers =                 \ 
    99        tny-mime-part.h                         \ 
    10         tny-msg-header.h                      \ 
     10        tny-header.h                          \ 
    1111        tny-msg.h                               \ 
    1212        tny-folder.h                            \ 
    …… 
    2626        tny-transport-account-priv.h            \ 
    2727        tny-msg-priv.h                          \ 
    28         tny-msg-header-priv.h                 \ 
     28        tny-header-priv.h                     \ 
    2929        tny-folder-priv.h                       \ 
    3030        $(libtinymail_camel_1_0_headers)        \ 
    3131        tny-msg.c                               \ 
    32         tny-msg-header.c                      \ 
     32        tny-header.c                          \ 
    3333        tny-mime-part-priv.h                    \ 
    3434        tny-mime-part.c                         \ 

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

    r700 r715  
    5555GType _tny_folder_list_iterator_get_type (void); 
    5656void _tny_folder_list_iterator_set_model (TnyFolderListIterator *self, TnyFolderList *model); 
    57 TnyFolderListIterator* _tny_msg_header_list_iterator_new (TnyFolderList *model); 
     57TnyFolderListIterator* _tny_header_list_iterator_new (TnyFolderList *model); 
    5858 
    5959G_END_DECLS 

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

    r700 r715  
    2626#include <tny-folder.h> 
    2727#include <tny-msg-iface.h> 
    28 #include <tny-msg-header-iface.h> 
     28#include <tny-header-iface.h> 
    2929#include <tny-msg.h> 
    30 #include <tny-msg-header.h> 
     30#include <tny-header.h> 
    3131#include <tny-store-account-iface.h> 
    3232#include <tny-store-account.h> 
    …… 
    146146 
    147147static void  
    148 tny_folder_remove_message (TnyFolderIface *self, TnyMsgHeaderIface *header) 
     148tny_folder_remove_message (TnyFolderIface *self, TnyHeaderIface *header) 
    149149{ 
    150150        TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
    …… 
    156156                load_folder_no_lock (priv); 
    157157 
    158         id = tny_msg_header_iface_get_uid (TNY_MSG_HEADER_IFACE (header)); 
     158        id = tny_header_iface_get_uid (TNY_HEADER_IFACE (header)); 
    159159        camel_folder_delete_message (priv->folder, id); 
    160160 
    …… 
    331331add_message_with_uid (gpointer data, gpointer user_data) 
    332332{ 
    333         TnyMsgHeaderIface *header = NULL; 
     333        TnyHeaderIface *header = NULL; 
    334334        FldAndPriv *ptr = user_data; 
    335335        const char *uid = (const char*)data; 
    …… 
    343343 
    344344        /* TODO: Proxy instantiation (happens a lot, could use a pool) */ 
    345         header = TNY_MSG_HEADER_IFACE (tny_msg_header_new ()); 
    346  
    347         tny_msg_header_iface_set_folder (header, self); 
    348         _tny_msg_header_set_camel_message_info (header, mi); 
     345        header = TNY_HEADER_IFACE (tny_header_new ()); 
     346 
     347        tny_header_iface_set_folder (header, self); 
     348        _tny_header_set_camel_message_info (header, mi); 
    349349 
    350350        /* Get rid of the reference already. I know this is ugly */ 
    …… 
    611611 
    612612static TnyMsgIface* 
    613 tny_folder_get_message (TnyFolderIface *self, TnyMsgHeaderIface *header) 
     613tny_folder_get_message (TnyFolderIface *self, TnyHeaderIface *header) 
    614614{ 
    615615        TnyFolderPriv *priv = TNY_FOLDER_GET_PRIVATE (TNY_FOLDER (self)); 
    …… 
    619619        g_mutex_lock (priv->folder_lock); 
    620620 
    621         id = tny_msg_header_iface_get_uid (TNY_MSG_HEADER_IFACE (header)); 
     621        id = tny_header_iface_get_uid (TNY_HEADER_IFACE (header)); 
    622622 
    623623        load_folder_no_lock (priv); 
    …… 
    644644 
    645645                _tny_msg_set_folder (message, self); 
    646                 tny_msg_iface_set_header (message, TNY_MSG_HEADER_IFACE (header)); 
     646                tny_msg_iface_set_header (message, TNY_HEADER_IFACE (header)); 
    647647                _tny_msg_set_camel_mime_message (TNY_MSG (message), camel_message); 
    648648        } else { 

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

    r700 r715  
    2525 
    2626#include <tny-msg-iface.h> 
    27 #include <tny-msg-header-iface.h> 
     27#include <tny-header-iface.h> 
    2828 
    2929#include <camel/camel-folder.h> 

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

    r714 r715  
    1 #ifndef TNY_MSG_HEADER_PRIV_H 
    2 #define TNY_MSG_HEADER_PRIV_H 
     1#ifndef TNY_HEADER_PRIV_H 
     2#define TNY_HEADER_PRIV_H 
    33 
    44/* libtinymail-camel - The Tiny Mail base library for Camel 
    …… 
    2424#include <camel/camel-folder-summary.h> 
    2525 
    26 void                _tny_msg_header_set_camel_message_info (TnyMsgHeader *self, CamelMessageInfo *camel_message_info); 
    27 CamelMimeMessage*   _tny_msg_header_get_camel_mime_message (TnyMsgHeader *self); 
     26void                _tny_header_set_camel_message_info (TnyHeader *self, CamelMessageInfo *camel_message_info); 
     27CamelMimeMessage*   _tny_header_get_camel_mime_message (TnyHeader *self); 
    2828 
    2929#endif 

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

    </
    r714 r715  
    2525#include <string.h> 
    2626 
    27 #include <tny-msg-header-iface.h> 
    28 #include <tny-msg-header.h> 
     27#include <tny-header-iface.h> 
     28#include <tny-header.h> 
    2929#include <tny-folder.h> 
    3030 
    3131#include "tny-camel-common-priv.h" 
    3232#include "tny-folder-priv.h" 
    33 #include "tny-msg-header-priv.h" 
     33#include "tny-header-priv.h" 
    3434 
    3535#include <tny-camel-shared.h> 
    …… 
    4949 
    5050#pragma pack(1) /* Size will be 21 in stead of 24 */ 
    51 struct _TnyMsgHeader  
     51struct _TnyHeader  
    5252{ 
    5353        GObject parent; 
    …… 
    5858}; 
    5959 
    60 struct _TnyMsgHeaderClass  
     60struct _TnyHeaderClass  
    6161{ 
    6262        GObjectClass parent_class; 
    …… 
    6666 
    6767static void  
    68 destroy_write (TnyMsgHeader *self) 
     68destroy_write (TnyHeader *self) 
    6969{ 
    7070        if (((WriteInfo*)self->info)->msg) 
    …… 
    7878 
    7979static void 
    80 prepare_for_write (TnyMsgHeader *self) 
     80prepare_for_write (TnyHeader *self) 
    8181{ 
    8282        if (!self->write) 
    …… 
    9292 
    9393void /* protected method */ 
    94 _tny_msg_header_set_camel_message_info (TnyMsgHeader *self, CamelMessageInfo *camel_message_info) 
     94_tny_header_set_camel_message_info (TnyHeader *self, CamelMessageInfo *camel_message_info) 
    9595{ 
    9696        if (G_UNLIKELY (self->info)) 
    …… 
    107107 
    108108CamelMimeMessage* /* protected method */ 
    109 _tny_msg_header_get_camel_mime_message (TnyMsgHeader *self) 
     109_tny_header_get_camel_mime_message (TnyHeader *self) 
    110110{ 
    111111 
    …… 
    123123 
    124124static const gchar* 
    125 tny_msg_header_get_replyto (TnyMsgHeaderIface *self) 
    126 { 
    127         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     125tny_header_get_replyto (TnyHeaderIface *self) 
     126{ 
     127        TnyHeader *me = TNY_HEADER (self); 
    128128        const gchar *retval = NULL; 
    129129 
    …… 
    136136 
    137137static void 
    138 tny_msg_header_set_bcc (TnyMsgHeaderIface *self, const gchar *bcc) 
    139 { 
    140         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     138tny_header_set_bcc (TnyHeaderIface *self, const gchar *bcc) 
     139{ 
     140        TnyHeader *me = TNY_HEADER (self); 
    141141        CamelInternetAddress *addr = camel_internet_address_new (); 
    142142 
    …… 
    154154 
    155155static void 
    156 tny_msg_header_set_cc (TnyMsgHeaderIface *self, const gchar *cc) 
    157 { 
    158         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     156tny_header_set_cc (TnyHeaderIface *self, const gchar *cc) 
     157{ 
     158        TnyHeader *me = TNY_HEADER (self); 
    159159        CamelInternetAddress *addr = camel_internet_address_new (); 
    160160 
    …… 
    171171 
    172172static void 
    173 tny_msg_header_set_from (TnyMsgHeaderIface *self, const gchar *from) 
    174 { 
    175         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     173tny_header_set_from (TnyHeaderIface *self, const gchar *from) 
     174{ 
     175        TnyHeader *me = TNY_HEADER (self); 
    176176        CamelInternetAddress *addr = camel_internet_address_new (); 
    177177        gchar *dup; 
    …… 
    190190 
    191191static void 
    192 tny_msg_header_set_subject (TnyMsgHeaderIface *self, const gchar *subject) 
    193 { 
    194         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     192tny_header_set_subject (TnyHeaderIface *self, const gchar *subject) 
     193{ 
     194        TnyHeader *me = TNY_HEADER (self); 
    195195 
    196196        prepare_for_write (me); 
    …… 
    201201 
    202202static void 
    203 tny_msg_header_set_to (TnyMsgHeaderIface *self, const gchar *to) 
    204 { 
    205         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     203tny_header_set_to (TnyHeaderIface *self, const gchar *to) 
     204{ 
     205        TnyHeader *me = TNY_HEADER (self); 
    206206        CamelInternetAddress *addr = camel_internet_address_new (); 
    207207        gchar *dup; 
    …… 
    223223 
    224224static void 
    225 tny_msg_header_set_replyto (TnyMsgHeaderIface *self, const gchar *to) 
    226 { 
    227         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     225tny_header_set_replyto (TnyHeaderIface *self, const gchar *to) 
     226{ 
     227        TnyHeader *me = TNY_HEADER (self); 
    228228 
    229229        /* TODO set replyto */ 
    …… 
    234234 
    235235static const gchar* 
    236 tny_msg_header_get_cc (TnyMsgHeaderIface *self) 
    237 { 
    238         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     236tny_header_get_cc (TnyHeaderIface *self) 
     237{ 
     238        TnyHeader *me = TNY_HEADER (self); 
    239239        const gchar *retval; 
    240240 
    …… 
    251251 
    252252static const gchar* 
    253 tny_msg_header_get_bcc (TnyMsgHeaderIface *self) 
    254 { 
    255         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     253tny_header_get_bcc (TnyHeaderIface *self) 
     254{ 
     255        TnyHeader *me = TNY_HEADER (self); 
    256256        const gchar *retval; 
    257257 
    …… 
    267267} 
    268268 
    269 static TnyMsgHeaderFlags 
    270 tny_msg_header_get_flags (TnyMsgHeaderIface *self) 
    271 { 
    272         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
    273         TnyMsgHeaderFlags retval; 
     269static TnyHeaderFlags 
     270tny_header_get_flags (TnyHeaderIface *self) 
     271{ 
     272        TnyHeader *me = TNY_HEADER (self); 
     273        TnyHeaderFlags retval; 
    274274 
    275275        if (me->write) 
    276276        { 
    277                 g_warning ("tny_msg_header_get_flags: This is a header for a new message!\n"); 
     277                g_warning ("tny_header_get_flags: This is a header for a new message!\n"); 
    278278                return retval; 
    279279        } 
    …… 
    285285 
    286286static void 
    287 tny_msg_header_set_flags (TnyMsgHeaderIface *self, TnyMsgHeaderFlags mask) 
    288 { 
    289         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     287tny_header_set_flags (TnyHeaderIface *self, TnyHeaderFlags mask) 
     288{ 
     289        TnyHeader *me = TNY_HEADER (self); 
    290290 
    291291        if (me->write) 
    292292        { 
    293                 g_warning ("tny_msg_header_get_flags: This is a header for a new message!\n"); 
     293                g_warning ("tny_header_get_flags: This is a header for a new message!\n"); 
    294294                return; 
    295295        } 
    …… 
    301301 
    302302static void 
    303 tny_msg_header_unset_flags (TnyMsgHeaderIface *self, TnyMsgHeaderFlags mask) 
    304 { 
    305         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     303tny_header_unset_flags (TnyHeaderIface *self, TnyHeaderFlags mask) 
     304{ 
     305        TnyHeader *me = TNY_HEADER (self); 
    306306 
    307307        if (me->write) 
    308308        { 
    309                 g_warning ("tny_msg_header_get_flags: This is a header for a new message!\n"); 
     309                g_warning ("tny_header_get_flags: This is a header for a new message!\n"); 
    310310                return; 
    311311        } 
    …… 
    317317 
    318318static time_t 
    319 tny_msg_header_get_date_received (TnyMsgHeaderIface *self) 
    320 { 
    321         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     319tny_header_get_date_received (TnyHeaderIface *self) 
     320{ 
     321        TnyHeader *me = TNY_HEADER (self); 
    322322 
    323323        time_t retval; 
    …… 
    335335 
    336336static time_t 
    337 tny_msg_header_get_date_sent (TnyMsgHeaderIface *self) 
    338 { 
    339         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     337tny_header_get_date_sent (TnyHeaderIface *self) 
     338{ 
     339        TnyHeader *me = TNY_HEADER (self); 
    340340 
    341341        time_t retval; 
    …… 
    350350         
    351351static const gchar* 
    352 tny_msg_header_get_from (TnyMsgHeaderIface *self) 
    353 { 
    354         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     352tny_header_get_from (TnyHeaderIface *self) 
     353{ 
     354        TnyHeader *me = TNY_HEADER (self); 
    355355         
    356356        const gchar *retval; 
    …… 
    376376 
    377377static const gchar* 
    378 tny_msg_header_get_subject (TnyMsgHeaderIface *self) 
    379 { 
    380         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     378tny_header_get_subject (TnyHeaderIface *self) 
     379{ 
     380        TnyHeader *me = TNY_HEADER (self); 
    381381        const gchar *retval; 
    382382 
    …… 
    394394 
    395395static const gchar* 
    396 tny_msg_header_get_to (TnyMsgHeaderIface *self) 
    397 { 
    398         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     396tny_header_get_to (TnyHeaderIface *self) 
     397{ 
     398        TnyHeader *me = TNY_HEADER (self); 
    399399        gchar *retval; 
    400400 
    …… 
    411411 
    412412static const gchar* 
    413 tny_msg_header_get_message_id (TnyMsgHeaderIface *self) 
    414 { 
    415         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     413tny_header_get_message_id (TnyHeaderIface *self) 
     414{ 
     415        TnyHeader *me = TNY_HEADER (self); 
    416416        gchar *retval; 
    417417 
    …… 
    431431 
    432432static const gchar* 
    433 tny_msg_header_get_uid (TnyMsgHeaderIface *self) 
    434 { 
    435         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     433tny_header_get_uid (TnyHeaderIface *self) 
     434{ 
     435        TnyHeader *me = TNY_HEADER (self); 
    436436        const gchar *retval; 
    437437 
    …… 
    446446 
    447447static void 
    448 tny_msg_header_finalize (GObject *object) 
    449 { 
    450         TnyMsgHeader *self = (TnyMsgHeader*) object; 
     448tny_header_finalize (GObject *object) 
     449{ 
     450        TnyHeader *self = (TnyHeader*) object; 
    451451 
    452452        if (G_UNLIKELY (self->write)) 
    …… 
    465465 
    466466/** 
    467  * tny_msg_header_new: 
     467 * tny_header_new: 
    468468 * 
    469469 * 
    470  * Return value: A new #TnyMsgHeader instance implemented for Camel 
     470 * Return value: A new #TnyHeader instance implemented for Camel 
    471471 **/ 
    472 TnyMsgHeader* 
    473 tny_msg_header_new (void) 
    474 { 
    475         TnyMsgHeader *self = g_object_new (TNY_TYPE_MSG_HEADER, NULL); 
     472TnyHeader* 
     473tny_header_new (void) 
     474{ 
     475        TnyHeader *self = g_object_new (TNY_TYPE_HEADER, NULL); 
    476476         
    477477        self->info = NULL; 
    …… 
    482482 
    483483static void 
    484 tny_msg_header_set_folder (TnyMsgHeaderIface *self, TnyFolderIface *folder) 
    485 { 
    486         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     484tny_header_set_folder (TnyHeaderIface *self, TnyFolderIface *folder) 
     485{ 
     486        TnyHeader *me = TNY_HEADER (self); 
    487487        me->folder = (TnyFolderIface*)folder; 
    488488        return; 
    …… 
    490490 
    491491static TnyFolderIface* 
    492 tny_msg_header_get_folder (TnyMsgHeaderIface *self) 
    493 { 
    494         TnyMsgHeader *me = TNY_MSG_HEADER (self); 
     492tny_header_get_folder (TnyHeaderIface *self) 
     493{ 
     494        TnyHeader *me = TNY_HEADER (self); 
    495495        return (TnyFolderIface*)me->folder; 
    496496} 
    497497 
    498498static void 
    499 tny_msg_header_iface_init (gpointer g_iface, gpointer iface_data) 
    500 { 
    501         TnyMsgHeaderIfaceClass *klass = (TnyMsgHeaderIfaceClass *)g_iface; 
    502  
    503         klass->get_from_func = tny_msg_header_get_from; 
    504         klass->get_message_id_func = tny_msg_header_get_message_id; 
    505         klass->get_to_func = tny_msg_header_get_to; 
    506         klass->get_subject_func = tny_msg_header_get_subject; 
    507         klass->get_date_received_func = tny_msg_header_get_date_received; 
    508         klass->get_date_sent_func = tny_msg_header_get_date_sent; 
    509         klass->get_cc_func = tny_msg_header_get_cc; 
    510         klass->get_bcc_func = tny_msg_header_get_bcc; 
    511         klass->get_replyto_func = tny_msg_header_get_replyto; 
    512         klass->get_uid_func = tny_msg_header_get_uid; 
    513         klass->set_folder_func = tny_msg_header_set_folder; 
    514         klass->get_folder_func = tny_msg_header_get_folder; 
    515         klass->set_bcc_func = tny_msg_header_set_bcc; 
    516         klass->set_cc_func = tny_msg_header_set_cc; 
    517         klass->set_to_func = tny_msg_header_set_to; 
    518         klass->set_from_func = tny_msg_header_set_from; 
    519         klass->set_subject_func = tny_msg_header_set_subject; 
    520         klass->set_replyto_func = tny_msg_header_set_replyto; 
    521         klass->set_flags_func = tny_msg_header_set_flags; 
    522         klass->unset_flags_func = tny_msg_header_unset_flags; 
    523         klass->get_flags_func = tny_msg_header_get_flags; 
     499tny_header_iface_init (gpointer g_iface, gpointer iface_data) 
     500{ 
     501        TnyHeaderIfaceClass *klass = (TnyHeaderIfaceClass *)g_iface; 
     502 
     503        klass->get_from_func = tny_header_get_from; 
     504        klass->get_message_id_func = tny_header_get_message_id; 
     505        klass->get_to_func = tny_header_get_to; 
     506        klass->get_subject_func = tny_header_get_subject; 
     507        klass->get_date_received_func = tny_header_get_date_received; 
     508        klass->get_date_sent_func = tny_header_get_date_sent; 
     509        klass->get_cc_func = tny_header_get_cc; 
     510        klass->get_bcc_func = tny_header_get_bcc; 
     511        klass->get_replyto_func = tny_header_get_replyto; 
     512        klass->get_uid_func = tny_header_get_uid; 
     513        klass->set_folder_func = tny_header_set_folder; 
     514        klass->get_folder_func = tny_header_get_folder; 
     515        klass->set_bcc_func = tny_header_set_bcc; 
     516        klass->set_cc_func = tny_header_set_cc; 
     517        klass->set_to_func = tny_header_set_to; 
     518        klass->set_from_func = tny_header_set_from; 
     519        klass->set_subject_func = tny_header_set_subject; 
     520        klass->set_replyto_func = tny_header_set_replyto; 
     521        klass->set_flags_func = tny_header_set_flags; 
     522        klass->unset_flags_func = tny_header_unset_flags; 
     523        klass->get_flags_func = tny_header_get_flags; 
    524524 
    525525        return; 
    …… 
    528528 
    529529static void  
    530 tny_msg_header_class_init (TnyMsgHeaderClass *class) 
     530tny_header_class_init (TnyHeaderClass *class) 
    531531{ 
    532532        GObjectClass *object_class; 
    …… 
    535535        object_class = (GObjectClass*) class; 
    536536 
    537         object_class->finalize = tny_msg_header_finalize; 
     537        object_class->finalize = tny_header_finalize; 
    538538 
    539539        return; 
    …… 
    542542 
    543543GType  
    544 tny_msg_header_get_type (void) 
     544tny_header_get_type (void) 
    545545{ 
    546546        static GType type = 0; 
    …… 
    559559                static const GTypeInfo info =  
    560560                { 
    561                   sizeof (TnyMsgHeaderClass), 
     561                  sizeof (TnyHeaderClass), 
    562562                  NULL,   /* base_init */ 
    563563                  NULL,   /* base_finalize */ 
    564                   (GClassInitFunc) tny_msg_header_class_init,   /* class_init */ 
     564                  (GClassInitFunc) tny_header_class_init,   /* class_init */ 
    565565                  NULL,   /* class_finalize */ 
    566566                  NULL,   /* class_data */ 
    567                   sizeof (TnyMsgHeader), 
     567                  sizeof (TnyHeader), 
    568568                  0,      /* n_preallocs */ 
    569569                  NULL    /* instance_init */ 
    570570                }; 
    571571 
    572                 static const GInterfaceInfo tny_msg_header_iface_info =  
     572                static const GInterfaceInfo tny_header_iface_info =  
    573573                { 
    574                   (GInterfaceInitFunc) tny_msg_header_iface_init, /* interface_init */ 
     574                  (GInterfaceInitFunc) tny_header_iface_init, /* interface_init */ 
    575575                  NULL,         /* interface_finalize */ 
    576576                  NULL          /* interface_data */ 
    …… 
    578578 
    579579                type = g_type_register_static (G_TYPE_OBJECT, 
    580                         "TnyMsgHeader", 
     580                        "TnyHeader", 
    581581                        &info, 0); 
    582582 
    583                 g_type_add_interface_static (type, TNY_TYPE_MSG_HEADER_IFACE,  
    584                         &tny_msg_header_iface_info); 
     583                g_type_add_interface_static (type, TNY_TYPE_HEADER_IFACE,  
     584                        &tny_header_iface_info); 
    585585        }