aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-format.c
Commit message (Collapse)AuthorAgeFilesLines
* make this a varags function, which then calls the virtual method to do theNot Zed2004-03-151-0/+27
| | | | | | | | | | | | | | | | 2004-03-15 Not Zed <NotZed@Ximian.com> * em-format.c (em_format_format_error): make this a varags function, which then calls the virtual method to do the work. (emf_multipart_appledouble, emf_multipart_mixed) (emf_multipart_alternative, emf_multipart_related) (emf_message_rfc822): print an error to explain why you're getting source content displayed. (em_format_format_secure): make this a function. and if we're done formatting a secure part, and we dont have a parent anymore, null out the validity. See #55541. svn path=/trunk/; revision=25070
* if we have the folder opened already, and its the outbox, then use theNot Zed2004-03-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-03-03 Not Zed <NotZed@Ximian.com> * em-inline-filter.c (emif_scan): * em-folder-tree-model.c (em_folder_tree_model_set_folder_info): if we have the folder opened already, and its the outbox, then use the total count instead of unread count. Bit of hack, but copies mail-folder-cache stuff. * mail-component.c (mc_add_store): renamed from mail_component_add_store, internal call. Added a done callback. (mc_add_local_store): renamed from mc_add_store, callback for local store. (mail_component_add_store): call mc_add_store to do the work. (mc_add_local_store_done): ugh, the target of all this shit - note all the default folders now they should be setup. * mail-folder-cache.c (mail_note_folder): clean up the logic a bit. was gonna do osmething else but it didn't work. 2004-03-02 Not Zed <NotZed@Ximian.com> * mail-send-recv.c (mail_send): if we're already sending, up the again count to tell it we need to re-send again. (receive_done): if we've been asked to run a send again while we were already running it, run it again to make sure we didn't miss any new messages. See bug #46839. * em-mailer-prefs.c (em_mailer_prefs_construct): update check_incoming_imap changes for merge conflicts. (settings_changed): i have no idea what these changes jeff did do, but check_incoming_imap is no longer needed, so i've deleted most of it. 2004-02-27 Not Zed <NotZed@Ximian.com> * em-format.c (emf_multipart_encrypted, emf_multipart_signed): If validation fails, display as multipart/mixed rather than unkown attachment type, and make the error a little clearer that its an error. See #52939. 2004-02-26 Not Zed <NotZed@Ximian.com> * message-list.c (regen_list_regened): NOOP if the folder has changed. * mail-session.c (mail_session_check_junk_notify): remove check_incoming_imap test. (mail_session_init): " * evolution-mail.schemas.in.in: Remove check_incoming_imap option. * mail-config.glade: Remove check incoming imap checkbox. * em-mailer-prefs.c (em_mailer_prefs_construct): remove check_incoming_imap test. (em_mailer_prefs_apply): " (settings_changed): " svn path=/trunk/; revision=24944
* check mps->protocol != NULL before dereferencing it. See #54406.Not Zed2004-02-231-6/+8
| | | | | | | | | 2004-02-23 Not Zed <NotZed@Ximian.com> * em-format.c (emf_multipart_signed): check mps->protocol != NULL before dereferencing it. See #54406. svn path=/trunk/; revision=24829
* wrap code with ENABLE_SMIME instead of HAVE_NSS. (emf_multipart_signed):Chris Toshok2004-02-201-4/+4
| | | | | | | | | | | 2004-02-19 Chris Toshok <toshok@ximian.com> * em-format.c (emf_application_xpkcs7mime): wrap code with ENABLE_SMIME instead of HAVE_NSS. (emf_multipart_signed): same. (type_builtin_table): same. svn path=/trunk/; revision=24811
* ** See bug #53258.Not Zed2004-02-061-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-02-06 Not Zed <NotZed@Ximian.com> ** See bug #53258. * em-format-html-display.c (efhd_find_handler): force any bonobo handler types to always be inline, even attachments. * em-format.c (em_format_is_inline): use handler flags for special cases, removing all hard-coded types. * em-format.h (EMFormatHandler): add a flags field, so far a flag to set default inline viewing of the content. 2004-02-06 Not Zed <NotZed@Ximian.com> * em-folder-properties.c: include string.h to kill warning. ** See bug #53627. * em-folder-view.c (emfv_popup_mark_junk): changed to work like delete does, jumping to the next message if required, and marking things immediately, then queuing up the junk marking job if required. * mail-ops.c (mail_mark_junk): ugh, this stuff totally can't go accessing messagelist from another thread!!!! Changed so this code only does the junk reporting, not setting flags. UGH! It should be doing this implictly on the folder when you set the flags, or at least when you sync the folder!!! Changed ot use the queued thread. * message-list.c (find_next_undeleted): changed to find next-unhidden, i.e. junk as well as deleted, if we're in hide-deleted mode. (build_tree): always call find_next_undeleted if we have a cursor. (build_flat): same. svn path=/trunk/; revision=24644
* ** See bug #53558 (plus other fixes/cleanups)Not Zed2004-01-301-71/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-01-30 Not Zed <NotZed@Ximian.com> ** See bug #53558 (plus other fixes/cleanups) * em-format.c (emf_format_secure): default implementation, handle output of inner part, but dont output any sign/encrypt info. (emf_multipart_signed, emf_multipart_encrypted): replaced with implementations from em-format-html.c, which now call em_format_format_secure to output guts. (emf_class_init): hook-up virtual method format_secure. * em-format.[ch]: add a virtual method for outputing secured parts. Moved all validity stuff from em-format-html.[ch] to here. * mail-component.c (impl_createControls): set the session interactive too. * em-format-html-display.c: make smime stuff dependent on HAVE_NSS. (efhd_multipart_signed, efhd_application_xpkcs7mime): removed, now handled by root class. (efhd_output_secure): renamed to efhd_format_secure, and use EMFormat::format_secure to kick off. (efhd_class_init): setup format_secure virtual method. * em-format-html.c (efh_multipart_encrypted): We need to handle this here so we can properly keep track of the ciphervalidity stuff. Also do it directly using the context, not multipartencrypted part. (efh_multipart_signed): with unsupported signature format, format as multipart/mixed, not as an attachment. (efh_multipart_signed): make the smime stuff optional. (efh_multipart_signed, efh_multipart_encrypted): Moved to em-format.c. (efh_application_xpkcs7mime): moved to em-format.c (efh_output_secure): renamed to efh_format_secure, linked into virtual method. call parent class to do the validation foo then output the info if needed. (efh_format_message): fixed access to validity stuff to parent object. (efh_class_init): hook up format_secure virtual method. (*): removed some now-unused headers. svn path=/trunk/; revision=24531
* Fixes a bug i can't find right nowNot Zed2004-01-291-1/+6
| | | | | | | | | | | | | | | | | | 2004-01-29 Not Zed <NotZed@Ximian.com> * em-format-html-display.c (efhd_attachment_button): check the snooped type for the icon/etc. (efhd_format_attachment): save the snooped type in the attach_puri. * em-format-html.c (efh_text_plain): If we had a snooped type, use that as the base type, rather than octet-stream, which will cause an attachment in attachment loop. * em-format.c (em_format_part_as): save the current snooped mime type in a stack if we had any. svn path=/trunk/; revision=24515
* ** See bug #53159.Not Zed2004-01-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | 2004-01-21 Not Zed <NotZed@Ximian.com> ** See bug #53159. * em-format.c (emf_message_rfc822): removed incorrect comment, this is not a fallback. * em-format-html.c (efh_text_plain): check the content-type of the containee object, not the holder. ** See bug #52979. * em-format-html.c: take out text/x-patch and put in text/* for a text/plain fallback handler instead. * em-format-html-display.c (efhd_find_handler): allow the bonobo handlers to override the builtin ones. svn path=/trunk/; revision=24341
* ** See bugs #51609 and #43515.Not Zed2004-01-151-0/+8
| | | | | | | | | | | | | | | | | | 2004-01-15 Not Zed <NotZed@Ximian.com> ** See bugs #51609 and #43515. * em-format-html-display.c (efhd_format_prefix): output flag for followup details above the message. (efhd_write_image): added to output icon data. * em-format-html.c (efh_format_do): call format_prefix before outputting the message in normal display mode. * em-format.c (emf_format_prefix): method called to format data before the first message output. Default impl == noop. svn path=/trunk/; revision=24230
* ** See bug 51660.Not Zed2004-01-141-20/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2004-01-14 Not Zed <NotZed@Ximian.com> ** See bug 51660. * em-format-html-quote.c (efhq_multipart_related): setup part_id appropriately. * em-format-html-display.c (efhd_output_secure): use part_id in classid, and add .signed to part_id for subpart. (efhd_bonobo_unknown): use part_id in classid. (efhd_format_attachment): use part_id in classid's. * em-format-html.c (efh_multipart_related) (emfh_multipart_related_check): setup part_id for each subpart. (efh_output_secure): as above, and use the part_id for the classid. (em_format_html_add_pobject): use part_id for a generated classid. (efh_text_plain): setup pseudo-parts into part_id. * em-format.c (emf_format_clone): setup the part_id base, folder + uid. (emf_finalise): free the part_id gstring. (emf_init): allocate the part_id gstring. (em_format_add_puri): build the cid from the part_id rather than an arbitrary number, so it is more persistent. Also save the part_id in the puri for multipart/related use. (emf_multipart_mixed, emf_multipart_alternative) (emf_multipart_appledouble, emf_multipart_encrypted) (emf_multipart_related, emf_multipart_signed): Set the part_id for each subpart. (emf_clear_puri_node): free part_id. 2004-01-13 Not Zed <NotZed@Ximian.com> ** See bug 51660. * em-format-html-print.c (em_format_html_print_print): dont take message, get the message from the source formatter. * em-format.c (emf_format_clone): Added folder and uid parameters, changed camelmedium to a mimemessage. * em-format-html-display.c (efhd_attachment_button): check the icon image cache and if the image is there use it. * em-icon-stream.c (em_icon_stream_get_image): api to lookup finished images in cache. (em_icon_stream_new): add a cache key arg. (emis_sync_close): store the image in the cache once its completed. svn path=/trunk/; revision=24210
* keep the windows charset filter around until we're done since if we set itNot Zed2004-01-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | 2004-01-09 Not Zed <NotZed@Ximian.com> * em-format.c (em_format_format_text): keep the windows charset filter around until we're done since if we set it up we reference its memory. Causes warnings and breaks message display. ** See bug #52637. * em-inline-filter.c (em_inline_filter_new): added a content-type paramter for the base content type. (em_inline_filter_finalize): free base content type. (emif_types[]): Added 'plain' parameter, indicates type needs plain parameters set on content type. (emif_add_part): inherit the full base type if it is set, for plain parts. * em-format-html.c (efh_text_plain): pass the part's content-type to the inline filter. svn path=/trunk/; revision=24121
* ** See bug #50996.Not Zed2004-01-051-3/+4
| | | | | | | | | | | | | | | 2004-01-05 Not Zed <NotZed@Ximian.com> ** See bug #50996. * em-format-html-display.c (efhd_find_handler): implement override for unknown types, try bonobo handlers. (efhd_bonobo_unknown): formathandler for bonobo objects. * em-format.c (em_format_find_handler): make virtual, rename to emf_find_handler. svn path=/trunk/; revision=24043
* ** See bug #52108.Not Zed2003-12-121-0/+1
| | | | | | | | | | | | | | | | 2003-12-12 Not Zed <NotZed@Ximian.com> ** See bug #52108. * em-format.c (em_format_is_attachment): also recognise application/pkcs7-mime for mailers who like to make up their own standards. * em-format-html.c (type_builtin_table[]): * em-format-html-display.c (type_builtin_table[]): make recognise application/pkcs7-mime too. svn path=/trunk/; revision=23931
* treat application/pkcs7-signature as application/x-pkcs-signature. StupudNot Zed2003-12-101-1/+2
| | | | | | | | | | | | 2003-12-10 Not Zed <NotZed@Ximian.com> * em-format-html-display.c (efhd_multipart_signed): * em-format-html.c (efh_multipart_signed): * em-format.c (emf_multipart_signed): treat application/pkcs7-signature as application/x-pkcs-signature. Stupud non-rfc-compliant mailers from apple. Bug #51750. svn path=/trunk/; revision=23907
* Added empty_trash prompt key.Not Zed2003-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2003-12-02 Not Zed <NotZed@Ximian.com> * evolution-mail.schemas: Added empty_trash prompt key. * em-utils.c (em_utils_prompt_user): changed to take the gconf 'prompt again' key directly. Fixed callers. (em_utils_expunge_folder): prompt the user with an expunge specific message. (em_utils_empty_trash): have an empty-trash specific message for prompting confirm. (emu_confirm_expunge): removed, no longer needed. Bug #38613. (em_utils_expunge_folder): remove most line feeds, let the label wrap them. (em_utils_empty_trash): ditto. * em-subscribe-editor.c (sub_folder_subscribed): update the ui selection state after we're done. maybe we should listen on the model but this is easier. Bug #50861. * em-message-browser.c (emmb_activate): hook up our own verb list. (emmb_message_verbs[], emmb_close): implement the close verb. Bug #51558. * em-format-html-display.c (efhd_attachment_popup): duh, actually add the menu list we create. Bug #49902. * em-format.c (d): turn off debug, committed by accident. svn path=/trunk/; revision=23562
* set session on print formatter for signatures to work.Not Zed2003-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2003-11-25 Not Zed <NotZed@Ximian.com> * em-folder-view.c (em_folder_view_print): set session on print formatter for signatures to work. * em-message-browser.c (emmb_destroy): kill warning. * em-format-html.c (efh_output_secure): same as efhd_output_secure, output the security bar, but for printing/plain html. (efh_application_xpkcs7mime): use output_secure. (em_format_html_multipart_signed_sign): removed, output_secure does what this did. * em-format-html-display.c (smime_sign_table, smime_encrypt_table): Added a short description for the mail display. (efhd_xpkcs7mime_button): only good/bad signature at this point, if only encrypted, then display 'bad' icon. (efhd_output_secure): output the security bar/button and handle multi-level enveloping properly. (efhd_application_xpkcs7mime): just call output_secure to do the security bar. (efhd_multipart_signed): same. (efhd_signature_button): removed, no longer used. (efhd_signature_check): removed, no longer used. svn path=/trunk/; revision=23483
* do not use horizonal rule, attachment content is now inside simple frameRadek Doulik2003-11-241-3/+0
| | | | | | | | | | | | | | | | | | | | 2003-11-24 Radek Doulik <rodo@ximian.com> * em-format.c (emf_multipart_mixed): do not use horizonal rule, attachment content is now inside simple frame * em-format-html.c (efh_text_plain): add 6 points around text plain content and frame it (efh_text_html): frame text/html (efh_format_do): fix body tag, set bgcolor (em_format_html_format_headers): do not put headers into own table, content body is framed now instead (efh_format_message): update for headers/body changes * em-format-html-display.c (efhd_format_attachment): put additional vertical space around attachment button svn path=/trunk/; revision=23474
* implement the key selector popup using e-cert-selector.Not Zed2003-11-131-62/+0
| | | | | | | | | | | | | | | | | | | | | | 2003-11-12 Not Zed <NotZed@Ximian.com> * mail-account-gui.c (smime_sign_key_select) (smime_encrypt_key_select, smime_encrypt_key_selected) (smime_sign_key_selected): implement the key selector popup using e-cert-selector. 2003-11-11 Not Zed <NotZed@Ximian.com> * em-format-html.c (efh_application_xpkcs7mime): output icons of the status. (em_format_html_add_pobject): Changed to take a size specificier, return the pobject, and re-ordered args to be more consistent with puri stuff. (em_format_html_remove_pobject): handle the free callback if set. * em-format.c (emf_application_xpkcs7mime): moved this to em-format-html since it needs to do icon stuff. svn path=/trunk/; revision=23312
* changed for cipher context api changes. ditto.Not Zed2003-11-101-16/+46
| | | | | | | | | | | | | | | | | | | | 2003-11-10 Not Zed <NotZed@Ximian.com> * em-format-html.c (em_format_html_multipart_signed_sign): changed for cipher context api changes. * em-format.c (emf_multipart_signed): ditto. 2003-11-07 Not Zed <NotZed@Ximian.com> * mail-config.glade: added security_information_dialog (probably temporarily in this file). * em-format.c (em_format_is_attachment): also treat pkcs7-mime as non-attachment. (emf_application_xpkcs7mime): no longer need to worry about scanning the part. svn path=/trunk/; revision=23243
* show application/x-pkcs7-mime inline always by default.Not Zed2003-10-301-11/+57
| | | | | | | | | | | | | | | | | | | | | | 2003-10-30 Not Zed <NotZed@Ximian.com> * em-format.c (em_format_is_inline): show application/x-pkcs7-mime inline always by default. 2003-10-30 Not Zed <NotZed@Ximian.com> * em-format.c (emf_multipart_signed): handle application/x-pkcs7-signature. 2003-10-29 Not Zed <NotZed@Ximian.com> * em-format-html.c (em_format_html_multipart_signed_sign): handle application/x-pkcs7-signature. * em-format.c (emf_application_xpkcs7mime): Handle application/x-pkcs7-mime. svn path=/trunk/; revision=23129
* Put an <hr> between parts of a multipart.Jeffrey Stedfast2003-10-221-3/+2
| | | | | | | | | 2003-10-21 Jeffrey Stedfast <fejj@ximian.com> * em-format.c (emf_multipart_mixed): Put an <hr> between parts of a multipart. svn path=/trunk/; revision=22969
* remove gconf stuff. (em_format_html_set_xmailer_mask): new method to setNot Zed2003-09-301-35/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2003-09-30 Not Zed <NotZed@Ximian.com> * em-format-html.c (efh_init): remove gconf stuff. (em_format_html_set_xmailer_mask): new method to set the xmailer mask. * em-folder-view.c (emfv_display_keys[]): Added charset key to monitor/retrieve, and xmailer_mask. (emfv_setting_notify): Monitor charset setting, pass onto the formatter, as well as xmailer_mask. * mail-preferences.c (mail_preferences_construct): use the new charset key. (mail_preferences_apply): use the new charset key. * evolution-mail.schemas: Moved the mail/format/charset to mail/display/charset. 1. it makes more sense, and 2. it makes notification update easier in em-folder-view.c * em-format.c (emf_init): remove the gconf charset stuff, for bug #48791, and also actually fixes the fixme that jeff thought he fixed. (em_format_format_text): use default charset as fallback. (em_format_set_default_charset): New method to set the default charset. (gconf_charset_changed): removed. svn path=/trunk/; revision=22768
* Oops, put the arguments in the right order.Jeffrey Stedfast2003-09-301-1/+1
| | | | | | | | 2003-09-29 Jeffrey Stedfast <fejj@ximian.com> * em-format.c (emf_init): Oops, put the arguments in the right order. svn path=/trunk/; revision=22757
* Fix for bug #48791 (and also fixes a FIXME)Jeffrey Stedfast2003-09-241-15/+40
| | | | | | | | | | | | | | | | 2003-09-23 Jeffrey Stedfast <fejj@ximian.com> Fix for bug #48791 (and also fixes a FIXME) * em-format.c (emf_init): Setup a gconf listener for changes to the charset setting. (gconf_charset_changed): Update the cached gconf charset value. (emf_finalise): Free the EMFormatPrivate data, unref the gconf client, disconnect the charset notify id, and free the cached gconf charset value. (em_format_format_text): Use the cached gconf charset value. svn path=/trunk/; revision=22675
* updated for camel namespace changesJeffrey Stedfast2003-09-191-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2003-09-18 Jeffrey Stedfast <fejj@ximian.com> * component-factory.c: updated for camel namespace changes * em-folder-view.c: updated for camel namespace changes * em-format-html-display.c: updated for camel namespace changes * em-format-html-quote.c: updated for camel namespace changes * em-format.c: updated for camel namespace changes * em-popup.c: updated for camel namespace changes * em-utils.c: updated for camel namespace changes * mail-autofilter.c: updated for camel namespace changes * mail-ops.c: updated for camel namespace changes * mail-session.c: updated for camel namespace changes * message-list.c: updated for camel namespace changes * message-tag-followup.c: updated for camel namespace changes * importers/evolution-mbox-importer.c: updated for camel namespace changes 2003-09-18 Jeffrey Stedfast <fejj@ximian.com> * em-popup.c (emp_standard_menu_factory): Don't forget to initialise/increment 'i' when using it as an object id in the for-loop. * em-format.c (em_format_format_text): Initialise charset to NULL or it may be used uninitialised. Also include gnome-vfs-mime-handlers.h for gnome_vfs_mime_type_get_description(). svn path=/trunk/; revision=22610
* Initialise charset to NULL or it may be used uninitialised. Also includeJeffrey Stedfast2003-09-191-1/+2
| | | | | | | | | | | | | 2003-09-18 Jeffrey Stedfast <fejj@ximian.com> * em-format.c (em_format_format_text): Initialise charset to NULL or it may be used uninitialised. Also include gnome-vfs-mime-handlers.h for gnome_vfs_mime_type_get_description(). * Makefile.am: Added $(MARSHALL_GENERATED) to $(BUILT_SOURCES) so that em-marshal.[c,h] were autogenerated. svn path=/trunk/; revision=22609
* cvs removed.Not Zed2003-09-181-0/+1228
2003-09-17 Not Zed <NotZed@Ximian.com> * folder-browser.c, folder-browser.h, folder-browser-ui.c folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h mail-display.c, mail-display.h, mail-display-stream.c mail-display-stream.h, mail-format.c, mail-format.h mail-identify.c, mail-search.c, mail-search.h message-browser.c, message-browser.h, subscribe-dialog.c subscribe-dialog.h, mail-font-prefs.c, mail-font-prefs.h: cvs removed. * Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for ages. * em-*.c: killed a bunch of printfs. * em-format-html-display.c (efhd_html_button_press_event): update for html object api chagnes. ** Merge in mail-refactor-2 branch. svn path=/trunk/; revision=22602