Changeset 710
- Timestamp:
- 08/05/06 10:43:56
- Files:
-
- trunk/bindings/python/tinymailui-gtk.override (modified) (1 diff)
- trunk/bindings/python/tinymailui.override (modified) (1 diff)
- trunk/libtinymail-camel/tny-msg-mime-part-priv.h (modified) (3 diffs)
- trunk/libtinymail-camel/tny-msg-mime-part.c (modified) (28 diffs)
- trunk/libtinymail-camel/tny-msg-mime-part.h (modified) (3 diffs)
- trunk/libtinymail-camel/tny-msg.c (modified) (10 diffs)
- trunk/libtinymail-camel/tny-msg.h (modified) (1 diff)
- trunk/libtinymail-test/tny-msg-mime-part-iface-test.c (modified) (3 diffs)
- trunk/libtinymail-test/tny-msg-mime-part-iface-test.h (modified) (1 diff)
- trunk/libtinymail-test/tny-test-anything.c (modified) (3 diffs)
- trunk/libtinymail/tny-msg-iface.c (modified) (2 diffs)
- trunk/libtinymail/tny-msg-iface.h (modified) (2 diffs)
- trunk/libtinymail/tny-msg-mime-part-iface.c (modified) (27 diffs)
- trunk/libtinymail/tny-msg-mime-part-iface.h (modified) (2 diffs)
- trunk/libtinymail/tny-shared.h (modified) (1 diff)
- trunk/libtinymailui-gtk/tny-attach-list-model.c (modified) (6 diffs)
- trunk/libtinymailui-gtk/tny-msg-view.c (modified) (2 diffs)
- trunk/libtinymailui-gtk/tny-save-strategy.c (modified) (3 diffs)
- trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c (modified) (2 diffs)
- trunk/libtinymailui/tny-save-strategy-iface.c (modified) (1 diff)
- trunk/libtinymailui/tny-save-strategy-iface.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/bindings/python/tinymailui-gtk.override
r700 r710 35 35 36 36 import tinymail.MsgFolderIface as PyTnyFolderIface_Type 37 import tinymail.MsgMimePartIface as PyTnyM sgMimePartIface_Type37 import tinymail.MsgMimePartIface as PyTnyMimePartIface_Type 38 38 import tinymail.ui.SaveStrategyIface as PyTnySaveStrategyIface_Type 39 39 import tinymail.ui.MsgViewIface as PyTnyMsgViewIface_Type trunk/bindings/python/tinymailui.override
r673 r710 26 26 import tinymail.MsgHeaderIface as PyTnyMsgHeaderIface_Type 27 27 import tinymail.MsgIface as PyTnyMsgIface_Type 28 import tinymail.MsgMimePartIface as PyTnyM sgMimePartIface_Type28 import tinymail.MsgMimePartIface as PyTnyMimePartIface_Type 29 29 import tinymail.AccountStoreIface as PyTnyAccountStoreIface_Type trunk/libtinymail-camel/tny-msg-mime-part-priv.h
r209 r710 1 #ifndef TNY_M SG_MIME_PART_PRIV_H2 #define TNY_M SG_MIME_PART_PRIV_H1 #ifndef TNY_MIME_PART_PRIV_H 2 #define TNY_MIME_PART_PRIV_H 3 3 4 4 /* libtinymail-camel - The Tiny Mail base library for Camel … … 25 25 #include <camel/camel-data-wrapper.h> 26 26 27 typedef struct _TnyM sgMimePartPriv TnyMsgMimePartPriv;27 typedef struct _TnyMimePartPriv TnyMimePartPriv; 28 28 29 struct _TnyM sgMimePartPriv29 struct _TnyMimePartPriv 30 30 { 31 31 GMutex *part_lock; … … 34 34 }; 35 35 36 #define TNY_M SG_MIME_PART_GET_PRIVATE(o) \37 (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_M SG_MIME_PART, TnyMsgMimePartPriv))36 #define TNY_MIME_PART_GET_PRIVATE(o) \ 37 (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MIME_PART, TnyMimePartPriv)) 38 38 39 39 #endif trunk/libtinymail-camel/tny-msg-mime-part.c
r503 r710 54 54 55 55 static gboolean 56 tny_msg_mime_part_is_attachment (TnyM sgMimePartIface *self)57 { 58 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);56 tny_msg_mime_part_is_attachment (TnyMimePartIface *self) 57 { 58 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 59 59 CamelDataWrapper *dw = camel_medium_get_content_object((CamelMedium *)priv->part); 60 60 … … 76 76 77 77 static void 78 tny_msg_mime_part_write_to_stream (TnyM sgMimePartIface *self, TnyStreamIface *stream)79 { 80 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);78 tny_msg_mime_part_write_to_stream (TnyMimePartIface *self, TnyStreamIface *stream) 79 { 80 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 81 81 CamelDataWrapper *wrapper; 82 82 CamelMedium *medium; … … 171 171 172 172 static void 173 tny_msg_mime_part_decode_to_stream (TnyM sgMimePartIface *self, TnyStreamIface *stream)174 { 175 176 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);173 tny_msg_mime_part_decode_to_stream (TnyMimePartIface *self, TnyStreamIface *stream) 174 { 175 176 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 177 177 CamelDataWrapper *wrapper; 178 178 CamelMedium *medium; … … 211 211 212 212 static gint 213 tny_msg_mime_part_construct_from_stream (TnyM sgMimePartIface *self, TnyStreamIface *stream, const gchar *type)214 { 215 216 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);213 tny_msg_mime_part_construct_from_stream (TnyMimePartIface *self, TnyStreamIface *stream, const gchar *type) 214 { 215 216 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 217 217 CamelDataWrapper *wrapper; 218 218 gint retval = -1; … … 244 244 245 245 static TnyStreamIface* 246 tny_msg_mime_part_get_stream (TnyM sgMimePartIface *self)247 { 248 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);246 tny_msg_mime_part_get_stream (TnyMimePartIface *self) 247 { 248 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 249 249 TnyStreamIface *retval = NULL; 250 250 CamelDataWrapper *wrapper; … … 278 278 279 279 const gchar* 280 tny_msg_mime_part_get_content_type (TnyM sgMimePartIface *self)281 { 282 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);280 tny_msg_mime_part_get_content_type (TnyMimePartIface *self) 281 { 282 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 283 283 284 284 if (G_LIKELY (!priv->cached_content_type)) … … 297 297 298 298 static gboolean 299 tny_msg_mime_part_content_type_is (TnyM sgMimePartIface *self, const gchar *type)300 { 301 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);299 tny_msg_mime_part_content_type_is (TnyMimePartIface *self, const gchar *type) 300 { 301 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 302 302 CamelContentType *ctype; 303 303 gchar *dup, *str1, *str2, *ptr; … … 330 330 /** 331 331 * tny_msg_mime_part_set_part: 332 * @self: The #TnyM sgMimePart instance332 * @self: The #TnyMimePart instance 333 333 * @part: The #CamelMimePart instance 334 334 * … … 336 336 **/ 337 337 void 338 tny_msg_mime_part_set_part (TnyM sgMimePart *self, CamelMimePart *part)339 { 340 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);338 tny_msg_mime_part_set_part (TnyMimePart *self, CamelMimePart *part) 339 { 340 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 341 341 342 342 g_mutex_lock (priv->part_lock); … … 359 359 /** 360 360 * tny_msg_mime_part_get_part: 361 * @self: The #TnyM sgMimePart instance361 * @self: The #TnyMimePart instance 362 362 * 363 363 * Return value: The #CamelMimePart instance 364 364 **/ 365 365 CamelMimePart* 366 tny_msg_mime_part_get_part (TnyM sgMimePart *self)367 { 368 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);366 tny_msg_mime_part_get_part (TnyMimePart *self) 367 { 368 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 369 369 CamelMimePart *retval; 370 370 … … 378 378 379 379 static const gchar* 380 tny_msg_mime_part_get_filename (TnyM sgMimePartIface *self)381 { 382 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);380 tny_msg_mime_part_get_filename (TnyMimePartIface *self) 381 { 382 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 383 383 const gchar *retval; 384 384 … … 391 391 392 392 static const gchar* 393 tny_msg_mime_part_get_content_id (TnyM sgMimePartIface *self)394 { 395 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);393 tny_msg_mime_part_get_content_id (TnyMimePartIface *self) 394 { 395 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 396 396 const gchar *retval; 397 397 … … 404 404 405 405 static const gchar* 406 tny_msg_mime_part_get_description (TnyM sgMimePartIface *self)407 { 408 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);406 tny_msg_mime_part_get_description (TnyMimePartIface *self) 407 { 408 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 409 409 const gchar *retval; 410 410 … … 417 417 418 418 static const gchar* 419 tny_msg_mime_part_get_content_location (TnyM sgMimePartIface *self)420 { 421 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);419 tny_msg_mime_part_get_content_location (TnyMimePartIface *self) 420 { 421 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 422 422 const gchar *retval; 423 423 … … 431 431 432 432 static void 433 tny_msg_mime_part_set_content_location (TnyM sgMimePartIface *self, const gchar *content_location)434 { 435 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);433 tny_msg_mime_part_set_content_location (TnyMimePartIface *self, const gchar *content_location) 434 { 435 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 436 436 437 437 g_mutex_lock (priv->part_lock); … … 443 443 444 444 static void 445 tny_msg_mime_part_set_description (TnyM sgMimePartIface *self, const gchar *description)446 { 447 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);445 tny_msg_mime_part_set_description (TnyMimePartIface *self, const gchar *description) 446 { 447 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 448 448 449 449 g_mutex_lock (priv->part_lock); … … 455 455 456 456 static void 457 tny_msg_mime_part_set_content_id (TnyM sgMimePartIface *self, const gchar *content_id)458 { 459 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);457 tny_msg_mime_part_set_content_id (TnyMimePartIface *self, const gchar *content_id) 458 { 459 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 460 460 461 461 g_mutex_lock (priv->part_lock); … … 467 467 468 468 static void 469 tny_msg_mime_part_set_filename (TnyM sgMimePartIface *self, const gchar *filename)470 { 471 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);469 tny_msg_mime_part_set_filename (TnyMimePartIface *self, const gchar *filename) 470 { 471 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 472 472 473 473 g_mutex_lock (priv->part_lock); … … 479 479 480 480 static void 481 tny_msg_mime_part_set_content_type (TnyM sgMimePartIface *self, const gchar *content_type)482 { 483 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);481 tny_msg_mime_part_set_content_type (TnyMimePartIface *self, const gchar *content_type) 482 { 483 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 484 484 485 485 g_mutex_lock (priv->part_lock); … … 498 498 tny_msg_mime_part_finalize (GObject *object) 499 499 { 500 TnyM sgMimePart *self = (TnyMsgMimePart*) object;501 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);500 TnyMimePart *self = (TnyMimePart*) object; 501 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 502 502 503 503 g_mutex_lock (priv->part_lock); … … 528 528 * tny_msg_mime_part_new: 529 529 * 530 * The #TnyM sgMimePart implementation is actually a proxy for #CamelMimePart.530 * The #TnyMimePart implementation is actually a proxy for #CamelMimePart. 531 531 * 532 * Return value: A new #TnyM sgMimePartIface instance implemented for Camel532 * Return value: A new #TnyMimePartIface instance implemented for Camel 533 533 **/ 534 TnyM sgMimePart*534 TnyMimePart* 535 535 tny_msg_mime_part_new (CamelMimePart *part) 536 536 { 537 TnyM sgMimePart *self = g_object_new (TNY_TYPE_MSG_MIME_PART, NULL);537 TnyMimePart *self = g_object_new (TNY_TYPE_MIME_PART, NULL); 538 538 539 539 tny_msg_mime_part_set_part (self, part); … … 547 547 tny_msg_mime_part_iface_init (gpointer g_iface, gpointer iface_data) 548 548 { 549 TnyM sgMimePartIfaceClass *klass = (TnyMsgMimePartIfaceClass *)g_iface;549 TnyMimePartIfaceClass *klass = (TnyMimePartIfaceClass *)g_iface; 550 550 551 551 klass->content_type_is_func = tny_msg_mime_part_content_type_is; … … 572 572 573 573 static void 574 tny_msg_mime_part_class_init (TnyM sgMimePartClass *class)574 tny_msg_mime_part_class_init (TnyMimePartClass *class) 575 575 { 576 576 GObjectClass *object_class; … … 581 581 object_class->finalize = tny_msg_mime_part_finalize; 582 582 583 g_type_class_add_private (object_class, sizeof (TnyM sgMimePartPriv));583 g_type_class_add_private (object_class, sizeof (TnyMimePartPriv)); 584 584 585 585 return; … … 589 589 tny_msg_mime_part_instance_init (GTypeInstance *instance, gpointer g_class) 590 590 { 591 TnyM sgMimePart *self = (TnyMsgMimePart*)instance;592 TnyM sgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);591 TnyMimePart *self = (TnyMimePart*)instance; 592 TnyMimePartPriv *priv = TNY_MIME_PART_GET_PRIVATE (self); 593 593 594 594 priv->part_lock = g_mutex_new (); … … 615 615 static const GTypeInfo info = 616 616 { 617 sizeof (TnyM sgMimePartClass),617 sizeof (TnyMimePartClass), 618 618 NULL, /* base_init */ 619 619 NULL, /* base_finalize */ … … 621 621 NULL, /* class_finalize */ 622 622 NULL, /* class_data */ 623 sizeof (TnyM sgMimePart),623 sizeof (TnyMimePart), 624 624 0, /* n_preallocs */ 625 625 tny_msg_mime_part_instance_init /* instance_init */ … … 634 634 635 635 type = g_type_register_static (G_TYPE_OBJECT, 636 "TnyM sgMimePart",636 "TnyMimePart", 637 637 &info, 0); 638 638 639 g_type_add_interface_static (type, TNY_TYPE_M SG_MIME_PART_IFACE,639 g_type_add_interface_static (type, TNY_TYPE_MIME_PART_IFACE, 640 640 &tny_msg_mime_part_iface_info); 641 641 } trunk/libtinymail-camel/tny-msg-mime-part.h
r155 r710 1 #ifndef TNY_M SG_MIME_PART_H2 #define TNY_M SG_MIME_PART_H1 #ifndef TNY_MIME_PART_H 2 #define TNY_MIME_PART_H 3 3 4 4 /* libtinymail-camel - The Tiny Mail base library for Camel … … 29 29 G_BEGIN_DECLS 30 30 31 #define TNY_TYPE_M SG_MIME_PART (tny_msg_mime_part_get_type ())32 #define TNY_M SG_MIME_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_MSG_MIME_PART, TnyMsgMimePart))33 #define TNY_M SG_MIME_PART_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_MSG_MIME_PART, TnyMsgMimePartClass))34 #define TNY_IS_M SG_MIME_PART(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_MSG_MIME_PART))35 #define TNY_IS_M SG_MIME_PART_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_MSG_MIME_PART))36 #define TNY_M SG_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)) 37 37 38 typedef struct _TnyM sgMimePart TnyMsgMimePart;39 typedef struct _TnyM sgMimePartClass TnyMsgMimePartClass;38 typedef struct _TnyMimePart TnyMimePart; 39 typedef struct _TnyMimePartClass TnyMimePartClass; 40 40 41 struct _TnyM sgMimePart41 struct _TnyMimePart 42 42 { 43 43 GObject parent; 44 44 }; 45 45 46 struct _TnyM sgMimePartClass46 struct _TnyMimePartClass 47 47 { 48 48 GObjectClass parent; … … 52 52 GType tny_msg_mime_part_get_type (void); 53 53 54 TnyM sgMimePart* tny_msg_mime_part_new (CamelMimePart *part);55 void tny_msg_mime_part_set_part (TnyM sgMimePart *self, CamelMimePart *part);56 CamelMimePart* tny_msg_mime_part_get_part (TnyM sgMimePart *self);54 TnyMimePart* tny_msg_mime_part_new (CamelMimePart *part); 55 void tny_msg_mime_part_set_part (TnyMimePart *self, CamelMimePart *part); 56 CamelMimePart* tny_msg_mime_part_get_part (TnyMimePart *self); 57 57 58 58 G_END_DECLS trunk/libtinymail-camel/tny-msg.c
r704 r710 95 95 { 96 96 TnyListIface *list = data; 97 TnyM sgMimePartIface *tpart;97 TnyMimePartIface *tpart; 98 98 99 99 if (!part) … … 103 103 and tny-msg-mime-part.c:515 ! */ 104 104 105 tpart = TNY_M SG_MIME_PART_IFACE (tny_msg_mime_part_new (part));105 tpart = TNY_MIME_PART_IFACE (tny_msg_mime_part_new (part)); 106 106 107 107 tny_list_iface_prepend (list, (GObject*)tpart); … … 116 116 _tny_msg_get_camel_mime_message (TnyMsg *self) 117 117 { 118 TnyM sgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self);118 TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 119 119 120 120 return CAMEL_MIME_MESSAGE (ppriv->part); … … 126 126 { 127 127 TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (self); 128 TnyM sgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self);128 TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 129 129 130 130 g_mutex_lock (priv->message_lock); … … 172 172 { 173 173 TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 174 TnyM sgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self);174 TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 175 175 176 176 g_mutex_lock (priv->parts_lock); … … 199 199 200 200 static gint 201 tny_msg_add_part (TnyMsgIface *self, TnyM sgMimePartIface *part)202 { 203 TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 204 TnyM sgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self);201 tny_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); 205 205 CamelMedium *medium; 206 206 CamelDataWrapper *containee; 207 TnyM sgMimePartIface *tpart;207 TnyMimePartIface *tpart; 208 208 gint curl = 0; 209 209 … … 234 234 235 235 camel_multipart_add_part ((CamelMultipart*)containee, 236 tny_msg_mime_part_get_part (TNY_M SG_MIME_PART (part)));236 tny_msg_mime_part_get_part (TNY_MIME_PART (part))); 237 237 238 238 g_mutex_unlock (priv->parts_lock); … … 251 251 { 252 252 TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 253 TnyM sgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self);253 TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 254 254 gpointer remove; 255 255 TnyIteratorIface *iterator; … … 295 295 TnyMsg *self = (TnyMsg*) object; 296 296 TnyMsgPriv *priv = TNY_MSG_GET_PRIVATE (TNY_MSG (self)); 297 TnyM sgMimePartPriv *ppriv = TNY_MSG_MIME_PART_GET_PRIVATE (self);297 TnyMimePartPriv *ppriv = TNY_MIME_PART_GET_PRIVATE (self); 298 298 299 299 g_mutex_lock (priv->header_lock); … … 445 445 }; 446 446 447 type = g_type_register_static (TNY_TYPE_M SG_MIME_PART,447 type = g_type_register_static (TNY_TYPE_MIME_PART, 448 448 "TnyMsg", 449 449 &info, 0); trunk/libtinymail-camel/tny-msg.h
r552 r710 44 44 struct _TnyMsg 45 45 { 46 TnyM sgMimePart parent;46 TnyMimePart parent; 47 47 }; 48 48 49 49 struct _TnyMsgClass 50 50 { 51 TnyM sgMimePartClass parent;51 TnyMimePartClass parent; 52 52 }; 53 53 trunk/libtinymail-test/tny-msg-mime-part-iface-test.c
r553 r710 30 30 #include <camel/camel-folder-summary.h> 31 31 32 static TnyM sgMimePartIface *iface = NULL;32 static TnyMimePartIface *iface = NULL; 33 33 static gchar *str; 34 34 … … 41 41 42 42 CamelMimePart *cpart = camel_mime_part_new (); 43 iface = TNY_M SG_MIME_PART_IFACE (tny_msg_mime_part_new (cpart));43 iface = TNY_MIME_PART_IFACE (tny_msg_mime_part_new (cpart)); 44 44 45 45 return; … … 162 162 163 163 /* Create test suite */ 164 suite = gunit_test_suite_new ("TnyM sgMimePartIface");164 suite = gunit_test_suite_new ("TnyMimePartIface"); 165 165 166 166 /* Add test case objects to test suite */ trunk/libtinymail-test/tny-msg-mime-part-iface-test.h
r158 r710 1 #ifndef TNY_M SG_MIME_PART_IFACE_TEST_H2 #define TNY_M SG_MIME_PART_IFACE_TEST_H1 #ifndef TNY_MIME_PART_IFACE_TEST_H 2 #define TNY_MIME_PART_IFACE_TEST_H 3 3 4 4 /* tinymail - Tiny Mail gunit test trunk/libtinymail-test/tny-test-anything.c
r554 r710 109 109 (body_text, strlen (body_text)))); 110 110 111 TnyM sgMimePartIface *mime_part =112 TNY_M SG_MIME_PART_IFACE (tny_msg_mime_part_new (camel_mime_part_new()));113 114 TnyM sgMimePartIface *body_part =115 TNY_M SG_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())); 116 116 117 117 tny_account_iface_set_account_store (TNY_ACCOUNT_IFACE (account), … … 147 147 148 148 tny_msg_mime_part_iface_set_content_type 149 (TNY_M SG_MIME_PART_IFACE (msg), "text/plain");149 (TNY_MIME_PART_IFACE (msg), "text/plain"); 150 150 151 151 tny_stream_iface_reset (body_stream); … … 154 154 { 155 155 tny_msg_mime_part_iface_construct_from_stream 156 (TNY_M SG_MIME_PART_IFACE (msg), body_stream, "text/plain");156 (TNY_MIME_PART_IFACE (msg), body_stream, "text/plain"); 157 157 } else { 158 158 tny_msg_iface_add_part (msg, body_part); trunk/libtinymail/tny-msg-iface.c
r704 r710 94 94 **/ 95 95 gint 96 tny_msg_iface_add_part (TnyMsgIface *self, TnyM sgMimePartIface *part)96 tny_msg_iface_add_part (TnyMsgIface *self, TnyMimePartIface *part) 97 97 { 98 98 #ifdef DEBUG … … 178 178 "TnyMsgIface", &info, 0); 179 179 180 g_type_interface_add_prerequisite (type, TNY_TYPE_M SG_MIME_PART_IFACE);180 g_type_interface_add_prerequisite (type, TNY_TYPE_MIME_PART_IFACE); 181 181 } 182 182 trunk/libtinymail/tny-msg-iface.h
r704 r710 48 48 49 49 void (*del_part_func) (TnyMsgIface *self, gint id); 50 gint (*add_part_func) (TnyMsgIface *self, TnyM sgMimePartIface *part);50 gint (*add_part_func) (TnyMsgIface *self, TnyMimePartIface *part); 51 51 52 52 }; … … 57 57 TnyMsgHeaderIface* tny_msg_iface_get_header (TnyMsgIface *self); 58 58 59 gint tny_msg_iface_add_part (TnyMsgIface *self, TnyM sgMimePartIface *part);59 gint tny_msg_iface_add_part (TnyMsgIface *self, TnyMimePartIface *part); 60 60 void tny_msg_iface_del_part (TnyMsgIface *self, gint id); 61 61 trunk/libtinymail/tny-msg-mime-part-iface.c
r522 r710 24 24 /** 25 25 * tny_msg_mime_part_iface_is_attachment: 26 * @self: a #TnyM sgMimePartIface object26 * @self: a #TnyMimePartIface object 27 27 * 28 28 * Return value: whether or not the mime part is an attachment … … 30 30 **/ 31 31 gboolean 32 tny_msg_mime_part_iface_is_attachment (TnyM sgMimePartIface *self)33 { 34 #ifdef DEBUG 35 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func)32 tny_msg_mime_part_iface_is_attachment (TnyMimePartIface *self) 33 { 34 #ifdef DEBUG 35 if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func) 36 36 g_critical ("You must implement tny_msg_mime_part_iface_is_attachment\n"); 37 37 #endif 38 return TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func (self);38 return TNY_MIME_PART_IFACE_GET_CLASS (self)->is_attachment_func (self); 39 39 } 40 40 … … 42 42 /** 43 43 * tny_msg_mime_part_iface_set_content_location: 44 * @self: a #TnyM sgMimePartIface object44 * @self: a #TnyMimePartIface object 45 45 * @content_location: the location 46 46 * … … 49 49 **/ 50 50 void 51 tny_msg_mime_part_iface_set_content_location (TnyM sgMimePartIface *self, const gchar *content_location)52 { 53 #ifdef DEBUG 54 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->set_content_location_func)51 tny_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) 55 55 g_critical ("You must implement tny_msg_mime_part_iface_set_content_location\n"); 56 56 #endif 57 57 58 TNY_M SG_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); 59 59 return; 60 60 } … … 62 62 /** 63 63 * tny_msg_mime_part_iface_set_description: 64 * @self: a #TnyM sgMimePartIface object64 * @self: a #TnyMimePartIface object 65 65 * @description: the description 66 66 * … … 69 69 **/ 70 70 void 71 tny_msg_mime_part_iface_set_description (TnyM sgMimePartIface *self, const gchar *description)72 { 73 #ifdef DEBUG 74 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->set_description_func)71 tny_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) 75 75 g_critical ("You must implement tny_msg_mime_part_iface_set_description\n"); 76 76 #endif 77 77 78 TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->set_description_func (self, description);78 TNY_MIME_PART_IFACE_GET_CLASS (self)->set_description_func (self, description); 79 79 return; 80 80 } … … 82 82 /** 83 83 * tny_msg_mime_part_iface_set_content_id: 84 * @self: a #TnyM sgMimePartIface object84 * @self: a #TnyMimePartIface object 85 85 * @content_id: the content id 86 86 * … … 89 89 **/ 90 90 void 91 tny_msg_mime_part_iface_set_content_id (TnyM sgMimePartIface *self, const gchar *content_id)92 { 93 #ifdef DEBUG 94 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->set_content_id_func)91 tny_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) 95 95 g_critical ("You must implement tny_msg_mime_part_iface_set_content_id\n"); 96 96 #endif 97 97 98 TNY_M SG_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); 99 99 return; 100 100 } … … 102 102 /** 103 103 * tny_msg_mime_part_iface_set_filename: 104 * @self: a #TnyM sgMimePartIface object104 * @self: a #TnyMimePartIface object 105 105 * @filename: the filename 106 106 * … … 109 109 **/ 110 110 void 111 tny_msg_mime_part_iface_set_filename (TnyM sgMimePartIface *self, const gchar *filename)112 { 113 #ifdef DEBUG 114 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->set_filename_func)111 tny_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) 115 115 g_critical ("You must implement tny_msg_mime_part_iface_set_filename\n"); 116 116 #endif 117 117 118 TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->set_filename_func (self, filename);118 TNY_MIME_PART_IFACE_GET_CLASS (self)->set_filename_func (self, filename); 119 119 return; 120 120 } … … 122 122 /** 123 123 * tny_msg_mime_part_iface_set_content_type: 124 * @self: a #TnyM sgMimePartIface object124 * @self: a #TnyMimePartIface object 125 125 * @content_type: the content_type 126 126 * … … 129 129 **/ 130 130 void 131 tny_msg_mime_part_iface_set_content_type (TnyM sgMimePartIface *self, const gchar *content_type)132 { 133 #ifdef DEBUG 134 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->set_content_type_func)131 tny_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) 135 135 g_critical ("You must implement tny_msg_mime_part_iface_set_content_type\n"); 136 136 #endif 137 137 138 TNY_M SG_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); 139 139 return; 140 140 } … … 143 143 /** 144 144 * tny_msg_mime_part_iface_get_filename: 145 * @self: a #TnyM sgMimePartIface object145 * @self: a #TnyMimePartIface object 146 146 * 147 147 * … … 149 149 **/ 150 150 const gchar* 151 tny_msg_mime_part_iface_get_filename (TnyM sgMimePartIface *self)152 { 153 #ifdef DEBUG 154 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func)151 tny_msg_mime_part_iface_get_filename (TnyMimePartIface *self) 152 { 153 #ifdef DEBUG 154 if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func) 155 155 g_critical ("You must implement tny_msg_mime_part_iface_get_filename\n"); 156 156 #endif 157 157 158 return TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func (self);158 return TNY_MIME_PART_IFACE_GET_CLASS (self)->get_filename_func (self); 159 159 } 160 160 161 161 /** 162 162 * tny_msg_mime_part_iface_get_content_id: 163 * @self: a #TnyM sgMimePartIface object163 * @self: a #TnyMimePartIface object 164 164 * 165 165 * … … 167 167 **/ 168 168 const gchar* 169 tny_msg_mime_part_iface_get_content_id (TnyM sgMimePartIface *self)170 { 171 #ifdef DEBUG 172 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->get_content_id_func)169 tny_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) 173 173 g_critical ("You must implement tny_msg_mime_part_iface_get_content_id\n"); 174 174 #endif 175 175 176 return TNY_M SG_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); 177 177 } 178 178 179 179 /** 180 180 * tny_msg_mime_part_iface_get_description: 181 * @self: a #TnyM sgMimePartIface object181 * @self: a #TnyMimePartIface object 182 182 * 183 183 * … … 185 185 **/ 186 186 const gchar* 187 tny_msg_mime_part_iface_get_description (TnyM sgMimePartIface *self)188 { 189 #ifdef DEBUG 190 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->get_description_func)187 tny_msg_mime_part_iface_get_description (TnyMimePartIface *self) 188 { 189 #ifdef DEBUG 190 if (!TNY_MIME_PART_IFACE_GET_CLASS (self)->get_description_func) 191 191 g_critical ("You must implement tny_msg_mime_part_iface_get_description\n"); 192 192 #endif 193 193 194 return TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->get_description_func (self);194 return TNY_MIME_PART_IFACE_GET_CLASS (self)->get_description_func (self); 195 195 } 196 196 197 197 /** 198 198 * tny_msg_mime_part_iface_get_content_location: 199 * @self: a #TnyM sgMimePartIface object199 * @self: a #TnyMimePartIface object 200 200 * 201 201 * … … 203 203 **/ 204 204 const gchar* 205 tny_msg_mime_part_iface_get_content_location (TnyM sgMimePartIface *self)206 { 207 #ifdef DEBUG 208 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->get_content_location_func)205 tny_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) 209 209 g_critical ("You must implement tny_msg_mime_part_iface_get_content_location\n"); 210 210 #endif 211 211 212 return TNY_M SG_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); 213 213 } 214 214 215 215 /** 216 216 * tny_msg_mime_part_iface_write_to_stream: 217 * @self: a #TnyM sgMimePartIface object217 * @self: a #TnyMimePartIface object 218 218 * @stream: a #TnyMsgStreamIface stream 219 219 * … … 224 224 **/ 225 225 void 226 tny_msg_mime_part_iface_write_to_stream (TnyM sgMimePartIface *self, TnyStreamIface *stream)227 { 228 #ifdef DEBUG 229 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->write_to_stream_func)226 tny_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) 230 230 g_critical ("You must implement tny_msg_mime_part_iface_write_to_stream\n"); 231 231 #endif 232 232 233 TNY_M SG_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); 234 234 return; 235 235 } … … 238 238 /** 239 239 * tny_msg_mime_part_iface_decode_to_stream: 240 * @self: a #TnyM sgMimePartIface object240 * @self: a #TnyMimePartIface object 241 241 * @stream: a #TnyMsgStreamIface stream 242 242 * … … 247 247 **/ 248 248 void 249 tny_msg_mime_part_iface_decode_to_stream (TnyM sgMimePartIface *self, TnyStreamIface *stream)250 { 251 #ifdef DEBUG 252 if (!TNY_M SG_MIME_PART_IFACE_GET_CLASS (self)->decode_to_stream_func)249 tny_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) 253 253 g_critical ("You must implement tny_msg_mime_part_iface_decode_to_stream\n"); 254 254 #endif 255 255 256 TNY_M SG_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); 257 257 return; 258 258 } 259 259 /** 260 260 * tny_msg_mime_part_iface_construct_from_stream: 261 * @self: a #TnyM sgMimePartIface object261 * @self: a #TnyMimePartIface object 262 262 * @stream: a #TnyMsgStreamIface stream 263 263 * @type: the type like text/plain&nbs
