| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-11-15 Not Zed <NotZed@Ximian.com>
* *.c: Moved various things from e-util to libedataserver.
* GNOME_Evolution_Mail.server.in.in: remove the startup wizard stuff.
* mail-config-druid.[ch]:
* mail-account-editor.[ch]:
* mail-account-gui.[ch]: removed & deleted.
* mail-session.c (mail_session_init): and here too.
* em-migrate.c (em_migrate_1_4): init camel-provider library too.
(e_path_to_physical): copy from e-util/e-path.c.
* Makefile.am (libevolution_mail_la_LIBADD): link to new libcamel
provider too.
svn path=/trunk/; revision=28047
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-04-01 Jeffrey Stedfast <fejj@ximian.com>
* importers/netscape-importer.c (netscape_import_accounts):
Updated for signature API changes.
* mail-account-gui.c: Same.
* mail-signature-editor.c: Same.
* em-composer-prefs.c: Same.
* mail-config.c: Rewrote the signature stuff to use ESignatureList
instead. Much cleaner and less broken.
* em-mailer-prefs.c (em_mailer_prefs_construct): Always make the
Add/Remove Header buttons de-sensitised at the start. Fixes bug
#56284.
svn path=/trunk/; revision=25282
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-03-31 Not Zed <NotZed@Ximian.com>
* *.[ch]: Cleaned up header inclusions and added plenty of forward
declarations. Sped up complete re-compilation by upto 20%.
** See bug #55950.
* em-utils.c (em_utils_in_addressbook): utility for checking if an
email address is in the addressbook. I can't tell if it works
'cause it crashes eds.
* em-format-html.c (emfh_gethttp): handle addressbook checking.
2004-03-30 Not Zed <NotZed@Ximian.com>
* mail-config.h: clean up the headers and use some forward decl's
instead.
* em-format-html.c (em_format_html_set_load_http): change state to
an int 'style' instead.
* em-folder-view.c (emfv_setting_notify): set the format load http
option to the config value directly.
** See bug #56147.
* message-list.c (clear_info): set the node data to NULL when we
unref its data.
(ml_get_save_id): use a different test for the root node, and
return NULL if we don't have any data on the node (because we're
cleaing it).
** See bug #54962.
* em-folder-tree.c (emft_popup_new_folder_response): put back the
old hack to open the vfolder editor if you try to create a folder
under vfolders.
** See bug #55940.
* mail-autofilter.c (mail_filter_rename_uri): map the uri to an
email uri before passing to filter code.
(mail_filter_delete_uri): same here.
svn path=/trunk/; revision=25261
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-03-25 Rodney Dawes <dobey@ximian.com>
* em-composer-prefs.c (sig_edit_cb):
(sig_add_script_cb): Use gtk_window_present instead of doing a show
then raise, as this also puts the window on the current workspace
(em_composer_prefs_construct): Fix the border widths for the dialog
vbox and action area to be HIG-compliant, and realize the window
Remove the dialog separator
Use a box_pack_start, rather than box_pack_start_defaults which causes
some weird behaviour when changing the border widths
* em-subscribe-editor.c (em_subscribe_editor_new): Realize the dialog
and set the border widths for its vbox and action area to be compliant
with the HIG
* local-config.glade: Removed this file as it is no longer used
* mail-account-editor.c (construct): Realize the dialog, remove its
separator, and set the border widths for its vbox and action area to
be HIG-compliant
* mail-account-editor.c (source_type_changed):
(transport_type_changed): Fix the showing and hiding of the widgets
related to the SSL options
(mail_account_gui_new): Get the transport/source frames for the SSL
options, and hide them by default
Show the default folder buttons by default here
(mail_account_gui_setup): Only call _show not _show_all here, so we
don't mess up the shown/hidden state of things
* mail-account-gui.h: Add ssl_frame widget to the MailAccountGuiService
* mail-config.glade:
* mail-search.glade:
* mail-security.glade: HIG-compliance fixes for the glade dialogs
* message-tag-followup.c (construct): Don't set border_width on the
dialog itself
Remove the separator from the dialog
Set the border_widths for the dialog's vbox and action areas to be
compliant with the HIG
* message-tags.glade:
* subscribe-dialog.glade: HIG-compliance fixes for these dialogs
Original patch from Martyn Russell
svn path=/trunk/; revision=25183
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-03-18 Not Zed <NotZed@Ximian.com>
* mail-account-gui.c (mail_account_gui_new): save the source and
transport vbox's to enable/disable the whole lot easier.
(mail_account_gui_setup): enable above based on perms.
(mail_account_gui_build_extra_conf): also disable extra page, as
above.
* em-account-prefs.c (account_cursor_change): disable the whole
account editor if accounts are ro.
svn path=/trunk/; revision=25114
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-03-18 Not Zed <NotZed@Ximian.com>
* mail-config.c (mail_config_writable): started writing this, but
i couldn't be fucked right now - apparently gnome is supposed to
use the gconf thing which just doens't work. i'll waste a few
hours trying to get it to work again first before i keep going
with this.
2004-03-17 Not Zed <NotZed@Ximian.com>
* em-format-html.c (efh_message_deliverystatus): format as plain
text too.
* em-format.c (emf_message_deliverystatus): format delivery
status messages as plain text, rather than as messages. since
they wont be CamelMimeMessages. Maybe they should be silently
hidden.
* mail-offline-handler.c (store_go_online): split this, only call
add_store/note_store once we've actually set the store online.
(store_went_online): set the store up once we're fully online.
Works around a deadlock in #55618.
* em-account-prefs.c (account_cursor_change): disable
editing/adding/removing accounts etc if accounts aren't editable.
(em_account_prefs_construct): call above after setup.
* mail-component.c (mc_quit_sync): if we have empty on exit days,
check that. keep track of the last empty on exit time.
* em-mailer-prefs.c (emmp_empty_trash_init): init the trash stuff
here.
(em_mailer_prefs_apply): save empty trash on exit frequency.
svn path=/trunk/; revision=25110
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-10-31 Not Zed <NotZed@Ximian.com>
* mail-config.glade: Rearranged smime config slightly, and added
encrypt key preference.
* mail-account-gui.c (mail_account_gui_save,
mail_account_gui_new): enable smime always if have_nss. Added new
options in glade file and handle changed names.
(smime_changed, smime_sign_key_select, smime_sign_key_clear)
(smime_encrypt_key_select, smime_encrypt_key_clear): Add a bunch
of mostly dummy UI behaviour management stuff.
svn path=/trunk/; revision=23145
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-10-24 Jeffrey Stedfast <fejj@ximian.com>
* em-account-prefs.[c,h]: Re-Namespaced mail-accounts.c
* em-composer-prefs.[c,h]: Re-Namespaced mail-composer-prefs.c
* em-mailer-prefs.[c,h]: Re-Namespaced mail-preferences.c
* mail-accounts.[c,h]: Removed.
* mail-composer-prefs.[c,h]: Removed.
* mail-preferences.[c,h]: Removed.
* mail-account-editor.c: Updated.
* mail-account-gui.c: Updated.
* mail-config-factory.c: Updated.
* mail-component-factory.c: Updated.
svn path=/trunk/; revision=23066
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-account-editor.c: Update for e_notice move
(apply_changes): Pass a parent_window to e_notice
* mail-account-gui.c: Update for e_notice move.
(mail_account_gui_save): Pass a parent_window to e_notice
* mail-callbacks.c: Update for e_notice move
* mail-local.c: Likewise
* mail-signature-editor.c: Likewise
* mail-vfolder.c: Likewise
svn path=/trunk/; revision=20502
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-01-17 Jeffrey Stedfast <fejj@ximian.com>
* mail-session.c (do_get_pass): Updated.
(request_password): Same.
* mail-send-recv.c (mail_send): Fixed to use EAccountService.
* mail-config-druid.c (make_account): Updated to use EAccount and
friends.
* mail-account-gui.c (service_check_supported): Updated to use
EAccountService.
(mail_account_gui_new): Ref the account passed in and also update
to use EAccount objects.
(save_service): Updated to use an EAccountService.
(add_new_store): Updated to use an EAccount.
(mail_account_gui_save): Updated to use EAccounts.
(setup_signatures): Updated because the new account->id->def_sig
is now an int and not a structure pointer.
* mail-account-editor.c (construct): Updated.
(mail_account_editor_new): Now takes an EAccount object as an
argument instead of a MailConfigAccount.
* mail-crypto.c (mail_crypto_get_pgp_cipher_context): Updated to
use EAccounts.
* subscribe-dialog.c (populate_store_foreach): Removed.
(populate_store_list): Can't use populate_store_foreach here
because of the change to EAccountList so do it manually.
* mail-vfolder.c (uri_is_ignore): Rewrote to use EAccountList and
EIterator and all that fun.
* mail-send-recv.c (build_dialogue): Updated to use EAccountList
and EAccount object stuff. *ugh*
(mail_send_receive): Here too.
(mail_autoreceive_setup): Same.
* mail-callbacks.c (check_send_configuration): Updated.
(composer_get_message): Updated.
(compose_msg): "
(list_add_addresses): "
(guess_me): "
(guess_me_from_accounts): Same.
(forward_get_composer): Here too.
(mail_generate_reply): Same.
(redirect_get_composer): "
(empty_trash): And finally here.
* mail-accounts.c (account_edit_clicked): Updated.
(account_delete_clicked): Same.
(account_default_clicked): Here too.
(account_able_clicked): "
(account_cursor_change): "
(mail_accounts_load): Again here.
* folder-browser.c (folder_browser_is_drafts): Updated to use
EAccountList and EAccount stuff.
(folder_browser_is_sent): Same.
* component-factory.c (mail_load_storages): Updated to use
EAccount and EAccountList stuff.
(owner_set_cb): Same.
(send_receive_cb): Here too.
* mail-config.c: Rewritten to use EAccount and EAccountList
objects.
svn path=/trunk/; revision=19509
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-config.glade: Add a "don't sign meeting requests" option to
the security pane, since some versions of Outlook won't recognize
pgp-signed meeting requests. Sigh.
* mail-config.c (account_copy, config_read, mail_config_write):
Handle pgp_no_imip_sign.
* mail-account-gui.c (mail_account_gui_new,
mail_account_gui_save): Setup/save "don't sign meeting requests"
button.
svn path=/trunk/; revision=17778
|
|
|
|
|
|
|
|
|
|
| |
2002-07-25 Jeffrey Stedfast <fejj@ximian.com>
* mail-config-druid.c (create_label): Make the gtk label line-wrap
instead of us forcing \n's in the label, that was just
wrong. Fixes bug #10320.
svn path=/trunk/; revision=17598
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2002-06-25 Jeffrey Stedfast <fejj@ximian.com>
* component-factory.c (mail_add_storage): Some compiler warning
fixes.
* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Removed.
(mail_crypto_get_pgp_cipher_context): New convenience function to
construct a pgp cipher context.
(mail_crypto_pgp_mime_part_verify): Use the new
get_pgp_cipher_context function.
(mail_crypto_pgp_mime_part_encrypt): Same.
(mail_crypto_pgp_mime_part_decrypt): Here too.
* mail-account-gui.c (mail_account_gui_new): Initialise the
pgp_always_trust checkbox.
(mail_account_gui_save): Get whether or not to always_trust the
user's pgp keys.
* mail-config.c (account_copy): Copy over the pgp_always_trust
option.
(config_read): Read in the always_trust option.
(mail_config_write): Save the always_trust option.
svn path=/trunk/; revision=17277
|
|
|
|
| |
svn path=/trunk/; revision=17117
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2002-04-26 Jeffrey Stedfast <fejj@ximian.com>
* mail-config-druid.c (extra_prepare): After building the extra
config options into a Gtk form, auto-detect any values that we can
and populate them by calling
mail_account_gui_auto_detect_extra_conf.
* mail-account-gui.c (mail_account_gui_auto_detect_extra_conf):
New function to auto-detect the extra config options for a source.
svn path=/trunk/; revision=16598
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2002-04-12 Jeffrey Stedfast <fejj@ximian.com>
* mail-account-gui.c (mail_account_gui_new): Set the text of the
reply-to.
(mail_account_gui_save): Get the reply-to text here.
(mail_account_gui_identity_complete): If there is text in the
reply-to widget make sure it's valid.
* mail-config.c (identity_copy): Copy the reply-to.
(config_read): Read in the reply-to for all the accounts.
(mail_config_write): Save the reply-to.
(impl_GNOME_Evolution_MailConfig_addAccount): Get the reply-to.
(identity_destroy): Free the reply-to.
svn path=/trunk/; revision=16446
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-account-gui.c (mail_account_gui_new): Make the drafts and
sent folder buttons be EvolutionFolderSelectorButtons. Remove the
code to deal with drafts_folder_name and sent_folder_name, since
they were only used to construct the button and aren't needed now.
(mail_account_gui_save): Remove drafts/sent name references.
(mail_account_gui_destroy): Likewise
(folder_selected): Handle the "selected" signal on the folder
selector button by updating the URI in the MailAccountGui.
(mail_account_gui_folder_selector_button_new): Glade custom widget
constructor.
* mail-callbacks.c (transfer_msg): Update for
evolution_shell_client_user_select_folder change.
* message-browser.c (transfer_msg): Likewise. (Sigh. Why is this
cut+pasted?)
* mail-config.glade: Make the drafts/sent folder buttons custom
widgets.
* mail-config.c (account_copy): Remove drafts/sent folder name
handling.
(account_destroy): Likewise.
(config_read): Likewise.
(mail_config_write): Likewise.
* Mail.idl (MailConfig:Account): remove drafts_folder_name and
sent_folder_name.
svn path=/trunk/; revision=16353
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2002-03-26 Jeffrey Stedfast <fejj@ximian.com>
Sync with yet-another-mail-config branch.
* mail-composer-prefs.c: Updated to get the right widgets and
whatnot. Also updated to tell the evolution-config-control that
stuff has changed.
* mail-preferences.c: Updated to get the right widgets and
whatnot. Also updated to tell the evolution-config-control that
stuff has changed.
* mail-accounts.etspec: New file needed by mail-accounts.c
svn path=/trunk/; revision=16257
|
|
|
|
| |
svn path=/trunk/; revision=15960
|
|
|
|
|
|
|
|
|
|
|
|
| |
2002-03-05 Jeffrey Stedfast <fejj@ximian.com>
* mail-account-gui.c (save_service): "use_ssl" can now be 3
options, modify the code to handle this.
(setup_service): Toggle the correct ssl option.
(source_type_changed): Show/hide the ssl hbox container widget.
(transport_type_changed): Same.
svn path=/trunk/; revision=15933
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-12-19 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (composer_get_message): Add the auto-cc/bcc
recipients here. The problem with setting them in the composer is
that what if the user changes which account he wants to use? We'd
either have to clear the cc/bcc lists *or* we'd have to leave them
alone. Either way is bad. We can't just clear the entries because
the user may have added addresses since the composer was
opened. We don't want to leave any old auto-cc/bcc addresses there
because that isn't desirable either. So we give up and add them
here after the user has already hit the send button.
* mail-config.c (account_copy): Update to copy the always-[b]cc
options.
(account_destroy): Update to destroy the above options.
(config_read): Update to read in those values.
(mail_config_write): Save those options.
* mail-account-gui.c (mail_account_gui_new): Setup Always Cc/Bcc
widgets.
(mail_account_gui_save): Get the user-entered values for the
always-cc/bcc stuff.
svn path=/trunk/; revision=15189
|
|
|
|
| |
svn path=/trunk/; revision=14217
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-08-27 Jeffrey Stedfast <fejj@ximian.com>
* mail-account-gui.c (mail_account_gui_new): Set the source and
transport description labels.
(transport_type_changed): Set the transport description label.
(source_type_changed): Set the source description label.
* mail-tools.c (mail_tool_make_message_attachment): Remove
X-Evolution* headers.
(mail_tool_remove_xevolution_headers): New function to convenience
removing the X-Evolution headers.
(mail_tool_restore_xevolution_headers): New convenience function
to restore the X-Evolution headers.
(mail_tool_destroy_xevolution): New function to cleanup the
structure.
(mail_tool_forward_message): Remove and restore the X-Evolution
headers here too.
svn path=/trunk/; revision=12487
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-08-09 Jeffrey Stedfast <fejj@ximian.com>
* mail-account-gui.c (mail_account_gui_save): Save the pgp and
smime always-sign options.
* mail-config.c (account_copy): Copy the always-sign options over
too.
svn path=/trunk/; revision=11841
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-07-24 Peter Williams <peterw@ximian.com>
* mail-config.glade: Add new label widgets with a message that SSL
isn't supported.
* mail-account-gui.h: Add a new member to the Transport GUI struct
for the 'SSL is not supported' message.
* mail-account-gui.c (source_type_changed): Change logic to display
a message stating that SSL isn't supported if SSL isn't supported.
(transport_type_changed): Same.
(mail_account_gui_new): Also load the labels for the the no-SSL
message.
* mail-accounts.c (construct): Fix typo.
svn path=/trunk/; revision=11340
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-07-09 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (setup_mime_tables): Handle application/pgp using
the text/plain handler.
* mail-account-gui.c (get_sensitive_widget): New function to determine
which widget is focused.
* mail-account-editor.c (apply_changes): Not only flip to the
notebook page that wasn't finished, but also grab the focus of the
incomplete widget.
* mail-config-druid.c (source_changed): Grab the focus of the
incomplete widget.
(transport_prepare): And here.
(identity_changed): Here too.
* mail-account-gui.c (mail_account_gui_identity_complete): Take an
incomplete argument so we can set which widget is incomplete and
then the caller can focus it or whatever.
(service_complete): Same.
(mail_account_gui_transport_complete): And again here.
(mail_account_gui_management_complete): And here too.
svn path=/trunk/; revision=10939
|
|
|
|
| |
svn path=/trunk/; revision=10578
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
signatures
2001-06-28 Radek Doulik <rodo@ximian.com>
* mail-config.c: use new fields everywhere
* mail-config.h: as below
* Mail.idl: added html_signature and has_html_signature
svn path=/trunk/; revision=10564
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-06-01 Jeffrey Stedfast <fejj@ximian.com>
* mail-account-gui.c (mail_account_gui_save): Save the pgp and
smime settings.
(mail_account_gui_new): Setup the pgp and s/mime page (but disable
the s/mime frame if we are not compiled with s/mime support).
* mail-config.c (account_copy): Updated to save extra pgp and
smime options.
(account_destroy): Free draft/sent folder info and also the new
pgp/smime keys.
(config_read): Read in the pgp and s/mime config options.
(mail_config_write): Save the account pgp and smime options.
svn path=/trunk/; revision=10084
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-account-gui.c: Add a "provider_type" arg to
MailAccountGuiService.
(transport_needs_auth_toggled): Call service_changed if enabling
the auth pane so the status of the "Check supported types" button
will be correct.
(service_check_supported): Use gsvc->provider_type, not
CAMEL_PROVIDER_STORE.
(mail_account_gui_new): Pass the transport as the user_data to the
"changed" signal on transport.hostname, not the store.
(mail_account_gui_setup): Set up provider_type fields
svn path=/trunk/; revision=9101
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-account-gui.c (mail_account_gui_new): Set up the
sent/drafts folder buttons.
(folder_picker_clicked): Pop up the folder selector when sent or
drafts is clicked.
(mail_account_gui_save): Save the sent/drafts folders.
* mail-config.c (account_copy): copy sent/drafts info
(config_read): read sent/drafts info
(mail_config_write): write sent/drafts info
* mail-callbacks.c (composer_send_cb, composer_postpone_cb):
split out some common code here (and fix inconsistencies). Always
set headers on the message giving the account name, transport,
and sent folder to use.
* mail-ops.c (mail_send_message): If the message has an
X-Evolution-Account header, use the transport/sent folder info for
that account (assuming it still exists). Otherwise, if it has
X-Evolution-Transport and/or X-Evolution-Fcc, use those. If not,
use the default transport and sent folder.
FIXME: Falls back silently to the default sent folder if it can't
open the account-specific one...
(send_queue_send): remove the X-Evolution-Transport, etc
processing here, as it gets done by mail_send_message now.
FIXME: We only sync the default sent folder.
* component-factory.c (owner_set_cb): While setting up the
standard folders, also record their URIs.
svn path=/trunk/; revision=8991
|
|
* mail-config.glade: Probably the very last new config dialog
ever. (Ha ha). From Anna, based on a story by me.
* mail-account-gui.c: New code for the new mail-config.glade. This
abstracts out all of the common code between the account editor
and the druid. It also handles the spiffy new provider-specific
config stuff.
FIXME: The code to check if a service is ok or not is no longer
there... waiting until the online/offline stuff from the shell
appears.
* mail-account-editor.c, mail-config-druid.c: These are much
smaller now, since most of the interesting bits moved to
mail-account-gui.c
* mail-accounts.c: Add an enabled/disabled column/button to
replace the checkbox that used to be in the editor, because it
really makes more sense to have it out here. This looks ugly.
Probably ought to ETable it...
(load_accounts): Fill in the enabled column.
(mail_select, mail_unselect): toggle the sensitivity and name of
the Enable/Disable button appropriately
(mail_able): Handle the enable/disable button.
* mail-config.c: Remove reply-to from MailConfigIdentity since it
didn't belong there (and wasn't being saved anyway).
(mail_config_check_service): Simplify this a bit. This really
needs to pop up a dialog with a "connecting..." message and a
cancel button.
svn path=/trunk/; revision=8971
|