aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers
Commit message (Expand)AuthorAgeFilesLines
* add mnemonic for checkboxes.Mengjie Yu2004-12-011-8/+8
* ** See bug #69615.Not Zed2004-12-011-5/+11
* rename to STREAM_LINE_SIZE so it doesn't override the STREAM_LINE enum.Not Zed2004-12-011-3/+3
* ** See bug #69446.S.Çağlar Onur2004-12-014-15/+15
* ** See bug #69109.Not Zed2004-11-221-7/+10
* added a setting to mark the account for offline usuageSivaiah Nallagatla2004-11-222-20/+52
* Make debug run based on 'nntp' debug option.Not Zed2004-11-193-19/+32
* In the fallback cases, clear the exception first.Jeffrey Stedfast2004-11-163-7/+16
* Use camel_tcp_stream_ssl_new_raw() for STARTTLS stream.Jeffrey Stedfast2004-11-163-6/+6
* Moved the last tcp_stream unref to afetr the last fail-check so that weJeffrey Stedfast2004-11-161-1/+1
* Moved the last tcp_stream unref to afetr the last fail-check so that weJeffrey Stedfast2004-11-161-2/+2
* Fix bug #69408 by filling our input buffer if inptr == inend.Jeffrey Stedfast2004-11-161-1/+4
* Handle numeric tokens for the COPYUID set values as well.Jeffrey Stedfast2004-11-141-8/+16
* Folder now gets set on the CamelFolderSummary object rather than theJeffrey Stedfast2004-11-132-18/+12
* Init appended_uid value to NULLJeffrey Stedfast2004-11-131-0/+3
* Properly handle NILs for the namespace separator (somehow I missed this,Jeffrey Stedfast2004-11-131-3/+13
* ** Merge in notzed-messageinfo-branch, fix some minor conflicts.Not Zed2004-11-1241-507/+496
* Free the passwd here if we need to retry to authenticate.Jeffrey Stedfast2004-11-121-1/+4
* #define d()Jeffrey Stedfast2004-11-121-0/+2
* removed some debug printf'sJeffrey Stedfast2004-11-111-5/+5
* Use the expanded ALL macro as on closer inspection of the RFC, we're notJeffrey Stedfast2004-11-111-10/+4
* include a headerJeffrey Stedfast2004-11-111-0/+1
* enabled \\Recent flagJeffrey Stedfast2004-11-113-9/+11
* before short-circuiting the check for child content, check the childNot Zed2004-11-101-16/+20
* Updated the properties to include all the same settings as the old imapJeffrey Stedfast2004-11-103-0/+113
* Handle not getting the CRLF pair together. Also don't require that we haveJeffrey Stedfast2004-11-104-10/+18
* Added much in-line documentation. (engine_parse_capability): UseJeffrey Stedfast2004-11-052-9/+158
* Don't bother getting the folder delim if the name is "" since we don'tJeffrey Stedfast2004-11-032-17/+16
* If namespaces is NULL, return the default folder delim ('/').Jeffrey Stedfast2004-11-031-0/+3
* Update stream->inptr after fetching the literal chunk.Jeffrey Stedfast2004-11-031-0/+2
* Do proper cleanup in case of error and also handle literals.Jeffrey Stedfast2004-11-031-6/+31
* Removed camel_service_connect() call which is no longer needed.Jeffrey Stedfast2004-11-031-7/+6
* Do the same SSL->TLS and TLS->CLEAR fallbacks that the 2.0 (and older)Jeffrey Stedfast2004-11-024-8/+20
* Remove expunged messages from the cache.Jeffrey Stedfast2004-11-024-8/+58
* Cache the folder-info on the summary if successful. (imap4_delete_folder):Jeffrey Stedfast2004-11-023-7/+25
* Cleaned up a bit. (save_namespaces): Same.Jeffrey Stedfast2004-11-021-27/+31
* Handle literal strings. (envelope_decode_date): Same. Fixes bug #68894.Jeffrey Stedfast2004-10-291-0/+25
* Properly tokenise "\*" as a flag token. Fixes bug #68869.Jeffrey Stedfast2004-10-281-0/+4
* New files implementing a folder-info cache for offline mode (and fasterJeffrey Stedfast2004-10-279-49/+664
* Don't allow users to create folders in offline mode. When in offline mode,Jeffrey Stedfast2004-10-212-8/+67
* Removed an already-fixed FIXME comment. (imap4_summary_fetch_flags): Same.Jeffrey Stedfast2004-10-214-108/+89
* updated commentJeffrey Stedfast2004-10-211-0/+1
* Removed an already-fixed FIXME comment. (imap4_summary_fetch_flags): Same.Jeffrey Stedfast2004-10-201-8/+0
* Change the service string for the sasl mechanism to"imap" rather thanJeffrey Stedfast2004-10-191-1/+1
* renamed delete_originals to move. clearer. cleaner. shorter. not as ugly.Jeffrey Stedfast2004-10-161-5/+5
* added gtk-doc commentsJeffrey Stedfast2004-10-161-1/+14
* kill cast as lvalue warning.Not Zed2004-10-1313-58/+162
* fix for #62053Sivaiah Nallagatla2004-10-111-3/+43
* ** See bug #67170.Not Zed2004-10-111-3/+3
* include camel-i18n.hJP Rosevear2004-10-041-0/+1
* make the build again, warnings, doesn't work.Not Zed2004-10-012-4/+13
* ** See bug #66509.Not Zed2004-09-296-141/+121
* s/not/no/ in the error string. Fixes bug #65828.Jeffrey Stedfast2004-09-281-1/+1
* make sure body indexing is turned off always, missed the ~ bit.Not Zed2004-09-289-118/+130
* Instead of doing a host-lookup ourselves, get it passed in to us as anJeffrey Stedfast2004-09-287-485/+341
* ** See bug #63521.Not Zed2004-09-272-3/+3
* ** See bug #47821.Not Zed2004-09-245-125/+114
* ** See bug #0xffff.Not Zed2004-09-201-12/+15
* Merged notzed-eplugin-2-branch to head.Michael Zucci2004-09-2036-20/+53
* ** See bug #64023.Not Zed2004-08-301-1/+4
* change the "CheckList" to "Tasks" as there is another foder calledSivaiah Nallagatla2004-08-261-1/+1
* Check for an exception from get_folders_online() here so that we don'tJeffrey Stedfast2004-08-241-3/+7
* ** See bug #63189.Not Zed2004-08-241-4/+29
* if any of the settings required for soap interaction changes trySivaiah Nallagatla2004-08-212-37/+46
* pass an exception handle to camel_provider_get.Not Zed2004-08-161-1/+4
* Use g_ptr_array_sized_new() rather than using set_size() after creating aJeffrey Stedfast2004-08-141-8/+8
* remove the cal/taksks sources when account is disbaled. Also do not try toSivaiah Nallagatla2004-08-141-3/+13
* update ssl setting label and title of the soap settings section FixesSivaiah Nallagatla2004-08-141-2/+2
* use g_string_append_len when appending a subset of a string rather than g_str...Jeffrey Stedfast2004-08-131-7/+7
* fix for e_passwords api change, and handle reprompting as well.Not Zed2004-08-121-2/+4
* Call camel_operation_progress(). (imap4_summary_fetch_all): Setup info weJeffrey Stedfast2004-08-071-0/+21
* Pass a reconnect func.Jeffrey Stedfast2004-08-043-3/+29
* This needs to prequeue the CAPABILITY command rather than queue itJeffrey Stedfast2004-07-312-4/+4
* fixed sed-o's (s/IMAP44/IMAP4/g)Jeffrey Stedfast2004-07-312-10/+10
* blehJeffrey Stedfast2004-07-311-0/+1
* Add an entry to specify POA address and a check box to say whehter ssl hasSivaiah Nallagatla2004-07-292-60/+136
* ** See bug #61841.Not Zed2004-07-281-1/+4
* Changed to be the same prototype as engine_queue().Jeffrey Stedfast2004-07-283-35/+48
* do not set transport object for groupwise provider. We want user to useSivaiah Nallagatla2004-07-271-6/+1
* Don't instantiate an engine here. Instead, take an engine as an argumentJeffrey Stedfast2004-07-273-85/+53
* ** See bug #61761.Not Zed2004-07-231-2/+21
* Free result after parsing it. Fixes a leak.Jeffrey Stedfast2004-07-211-0/+1
* Don't grab the connect_lock before calling refresh_info so that we avoidJeffrey Stedfast2004-07-171-2/+0
* : pass "use_ssl" value to these functions and set it on e-sourceSivaiah Nallagatla2004-07-131-20/+57
* use CAMEL_GROUPWISE_CFLAGS. (libcamelgroupwise_la_LIBADD): useChris Toshok2004-07-091-2/+2
* Set the size of the ptrarray to prevent potentially realloc'ing severalJeffrey Stedfast2004-07-011-6/+10
* Aded a new %formatter 'V' which takes a string vector (needed for SEARCH).Jeffrey Stedfast2004-06-308-166/+628
* override CAMEL_FOLDER_NAME arg so we can translate "." into "Inbox".Not Zed2004-06-282-2/+33
* take url argument directly, fixes a memleak. (camel_folder_info_new): makeNot Zed2004-06-281-7/+22
* Error out and set an exception if camel_pop3_engine_new() returns NULLJeffrey Stedfast2004-06-252-30/+53
* If we fail to lock the folder, close the lockfd and reset it to -1. FixesJeffrey Stedfast2004-06-251-1/+4
* First LIST/LSUB the toplevel folder, and then LIST/LSUB the subfolders (itJeffrey Stedfast2004-06-241-6/+57
* Same.Jeffrey Stedfast2004-06-243-10/+13
* Hide password, etc info in the fi->uri's. (imap4_create_folder): Don'tJeffrey Stedfast2004-06-241-20/+73
* Hide password, etc info in the fi->uri's.Jeffrey Stedfast2004-06-242-2/+2
* make 'colon' a const char *Jeffrey Stedfast2004-06-181-2/+2
* init tail->last to (guint32) -1, so that index = tail->last + 1 will startJeffrey Stedfast2004-06-181-2/+3
* Make sure we have elements in the array, if not then we're done (return aJeffrey Stedfast2004-06-181-0/+6
* Fixed to work properly. It was getting ranges wrong before sometimes whichJeffrey Stedfast2004-06-181-62/+144
* simplified furtherJeffrey Stedfast2004-06-171-4/+0
* Only ignore if (tag & CAMEL_ARG_TAG) == CAMEL_ARG_IGNORE, not if (tag &Jeffrey Stedfast2004-06-171-1/+1
* Only force a re-update of all FLAGS if this folder wasn't in the SELECTEDJeffrey Stedfast2004-06-171-3/+17
* Added a 'first' member to the imap_fetch_all_t struct so we can use thatJeffrey Stedfast2004-06-171-2/+8
* Added a 'first' member to the imap_fetch_all_t struct so we can use thatJeffrey Stedfast2004-06-171-37/+101
* Init have_unget to FALSE. Don't set unget to NULL, it's no longer aJeffrey Stedfast2004-06-152-13/+9
* use g_ascii_strcasecmp. (smtp_connect): do not re-helo after we'veNot Zed2004-06-141-10/+1
* Flush summary updates for the currently selected folder. (imap4_noop):Jeffrey Stedfast2004-06-131-2/+11
* Flush summary updates for the currently selected folder.Jeffrey Stedfast2004-06-122-1/+4
* Don't bother with exists_changed. We don't need it afterall.Jeffrey Stedfast2004-06-122-9/+4
* Force updating of the emsage flags (normally this only happens ifJeffrey Stedfast2004-06-121-0/+1
* Handle getting FLAGS even though we didn't request it (server can send usJeffrey Stedfast2004-06-113-30/+75
* if we scan from "" or top == NULL, then we really want to scan from "."Not Zed2004-06-111-1/+1
* some test codeMichael Zucci2004-06-111-0/+172
* (camel_imap4_summary_flush_updates): Added some logic toJeffrey Stedfast2004-06-112-0/+8
* Don't bother scanning summary info if EXISTS was 0.Jeffrey Stedfast2004-06-111-3/+29
* Don't bother scanning summary info if EXISTS was 0.Jeffrey Stedfast2004-06-112-9/+51
* Don't always try and parse a RESP-CODE in the BYE case as the RESP-CODE isJeffrey Stedfast2004-06-111-1/+9
* replace strcasecmp with g_ascii_strcasecmpJeffrey Stedfast2004-06-111-2/+2
* some code cleanupJeffrey Stedfast2004-06-112-4/+7
* If flags does not include FOLDER_INFO_FAST, get the total/unread countsJeffrey Stedfast2004-06-114-168/+249
* move the stream based checking into the loop, after we connect. Fixes aNot Zed2004-06-101-8/+8
* Load the entire summary, not just the summary header. This way when theJeffrey Stedfast2004-06-082-2/+4
* Implemented, mostly. Still need to update state on the renamed folderJeffrey Stedfast2004-06-073-1/+138
* removed debug printfsJeffrey Stedfast2004-06-051-3/+0
* Initialise the folder->summary and force an update of the message infoJeffrey Stedfast2004-06-052-7/+22
* Duh. If the user doesn't care about SSL/TLS - use USE_SSL_NEVER, notJeffrey Stedfast2004-06-051-1/+1
* Always just return 0, don't try to PR_Sync() - fsync on a socket causes anJeffrey Stedfast2004-06-053-8/+22
* reset current folder. (connect_to_server): and here too just to make sure.Not Zed2004-06-031-1/+6
* disconnect if we get an io error or user cancellation.Not Zed2004-06-031-0/+1
* only save the summary, don't update from server, thats what refresh infoNot Zed2004-06-039-631/+603
* Fixes bug #59191.Jeffrey Stedfast2004-05-281-4/+1
* set port property on e-sourceSivaiah nallagatla2004-05-261-0/+2
* return NULL when there is no existing gw account with same uidSivaiah Nallagatla2004-05-261-9/+12
* remove /soap part from uri. make port as a e-source property instead ofSivaiah Nallagatla2004-05-261-44/+76
* removed.Not Zed2004-05-269-48/+27
* added CAMEL_PROVIDER_CONF_HIDDEN to conf item type enum. This is used bySivaiah Nallagatla2004-05-242-3/+8
* Added a workaround for broken IMAP. Hopefully by forcing only the IMAP4Jeffrey Stedfast2004-05-221-1/+32
* added a 'domain' argument, and rearragned arguments to be prettier andNot Zed2004-05-216-14/+14
* re-arrange the code so exception debug will print the expandedNot Zed2004-05-214-20/+25
* Fixes bug #42295 and the infinite loop part of bug #58766 (these 2 bugsJeffrey Stedfast2004-05-211-22/+23
* oops, poke the right uid to get the article number.Not Zed2004-05-201-2/+2
* use the article number instead of the messageid. Some servers are justNot Zed2004-05-191-11/+16
* do the same load of mailbox if we're in slow mode as we did for maildir.Not Zed2004-05-181-0/+5
* ** Bug #56050.Not Zed2004-05-172-3/+80
* if we have no folder in-memory, load it if we're not doing it fast to getNot Zed2004-05-171-0/+5
* type-o fix for bug #58404Jeffrey Stedfast2004-05-131-1/+1
* eliminate the need for another variableJeffrey Stedfast2004-05-131-5/+2
* oops, tiny fixJeffrey Stedfast2004-05-131-0/+2
* Ignore PERMANENTFLAGS if it gives us an empty set. Works around brokenJeffrey Stedfast2004-05-131-3/+8
* changed to match_threads. (camel_folder_search_search): remove threadNot Zed2004-05-123-95/+19
* New class for zipping/unzipping gzip streams.Jeffrey Stedfast2004-05-111-0/+5
* set nodelay and keepalive on the socket.Not Zed2004-05-061-1/+12
* dont set X-Evolution-Source here anymore, set in caller.Not Zed2004-05-051-17/+15
* Fixed typo.Christian Kellner2004-05-041-1/+1
* ** See #57979.Not Zed2004-05-041-1/+2
* Fix typo. #53466.Priit Laes2004-05-011-1/+1
* Change the UID_SET_LIMIT to 768 (something <1000 octets as suggested byJeffrey Stedfast2004-04-281-2/+5
* Send a flag list rather than \Deleted by itself. See #57381.Not Zed2004-04-221-4/+4
* Don't bother doing any work if perm_flags is 0.Jeffrey Stedfast2004-04-221-0/+3
* added CAMEL_LIBS to LIBADD added new function to get addres book namesSivaiah Nallagatla2004-04-212-68/+167
* set the meta data file on nntp folders.Not Zed2004-04-211-0/+5
* implement dummy virtual method.Not Zed2004-04-211-0/+29
* Fixed to not expect ]'s as part of the BODY atom token.Jeffrey Stedfast2004-04-201-1/+7
* Changed imap_atom_specials[] to not treat ']' as an atom char (as perJeffrey Stedfast2004-04-161-2/+4
* Use %F instead of %S so that the folder name gets properly converted fromJeffrey Stedfast2004-04-151-1/+1
* Rearranged some error checking code to fix bug #56405.Jeffrey Stedfast2004-04-141-10/+11
* change the auth type string from Password to plain/passwordSivaiah Nallagatla2004-04-131-1/+1
* add bookname to uriSivaiah Nallagatla2004-04-111-6/+5
* Fix capitalisation of the "mailcheck" section title and move it to the topJeffrey Stedfast2004-04-102-7/+7
* Changed (!flags & _CREATE) to (!(flags & _CREATE)) (get_folder_online): DoJeffrey Stedfast2004-04-081-4/+99
* include camel-debug.hNot Zed2004-04-081-2/+12
* Added mutex locking where appropriate.Jeffrey Stedfast2004-04-071-2/+24
* Added mutex locking where appropriate.Jeffrey Stedfast2004-04-071-11/+54
* Defined.Jeffrey Stedfast2004-04-075-7/+12
* ** See bug #56110.Not Zed2004-04-061-10/+52
* dont add folders to folders_out here, only in get_folders_add_folders.Not Zed2004-04-051-5/+3
* Partially implemented. (imap4_get_folder): Implemented.Jeffrey Stedfast2004-03-312-19/+298
* added some debug to dump the whole folderinfo tree if store:folder_info isNot Zed2004-03-302-22/+64
* Implemented.Jeffrey Stedfast2004-03-3025-1997/+2103
* Updated to actually parse the STATUS response into a list of item/valueJeffrey Stedfast2004-03-301-23/+120
* Removed debugging printfs.Jeffrey Stedfast2004-03-302-4/+1
* use object_bag_peek instead of _get, since we dont want to clash/wait forNot Zed2004-03-291-23/+9
* remove locking here, we're locked whne we enter. (fill_fi): callNot Zed2004-03-291-4/+3
* New source files implementing the CamelFolder class for the new IMAP4Jeffrey Stedfast2004-03-293-0/+836
* added .cvsignoreJeffrey Stedfast2004-03-291-0/+7
* added camel-imap-store.[c,h] to the buildJeffrey Stedfast2004-03-292-20/+47
* added camel-imap-provider.cJeffrey Stedfast2004-03-293-1/+141
* build fixesJeffrey Stedfast2004-03-292-6/+7
* New source files implementing the CamelFolderSummary class for the newJeffrey Stedfast2004-03-293-0/+1200
* Reverted imap.web.de fix.Jeffrey Stedfast2004-03-271-6/+3
* Added new maildir flags D for draft and commented P for forwarded.Not Zed2004-03-262-4/+20
* No longer need to split ']' tokens from atom tokens due to a fixup in theJeffrey Stedfast2004-03-264-27/+892
* If the server is imap.web.de, just ask for all the headers rather thanJeffrey Stedfast2004-03-263-7/+16
* Fix for bug #55018.Jeffrey Stedfast2004-03-261-4/+23
* Removed newline character from the provider descriptionMartyn Russell2004-03-251-1/+1
* removed ldap seetings and added a settng for SOAP port read port numberSivaiah Nallagatla2004-03-252-93/+70
* New convenience wrapper function. (engine_parse_status): Fixed to handleJeffrey Stedfast2004-03-253-9/+67
* #include <stdlib.h> for strtoul()Jeffrey Stedfast2004-03-251-0/+1
* The beginnings of a new IMAP provider moduleJeffrey Stedfast2004-03-2512-0/+4071
* Reworked the else bit to fix a bug where if we had the BODY structure, weJeffrey Stedfast2004-03-241-51/+50
* use camel debug to add some debug here.Not Zed2004-03-231-62/+73
* connect lock around this. was getting a race with mem corruptionNot Zed2004-03-231-2/+6
* decode newsgroups header into a list of newsgroups.Not Zed2004-03-222-2/+11
* remove async_thread thing.Not Zed2004-03-192-58/+0
* Checking that mi->content->type != NULL is no longer good enough to tellJeffrey Stedfast2004-03-181-4/+21
* Reverted jeff's fix for #55018, since it wasn't tested, and doesn't work.Not Zed2004-03-171-75/+29
* See bug #55618.Not Zed2004-03-171-0/+2
* If the initial SELECT fails and CREATE is specified, clear the exceptionJeffrey Stedfast2004-03-161-1/+3
* same as below for path.Not Zed2004-03-152-2/+4
* set the mime-type field on the content the same way asNot Zed2004-03-151-3/+10
* Now takes an argument to specify whether disconnecting when respbuf isJeffrey Stedfast2004-03-131-15/+16
* Fix for bug #53497.Jeffrey Stedfast2004-03-131-37/+19
* Fixes for bug #55018.Jeffrey Stedfast2004-03-134-59/+96
* If errno is EINTR, set USER_CANCEL instead of SERVICE_UNAVAILABLE orJeffrey Stedfast2004-03-131-37/+28
* removed this. not sure what it was doing there, a 1 line funciton usedNot Zed2004-03-111-16/+14
* (imap_store_refresh_folders): check we're updating an imap folder,Michael Zucci2004-03-111-0/+6
* turn off NOINFERIORS always, translate to nochildren.Not Zed2004-03-1111-126/+217
* fix all the warningsMichael Zucci2004-03-045-8/+10
* ** See bug #53355.Not Zed2004-03-041-3/+7
* use "Calendar" and "Checklist" for the folder names, instead of "Default".Rodrigo Moya2004-03-031-8/+7
* fun dun diddley un fun. Since we're writing a const buffer, we need toNot Zed2004-03-034-22/+47
* Overrides the parent method. We don't want to encode user flags/tags orJeffrey Stedfast2004-03-031-1/+22
* use g_ascii_str[n]casecmp everywhere. fix the sense of the nil check forNot Zed2004-02-271-29/+31
* moved the RECNET flag into the folder area (bit 17-30).Not Zed2004-02-253-19/+13
* If our folder has a subdir, but no actual children, then we need to unsetRodney Dawes2004-02-241-0/+2
* remove debugMichael Zucci2004-02-241-8/+1
* kill some debugMichael Zucci2004-02-242-16/+3
* Add sanity checking to the folder name if we are going to create it, justJeffrey Stedfast2004-02-201-0/+14
* Fixes for api changes.Not Zed2004-02-198-46/+31
* ** See bug #53861.Not Zed2004-02-171-0/+4
* ** See bug #51045.Not Zed2004-02-1613-60/+266
* Same.Jeffrey Stedfast2004-02-145-45/+60
* ** See bug #53978.Not Zed2004-02-091-1/+5
* ** See bug #51319.Not Zed2004-02-091-9/+9
* changed to return a boolean to indicate if the flags were actually changedNot Zed2004-02-063-9/+18
* rename .cmeta file too, and fix the recovery order.Not Zed2004-02-054-315/+327
* ** See bug #53553.Not Zed2004-02-052-2/+6
* Get rid of some unnecessary CAMEL_OBJECT() casts.Jeffrey Stedfast2004-02-052-31/+31
* Fix for bug #53755 (local folders case)Jeffrey Stedfast2004-02-051-13/+16
* added 'expunge' parameter, easier 'empty trash on exit' call.Not Zed2004-02-041-0/+3
* changed order around, first try to delete and only remove from the objectNot Zed2004-02-042-19/+0
* Fixes for bug #53091.Jeffrey Stedfast2004-02-031-1/+4
* Same as below.Jeffrey Stedfast2004-02-012-4/+4
* Fix spelling error in provider descriptionRodney Dawes2004-01-311-1/+1
* ** See bug #53269.Not Zed2004-01-291-4/+3
* Make sure the new dir path exists before trying to rename files to avoidJeffrey Stedfast2004-01-291-7/+39
* add port and /soap parts to relative uri while updating it when accountSivaih Nallagatla2004-01-281-4/+5
* set CAMEL_FOLDER_SUPRESS_JUNK_TEST flag (imap_update_summary): updateRadek Doulik2004-01-271-3/+12
* (imap_get_message): revert peterw's change of 2002-07-15, insteadMichael Zucci2004-01-231-8/+0
* removed the meaningless fixme, a butt-retrieved-number is as good as anyNot Zed2004-01-231-1/+2