Changeset 710

Show
Ignore:
Timestamp:
08/05/06 10:43:56
Author:
pvanhoof
Message:

Renaming TnyMsgMimePart? to TnyMimePart

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/bindings/python/tinymailui-gtk.override

    r700 r710  
    3535 
    3636import tinymail.MsgFolderIface as PyTnyFolderIface_Type 
    37 import tinymail.MsgMimePartIface as PyTnyMsgMimePartIface_Type 
     37import tinymail.MsgMimePartIface as PyTnyMimePartIface_Type 
    3838import tinymail.ui.SaveStrategyIface as PyTnySaveStrategyIface_Type 
    3939import tinymail.ui.MsgViewIface as PyTnyMsgViewIface_Type 
  • trunk/bindings/python/tinymailui.override

    r673 r710  
    2626import tinymail.MsgHeaderIface as PyTnyMsgHeaderIface_Type 
    2727import tinymail.MsgIface as PyTnyMsgIface_Type 
    28 import tinymail.MsgMimePartIface as PyTnyMsgMimePartIface_Type 
     28import tinymail.MsgMimePartIface as PyTnyMimePartIface_Type 
    2929import tinymail.AccountStoreIface as PyTnyAccountStoreIface_Type 
  • trunk/libtinymail-camel/tny-msg-mime-part-priv.h

    r209 r710  
    1 #ifndef TNY_MSG_MIME_PART_PRIV_H 
    2 #define TNY_MSG_MIME_PART_PRIV_H 
     1#ifndef TNY_MIME_PART_PRIV_H 
     2#define TNY_MIME_PART_PRIV_H 
    33 
    44/* libtinymail-camel - The Tiny Mail base library for Camel 
     
    2525#include <camel/camel-data-wrapper.h> 
    2626 
    27 typedef struct _TnyMsgMimePartPriv TnyMsgMimePartPriv; 
     27typedef struct _TnyMimePartPriv TnyMimePartPriv; 
    2828 
    29 struct _TnyMsgMimePartPriv 
     29struct _TnyMimePartPriv 
    3030{ 
    3131        GMutex *part_lock; 
     
    3434}; 
    3535 
    36 #define TNY_MSG_MIME_PART_GET_PRIVATE(o)      \ 
    37         (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MSG_MIME_PART, TnyMsgMimePartPriv)) 
     36#define TNY_MIME_PART_GET_PRIVATE(o)  \ 
     37        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MIME_PART, TnyMimePartPriv)) 
    3838 
    3939#endif 
  • trunk/libtinymail-camel/tny-msg-mime-part.c

    r503 r710  
    5454 
    5555static gboolean  
    56 tny_msg_mime_part_is_attachment (TnyMsgMimePartIface *self) 
    57 { 
    58         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     56tny_msg_mime_part_is_attachment (TnyMimePartIface *self) 
     57{ 
     58        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    5959        CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)priv->part); 
    6060 
     
    7676 
    7777static void 
    78 tny_msg_mime_part_write_to_stream (TnyMsgMimePartIface *self, TnyStreamIface *stream) 
    79 { 
    80         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     78tny_msg_mime_part_write_to_stream (TnyMimePartIface *self, TnyStreamIface *stream) 
     79{ 
     80        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    8181        CamelDataWrapper *wrapper; 
    8282        CamelMedium *medium; 
     
    171171 
    172172static void 
    173 tny_msg_mime_part_decode_to_stream (TnyMsgMimePartIface *self, TnyStreamIface *stream) 
    174 { 
    175  
    176         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     173tny_msg_mime_part_decode_to_stream (TnyMimePartIface *self, TnyStreamIface *stream) 
     174{ 
     175 
     176        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    177177        CamelDataWrapper *wrapper; 
    178178        CamelMedium *medium; 
     
    211211 
    212212static gint 
    213 tny_msg_mime_part_construct_from_stream (TnyMsgMimePartIface *self, TnyStreamIface *stream, const gchar *type) 
    214 { 
    215  
    216         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     213tny_msg_mime_part_construct_from_stream (TnyMimePartIface *self, TnyStreamIface *stream, const gchar *type) 
     214{ 
     215 
     216        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    217217        CamelDataWrapper *wrapper; 
    218218        gint retval = -1; 
     
    244244 
    245245static TnyStreamIface*  
    246 tny_msg_mime_part_get_stream (TnyMsgMimePartIface *self) 
    247 { 
    248         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     246tny_msg_mime_part_get_stream (TnyMimePartIface *self) 
     247{ 
     248        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    249249        TnyStreamIface *retval = NULL; 
    250250        CamelDataWrapper *wrapper; 
     
    278278 
    279279const gchar*  
    280 tny_msg_mime_part_get_content_type (TnyMsgMimePartIface *self) 
    281 { 
    282         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     280tny_msg_mime_part_get_content_type (TnyMimePartIface *self) 
     281{ 
     282        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    283283 
    284284        if (G_LIKELY (!priv->cached_content_type)) 
     
    297297 
    298298static gboolean  
    299 tny_msg_mime_part_content_type_is (TnyMsgMimePartIface *self, const gchar *type) 
    300 { 
    301         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     299tny_msg_mime_part_content_type_is (TnyMimePartIface *self, const gchar *type) 
     300{ 
     301        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    302302        CamelContentType *ctype; 
    303303        gchar *dup, *str1, *str2, *ptr; 
     
    330330/** 
    331331 * tny_msg_mime_part_set_part: 
    332  * @self: The #TnyMsgMimePart instance 
     332 * @self: The #TnyMimePart instance 
    333333 * @part: The #CamelMimePart instance 
    334334 * 
     
    336336 **/ 
    337337void 
    338 tny_msg_mime_part_set_part (TnyMsgMimePart *self, CamelMimePart *part) 
    339 { 
    340         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     338tny_msg_mime_part_set_part (TnyMimePart *self, CamelMimePart *part) 
     339{ 
     340        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    341341 
    342342        g_mutex_lock (priv->part_lock); 
     
    359359/** 
    360360 * tny_msg_mime_part_get_part: 
    361  * @self: The #TnyMsgMimePart instance 
     361 * @self: The #TnyMimePart instance 
    362362 * 
    363363 * Return value: The #CamelMimePart instance 
    364364 **/ 
    365365CamelMimePart* 
    366 tny_msg_mime_part_get_part (TnyMsgMimePart *self) 
    367 { 
    368         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     366tny_msg_mime_part_get_part (TnyMimePart *self) 
     367{ 
     368        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    369369        CamelMimePart *retval; 
    370370 
     
    378378 
    379379static const gchar* 
    380 tny_msg_mime_part_get_filename (TnyMsgMimePartIface *self) 
    381 { 
    382         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     380tny_msg_mime_part_get_filename (TnyMimePartIface *self) 
     381{ 
     382        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    383383        const gchar *retval; 
    384384 
     
    391391 
    392392static const gchar* 
    393 tny_msg_mime_part_get_content_id (TnyMsgMimePartIface *self) 
    394 { 
    395         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     393tny_msg_mime_part_get_content_id (TnyMimePartIface *self) 
     394{ 
     395        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    396396        const gchar *retval; 
    397397 
     
    404404 
    405405static const gchar* 
    406 tny_msg_mime_part_get_description (TnyMsgMimePartIface *self) 
    407 { 
    408         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     406tny_msg_mime_part_get_description (TnyMimePartIface *self) 
     407{ 
     408        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    409409        const gchar *retval; 
    410410 
     
    417417 
    418418static const gchar* 
    419 tny_msg_mime_part_get_content_location (TnyMsgMimePartIface *self) 
    420 { 
    421         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     419tny_msg_mime_part_get_content_location (TnyMimePartIface *self) 
     420{ 
     421        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    422422        const gchar *retval; 
    423423 
     
    431431 
    432432static void  
    433 tny_msg_mime_part_set_content_location (TnyMsgMimePartIface *self, const gchar *content_location) 
    434 { 
    435         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     433tny_msg_mime_part_set_content_location (TnyMimePartIface *self, const gchar *content_location) 
     434{ 
     435        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    436436 
    437437        g_mutex_lock (priv->part_lock); 
     
    443443 
    444444static void  
    445 tny_msg_mime_part_set_description (TnyMsgMimePartIface *self, const gchar *description) 
    446 { 
    447         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     445tny_msg_mime_part_set_description (TnyMimePartIface *self, const gchar *description) 
     446{ 
     447        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    448448 
    449449        g_mutex_lock (priv->part_lock); 
     
    455455 
    456456static void  
    457 tny_msg_mime_part_set_content_id (TnyMsgMimePartIface *self, const gchar *content_id) 
    458 { 
    459         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     457tny_msg_mime_part_set_content_id (TnyMimePartIface *self, const gchar *content_id) 
     458{ 
     459        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    460460 
    461461        g_mutex_lock (priv->part_lock); 
     
    467467 
    468468static void  
    469 tny_msg_mime_part_set_filename (TnyMsgMimePartIface *self, const gchar *filename) 
    470 { 
    471         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     469tny_msg_mime_part_set_filename (TnyMimePartIface *self, const gchar *filename) 
     470{ 
     471        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    472472 
    473473        g_mutex_lock (priv->part_lock); 
     
    479479 
    480480static void  
    481 tny_msg_mime_part_set_content_type (TnyMsgMimePartIface *self, const gchar *content_type) 
    482 { 
    483         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     481tny_msg_mime_part_set_content_type (TnyMimePartIface *self, const gchar *content_type) 
     482{ 
     483        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    484484 
    485485        g_mutex_lock (priv->part_lock); 
     
    498498tny_msg_mime_part_finalize (GObject *object) 
    499499{ 
    500         TnyMsgMimePart *self = (TnyMsgMimePart*) object; 
    501         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     500        TnyMimePart *self = (TnyMimePart*) object; 
     501        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    502502 
    503503        g_mutex_lock (priv->part_lock); 
     
    528528 * tny_msg_mime_part_new: 
    529529 *  
    530  * The #TnyMsgMimePart implementation is actually a proxy for #CamelMimePart. 
     530 * The #TnyMimePart implementation is actually a proxy for #CamelMimePart. 
    531531 * 
    532  * Return value: A new #TnyMsgMimePartIface instance implemented for Camel 
     532 * Return value: A new #TnyMimePartIface instance implemented for Camel 
    533533 **/ 
    534 TnyMsgMimePart* 
     534TnyMimePart* 
    535535tny_msg_mime_part_new (CamelMimePart *part) 
    536536{ 
    537         TnyMsgMimePart *self = g_object_new (TNY_TYPE_MSG_MIME_PART, NULL); 
     537        TnyMimePart *self = g_object_new (TNY_TYPE_MIME_PART, NULL); 
    538538         
    539539        tny_msg_mime_part_set_part (self, part); 
     
    547547tny_msg_mime_part_iface_init (gpointer g_iface, gpointer iface_data) 
    548548{ 
    549         TnyMsgMimePartIfaceClass *klass = (TnyMsgMimePartIfaceClass *)g_iface; 
     549        TnyMimePartIfaceClass *klass = (TnyMimePartIfaceClass *)g_iface; 
    550550 
    551551        klass->content_type_is_func = tny_msg_mime_part_content_type_is; 
     
    572572 
    573573static void  
    574 tny_msg_mime_part_class_init (TnyMsgMimePartClass *class) 
     574tny_msg_mime_part_class_init (TnyMimePartClass *class) 
    575575{ 
    576576        GObjectClass *object_class; 
     
    581581        object_class->finalize = tny_msg_mime_part_finalize; 
    582582 
    583         g_type_class_add_private (object_class, sizeof (TnyMsgMimePartPriv)); 
     583        g_type_class_add_private (object_class, sizeof (TnyMimePartPriv)); 
    584584 
    585585        return; 
     
    589589tny_msg_mime_part_instance_init (GTypeInstance *instance, gpointer g_class) 
    590590{ 
    591         TnyMsgMimePart *self = (TnyMsgMimePart*)instance; 
    592         TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     591        TnyMimePart *self = (TnyMimePart*)instance; 
     592        TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 
    593593 
    594594        priv->part_lock = g_mutex_new (); 
     
    615615                static const GTypeInfo info =  
    616616                { 
    617                   sizeof (TnyMsgMimePartClass), 
     617                  sizeof (TnyMimePartClass), 
    618618                  NULL,   /* base_init */ 
    619619                  NULL,   /* base_finalize */ 
     
    621621                  NULL,   /* class_finalize */ 
    622622                  NULL,   /* class_data */ 
    623                   sizeof (TnyMsgMimePart), 
     623                  sizeof (TnyMimePart), 
    624624                  0,      /* n_preallocs */ 
    625625                  tny_msg_mime_part_instance_init    /* instance_init */ 
     
    634634 
    635635                type = g_type_register_static (G_TYPE_OBJECT, 
    636                         "TnyMsgMimePart", 
     636                        "TnyMimePart", 
    637637                        &info, 0); 
    638638 
    639                 g_type_add_interface_static (type, TNY_TYPE_MSG_MIME_PART_IFACE,  
     639                g_type_add_interface_static (type, TNY_TYPE_MIME_PART_IFACE,  
    640640                        &tny_msg_mime_part_iface_info); 
    641641        } 
  • trunk/libtinymail-camel/tny-msg-mime-part.h

    r155 r710  
    1 #ifndef TNY_MSG_MIME_PART_H 
    2 #define TNY_MSG_MIME_PART_H 
     1#ifndef TNY_MIME_PART_H 
     2#define TNY_MIME_PART_H 
    33 
    44/* libtinymail-camel - The Tiny Mail base library for Camel 
     
    2929G_BEGIN_DECLS 
    3030 
    31 #define TNY_TYPE_MSG_MIME_PART             (tny_msg_mime_part_get_type ()) 
    32 #define TNY_MSG_MIME_PART(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_MSG_MIME_PART, TnyMsgMimePart)) 
    33 #define TNY_MSG_MIME_PART_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_MSG_MIME_PART, TnyMsgMimePartClass)) 
    34 #define TNY_IS_MSG_MIME_PART(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_MSG_MIME_PART)) 
    35 #define TNY_IS_MSG_MIME_PART_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_MSG_MIME_PART)) 
    36 #define TNY_MSG_MIME_PART_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_MSG_MIME_PART, TnyMsgMimePartClass)) 
     31#define TNY_TYPE_MIME_PART             (tny_msg_mime_part_get_type ()) 
     32#define TNY_MIME_PART(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_MIME_PART, TnyMimePart)) 
     33#define TNY_MIME_PART_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_MIME_PART, TnyMimePartClass)) 
     34#define TNY_IS_MIME_PART(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_MIME_PART)) 
     35#define TNY_IS_MIME_PART_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_MIME_PART)) 
     36#define TNY_MIME_PART_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_MIME_PART, TnyMimePartClass)) 
    3737 
    38 typedef struct _TnyMsgMimePart TnyMsgMimePart; 
    39 typedef struct _TnyMsgMimePartClass TnyMsgMimePartClass; 
     38typedef struct _TnyMimePart TnyMimePart; 
     39typedef struct _TnyMimePartClass TnyMimePartClass; 
    4040 
    41 struct _TnyMsgMimePart  
     41struct _TnyMimePart  
    4242{ 
    4343        GObject parent; 
    4444}; 
    4545 
    46 struct _TnyMsgMimePartClass  
     46struct _TnyMimePartClass  
    4747{ 
    4848        GObjectClass parent; 
     
    5252GType                 tny_msg_mime_part_get_type  (void); 
    5353 
    54 TnyMsgMimePart*       tny_msg_mime_part_new       (CamelMimePart *part); 
    55 void                  tny_msg_mime_part_set_part  (TnyMsgMimePart *self, CamelMimePart *part); 
    56 CamelMimePart*        tny_msg_mime_part_get_part  (TnyMsgMimePart *self); 
     54TnyMimePart*       tny_msg_mime_part_new       (CamelMimePart *part); 
     55void                  tny_msg_mime_part_set_part  (TnyMimePart *self, CamelMimePart *part); 
     56CamelMimePart*        tny_msg_mime_part_get_part  (TnyMimePart *self); 
    5757 
    5858G_END_DECLS 
  • trunk/libtinymail-camel/tny-msg.c

    r704 r710  
    9595{ 
    9696        TnyListIface *list = data; 
    97         TnyMsgMimePartIface *tpart; 
     97        TnyMimePartIface *tpart; 
    9898 
    9999        if (!part) 
     
    103103           and tny-msg-mime-part.c:515 ! */ 
    104104 
    105         tpart = TNY_MSG_MIME_PART_IFACE  (tny_msg_mime_part_new (part)); 
     105        tpart = TNY_MIME_PART_IFACE  (tny_msg_mime_part_new (part)); 
    106106 
    107107        tny_list_iface_prepend (list, (GObject*)tpart); 
     
    116116_tny_msg_get_camel_mime_message (TnyMsg *self) 
    117117{ 
    118         TnyMsgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     118        TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 
    119119 
    120120        return CAMEL_MIME_MESSAGE (ppriv->part); 
     
    126126{ 
    127127        TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (self); 
    128         TnyMsgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     128        TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 
    129129 
    130130        g_mutex_lock (priv->message_lock); 
     
    172172{ 
    173173        TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 
    174         TnyMsgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     174        TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 
    175175 
    176176        g_mutex_lock (priv->parts_lock); 
     
    199199 
    200200static gint 
    201 tny_msg_add_part (TnyMsgIface *self, TnyMsgMimePartIface *part) 
    202 { 
    203         TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 
    204         TnyMsgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     201tny_msg_add_part (TnyMsgIface *self, TnyMimePartIface *part) 
     202{ 
     203        TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 
     204        TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 
    205205        CamelMedium *medium; 
    206206        CamelDataWrapper *containee; 
    207         TnyMsgMimePartIface *tpart; 
     207        TnyMimePartIface *tpart; 
    208208        gint curl = 0; 
    209209 
     
    234234 
    235235        camel_multipart_add_part ((CamelMultipart*)containee,  
    236                 tny_msg_mime_part_get_part (TNY_MSG_MIME_PART (part))); 
     236                tny_msg_mime_part_get_part (TNY_MIME_PART (part))); 
    237237 
    238238        g_mutex_unlock (priv->parts_lock); 
     
    251251{ 
    252252        TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 
    253         TnyMsgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     253        TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 
    254254        gpointer remove; 
    255255        TnyIteratorIface *iterator; 
     
    295295        TnyMsg *self = (TnyMsg*) object; 
    296296        TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 
    297         TnyMsgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self); 
     297        TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 
    298298 
    299299        g_mutex_lock (priv->header_lock); 
     
    445445                }; 
    446446 
    447                 type = g_type_register_static (TNY_TYPE_MSG_MIME_PART, 
     447                type = g_type_register_static (TNY_TYPE_MIME_PART, 
    448448                        "TnyMsg", 
    449449                        &info, 0); 
  • trunk/libtinymail-camel/tny-msg.h

    r552 r710  
    4444struct _TnyMsg 
    4545{ 
    46         TnyMsgMimePart parent;         
     46        TnyMimePart parent;    
    4747}; 
    4848 
    4949struct _TnyMsgClass  
    5050{ 
    51         TnyMsgMimePartClass parent; 
     51        TnyMimePartClass parent; 
    5252}; 
    5353 
  • trunk/libtinymail-test/tny-msg-mime-part-iface-test.c

    r553 r710  
    3030#include <camel/camel-folder-summary.h> 
    3131 
    32 static TnyMsgMimePartIface *iface = NULL; 
     32static TnyMimePartIface *iface = NULL; 
    3333static gchar *str; 
    3434 
     
    4141 
    4242        CamelMimePart *cpart = camel_mime_part_new (); 
    43         iface = TNY_MSG_MIME_PART_IFACE (tny_msg_mime_part_new (cpart)); 
     43        iface = TNY_MIME_PART_IFACE (tny_msg_mime_part_new (cpart)); 
    4444 
    4545        return; 
     
    162162 
    163163        /* Create test suite */ 
    164         suite = gunit_test_suite_new ("TnyMsgMimePartIface"); 
     164        suite = gunit_test_suite_new ("TnyMimePartIface"); 
    165165 
    166166        /* Add test case objects to test suite */ 
  • trunk/libtinymail-test/tny-msg-mime-part-iface-test.h

    r158 r710  
    1 #ifndef TNY_MSG_MIME_PART_IFACE_TEST_H 
    2 #define TNY_MSG_MIME_PART_IFACE_TEST_H 
     1#ifndef TNY_MIME_PART_IFACE_TEST_H 
     2#define TNY_MIME_PART_IFACE_TEST_H 
    33 
    44/* tinymail - Tiny Mail gunit test 
  • trunk/libtinymail-test/tny-test-anything.c

    r554 r710  
    109109                                (body_text, strlen (body_text)))); 
    110110         
    111         TnyMsgMimePartIface *mime_part =  
    112                 TNY_MSG_MIME_PART_IFACE (tny_msg_mime_part_new (camel_mime_part_new())); 
    113  
    114         TnyMsgMimePartIface *body_part =  
    115                 TNY_MSG_MIME_PART_IFACE (tny_msg_mime_part_new (camel_mime_part_new())); 
     111        TnyMimePartIface *mime_part =  
     112                TNY_MIME_PART_IFACE (tny_msg_mime_part_new (camel_mime_part_new())); 
     113 
     114        TnyMimePartIface *body_part =  
     115                TNY_MIME_PART_IFACE (tny_msg_mime_part_new (camel_mime_part_new())); 
    116116         
    117117        tny_account_iface_set_account_store (TNY_ACCOUNT_IFACE (account),  
     
    147147 
    148148        tny_msg_mime_part_iface_set_content_type  
    149                 (TNY_MSG_MIME_PART_IFACE (msg), "text/plain"); 
     149                (TNY_MIME_PART_IFACE (msg), "text/plain"); 
    150150 
    151151        tny_stream_iface_reset (body_stream); 
     
    154154        { 
    155155                tny_msg_mime_part_iface_construct_from_stream  
    156                         (TNY_MSG_MIME_PART_IFACE (msg), body_stream, "text/plain"); 
     156                        (TNY_MIME_PART_IFACE (msg), body_stream, "text/plain"); 
    157157        } else { 
    158158                tny_msg_iface_add_part (msg, body_part);  
  • trunk/libtinymail/tny-msg-iface.c

    r704 r710  
    9494 **/ 
    9595gint 
    96 tny_msg_iface_add_part (TnyMsgIface *self, TnyMsgMimePartIface *part) 
     96tny_msg_iface_add_part (TnyMsgIface *self, TnyMimePartIface *part) 
    9797{ 
    9898#ifdef DEBUG 
     
    178178                        "TnyMsgIface", &info, 0); 
    179179 
    180                 g_type_interface_add_prerequisite (type, TNY_TYPE_MSG_MIME_PART_IFACE);  
     180                g_type_interface_add_prerequisite (type, TNY_TYPE_MIME_PART_IFACE);  
    181181        } 
    182182 
  • trunk/libtinymail/tny-msg-iface.h

    r704 r710  
    4848 
    4949        void                     (*del_part_func)         (TnyMsgIface *self, gint id); 
    50         gint                     (*add_part_func)         (TnyMsgIface *self, TnyMsgMimePartIface *part); 
     50        gint                     (*add_part_func)         (TnyMsgIface *self, TnyMimePartIface *part); 
    5151 
    5252}; 
     
    5757TnyMsgHeaderIface* tny_msg_iface_get_header       (TnyMsgIface *self); 
    5858 
    59 gint                     tny_msg_iface_add_part         (TnyMsgIface *self, TnyMsgMimePartIface *part); 
     59gint                     tny_msg_iface_add_part         (TnyMsgIface *self, TnyMimePartIface *part); 
    6060void                     tny_msg_iface_del_part         (TnyMsgIface *self, gint id); 
    6161 
  • trunk/libtinymail/tny-msg-mime-part-iface.c

    r522 r710  
    2424/** 
    2525 * tny_msg_mime_part_iface_is_attachment: 
    26  * @self: a #TnyMsgMimePartIface object 
     26 * @self: a #TnyMimePartIface object 
    2727 *  
    2828 * Return value: whether or not the mime part is an attachment 
     
    3030 **/ 
    3131gboolean  
    32 tny_msg_mime_part_iface_is_attachment (TnyMsgMimePartIface *self) 
    33 { 
    34 #ifdef DEBUG 
    35         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func) 
     32tny_msg_mime_part_iface_is_attachment (TnyMimePartIface *self) 
     33{ 
     34#ifdef DEBUG 
     35        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func) 
    3636                g_critical ("You must implement tny_msg_mime_part_iface_is_attachment\n"); 
    3737#endif 
    38         return TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func (self); 
     38        return TNY_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func (self); 
    3939} 
    4040 
     
    4242/** 
    4343 * tny_msg_mime_part_iface_set_content_location: 
    44  * @self: a #TnyMsgMimePartIface object 
     44 * @self: a #TnyMimePartIface object 
    4545 * @content_location: the location  
    4646 *  
     
    4949 **/ 
    5050void 
    51 tny_msg_mime_part_iface_set_content_location (TnyMsgMimePartIface *self, const gchar *content_location) 
    52 { 
    53 #ifdef DEBUG 
    54         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_content_location_func) 
     51tny_msg_mime_part_iface_set_content_location (TnyMimePartIface *self, const gchar *content_location) 
     52{ 
     53#ifdef DEBUG 
     54        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->set_content_location_func) 
    5555                g_critical ("You must implement tny_msg_mime_part_iface_set_content_location\n"); 
    5656#endif 
    5757 
    58         TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_content_location_func (self, content_location); 
     58        TNY_MIME_PART_IFACE_GET_CLASS (self)->set_content_location_func (self, content_location); 
    5959        return; 
    6060} 
     
    6262/** 
    6363 * tny_msg_mime_part_iface_set_description: 
    64  * @self: a #TnyMsgMimePartIface object 
     64 * @self: a #TnyMimePartIface object 
    6565 * @description: the description  
    6666 *  
     
    6969 **/ 
    7070void 
    71 tny_msg_mime_part_iface_set_description (TnyMsgMimePartIface *self, const gchar *description) 
    72 { 
    73 #ifdef DEBUG 
    74         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_description_func) 
     71tny_msg_mime_part_iface_set_description (TnyMimePartIface *self, const gchar *description) 
     72{ 
     73#ifdef DEBUG 
     74        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->set_description_func) 
    7575                g_critical ("You must implement tny_msg_mime_part_iface_set_description\n"); 
    7676#endif 
    7777 
    78         TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_description_func (self, description); 
     78        TNY_MIME_PART_IFACE_GET_CLASS (self)->set_description_func (self, description); 
    7979        return; 
    8080} 
     
    8282/** 
    8383 * tny_msg_mime_part_iface_set_content_id: 
    84  * @self: a #TnyMsgMimePartIface object 
     84 * @self: a #TnyMimePartIface object 
    8585 * @content_id: the content id  
    8686 *  
     
    8989 **/ 
    9090void 
    91 tny_msg_mime_part_iface_set_content_id (TnyMsgMimePartIface *self, const gchar *content_id) 
    92 { 
    93 #ifdef DEBUG 
    94         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_content_id_func) 
     91tny_msg_mime_part_iface_set_content_id (TnyMimePartIface *self, const gchar *content_id) 
     92{ 
     93#ifdef DEBUG 
     94        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->set_content_id_func) 
    9595                g_critical ("You must implement tny_msg_mime_part_iface_set_content_id\n"); 
    9696#endif 
    9797 
    98         TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_content_id_func (self, content_id); 
     98        TNY_MIME_PART_IFACE_GET_CLASS (self)->set_content_id_func (self, content_id); 
    9999        return; 
    100100} 
     
    102102/** 
    103103 * tny_msg_mime_part_iface_set_filename: 
    104  * @self: a #TnyMsgMimePartIface object 
     104 * @self: a #TnyMimePartIface object 
    105105 * @filename: the filename  
    106106 *  
     
    109109 **/ 
    110110void 
    111 tny_msg_mime_part_iface_set_filename (TnyMsgMimePartIface *self, const gchar *filename) 
    112 { 
    113 #ifdef DEBUG 
    114         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_filename_func) 
     111tny_msg_mime_part_iface_set_filename (TnyMimePartIface *self, const gchar *filename) 
     112{ 
     113#ifdef DEBUG 
     114        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->set_filename_func) 
    115115                g_critical ("You must implement tny_msg_mime_part_iface_set_filename\n"); 
    116116#endif 
    117117 
    118         TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_filename_func (self, filename); 
     118        TNY_MIME_PART_IFACE_GET_CLASS (self)->set_filename_func (self, filename); 
    119119        return; 
    120120} 
     
    122122/** 
    123123 * tny_msg_mime_part_iface_set_content_type: 
    124  * @self: a #TnyMsgMimePartIface object 
     124 * @self: a #TnyMimePartIface object 
    125125 * @content_type: the content_type  
    126126 *  
     
    129129 **/ 
    130130void 
    131 tny_msg_mime_part_iface_set_content_type (TnyMsgMimePartIface *self, const gchar *content_type) 
    132 { 
    133 #ifdef DEBUG 
    134         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_content_type_func) 
     131tny_msg_mime_part_iface_set_content_type (TnyMimePartIface *self, const gchar *content_type) 
     132{ 
     133#ifdef DEBUG 
     134        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->set_content_type_func) 
    135135                g_critical ("You must implement tny_msg_mime_part_iface_set_content_type\n"); 
    136136#endif 
    137137 
    138         TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->set_content_type_func (self, content_type); 
     138        TNY_MIME_PART_IFACE_GET_CLASS (self)->set_content_type_func (self, content_type); 
    139139        return; 
    140140} 
     
    143143/** 
    144144 * tny_msg_mime_part_iface_get_filename: 
    145  * @self: a #TnyMsgMimePartIface object 
     145 * @self: a #TnyMimePartIface object 
    146146 *  
    147147 * 
     
    149149 **/ 
    150150const gchar* 
    151 tny_msg_mime_part_iface_get_filename (TnyMsgMimePartIface *self) 
    152 { 
    153 #ifdef DEBUG 
    154         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func) 
     151tny_msg_mime_part_iface_get_filename (TnyMimePartIface *self) 
     152{ 
     153#ifdef DEBUG 
     154        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func) 
    155155                g_critical ("You must implement tny_msg_mime_part_iface_get_filename\n"); 
    156156#endif 
    157157 
    158         return TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func (self); 
     158        return TNY_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func (self); 
    159159} 
    160160 
    161161/** 
    162162 * tny_msg_mime_part_iface_get_content_id: 
    163  * @self: a #TnyMsgMimePartIface object 
     163 * @self: a #TnyMimePartIface object 
    164164 *  
    165165 * 
     
    167167 **/ 
    168168const gchar* 
    169 tny_msg_mime_part_iface_get_content_id (TnyMsgMimePartIface *self) 
    170 { 
    171 #ifdef DEBUG 
    172         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_content_id_func) 
     169tny_msg_mime_part_iface_get_content_id (TnyMimePartIface *self) 
     170{ 
     171#ifdef DEBUG 
     172        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->get_content_id_func) 
    173173                g_critical ("You must implement tny_msg_mime_part_iface_get_content_id\n"); 
    174174#endif 
    175175 
    176         return TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_content_id_func (self); 
     176        return TNY_MIME_PART_IFACE_GET_CLASS (self)->get_content_id_func (self); 
    177177} 
    178178 
    179179/** 
    180180 * tny_msg_mime_part_iface_get_description: 
    181  * @self: a #TnyMsgMimePartIface object 
     181 * @self: a #TnyMimePartIface object 
    182182 *  
    183183 * 
     
    185185 **/ 
    186186const gchar* 
    187 tny_msg_mime_part_iface_get_description (TnyMsgMimePartIface *self) 
    188 { 
    189 #ifdef DEBUG 
    190         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_description_func) 
     187tny_msg_mime_part_iface_get_description (TnyMimePartIface *self) 
     188{ 
     189#ifdef DEBUG 
     190        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->get_description_func) 
    191191                g_critical ("You must implement tny_msg_mime_part_iface_get_description\n"); 
    192192#endif 
    193193 
    194         return TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_description_func (self); 
     194        return TNY_MIME_PART_IFACE_GET_CLASS (self)->get_description_func (self); 
    195195} 
    196196 
    197197/** 
    198198 * tny_msg_mime_part_iface_get_content_location: 
    199  * @self: a #TnyMsgMimePartIface object 
     199 * @self: a #TnyMimePartIface object 
    200200 *  
    201201 * 
     
    203203 **/ 
    204204const gchar* 
    205 tny_msg_mime_part_iface_get_content_location (TnyMsgMimePartIface *self) 
    206 { 
    207 #ifdef DEBUG 
    208         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_content_location_func) 
     205tny_msg_mime_part_iface_get_content_location (TnyMimePartIface *self) 
     206{ 
     207#ifdef DEBUG 
     208        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->get_content_location_func) 
    209209                g_critical ("You must implement tny_msg_mime_part_iface_get_content_location\n"); 
    210210#endif 
    211211 
    212         return TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->get_content_location_func (self); 
     212        return TNY_MIME_PART_IFACE_GET_CLASS (self)->get_content_location_func (self); 
    213213} 
    214214 
    215215/** 
    216216 * tny_msg_mime_part_iface_write_to_stream: 
    217  * @self: a #TnyMsgMimePartIface object 
     217 * @self: a #TnyMimePartIface object 
    218218 * @stream: a #TnyMsgStreamIface stream 
    219219 *  
     
    224224 **/ 
    225225void 
    226 tny_msg_mime_part_iface_write_to_stream (TnyMsgMimePartIface *self, TnyStreamIface *stream) 
    227 { 
    228 #ifdef DEBUG 
    229         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->write_to_stream_func) 
     226tny_msg_mime_part_iface_write_to_stream (TnyMimePartIface *self, TnyStreamIface *stream) 
     227{ 
     228#ifdef DEBUG 
     229        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->write_to_stream_func) 
    230230                g_critical ("You must implement tny_msg_mime_part_iface_write_to_stream\n"); 
    231231#endif 
    232232 
    233         TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->write_to_stream_func (self, stream); 
     233        TNY_MIME_PART_IFACE_GET_CLASS (self)->write_to_stream_func (self, stream); 
    234234        return; 
    235235} 
     
    238238/** 
    239239 * tny_msg_mime_part_iface_decode_to_stream: 
    240  * @self: a #TnyMsgMimePartIface object 
     240 * @self: a #TnyMimePartIface object 
    241241 * @stream: a #TnyMsgStreamIface stream 
    242242 *  
     
    247247 **/ 
    248248void 
    249 tny_msg_mime_part_iface_decode_to_stream (TnyMsgMimePartIface *self, TnyStreamIface *stream) 
    250 { 
    251 #ifdef DEBUG 
    252         if (!TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->decode_to_stream_func) 
     249tny_msg_mime_part_iface_decode_to_stream (TnyMimePartIface *self, TnyStreamIface *stream) 
     250{ 
     251#ifdef DEBUG 
     252        if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->decode_to_stream_func) 
    253253                g_critical ("You must implement tny_msg_mime_part_iface_decode_to_stream\n"); 
    254254#endif 
    255255 
    256         TNY_MSG_MIME_PART_IFACE_GET_CLASS (self)->decode_to_stream_func (self, stream); 
     256        TNY_MIME_PART_IFACE_GET_CLASS (self)->decode_to_stream_func (self, stream); 
    257257        return; 
    258258} 
    259259/** 
    260260 * tny_msg_mime_part_iface_construct_from_stream: 
    261  * @self: a #TnyMsgMimePartIface object 
     261 * @self: a #TnyMimePartIface object 
    262262 * @stream: a #TnyMsgStreamIface stream 
    263263 * @type: the type like text/plain&nbs