| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
| |
2002-08-22 Jeffrey Stedfast <fejj@ximian.com>
* mail-tools.c (mail_tool_restore_xevolution_headers): Reset the
X-Evolution-PostTo header.
(mail_tool_remove_xevolution_headers): Remove the
X-Evolution-PostTo header.
svn path=/trunk/; revision=17844
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2002-07-24 Jeffrey Stedfast <fejj@ximian.com>
* mail-config.c (mail_config_folder_to_safe_url): Use
mail_tools_folder_to_url().
* mail-tools.c (mail_tools_folder_to_url): New convenience
function to take a CamelFolder and return the URL associated with
it.
* mail-callbacks.c (composer_get_message): Pass in a 'post'
argument so we know whether or not we can ignore a NULL set of
recipients.
(composer_send_cb): Default send->send to TRUE unless we are in
Post-To mode, in which case set send->send to FALSE (since we'll
have nothing to send). Also, if we are in Post-To mode, append to
the folder the user wants to post to rather than appending to
Outbox.
(composer_send_queued_cb): Only queue a send thread if send->send
is TRUE (ie, the composer was not in Post mode - if it was in Post
mode, then the message post has already been saved in the correct
folder so there is nothing to do).
(post_message): New function to create an empty composer widget in
Post mode.
(post_reply): New function that calls mail_reply with the new mode
of REPLY_POST.
(mail_generate_reply): If the mode is REPLY_POST, create a Post
composer widget otherwise create a normal composer widget.
svn path=/trunk/; revision=17592
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-12-21 Jeffrey Stedfast <fejj@ximian.com>
The idea here is that if we consistantly name the movemail file
between Send&Receive sessions that if the user cancells the
"download" of a mbox spool that the next Send&Receive will not
"lose" mail that didn't finish the previous session. Fixes bug
#17759. Well, mostly. If you have 200 messages and cancel after
the first 100, say, then the next time you hit Send&Receive, it
will start over from 1 so you'll end up duplicating the first 100
messages, but at least you won't "lose" mail.
* mail-tools.c (mail_tool_get_local_movemail_path): Now a static
internal function, takes a char *uri argument and no longer
generates movemail.%d filenames... they are now based on the uri
provided.
(mail_tool_do_movemail): Pass along the source_uri.
svn path=/trunk/; revision=15224
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-11-08 Jeffrey Stedfast <fejj@ximian.com>
* mail-tools.c (mail_tools_x_evolution_message_parse): Was
x_evolution_message_parse from folder-browser.c. A space char is
no longer used to separate the folder URI and the first uid,
instead this is now done with a nul-char so update to parse the
newer/better format.
* component-factory.c (destination_folder_handle_drop): Update to
parse the new/better format.
* folder-browser.c (x_evolution_message_parse): Moved to
mail-tools.c
(message_list_drag_data_get): Instead of placing a space char
after the folder URI, instead use a nul-char.
svn path=/trunk/; revision=14645
|
| |
|
|
|
|
| |
(instead of version 2 or any later version).
svn path=/trunk/; revision=14191
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-10-23 <NotZed@Ximian.com>
* mail-session.c (get_password): Completely re-done. We now hae a
completely async dialogue when requested from antoehr thread, and
dont use gtk_main() if we can avoid it (which is normally the
case). This stuff is only partially finished, and will mena the
removal of the same from mail-mt.c, and the mail_user_message()
code will be moved here and changed to work in a similar way.
* mail-callbacks.c (empty_trash): Dont try and connect to remote
stores just to get the trash. Also, always run empty trash async,
and make sure we unref the trash.
(empty_trash): Hmm, dont unref the trash, causes a problem on
exit, i suspect something else is doing funky unrefs on it.
* mail-tools.c (mail_tool_get_trash): Pass a 'connect' arg, tell
it whether it should tryand connect or not to the parent service,
if it isn't already connected.
* component-factory.c (owner_unset_cb): Dont try wait_all here,
could potentially deadlock.
(idle_quit): Keep returning TRUE if we have outstanding
processing. Note that this may busy-wait during exit processign
with busy tasks :(
(idle_quit): Keep calling ourselves till we no longer get called
(i.e. gtk_main really quits).
* mail-mt.c (mail_msg_active): New function, returns TRUE if
events are still active/outstanding.
(do_op_status): @$@$#@@!#@!! didn't unlock the mail_msg_lock if
data->activity was NULL and we had no global_shell_client anymore!
Also shortcut processing if this is going to be the case.
(mail_msg_init): Setup a temporary other gui_port for redoing with
new semantics password, user message and progress reporting.
(mail_get_password): #ifdef'd out all this code temporarily, till
it gets fully moved to mail-session.c
2001-10-22 <NotZed@Ximian.com>
* component-factory.c (owner_set_cb): Dont call enable_interaction
here.
(interactive_cb): But here instead, let the shell tell us when its
ok to go interactive.
svn path=/trunk/; revision=13933
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-10-02 Jeffrey Stedfast <fejj@ximian.com>
* mail-vfolder.c (vfolder_setup_do): Pass an empty flags argument
to mail_tool_uri_to_folder.
(vfolder_adduri_do): Same.
* mail-session.c (get_folder): Pass an empty flags argument to
mail_tool_uri_to_folder.
* mail-send-recv.c (receive_get_folder): Pass an empty flags
argument to mail_tool_uri_to_folder.
* mail-ops.c (get_folder_get): Pass the flags to
mail_tool_uri_to_folder.
(mail_get_folder): Now takes a flags argument.
(remove_folder_get): Pass an empty flags argument to
mail_tool_uri_to_folder.
(mail_send_message): Pass an empty argument flag to
mail_tool_uri_to_folder.
(transfer_messages_transfer): Same. Destination folder should
already be created by this time.
* folder-info.c (do_get_info): Pass an empty flags argument to
mail_tool_uri_to_folder.
* importers/evolution-mbox-importer.c (folder_created_cb): Pass
the CREATE flag here too.
(load_file_fn): And here.
(load_file_fn): And here too.
* importers/evolution-outlook-importer.c (load_file_fn): Pass the
CREATE flag to mail_tool_uri_to_folder.
* folder-browser.c (folder_browser_new): Pass an empty flags
argument.
(x_evolution_message_parse): Pass an empty flags argument to
mail_tool_uri_to_folder.
* component-factory.c (create_folder): Pass a CREATE flag to
mail_get_folder here too.
(owner_set_cb): And here.
(xfer_folder): Shouldn't need the CREATE flag here, so not passing
any flags.
(destination_folder_handle_drop): Same.
* mail-local.c (mail_local_store_add_folder): Pass a CREATE flag
to mail_get_folder.
(reconfigure_folder_reconfigure): Pass an empty flags argument to
mail_tool_uri_to_folder.
* mail-tools.c (mail_tool_uri_to_folder): Take a flags argument.
(mail_tool_get_local_inbox): Pass an empty flags argument to
mail_tool_uri_to_folder.
svn path=/trunk/; revision=13353
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-local.c (mail_local_reconfigure_folder): Don't use
mail_tool_get_folder_name here since that function only existed to
be clever in a certain case that this is not.
(reconfigure_folder_free): Remove the dialog from the hash table
here so that it gets removed in the successfully-reconfigured case
too. Don't unref folder_out if it never got set.
(reconfigure_clicked): Remove the hash table code from here; it's
in reconfigure_folder_free now.
* mail-tools.c (mail_tool_get_folder_name): No longer used by
anything.
(mail_tool_get_folder_from_urlname): Also not used anywhere.
svn path=/trunk/; revision=13273
|
| |
|
|
|
|
|
|
|
|
| |
2001-09-18 Jeffrey Stedfast <fejj@ximian.com>
* mail-tools.c (mail_tool_remove_xevolution_headers): Oops, forgot
about X-Evolution-Format.
(mail_tool_restore_xevolution_headers): Same.
svn path=/trunk/; revision=12955
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2749 - Message text not included in reply, but html attachment is
4294 - "forward inline" should quote the same headers as the
normal mail display
6100 - Reply to a forwarded email displays email headers
7255 - Replying to HTML message
7527 - replying to forwarded message w/ attachments does the wrong
thing
* mail-format.c (mail_get_message_rfc822): New function to get
message headers and body together, for inline forwards, or replies
containing attached messages.
(mail_get_message_body): Redo this to always return HTML, but keep
the "want_plain" flag, to decide whether to return HTML that looks
like HTML or HTML that looks like plain text. Use
mail_get_message_rfc822 to handle attached message/rfc822 parts.
Don't include the text of vcard or icalendar attachments. Don't
fail to include text parts just because we found an HTML part.
(Since we're always returning HTML now, this doesn't cause
problems any more.)
* mail-tools.c (mail_tool_quote_message): Simplify greatly.
mail_get_message_body always returns HTML now, and we let it take
care of prepending "> "s too. We then let GtkHTML deal with
converting the HTML to plain text if the user wants to reply in
plain text.
(mail_tool_forward_message): Simplify this a ton too: parts of it
are moved into mail_get_message_rfc822 and parts are now
unnecessary.
* mail-callbacks.c (do_forward_non_attached): Call
mail_tool_forward_message here always, and let it do the "> "
quoting in the "quoted" case, so that we get the headers too when
forwarding quoted. Related to bug #4294.
svn path=/trunk/; revision=12657
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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-27 Jeffrey Stedfast <fejj@ximian.com>
* 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=12484
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-07-24 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (guess_me): Do a case-insensitive comparison.
(mail_generate_reply): Only resort to the source account's
identity if we can't find out which identity to use based on the
recipients of the message first.
* mail-config.c (mail_config_get_default_account): Make sure to
return the 0th account if we don't have a default. We don't want
to return NULL.
* mail-callbacks.c (empty_trash): Use mail_tool_get_trash for the
remote store trash folders.
* mail-tools.c (mail_tool_get_trash): New convenience function.
svn path=/trunk/; revision=11353
|
| |
|
|
|
|
|
|
|
|
| |
2001-07-18 Jason Leach <jleach@ximian.com>
* mail-tools.h (mail_tool_get_local_inbox_url): Remove this
prototype for a function that was removed long ago.
(mail_tool_get_local_movemail_url): Ditto.
svn path=/trunk/; revision=11220
|
| |
|
|
|
|
| |
helixcode.com with ximian.com all over the place.
svn path=/trunk/; revision=10440
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
2001-05-11 Jeffrey Stedfast <fejj@ximian.com>
* mail-local.c (mail_local_reconfigure_folder): Set a title on the
window "Reconfigure %s" where %s is the folder name. Also, don't
allow more than one of these type windows to be opened per folder.
* mail-tools.c (mail_tool_get_folder_name): Fix Danw's kludge to
actually work :-)
svn path=/trunk/; revision=9767
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-03-08 Jeffrey Stedfast <fejj@ximian.com>
* folder-browser-factory.c: Set the Forward->Quoted callback.
Also set the forward->Attachment callback.
* mail-view.c (view_forward_msg): Specify FORWARD_ATTACHED.
* mail-callbacks.c (forward_attached): Don't call
forward_messages() anymore...never really needed to. Just handle
it directly.
(forward_inlined): Specify FORWARD_INLINE as the flag argument.
(forward_quoted): New function sorta like forward_inlined except
this forwards the message quoted.
* mail-tools.c (mail_tool_forward_message): New function to
prepare a message to be forwarded.
svn path=/trunk/; revision=8611
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-02-24 Jeffrey Stedfast <fejj@ximian.com>
* folder-browser.c: Toss the mail_tool_camel_lock* stuff.
* mail-ops.c: Same.
* mail-summary.c: Here too.
* mail-tools.c (mail_tool_uri_to_folder_noex): Blown away!
(mail_tool_filter_get_folder_func): *kapoosh*
(mail_tool_camel_lock_up): Same.
(mail_tool_camel_lock_down): Same.
(mail_tool_set_uid_flags): Don't need this rubbish anymore either.
svn path=/trunk/; revision=8384
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-local.c: Updates for CamelStore changes, small memory leak
fixes.
(lookup_folder): Removed (and moved into the reconfigure code)
since this method no longer exists in CamelStore.
(do_reconfigure_folder, etc): Update the info in the
MailLocalStore after reconfiguring.
(mail_local_lookup_folder): Removed
* local-config.glade: fix padding of the label_format
* message-list.c (ml_tree_value_at): Don't keep message infos
reffed across calls, since this can cause badness after a
reconfigure. Instead, just strdup the needed values and free those
on the next call.
* mail-tools.c (mail_tool_get_root_of_store): Unused, remove.
(mail_tool_get_inbox): use camel_store_get_inbox.
* evolution-outlook-importer.c (load_file_fn):
* evolution-mbox-importer.c (load_file_fn): Use
mail_tool_get_local_inbox() instead of mail_importer_get_folder()
* mail-importer.c (mail_importer_get_folder): Removed
svn path=/trunk/; revision=8147
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* mail-tools.h: s/filter-driver.h/camel-filter-driver.h/ and
update first arg of mail_too_filter_get_folder_func
* mail-tools.c (mail_tool_filter_get_folder_func): Update first
arg to CamelFilterDriver *
* mail-send-recv.c (receive_status):
* mail-ops.c (send_queue_send): s/FILTER/CAMEL_FILTER/
* mail-callbacks.c: Remove filter-driver.h include
* mail-accounts.c: Put the news functions inside #ifdef
ENABLE_NNTP to prevent warnings about unused statis functions.
* subscribe-dialog.c (subscribe_folders, unsubscribe_folders,
subscribe_refresh_list): Update prototype to match BONOBO_UI_VERB.
(populate_store_list): add a de-constifying cast
svn path=/trunk/; revision=7708
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2001-01-22 Not Zed <NotZed@Ximian.com>
* component-factory.c (owner_set_cb): remove a warning with
conditional news compilation.
* mail-ops.h: Cleaned up the header list.
* folder-browser-factory.c: Replace the old get_send mail with the
new one (button).
* mail-ops.c (set_x_mailer):
(mail_load_evolution_rule_context):
(mail_do_fetch_mail):
(mail_do_filter_ondemand):
(mail_send_mail_old):
(mail_do_send_queue): All removed, (for) now lives in mail-send-recv.c.
(load_context):
(setup_filter_driver):
(filter_get_folder):
(mail_filter_folder):
(mail_fetch_mail):
(mail_update_subfolders):
(mail_send_mail):
(mail_send_queue): New equivalents of all these fundtions, moved
from mail-send-recv.c ...
(mail_filter_on_demand): Moved here too.
(mail_load_filter_context): Export this.
* mail-callbacks.c (apply_filters): Use the new
mail_filter_on_demand() call.
(send_receieve_mail): Use mail_send_receive to do the work. Add a
little error handling here that used to be elsewhere.
(send_queued_mail): Removed.
(fetch_mail): Removed.
(select_first_unread): #ifdef'd this out. Not sure if this still
makes sense, but it doesn't get run right now anyway.
(composer_postpone_cb): Fix the setting of message flags. You
dont need to get them first, ever.
* mail-send-recv.c (mail_send_message): Dont use
mail_tool_send_via_transport anymore (it does nothing useful).
* mail-tools.c (mail_tool_camel_lock_up): Turned into a noop.
(mail_tool_camel_lock_down): And here too.
(mail_tool_move_folder_contents): Removed from the code (hasn't
bene used for ages).
(mail_tool_send_via_transport): Removed, it doesn't save anything.
svn path=/trunk/; revision=7702
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2000-11-17 Jeffrey Stedfast <fejj@helixcode.com>
* mail-format.c (mail_generate_reply): Use the new quote_message
function and make it start with "On %s, %s wrote:" since people
seem to want that.
* mail-ops.c (cleanup_forward_messages): Use the new quote_message
function.
* mail-tools.c (mail_tool_quote_message): New convenience function
to quote a message body (since both the reply and forward code do
similar quoting)
svn path=/trunk/; revision=6605
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2000-10-18 Not Zed <NotZed@HelixCode.com>
* folder-browser.c (folder_browser_gui_init): No, we REALLY dont
want to perform an immediate search as the keys are pressed.
* mail-display.c (on_object_requested): Kill a minor warning with
a cast.
* mail-config.c: Include mising ctype.h to kill a warning.
* message-thread.c (main): Fixed the test case for api changes.
* message-list.c (message_list_drag_data_get): Set some flags to
get_folder(). I dont even think this will work because
mail_tool_get_folder doesn't handle file url's.
* mail-vfolder.c (vfolder_uri_to_folder): Pass appropriate flags.
* mail-ops.c (do_setup_folder): Pass appropriate flags. Hmm,
whats the difference between setup and create. *shrug*
(do_create_folder): Pass appropriate flags to get_folder. Needs a
way to specify the index flag.
* mail-tools.c (mail_tool_get_folder_from_urlname): Changed create
to flags argument.
(mail_tool_get_local_inbox_url): Add an index argument.
(mail_tool_get_local_inbox): honour index flag.
(mail_tool_get_inbox): Changed for api change.
(mail_tool_uri_to_folder): Fixed calls to store_get_folder();
* mail-local.c (load_metainfo): Added an indexed field to the metainfo.
(save_metainfo): And save it too.
(do_reconfigure_folder): Honour index flag when creating the new
folder. Do not open the old folder with an index at all.
(mail_local_map_uri): Add an index argument - tells if the mbox is
indexed.
(mail_tool_local_uri_to_folder): Create & pass flags properly.
(#include gnome.h): Dont include all of gnome, just what we use,
and explicity include xml-memory, so we get xmlFree().
svn path=/trunk/; revision=5979
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2000-10-12 Not Zed <NotZed@HelixCode.com>
* message-list.c (message_list_setup_etable): Duh, fix the test
for the folder name, strstr != strcmp is it.
2000-10-10 Not Zed <NotZed@HelixCode.com>
* message-list.c (folder_to_cachename): Removed, changed callers
to use mail_config_folder_to_cachename instead.
* mail-config.c (mail_config_folder_to_cachename): New utility
function to get a cache name for a folder.
* mail-tools.c (mail_tool_do_movemail): Changed to return the path
to the mbox, rather than opening a folder of it.
* mail-ops.c (mail_incorporate_messages): Dont bother making the
pseudo messageinfo, filder_driver_filter_message will do it for
us.
(report_status): Callback to report status of filtering operation.
(do_fetch_mail): Changed significantly - for the api changes to
the filtering system. Also now incorporates a mailbox file
directly, without having to import it into a camel folder first.
(mail_incorporate_messages): Removed entirely, no longer needed.
* mail-vfolder.c (vfolder_refresh): Fix for context api changes.
(vfolder_uri_to_folder): Likewise.
* folder-browser-factory.c (create_ondemand_hooks): Changed for
api changes. Also only adds demand filters to the menu (fixed a
small logic bug).
svn path=/trunk/; revision=5883
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2000-09-06 Jeffrey Stedfast <fejj@helixcode.com>
* mail-ops.c (mail_do_filter_ondemand): New async function to
filter messages on demand.
(do_fetch_mail): Updated to filter 1 message at a time using the
new filter-driver code
* mail-callbacks.c (composer_postpone_cb): Send NULL as the
message info.
(run_filter_ondemand): Use mail_do_filter_ondemand instead of
filter_driver_run
* mail-tools.c: Removed mail_tool_filter_contents_into and
mail_tool_fetch_mail_into_searchable as they have now been
deprecated.
svn path=/trunk/; revision=5225
|
| |
|
|
|
|
| |
the recursive-store-loading. Load stores when they're added to the config page.
svn path=/trunk/; revision=5005
|
| |
|
|
| |
svn path=/trunk/; revision=4864
|
| |
|
|
|
|
|
|
| |
2000-08-11 Christopher James Lahey <clahey@helixcode.com>
* mail-format.c, mail-tools.h, message-list.c: Fixed a warning.
svn path=/trunk/; revision=4760
|
| |
|
|
|
|
|
|
|
|
|
| |
* mail-tools.c (mail_tool_get_folder_name): Add a function to
return a useful name for a folder (not just "mbox" or "mh" for
any local folder.)
* mail-ops.c: Use mail_tool_get_folder_name rather than
folder->full_name when printing folder names.
svn path=/trunk/; revision=4733
|
| |
|
|
| |
svn path=/trunk/; revision=4727
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* mail-tools.c (mail_tool_get_folder_from_urlname): Add a
"gboolean create" argument to pass to camel_store_get_folder.
* mail-ops.c (do_create_folder, do_setup_draftbox):
* mail-local.c (mail_tool_local_uri_to_folder):
* mail-vfolder.c (vfolder_uri_to_folder): Add create flag to
mail_tool_get_folder_from_urlname calls.
svn path=/trunk/; revision=4702
|
| |
|
|
| |
svn path=/trunk/; revision=4696
|
|
|
svn path=/trunk/; revision=4688
|
