aboutsummaryrefslogtreecommitdiffstats
path: root/mail
Commit message (Expand)AuthorAgeFilesLines
...
* Build fixes from Jacob, same as the other branch.Ettore Perazzoli2000-10-202-1/+10
* Clean up some old #if 0 code.Dan Winship2000-10-192-204/+4
* Get the MailConfigIdentity *before* we create a new composer object soJeffrey Stedfast2000-10-192-4/+10
* kill. (create_ondemand_hooks): die. (control_activate): remove hook.Michael Meeks2000-10-194-54/+15
* Fixed some column widths.Christopher James Lahey2000-10-192-3/+7
* Make all the CLists have passive titles. (identity_dialog): Make theIain Holmes2000-10-193-3/+18
* Disable the optionmenu because it is empty. (service_page_item_auth_fill):Iain Holmes2000-10-183-3/+27
* No, we REALLY dont want to perform an immediate search as the keys areNot Zed2000-10-1813-29/+118
* Un #if 0'd out (search_full): Same. (folder_browser_gui_init): ConnectJeffrey Stedfast2000-10-173-6/+16
* fixed ChangeLog merge-conflict errorsJeffrey Stedfast2000-10-171-2/+0
* Decode recipient names so that they display nicely in the To and CcJeffrey Stedfast2000-10-172-23/+48
* only set the url->user field if the user string is non-NULL and not empty.Chris Toshok2000-10-172-2/+15
* Uh, fixed jeff's wrong fix for setting the speficiation (the functionNot Zed2000-10-162-16/+17
* ETreePath != GNode now, use accessors. (ml_tree_value_at): same.Chris Toshok2000-10-162-15/+29
* Icon attribute for the mail component.Ettore Perazzoli2000-10-154-0/+11
* Don't free the service name.Jeffrey Stedfast2000-10-142-11/+15
* sync & expunge the source folder after filtering.Jeffrey Stedfast2000-10-132-36/+54
* Create the 'spec' and 'extras' arguments and call e_table_scrolled_new()Jeffrey Stedfast2000-10-132-5/+90
* Duh, fix the test for the folder name, strstr != strcmp is it.Not Zed2000-10-129-85/+229
* special case for folders with NULL urls (which aren'tChris Toshok2000-10-122-5/+31
* Replace To with From except in Drafts, Outbox, or Sent boxes. Make SubjectChristopher James Lahey2000-10-122-4/+10
* ChangelogIain Holmes2000-10-121-0/+4
* Disable the executive-summaryIain Holmes2000-10-122-5/+11
* set expansion to 0.0, minimum-width to 16, and resizable to false for theChris Toshok2000-10-122-23/+61
* Changed the password-getting dialog so that the text entry has focus.Anna Marie Dirks2000-10-122-0/+15
* change cell type to "string" since we're not including it in the extras.Chris Toshok2000-10-122-1/+6
* Changed these to use the proper form for the column element.Christopher James Lahey2000-10-113-7/+12
* Updated these to the new ETable style of specifications.Christopher James Lahey2000-10-114-204/+82
* convert to the new gal e-table stuff. (html_size_req): (html_new):Chris Toshok2000-10-112-63/+42
* remove the html description stuff for now.Chris Toshok2000-10-112-0/+10
* umm.. duh :) only subscribe if it's not subscribed, and vice versa.Chris Toshok2000-10-112-4/+17
* add a ref to input->storage here so that the ref/unref pattern moreChris Toshok2000-10-116-42/+123
* make sure we dup the return value of get_reply_to or get_from whenLarry Ewing2000-10-112-2/+10
* HTML changeIain Holmes2000-10-112-1/+6
* Added #include <errno.h> to mail/mail-threads.c so it will compile.Cody Russell2000-10-112-0/+4
* Fixed for new rule_context_loadIain Holmes2000-10-102-1/+5
* use our own etable to display the stores, and get them from theChris Toshok2000-10-103-149/+362
* Updated to use new icon code.Iain Holmes2000-10-102-52/+179
* Oops, forgot these files last night.Michael Zucci2000-10-102-0/+221
* Work around missing files in Zucchi's commit.Ettore Perazzoli2000-10-093-5/+21
* New widget, full search dialogue for mail.Not Zed2000-10-0912-50/+221
* re-write.Michael Meeks2000-10-094-11/+26
* Tag string for translation (do_flag_messages): ditto.Miguel de Icaza2000-10-082-4/+7
* Repeates writes on EINTRS. (pipe_read): Repeats reads on EINTRS.Miguel de Icaza2000-10-083-24/+111
* Move the functionality to incorporate messages intoMiguel de Icaza2000-10-082-122/+149
* Fix the locking up of the mail by only calling camel functions from theIain Holmes2000-10-075-53/+163
* set the @subscribed_only parameter to TRUE, since the subscribe UI is theChris Toshok2000-10-072-1/+7
* Add missing parameter in call to `camel_store_get_folder_info()'.Ettore Perazzoli2000-10-072-1/+7
* Decode the header before writing it to the header box.Jeffrey Stedfast2000-10-062-2/+9
* fetch mail before sending, this is a temp fix for POP-before-SMTPJeffrey Stedfast2000-10-062-3/+9
* Disable summary stuff, it appears to be badly broken.Michael Meeks2000-10-054-138/+152
* Use CamelInternetAddress instead of my quick hack (aka InternetAddress).Jeffrey Stedfast2000-10-053-154/+43
* Don't listen for message-changed hook, because it causes a lock up (?)Iain Holmes2000-10-052-3/+4
* Add the stuff to make evolution-mail a summary providing component. :)Iain Holmes2000-10-058-46/+254
* Add back the "sync folder on leave" hack that got lost in the UIHandlerDan Winship2000-10-052-1/+7
* Instead of UnSelectAll, we want InvertSelection.Jeffrey Stedfast2000-10-054-29/+41
* remove news specific check. (mail_tool_uri_to_folder): news: -> nntp:Chris Toshok2000-10-052-9/+8
* Don't expunge the source mailbox on completion.Jeffrey Stedfast2000-10-052-1/+6
* Don't try to add_folders if get_folder_info returned NULL.Dan Winship2000-10-052-2/+9
* Fix the attachment icon width. (content_is_attachment): Perform someNot Zed2000-10-042-4/+48
* Added a comment to a piece of code that I was trying to "fix" just to findMiguel de Icaza2000-10-042-0/+19
* destroy our tree_model and remove the root node. also, release_unref ourChris Toshok2000-10-033-6/+34
* add a storage-set-view-listener, and add a little printf saying whatChris Toshok2000-10-033-2/+30
* get Evolution::StorageSetView interface on our storage set view control,Chris Toshok2000-10-032-0/+13
* add -I$(top_srcdir)/widgets/miscChris Toshok2000-10-033-4/+27
* add fields for the storage set Bonobo_Control and Evolution_StorageSetViewChris Toshok2000-10-033-31/+46
* remove spurious conflict indicator.Michael Meeks2000-10-031-1/+0
* kill.Michael Meeks2000-10-031-0/+5
* Remove "Port" entry from source dialog. We'll use "host:port" likeDan Winship2000-10-032-75/+25
* subscribe-control.[ch] -> subscribe_dialog.[ch]Chris Toshok2000-10-037-78/+95
* remove the 2 tree pixbufs, so adjust the offsets to the score pixbufs.Chris Toshok2000-10-032-7/+8
* Update for CamelFolderInfo changes.Dan Winship2000-10-034-48/+52
* Add a cache for the pixbufs, hashed on CID, so that we only have to make aIain Holmes2000-10-023-81/+174
* Eye-candy, eye-candy.Iain Holmes2000-10-012-10/+106
* Add print preview verb here.Miguel de Icaza2000-09-305-51/+140
* nuked.Chris Toshok2000-09-309-332/+227
* added prototype.Chris Toshok2000-09-294-7/+61
* Messages should be appended to Sent as Seen. (do_send_mail): Same.Jeffrey Stedfast2000-09-292-2/+8
* Don't compile the subscribe control for now, as it needs to beEttore Perazzoli2000-09-282-4/+6
* new function.Chris Toshok2000-09-284-8/+86
* add SubscribeControl typedef.Chris Toshok2000-09-287-0/+673
* Note: We need a configuration option to specify whether to log filteringJeffrey Stedfast2000-09-282-3/+40
* Fix it so that "send later" will still mark a message as being replied,Jeffrey Stedfast2000-09-282-0/+16
* If the message has been deleted, don't try filtering it - skip to the nextJeffrey Stedfast2000-09-282-0/+14
* Shuffling (un)select all menu items to the Edit menu.Jeffrey Stedfast2000-09-262-4/+10
* Added new menu itemsJeffrey Stedfast2000-09-264-25/+77
* Function to convert a folder name/path to a filename for per-folder data.Not Zed2000-09-263-16/+174
* Updated to use Nat's ENameWestern parser.Jeffrey Stedfast2000-09-263-6/+54
* CamelException is not for compile-time errors. Replace lots of argumentDan Winship2000-09-262-485/+95
* Updates for the Bonobo changes from Michael who is having someEttore Perazzoli2000-09-232-27/+11
* Fix a crash that happened on my system when sorting by the "From"Ettore Perazzoli2000-09-232-2/+16
* New comparison function for email addresses. (subject_compare): NewJeffrey Stedfast2000-09-231-6/+23
* New comparison function for email addresses. (subject_compare): NewJeffrey Stedfast2000-09-222-3/+169
* Fixed some memory leakage. Call free_recipients() so we don't leak memory.Jeffrey Stedfast2000-09-223-10/+26
* s/Bonobo_UIHandler/Bonobo_UIContainer/Michael Meeks2000-09-212-6/+5
* Use the folder's full_name so recursive directory structures displayJeffrey Stedfast2000-09-202-2/+7
* Update for CamelFolder changes (subfolder_names -> subfolder_info).Dan Winship2000-09-202-5/+13
* Deal with NULL composer.Dan Winship2000-09-195-16/+36
* Call gnome_vfs_init() since the composer now does file operations (to getDan Winship2000-09-192-0/+8
* Removed COL_ONLINE_STATUS because we don't want that. Renamed COL_PRIORITYJeffrey Stedfast2000-09-193-123/+169
* Added check for gnome-app-lib. Removed directories that have been moved toChristopher James Lahey2000-09-1812-29/+38
* Everywhere add a -DEVOLUTION_DATADIR=${datadir} in the Makefile.amMichael Meeks2000-09-173-1/+9
* Revert **Temp fix** from below since the relevant shell bug has been fixedDan Winship2000-09-152-4/+9
* Don't get_message_flags, because POP doesn't support it and it's pointlessDan Winship2000-09-152-6/+7
* Fix the sense of the "keep on server" check so we're not doing thisDan Winship2000-09-152-1/+6
* This bug was so much fun to fix the first time that I decided toDan Winship2000-09-152-1/+14
* **Temp fix** Send "" as the default folder to select as anything elseJeffrey Stedfast2000-09-152-16/+25
* Made a nicer dialog for the "You have not configured the mail client" errorIain Holmes2000-09-152-13/+26
* camel_folder_append is perfectly happy to take a NULL info.Dan Winship2000-09-142-6/+5
* add bonobo_ui_handler_unset_container to stop menus screwing up.Michael Meeks2000-09-142-0/+4
* Make Tigert's icons work again.Michael Meeks2000-09-142-8/+9
* Move a couple of helpers into Bonobo before more people start the re-buildMichael Meeks2000-09-142-17/+4
* Changed the include here because it caused make distcheck to fail for me.Christopher James Lahey2000-09-142-1/+7
* Only use the cache if the user plans to keep_on_server.Jeffrey Stedfast2000-09-142-20/+27
* kill warning. (control_activate): set threaded toggle state, add freeze /Michael Meeks2000-09-142-76/+74
* The Commit from hell that breaks all UI related stuff;Michael Meeks2000-09-141-223/+80
* Fixed a warning (Missing include file.)Christopher James Lahey2000-09-142-0/+6
* Thou shalt add a space after `-I' when invoking `orbit-idl'.Ettore Perazzoli2000-09-132-1/+5
* Get rid of the `ui.xml' stuff that Michael committed, as it's breakingEttore Perazzoli2000-09-132-4/+5
* Tidy some xml.Michael Meeks2000-09-131-170/+0
* set folder_tree before adding the listener, since that will eventuallyDan Winship2000-09-132-2/+6
* sync the folder on deactivate.Dan Winship2000-09-132-0/+6
* For additional coolness, display the name of the mailing list in theEttore Perazzoli2000-09-124-7/+34
* Grey out the "Filter for Mailing List" item if we cannot figure out aEttore Perazzoli2000-09-123-36/+70
* Cool Hack of the Day: right-click menu item to autodetect what mailingEttore Perazzoli2000-09-1211-38/+543
* Was trying to unhook an event from the wrong folder - oops.Jeffrey Stedfast2000-09-122-1/+6
* (prune_empty): Plugged another small leak.Michael Zucci2000-09-122-0/+2
* Reverted to version 1.15. (remove_node): Ok, if a node has a parent,Not Zed2000-09-122-313/+63
* added some comments (no source code changes)Jeffrey Stedfast2000-09-121-1/+2
* ChangeLog for my previous commit.Ettore Perazzoli2000-09-121-0/+9
* Updated to use the new mail_do_filter_ondemand.Jeffrey Stedfast2000-09-124-26/+34
* Don't have the filter driver self_destruct.Jeffrey Stedfast2000-09-122-1/+6
* Added a simple LocalStorage manager module so that we can hook upEttore Perazzoli2000-09-124-0/+227
* If we're fetching from an mbox formatted file then we need to do someJeffrey Stedfast2000-09-122-1/+9
* Accidently didn't commit the ChangeLogChris Lahey2000-09-121-0/+4
* Fixed some warnings.Christopher James Lahey2000-09-121-4/+4
* Another big rewrite of this stuff. Now all (well, most) attachments get aDan Winship2000-09-124-357/+505
* might be a good idea to *save* the uids in the cache when we're done fetching...Jeffrey Stedfast2000-09-101-1/+9
* Use the CamelUIDCache so that we only retrieve *new* messages and alsoJeffrey Stedfast2000-09-102-1/+34
* Updated to not send hook/unhook data to filter_driver_run as it no longerJeffrey Stedfast2000-09-102-2/+14
* Freeze the default folder before filtering and thaw it afterward toJeffrey Stedfast2000-09-102-1/+17
* Fixed some warnings.Christopher James Lahey2000-09-095-5/+171
* Updated to pass a CamelMessageInfo to filter_driver_runJeffrey Stedfast2000-09-082-6/+42
* Updated to check the boolean return code from fulter_driver_run to findJeffrey Stedfast2000-09-082-6/+24
* *** empty log message ***Jesse Pavel2000-09-081-0/+6
* I changed the Reply-All behavior so that the sender's address doesJesse Pavel2000-09-081-2/+10
* Preliminaries for new UI handler.Michael Meeks2000-09-082-1/+174
* oops, forgot to pass "expunge" to camel_folder_sync - this should fix thatJeffrey Stedfast2000-09-081-1/+1
* Updated to pass an exception to filter_driver_run and also check theJeffrey Stedfast2000-09-082-4/+16
* Pass a storage dir to camel_session_new now.Dan Winship2000-09-084-4/+16
* Fix previous fix. (Free the uids, just do it correctly.)Dan Winship2000-09-082-0/+6
* Don't free uids, let the camel folder do that when it gets finalizedJeffrey Stedfast2000-09-082-3/+8
* Bunch of unicode related changesLauris Kaplinski2000-09-082-3/+3
* New async function to filter messages on demand. (do_fetch_mail): UpdatedJeffrey Stedfast2000-09-076-186/+273
* set the data to NULL for the tree root, so nuke_uids won't try to freeDan Winship2000-09-072-1/+6
* Fix memory handling for the shell's CORBA object reference within theEttore Perazzoli2000-09-065-17/+51
* camel_mime_part_get_filename now deals with both Content-Disposition andDan Winship2000-09-064-23/+10
* kill a warningDan Winship2000-09-061-1/+1
* Add a use-default-port option to the source editor ; bugfixesPeter Williams2000-09-064-47/+204
* Re-rename "Sent".Dan Winship2000-09-062-1/+3
* Remove the "+ 90" here since it seems to break things for me, and it's notDan Winship2000-09-062-1/+7
* Cleanup of lots of exception handling ; bugfixesPeter Williams2000-09-062-3/+9
* only call camel_folder_get_message_info if the folder hasDan Winship2000-09-062-52/+48
* Replace mail_do_setup_draftbox, mail_do_setup_outbox, andDan Winship2000-09-064-148/+66
* Applied Jesse's patch that will append a signature to the replied messageJeffrey Stedfast2000-09-043-22/+36
* Copy the passed in item before adding (mail_config_add_source): dittoJP Rosevear2000-09-033-20/+45
* Change the "Get Mail" toolbar button to become "Send & Receieve"Jeffrey Stedfast2000-09-037-41/+263
* Since POP3 doesn't implement get_message_info, we need to check for infoJeffrey Stedfast2000-09-032-40/+61
* Make the `Home' and `End' keys do the Right Thing. Remove circularEttore Perazzoli2000-09-035-24/+101
* A bit more e_utf8 wrappers here and thereLauris Kaplinski2000-09-023-12/+22
* Added calendar/conduits/Makefile, calendar/conduits/calendar/Makefile andChristopher James Lahey2000-09-022-0/+6
* Attach a callback to the postpone signal (send_to_url): Same (mail_reply):Jeffrey Stedfast2000-09-025-26/+197
* New convenience function to load the Outbox folderJeffrey Stedfast2000-09-024-14/+153
* Changed `Evolution::Storage' so that the displayed name for a folderEttore Perazzoli2000-09-013-2/+13
* Make the HTML widget grab the focus in the mail view window so thatEttore Perazzoli2000-08-312-0/+6
* Make CamelServices connect only when told to (old behavior). Make CamelRemote...Peter Williams2000-08-313-78/+26
* Fixing a spurious unref, or creating a circular reference? You decide.Peter Williams2000-08-302-0/+12
* Update this and related functions to no longer take a From address. (TheDan Winship2000-08-304-41/+26
* Add new news stores as well as mail sourcesPeter Williams2000-08-292-0/+11
* Free the from address when we're done with it. Also,Jeffrey Stedfast2000-08-292-12/+16
* Add more user-friendly progress messages from the friendly folks at Helix Cod...Peter Williams2000-08-283-3/+27
* Display the number of messages downloaded starting from one instead ofEttore Perazzoli2000-08-283-16/+49
* Goodbye, GDK_THREADS!Peter Williams2000-08-2811-102/+31
* Fix to prevent possible buffer overflows and a logic fix.Jeffrey Stedfast2000-08-282-5/+5
* Fix to prevent possible buffer overflowsJeffrey Stedfast2000-08-282-34/+42
* New crypto function to clearsign plaintextJeffrey Stedfast2000-08-283-8/+140
* Added bonobo menu handler for mark_all_deleted function.Ariel Rios2000-08-284-0/+28
* Change the way the message view window's size is set up so that theEttore Perazzoli2000-08-272-1/+8
* Fixed an uninitialized variable.Christopher James Lahey2000-08-262-1/+5
* KillJP Rosevear2000-08-263-33/+8
* Add support for specifying on which port to connect to a server; fix a potent...Peter Williams2000-08-262-0/+42
* Implemented PGP 2.x encryption. We only need to get the passphrase if weJeffrey Stedfast2000-08-262-17/+65
* More UTF-8 handlingLauris Kaplinski2000-08-253-29/+42
* Sync the right-click menu with the main menu for modifying messagesPeter Williams2000-08-254-6/+55
* Start adding progress info; make flag_all_messages camel-safe; make the no ne...Peter Williams2000-08-255-8/+70
* Fixed some warnings in the uihandler code.Christopher James Lahey2000-08-252-7/+12
* Fix GDK_THREADS_entering and leaving, hopefully once and for all. Genericify ...Peter Williams2000-08-2517-227/+512
* Reformat a bit, make "Folder" appear before "Message", fill in the MessageDan Winship2000-08-242-102/+132
* Fix a deadlock upon checking mail due to new camel_service semantics.Peter Williams2000-08-242-5/+11
* ChangeLog updates.Peter Williams2000-08-231-0/+12
* Automatically connect services when given a valid URL (should hopefully disco...Peter Williams2000-08-235-44/+48
* Fix an infinite loop in the message threading with empty containers.Peter Williams2000-08-222-1/+26
* Added fb_resize_cb to folder-browser.cJeremy Wise2000-08-212-1/+15
* many fixes to make it compile with strange prefixes...Mathieu Lacage2000-08-211-1/+0
* Fix menu itemsPeter Williams2000-08-182-11/+16
* Move menu items around, fix some GUI bits.Ettore Perazzoli2000-08-186-42/+98
* Filtering on demand! booyeah!Peter Williams2000-08-1811-12/+197
* Whole buncha leak fixes thanks to PurifyMatthew Loper2000-08-178-8/+36
* Use a configurable timeout.Richard Hult2000-08-177-3/+127
* Plug mem leaks.Peter Williams2000-08-173-30/+179
* Updates to the memory debugging stuff.Peter Williams2000-08-162-14/+57
* Updated russian translation. Fixed typo in mail-ops.c.Valek Frob2000-08-161-1/+1
* Add support for debugging the message thread memory leaks.Peter Williams2000-08-162-5/+65
* Address bugzilla bug #496Peter Williams2000-08-162-1/+10
* Close the pipes when finished; add i18nPeter Williams2000-08-164-62/+90
* Add support for copying messagesPeter Williams2000-08-167-51/+112
* Don't deadlock on PGP key requestPeter Williams2000-08-162-1/+9
* Fix the error dialogs.Peter Williams2000-08-152-3/+11
* Compile fix for RH7.0beta from Kenny Graunke <kwg@teleport.com>; unprototype ...Peter Williams2000-08-143-1/+8
* Added support for encrypting via PGP 5.0Jeffrey Stedfast2000-08-142-5/+26
* Use CORBA_Object_release() instead of CORBA_free() as appropriate, youEttore Perazzoli2000-08-142-1/+6
* Use the default handlers for SIGBUS and SIGSEGV as gnome_segv_handlerEttore Perazzoli2000-08-142-0/+13
* Set config->configured to TRUEJeffrey Stedfast2000-08-142-1/+7
* Remove a bogus `GDK_THREADS_ENTER()'/`GDK_THREADS_LEAVE()' pair.Ettore Perazzoli2000-08-142-2/+7
* Fix the ugly hack to get rid of a CORBA race condition. Yes, it'sEttore Perazzoli2000-08-144-15/+26
* add mail-local.hDan Winship2000-08-142-1/+6
* Disable error dialogs for now, as they hang.Ettore Perazzoli2000-08-142-1/+6
* Fix some freed-memory referencesDan Winship2000-08-142-12/+14
* Don't free the prompt. It doesn't belong to you.Dan Winship2000-08-142-1/+5
* Fix bug in the folder creation code: CORBA_Object_duplicate() theEttore Perazzoli2000-08-142-6/+15
* Don't wrap the gnome_dialog_run in GDK_THREADS_ENTER/LEAVEJeffrey Stedfast2000-08-142-2/+7
* Get the mail component to use the new Evolution::ShellView interface.Ettore Perazzoli2000-08-139-544/+380
* Updated to reflect changes to mail_do_scan_subfoldersJeffrey Stedfast2000-08-135-200/+187
* Lose a reference to the store on purpose. To be fixed later.Dan Winship2000-08-132-0/+11
* Take the source as a command-line argument rather than fetching it fromDan Winship2000-08-132-17/+22
* Redo this so that the lock icon remains active after a failed decryptionDan Winship2000-08-132-17/+31
* Don't clear the tree here. If two "folder_changed"s arrive in closeDan Winship2000-08-134-22/+53
* Don't leak the transport.Dan Winship2000-08-132-0/+3
* Don't ref the store returned from camel_session_get_store. It's alreadyDan Winship2000-08-132-14/+8
* Toggling a flag is an "instantaneous" operation, so if we're only doingDan Winship2000-08-122-2/+21
* Remove workaround for gnome-vfs 0.2 bug.Dan Winship2000-08-123-29/+8
* kill using_oaf assertion.Michael Meeks2000-08-122-1/+4
* Fix compilation of that vital necessity test-mailPeter Williams2000-08-122-3/+7
* Move menu items that affect a single message together, ditto with onesJP Rosevear2000-08-122-8/+16
* Fixed a warning.Christopher James Lahey2000-08-124-1/+8
* Redo this again. Get rid of struct mail_format_data and move most of thatDan Winship2000-08-125-296/+323
* ChangeLog update to go with my previous commitPeter Williams2000-08-121-0/+14
* use config->news instead of config->sources.Chris Toshok2000-08-122-2/+7
* Fix 'Test settings' in the prefs dialog. Update the async readme.Peter Williams2000-08-125-67/+152
* Update this for CamelObject (try_inline_pgp): Deal with decrypting hereDan Winship2000-08-125-118/+123