| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
a11y/widgets/ea-combo-button.c
a11y/widgets/ea-combo-button.h
addressbook/gui/component/addressbook-component.c
addressbook/gui/component/addressbook-component.h
addressbook/gui/component/addressbook-view.c
addressbook/gui/component/addressbook-view.h
addressbook/gui/component/component-factory.c
addressbook/gui/widgets/e-addressbook-view.c
addressbook/gui/widgets/eab-contact-display.c
addressbook/gui/widgets/eab-gui-util.h
addressbook/gui/widgets/eab-menu.c
addressbook/gui/widgets/eab-menu.h
addressbook/gui/widgets/eab-popup-control.c
addressbook/gui/widgets/eab-popup-control.h
addressbook/gui/widgets/eab-popup.c
addressbook/gui/widgets/eab-popup.h
calendar/gui/cal-search-bar.c
calendar/gui/calendar-commands.c
calendar/gui/calendar-component.c
calendar/gui/comp-editor-factory.c
calendar/gui/comp-editor-factory.h
calendar/gui/control-factory.c
calendar/gui/dialogs/comp-editor.c
calendar/gui/e-cal-component-memo-preview.c
calendar/gui/e-cal-component-memo-preview.h
calendar/gui/e-calendar-table.c
calendar/gui/e-memo-table.c
calendar/gui/e-memos.c
calendar/gui/e-tasks.c
calendar/gui/gnome-cal.c
calendar/gui/gnome-cal.h
calendar/gui/itip-bonobo-control.c
calendar/gui/itip-bonobo-control.h
calendar/gui/main.c
calendar/gui/memos-component.c
calendar/gui/memos-control.c
calendar/gui/memos-control.h
calendar/gui/migration.c
calendar/gui/migration.h
calendar/gui/tasks-component.c
calendar/gui/tasks-control.c
calendar/importers/main.c
composer/Makefile.am
composer/e-composer-header-table.c
composer/e-composer-header.c
composer/e-composer-header.h
composer/e-composer-name-header.c
composer/e-composer-private.c
composer/e-composer-text-header.c
composer/e-msg-composer.c
composer/e-msg-composer.h
e-util/e-corba-utils.h
e-util/e-logger.c
e-util/e-logger.h
e-util/e-util-labels.c
e-util/e-util-labels.h
em-format/em-format.c
mail/Makefile.am
mail/e-mail-shell-migrate.c
mail/em-account-editor.c
mail/em-account-editor.h
mail/em-composer-prefs.c
mail/em-composer-utils.c
mail/em-composer-utils.h
mail/em-folder-browser.c
mail/em-folder-tree-model.c
mail/em-folder-tree.c
mail/em-folder-tree.h
mail/em-folder-utils.c
mail/em-folder-utils.h
mail/em-folder-view.c
mail/em-format-html-display.c
mail/em-format-html.c
mail/em-mailer-prefs.c
mail/em-mailer-prefs.h
mail/em-message-browser.c
mail/em-message-browser.h
mail/em-network-prefs.h
mail/em-popup.c
mail/em-utils.c
mail/importers/Makefile.am
mail/mail-component-factory.c
mail/mail-component.c
mail/mail-config-factory.c
mail/mail-config-factory.h
mail/mail-config.c
mail/mail-dialogs.glade
mail/mail-types.h
plugins/calendar-weather/calendar-weather.c
plugins/mail-account-disable/mail-account-disable.c
plugins/select-one-source/select-one-source.c
po/POTFILES.in
shell/e-component-registry.c
shell/e-component-registry.h
shell/e-component-view.c
shell/e-component-view.h
shell/e-corba-config-page.c
shell/e-corba-config-page.h
shell/e-shell-constants.h
shell/e-shell-settings-dialog.c
shell/e-shell-settings-dialog.h
shell/e-shell-window-commands.c
shell/e-shell-window.c
shell/e-shell.h
shell/e-sidebar.c
shell/e-sidebar.h
shell/e-user-creatable-items-handler.c
shell/e-user-creatable-items-handler.h
shell/es-menu.c
shell/es-menu.h
shell/evolution-component.h
shell/evolution-config-control.c
shell/evolution-config-control.h
shell/evolution-listener.c
shell/evolution-listener.h
shell/evolution-shell-component-utils.c
shell/evolution-shell-component-utils.h
shell/importer/evolution-importer-client.c
shell/importer/evolution-importer-client.h
shell/importer/evolution-importer-listener.c
shell/importer/evolution-importer-listener.h
shell/importer/evolution-importer.c
shell/importer/evolution-importer.h
shell/importer/evolution-intelligent-importer.c
shell/importer/evolution-intelligent-importer.h
shell/importer/intelligent.c
shell/main.c
shell/test/evolution-test-component.c
shell/test/evolution-test-component.h
widgets/menus/gal-view-instance.c
widgets/menus/gal-view-menus.c
widgets/menus/gal-view-menus.h
widgets/misc/Makefile.am
widgets/misc/e-activity-handler.c
widgets/misc/e-activity-handler.h
widgets/misc/e-charset-picker.c
widgets/misc/e-combo-button.c
widgets/misc/e-combo-button.h
widgets/misc/e-config-page.h
widgets/misc/e-dropdown-button.c
widgets/misc/e-dropdown-button.h
widgets/misc/e-filter-bar.c
widgets/misc/e-info-label.c
widgets/misc/e-info-label.h
widgets/misc/e-multi-config-dialog.c
widgets/misc/e-multi-config-dialog.h
widgets/misc/e-search-bar.c
widgets/misc/e-search-bar.h
widgets/misc/e-task-bar.c
widgets/misc/e-task-bar.h
widgets/misc/e-task-widget.c
widgets/misc/e-task-widget.h
widgets/misc/test-dropdown-button.c
widgets/misc/test-error.c
widgets/misc/test-info-label.c
widgets/table/e-table-example-1.c
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
There still left two things opened, search for KILL-BONOBO to find them.
One is in calendar's Makefile.am, one in composer.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
a11y/widgets/Makefile.am
a11y/widgets/ea-widgets.c
a11y/widgets/ea-widgets.h
addressbook/gui/component/addressbook-component.c
calendar/gui/Makefile.am
calendar/gui/calendar-component.c
calendar/gui/dialogs/comp-editor.c
calendar/gui/dialogs/event-editor.c
calendar/gui/dialogs/memo-editor.c
calendar/gui/dialogs/task-editor.c
calendar/gui/memos-component.c
calendar/gui/tasks-component.c
composer/e-composer-private.c
composer/e-msg-composer.c
configure.in
e-util/e-plugin-ui.c
e-util/e-plugin-ui.h
mail/ChangeLog
mail/Makefile.am
mail/e-mail-attachment-bar.c
mail/em-format-html-display.c
mail/em-format-html-display.h
mail/em-format-html.h
mail/em-format.h
mail/em-popup.c
mail/mail-component.c
plugins/external-editor/external-editor.c
widgets/misc/Makefile.am
widgets/misc/e-attachment-paned.c
widgets/misc/e-attachment-view.c
widgets/misc/e-attachment.c
|
| | |
|
| |
| |
| |
| | |
svn path=/trunk/; revision=36116
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
to a new GtkHTML subclass named EMailDisplay, and have EMFormatHTML create an
instance of that. EMailDisplay will handle link clicking, mousing over URIs,
popup menus, and interactive search. This makes EMFormatHTMLDisplay and
EMailReader more lightweight.
Clean up more of the EMFormat stack.
svn path=/branches/kill-bonobo/; revision=37346
|
| |
| |
| |
| |
| |
| | |
Add some handy color conversion functions to e-util.
svn path=/branches/kill-bonobo/; revision=37290
|
|/
|
|
| |
svn path=/branches/kill-bonobo/; revision=36307
|
|
|
|
| |
svn path=/trunk/; revision=35663
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2008-04-29 Milan Crha <mcrha@redhat.com>
** Fix for bug #511337
* em-format-html.h: (EMFormatHTMLState), (struct _EMFormatHTML):
* em-format-html.c: (efh_init), (efh_format_done),
(efh_format_timeout): Track state of the object to recognize
whether rendering new content or doing nothing.
* em-format-html-display.c: (efhd_can_process_attachment),
(efhd_attachment_show), (efhd_attachment_popup),
(efhd_attachment_image), (efhd_attachment_button):
Do nothing when EMFormatHTML object's state is RENDERING,
the puri object instance is not valid anyway.
svn path=/trunk/; revision=35437
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2008-04-28 Johan Euphrosine <proppy@aminche.com>
** Fix for bug #529247
* em-format-html.h (struct _EMFormatHTML): Add header_colour.
* em-format-html-display.c (efhd_gtkhtml_realise): Use bg style
properties for body_colour, fg for header_colour, darken for
frame_colour, bg for content_colour.
* em-format-html.c (efh_init), (efh_format_exec), (efh_init),
(efh_text_plain), (efh_text_enriched), (efh_text_html),
(efh_message_deliverystatus): Use header_colour for text color of
the message header, body_colour for background color of the
message header, text_colour for text color of the message content,
base_colour for background color of the message content.
svn path=/trunk/; revision=35429
|
|
|
|
|
|
|
|
|
| |
2007-11-14 Matthew Barnes <mbarnes@redhat.com>
** Remove trailing whitespace from source code.
svn path=/trunk/; revision=34537
|
|
|
|
|
|
|
|
|
|
| |
2007-09-02 Matthew Barnes <mbarnes@redhat.com>
* Update FSF address in header comments (#469886).
Patch from Tobias Mueller.
svn path=/trunk/; revision=34151
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-02-12 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #350253
* Add new evolution icons:
art/16x16/evolution.png
art/22x22/evolution.png
art/24x24/evolution.png
art/32x32/evolution.png
art/scalable/evolution.svg
* Remove obsolete icons:
art/about-box.png
art/bcg.png
art/evolution.png
art/monkey-16.png
* art/Makefile.am: Ship our own named icons.
* mail/em-format-html-print.h:
Rename show_rupert field to show_icon.
* mail/em-format-html-print.c (efh_format_headers):
Lookup the evolution icon by name.
svn path=/trunk/; revision=33211
|
|
|
|
| |
svn path=/trunk/; revision=32020
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2005-05-16 Not Zed <NotZed@Ximian.com>
* mail-vfolder.h:
* mail-autofilter.h: forward-reference structures
* *.h: Make installed headers includable from mail/
* Makefile.am (mailinclude_HEADERS): install various mail headers
as first cut at public plugin api.
svn path=/trunk/; revision=29371
|
|
|
|
| |
svn path=/trunk/; revision=27300
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-05-18 Not Zed <NotZed@Ximian.com>
** Quick fix for #57434
* em-format.c (emf_format_clone): fix the FIXME about cloning
headers shown.
* em-format-html.c (efh_format_headers): only show rupert if we're
showing rupert.
* em-format-html-print.c (efhp_init): default show_rupert to off.
* em-format-html.c (efh_init): default show_rupert to on.
* em-format-html.h: added show_rupert bit.
svn path=/trunk/; revision=25953
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-05-05 Not Zed <NotZed@Ximian.com>
** See bug #57720.
* em-folder-browser.c (emfb_create_view_menus): removed some stuff
done in create_view_instance in the superclass.
* em-folder-view.c (emfv_create_view_instance): moved here from
em-folder-browser, setup the view instance for the folder.
(emfv_set_folder): if the folder is set, create the view instance.
* em-folder-browser.c: moved the galview instance and menu
pointers to EMFolderView, since they're basically meta-data on the
messagelist @ to fix issues.
* em-folder-view.c (em_folder_view_open_selected): copy over the
threaded list value when the message browser is brought up.
** some clean up
* evolution-mail.schemas.in.in: removed xmailer_mask stuff.
* em-migrate.c (mail_display_map[]): Removed xmailer_mask stuff.
* em-folder-view.c (emfv_setting_notify): removed xmailer_mask stuff.
* em-format-html.c (em_format_html_set_xmailer_mask): removed.
This isn't used anymore.
** Fixes the double-draw on separate mail view.
* message-list.c (on_cursor_activated_cmd): noop if the cursor and
uid match for all cases (clearing uid).
(on_selection_changed_cmd): noop if the cursor and new selection
hasn't changed & fix a memleak.
svn path=/trunk/; revision=25806
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-04-19 Michael Terry <mike@mterry.name>
* GNOME_Evolution_Mail.server.in.in:
* em-account-prefs.[ch]:
* em-composer-prefs.[ch]:
* em-folder-browser.c:
* em-folder-tree.c:
* em-folder-view.c:
* em-format-html-display.c:
* em-format-html.[ch]:
* em-popup.c:
* mail-component.c
* mail-config-druid.c:
* mail-config.glade:
* mail-mt.c:
* mail-send-recv.c:
* message-list.c:
* message-tag-followup.c:
* message-tags.glade: Update the mailer to use icon themes through the
EIconFactory object in e-util
svn path=/trunk/; revision=25517
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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-23 Radek Doulik <rodo@ximian.com>
* em-format-html-display.c (efhd_format_attachment): use
EM_FORMAT_HTML_VPAD
* em-format-html.h (EM_FORMAT_HTML_VPAD): added new define for
vertical padding
* em-format-html.c (efh_format_message): change padding table so
that it works OK with fixed gtkhtml
svn path=/trunk/; revision=25156
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2004-02-06 Jeffrey Stedfast <fejj@ximian.com>
* em-format-html.c (efh_format_headers): Make private (only
EMFormatHTMLQuote used it and that class is no longer in use).
(efh_format_message): Updated for above change.
* em-format-quote.c (emfq_format_message): Always write a \n after
the credits line.
svn path=/trunk/; revision=24661
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2003-11-24 Radek Doulik <rodo@ximian.com>
* em-format-html.c (efh_text_plain): use new colors
(efh_text_html): ditto
* em-format-html-display.c (efhd_gtkhtml_realise): set new colors
according to style
* em-format-html.c (efh_init): init new colors
* em-format-html.h: added frame and content colors
svn path=/trunk/; revision=23477
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
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
|