aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/ChangeLog
Commit message (Expand)AuthorAgeFilesLines
* (e_select_names_new): Don't set the "modal" property throughEttore Perazzoli2003-03-041-0/+7
* (create_minicard_view): No needEttore Perazzoli2003-03-041-0/+5
* (e_select_names_init): Instead of using gtk_widget_unparent(),Ettore Perazzoli2003-03-041-0/+8
* Build libecontacteditor as an uninstalled shared library.Dan Winship2003-03-011-0/+20
* Remove these from here; talking to the mailer doesn't really belong at theDan Winship2003-03-011-0/+25
* use g_signal_connect here, not swapped... although since we pass theChris Toshok2003-02-281-0/+21
* link to libversit libtool objectJP Rosevear2003-02-281-0/+4
* Fix for server files from Antonio XuRodney Dawes2003-02-281-0/+4
* if we fail to activate factories for a given protocol, return.Chris Toshok2003-02-271-0/+8
* Make libversit a shared library, update stuff for that, and clean upDan Winship2003-02-221-0/+21
* Make libemiscwidgets, libefilterbar, and libetimezonedialog dynamicDan Winship2003-02-211-0/+8
* revert previous changeDan Winship2003-02-201-9/+0
* Build the subparts as (noinst) shared libraries rather than staticDan Winship2003-02-201-0/+9
* Make parent_class static.Dan Winship2003-02-201-0/+8
* [ fix #38074 ] first arg is a GtkWidget. duh.Chris Toshok2003-02-201-0/+6
* (INCLUDES): Use $(evolutionuidir)Ettore Perazzoli2003-02-201-0/+5
* if we can complete solely from our cached cards, callChris Toshok2003-02-181-0/+13
* move the bulk of the non-summary searching stuff here. we aggregate up toChris Toshok2003-02-171-0/+11
* indent properly.Chris Toshok2003-02-171-0/+5
* disconnect search_started and search_result. (addressbook_compare): ifChris Toshok2003-02-171-0/+32
* [ fixes bug #33066 ] new function (set_entry_changed_signals): callChris Toshok2003-02-111-0/+18
* Install load-pine-addressbook and load-gnomecard-addressbook intoEttore Perazzoli2003-02-111-0/+19
* gone. (match_initials): gone. (book_query_sexp): remove the primaryChris Toshok2003-02-101-0/+19
* lots of changes here. should be a big performance gain. god i hope this isChris Toshok2003-02-101-0/+6
* [ huge change, all for 1 little performance problem :) fixes #18207 ] useChris Toshok2003-02-081-0/+127
* check the status, not the book, and unref the book here.Chris Toshok2003-02-071-0/+53
* Use different tmp file names so these rules can be executed in parallelEttore Perazzoli2003-02-071-0/+13
* s/PACKAGE/GETTEXT_PACKAGE/ in gettext initDan Winship2003-02-071-0/+5
* update Makefile.ams and fix a lot of warningsDan Winship2003-02-061-0/+143
* Replace deprecated glade_gnome_init() with glade_init().Dan Winship2003-02-061-0/+11
* [ pull forward Jack Jia's fix for #34900 ] use a weak ref for the fileChris Toshok2003-02-041-0/+11
* pull forward Jack Jia's fix for #33672, but convert it to use unlinkChris Toshok2003-02-041-0/+6
* add a scrolled window (SHADOW_IN) around the address textview.Chris Toshok2003-01-281-0/+5
* rename the category entry to entry-categories.Chris Toshok2003-01-271-0/+9
* i need to sleep more.Chris Toshok2003-01-261-0/+4
* need to assign this here or else the lib doesn't get built.Chris Toshok2003-01-261-0/+5
* begin the new page after showing the last one. (complete_sequence):Chris Toshok2003-01-261-0/+10
* enable this, as building the conduit works if you have gnome-pilot2.Chris Toshok2003-01-261-0/+5
* GObjectify the stuff in here that refers to addressbook objects. theChris Toshok2003-01-261-0/+6
* Remove definition; this is now in configure.in. Likewise. Likewise.Ettore Perazzoli2003-01-251-0/+7
* [ fixes bug #34898 ] handle modifications to email addresses in contactSean Gao2003-01-241-0/+6
* [ fixes bug #36375 ] use PHONE_OTHER_FAX instead of PHONE_OTHER forSean Gao2003-01-241-0/+6
* [ fixes bug #31014, roll this in from the 1.2 branch ] use "categories"Chris Toshok2003-01-241-0/+7
* fix for bug 34883 broke ssl transactions (at least those where we wereChris Toshok2003-01-241-0/+6
* Remove definition; no need to set it here since it's now defined inEttore Perazzoli2003-01-241-0/+7
* Version using $(BASE_VERSION). (etspecdir): Likewise. (iconsdir):Ettore Perazzoli2003-01-231-0/+24
* don't use gnome_print_multipage_new_from_sizes and add warningRadek Doulik2003-01-221-0/+5
* Change dialog from Yes/No/Cancel to Discard/Cancel/Save to match the HIG.Ettore Perazzoli2003-01-151-0/+34
* Add $(schema_DATA).Ettore Perazzoli2003-01-151-0/+4
* try to load the uri again if it failed previously. (book_open_cb): setChris Toshok2003-01-101-0/+18
* doh, fix build error.Chris Toshok2003-01-101-0/+5
* #include gtklabel.h, fixes an unresolved symbol.Chris Toshok2003-01-101-0/+5
* build up the list of supported auth_methods.Chris Toshok2003-01-101-0/+55
* deal with backends that might not have loaded successfully (they'll have aChris Toshok2003-01-101-0/+6
* call e_select_names_bonobo_construct on the newly created object.Chris Toshok2003-01-101-0/+6
* addressbook-config.etspec is gone.Chris Toshok2003-01-101-0/+10
* fix parameter types here (this signal isn't generated from an ETable.)Chris Toshok2003-01-101-0/+21
* comment out the factory oaf_server, and change the location of theChris Toshok2003-01-101-0/+15
* oops, don't include e-treeview-selection-model.h unless we're building theChris Toshok2003-01-091-0/+5
* Fix to build.Jeffrey Stedfast2003-01-091-0/+5
* add in the schema entry for minimum_query_length.Chris Toshok2003-01-091-0/+5
* add E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out.Chris Toshok2003-01-091-0/+31
* $(datadir)/evolution/images instead of $(datadir)/images/evolution.Ettore Perazzoli2003-01-091-0/+8
* Move PASBook request handling into PASBackend itself since allDan Winship2003-01-091-0/+41
* fix the SYNTAX for the telephone attributes, and make the fax attributesChris Toshok2003-01-081-0/+6
* remove idldir definition. (It's defined in configure.in now)Dan Winship2003-01-061-0/+7
* [ fixes the non-ui portion of #36183 ] use the entry'sChris Toshok2003-01-021-0/+24
* (addressbook_config_control_new): Made it return anEttore Perazzoli2002-12-201-0/+7
* [ fixes bug #34897 ] don't free the return of e_card_simple_get_const, asChris Toshok2002-12-191-0/+7
* convert the clist in here to a GtkTreeView. your guess is as good as mineChris Toshok2002-12-191-0/+6
* g_string_sprintfa -> g_string_append_printf. (create_alphabet): same.Chris Toshok2002-12-191-0/+9
* drop use of "font" arg. (get_left_width): use pango to calculate thisChris Toshok2002-12-191-0/+110
* g_strcasecmp -> g_ascii_strcasecmp. (FIND_INSERT): same.Chris Toshok2002-12-181-0/+15
* oops, use strcmp, not !strcmp here.Chris Toshok2002-12-181-0/+5
* [ Fixes bug #35135 ] don't free the default_book_uri here, it's done inChris Toshok2002-12-181-0/+12
* (addressbook_config_control_new): UseEttore Perazzoli2002-12-171-0/+7
* Don't #include <e-util/e-html-utils.h>Jeffrey Stedfast2002-12-171-0/+5
* GObject-ize this.Chris Toshok2002-12-101-0/+4
* pass "Addressbook" to e_passwords*. (addressbook_authenticate): same.Chris Toshok2002-12-101-0/+6
* remove PENDING_PORT_WORK. (addressbook_search_activated): same.Chris Toshok2002-12-101-0/+10
* #define MINICARD_CONTROL_ID.Ettore Perazzoli2002-12-101-0/+4
* connect ::response to gtk_widget_destroy so the dialog goes away.Chris Toshok2002-12-091-0/+8
* this uses pango now. (addressbook_height): same.Chris Toshok2002-12-091-0/+6
* use e_card_set_book instead of basically duplicating its code here.Chris Toshok2002-12-071-0/+6
* #include <string.h>.Ettore Perazzoli2002-12-071-0/+54
* Use collate for sorting rather than the normal string sort. This fixes bugJeffrey Stedfast2002-12-061-0/+6
* only enable the LDAPv3 stuff if TLS is being used. Also, deal with namingChris Toshok2002-12-031-0/+8
* gnomedialog -> gtkdialog stuff. print dialog is a gtkdialog now.Not Zed2002-12-021-0/+12
* the detail is supposed to go after the signal id, not at the end of theChris Toshok2002-11-301-0/+6
* [ roll forward from 1.2 branch, partial fix for #31763 ] add the FindChris Toshok2002-11-291-0/+5
* remove the button_press_event handler (that did nothing). this makes it soChris Toshok2002-11-291-0/+7
* add include for gtkstock.h.Chris Toshok2002-11-271-0/+30
* [ roll forward from 1.2 branch ] never pass NULL as the vcard to the corbaChris Toshok2002-11-271-0/+9
* [ roll forward from 1.2 branch, Fixes addressbook bug #28945 ] if theChris Toshok2002-11-271-0/+7
* remove redundant setting of y2.Chris Toshok2002-11-271-0/+20
* use new schema for completion/uris. (uris_listener): same.Chris Toshok2002-11-271-0/+24
* show the etable. (addressbook_add_server_druid): show_all before returningChris Toshok2002-11-251-0/+7
* [ roll forward from the 1.2 branch. fixes #25540, part of #29630, as wellChris Toshok2002-11-251-0/+50
* [ roll forward Sean.Gao@sun.com's fix for #16870 from the 1.2 branch ]Chris Toshok2002-11-231-0/+7
* [ rolling forward fix for #34254 from 1.2 branch ] use g-ascii_strncasecmpChris Toshok2002-11-231-0/+7
* roll forward the scope fix.Chris Toshok2002-11-211-0/+4
* roll forward the fix for the contact editor.Chris Toshok2002-11-211-0/+5
* Pass type to bonobo_ctonrol_set_property, and also NULL terminate theNot Zed2002-11-211-0/+9
* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.Ettore Perazzoli2002-11-201-0/+6
* show the custom table.Chris Toshok2002-11-191-0/+5
* remove the cast to (int) - column_width is a double.Chris Toshok2002-11-191-0/+17
* oops, missed some "oaf"'s.Chris Toshok2002-11-181-0/+5
* sink the popup. (e_contact_editor_build_email_ui): same.Chris Toshok2002-11-171-0/+10
* Added rule to generate GNOME_Evolution_Addressbook.server.in fromEttore Perazzoli2002-11-161-1/+17
* Use bonobo_main_quitRodney Dawes2002-11-161-0/+4
* clean this up a tad.Chris Toshok2002-11-151-0/+10
* push_in = FALSE, no clue why... :) (_arrow_pressed): callChris Toshok2002-11-131-0/+23
* guard against multiple invocations.Chris Toshok2002-11-121-0/+30
* change signature to that of a weak ref notify function. (main): ::destroyChris Toshok2002-11-121-0/+81
* change around a little, still ifdefed though.Chris Toshok2002-11-121-0/+41
* guard against multiple invocations.Chris Toshok2002-11-101-0/+33
* guard against multiple invocations. (remove_book_view): same.Chris Toshok2002-11-091-0/+18
* oops, missed these casts.Chris Toshok2002-11-091-0/+12
* port work.Chris Toshok2002-11-091-0/+62
* parent class is GObjectClass.Chris Toshok2002-11-091-0/+31
* convert to glade-2Chris Toshok2002-11-081-0/+8
* port work.Chris Toshok2002-11-081-0/+12
* prepend /apps/Evolution to config db paths.Chris Toshok2002-11-081-0/+9
* more porting work.Chris Toshok2002-11-081-0/+18
* add lots of libs back in since they're building now.Chris Toshok2002-11-081-0/+15
* more porting work.Chris Toshok2002-11-081-0/+26
* tests are linking now, and link in libcamel.la.Chris Toshok2002-11-081-0/+16
* add prototypes for e_utf8_casefold_collate{_len}Chris Toshok2002-11-081-0/+8
* port this to gnome2/gnomeprint2.Chris Toshok2002-11-071-0/+19
* gobjectify this.Chris Toshok2002-11-071-0/+54
* use g_type_class_peek_parent.Chris Toshok2002-11-071-0/+27
* call g_build_filename, not g_build_path.Chris Toshok2002-11-061-0/+5
* fix the gnome-xml headers.Chris Toshok2002-11-061-0/+4
* fix the gnome-xml headers.Chris Toshok2002-11-061-0/+51
* only build the backend and gui dirs for now. printing and conduits areChris Toshok2002-11-061-0/+8
* ignore the new .server file.Chris Toshok2002-11-061-0/+27
* ignore the marshal generated stuff.Chris Toshok2002-11-061-0/+14
* ignore the marshal generated stuff.Chris Toshok2002-11-061-0/+20
* Port to GObject/gnome2.Chris Toshok2002-11-061-1/+46
* Port to GObject/gnome2.Chris Toshok2002-11-061-0/+38
* ignore the generated marshaller files.Chris Toshok2002-11-061-0/+21
* copy a memleak fix from pas-backend-ad.Dan Winship2002-11-051-0/+5
* g_date_* => g_date_get_*, fixes G_DISABLE_DEPRECATED build.Chris Toshok2002-11-051-0/+23
* port to gnome 2.Chris Toshok2002-11-051-0/+29
* don't call bonobo_activation_init directly.Chris Toshok2002-11-051-0/+29
* just include glib.h instead of the gtk stuff.Chris Toshok2002-11-031-0/+33
* never set the charset on an item without also encoding it. Mime messagesLarry Ewing2002-10-281-0/+6
* Disconnect from the book's backend_died signal.Dan Winship2002-10-271-0/+5
* install evolutionperson.schema to $(datadir)/evolution.Chris Toshok2002-10-261-0/+5
* [ fixes #29144 ] use e_table_memory_storage_change instead ofChris Toshok2002-10-251-0/+7
* Set /Addressbook/select_names_uri in the configdb to the selected folder.Dan Winship2002-10-231-0/+12
* fix the sense of a strcmpDan Winship2002-10-221-0/+5
* [ fix for #23764 ] handle multiple letters associated with a singleChris Toshok2002-10-221-0/+9
* [ fixes #29067 ] we need to create a card_sexp even when doing summaryChris Toshok2002-10-221-0/+7
* [ fixes #32144 ] convert the name to the gtk locale before saving.Chris Toshok2002-10-221-0/+7
* [ probable fix for #25477, and memory leak fix ] if the dialog isn't inChris Toshok2002-10-211-0/+11
* Return right away rather than crashing if card->email is NULL.Dan Winship2002-10-161-0/+6
* [ Fix #7094, #7064, #7095, #31944, #31945 ] Hook up new etspec file.Kjartan Maraas2002-10-101-0/+16
* [ Fix #28392 ] #if 0 out the gal_view submenu, since it's not spec'ed toChris Toshok2002-10-051-0/+7
* [ Fixes #31321 ] add VERSION:2.1 to exported vCards.Chris Toshok2002-10-011-0/+6
* [ Fixes #31434 ] always retrieve the card from the db. use the summaryChris Toshok2002-10-011-0/+9
* It's a grand old string-review! Nitpicky and minor changes; details in the ap...Aaron Weber2002-10-011-0/+4
* update for Composer_setHeaders change.Dan Winship2002-09-301-0/+5
* [ fixes #27521 ] always unref the contact editor when we get theChris Toshok2002-09-281-0/+7
* set the timeout to 30 seconds. (query_ldap_root_dse): same, and alsoChris Toshok2002-09-281-0/+10
* Change folder type to "contacts/ldap". (addressbook_storage_add_source):Dan Winship2002-09-271-0/+9
* Rename "ldap-contacts" to "contacts/ldap" and add "contacts/public".Dan Winship2002-09-261-0/+17
* free adapter->priv.Chris Toshok2002-09-261-0/+21
* add libeutil to the link and link with libcamel instead ofJP Rosevear2002-09-241-0/+5
* oops, add cached_folder_list to struct _ESelectNamesManager.Chris Toshok2002-09-231-0/+5
* [ Fixes #30481 ] initialize the select names dialog with the defaultChris Toshok2002-09-231-0/+7
* [ Fixes #28165, 29171 ] check to see if the value has really changed. theChris Toshok2002-09-231-0/+17
* [ Fixes #30483 ] argh, contains => beginswith.Chris Toshok2002-09-211-0/+6
* don't add the user creatable item for ldap-contact folders atm, since itChris Toshok2002-09-181-0/+7
* Fix a typo.Kjartan Maraas2002-09-181-0/+4
* [ Fixes bug #30250 ] handle "Unnamed Lists" here by setting their name toChris Toshok2002-09-131-0/+19
* return g_strdup("true"), not "true".Dan Winship2002-09-131-0/+5
* institute an arbitrary minimum limit on the number of characters before weChris Toshok2002-09-121-0/+7
* [ fixes the other half of #17336 ] parse the name when we're asked to setChris Toshok2002-09-121-0/+7
* [ fixes part of #17336 ] get the window title from the .glade file, andChris Toshok2002-09-121-0/+10
* [ fixes #30208 ] if the user clicked cancel in the password dialog, letChris Toshok2002-09-121-0/+15
* Changed the description of the Directory Servers page of the settingsAnna Dirks2002-09-061-0/+7
* [ Fixes #29904 ] we need to activate either a contact list editor orChris Toshok2002-09-051-0/+8
* Pass FALSE to evolution_storage_new: the Other Contacts storage doesn'tDan Winship2002-09-051-0/+7
* Pass NULL as @unpopulate_folder_context_menu_fn toEttore Perazzoli2002-09-051-0/+6
* unref the "without", adapter, and model, then chain up the GnomeDialogMike Kestner2002-09-041-0/+6
* Use ldap-settings.png instead of evolution-contacts.png.Ettore Perazzoli2002-09-041-0/+5
* [ fixes #29699 ] call _set_source with a NULL source to fill in dialogChris Toshok2002-09-041-0/+8
* (delete_contact_cb): Fix typoEttore Perazzoli2002-09-041-0/+6
* add QueryRefused, for when the backend refuses to perform a query. (partDan Winship2002-08-311-0/+12
* [ fixes #27923] up the version to 4_0 (4000).Chris Toshok2002-08-301-0/+10
* call evolution_shell_component_add_user_creatable_item twice here, onceChris Toshok2002-08-301-0/+6
* [ fixes #20347 ] hook up the backend_died signal. (backend_died): newChris Toshok2002-08-291-0/+25
* use strcasecmp here, since all the other helpers use case insensitiveChris Toshok2002-08-291-0/+8
* return NULL if the list is empty. (pas_backend_ldap_connect): always tryChris Toshok2002-08-291-0/+7
* [ fixes #25038 ] need to have EVOLUTION_ICONSDIR defined.Chris Toshok2002-08-291-0/+18
* spew the filter we're using for the search.Chris Toshok2002-08-291-0/+5
* stop the EBookViews before unreffing.Mike Kestner2002-08-291-0/+5
* Add an evolution:shell_component_launch_order and renameDan Winship2002-08-291-0/+6
* [ oops, merged the .h and .glade file back to the HEAD from the 1-0Chris Toshok2002-08-281-0/+9
* [ fixes #19286 ] confirm deletion of contacts when using the menubar orChris Toshok2002-08-281-0/+6
* [ fixes #28897 ] set book_data to NULL after clearing/freeing the list.Chris Toshok2002-08-281-0/+7
* [ fixes #20348 ] deprecate "categories" in favor of "category". evolutionChris Toshok2002-08-281-0/+16
* [ Fixes #14835 ] notify_complete with InvalidQuery if the parse fails.Chris Toshok2002-08-281-0/+6
* [ fixes #26907 ] use beginswith for email.Chris Toshok2002-08-281-0/+6
* change prototype for complete_sequence to match sequence_complete.Chris Toshok2002-08-271-0/+6
* [ fixes #29446 ] searching_modify_func can be NULL (since we don't requireChris Toshok2002-08-271-0/+8
* [ Fixes (almost certainly) #24649, #25494, #27351, and other LDAP searchChris Toshok2002-08-271-0/+29
* stop the view before unref, in case the listener has pending events.Mike Kestner2002-08-271-0/+5
* not sure what i was thinking here... the EBook isn't valid if we couldn'tChris Toshok2002-08-211-0/+6
* add the listener_id slot.Chris Toshok2002-08-201-0/+13
* take and pass the CallStatus to our listener.Chris Toshok2002-08-201-0/+84
* add "cache-completions" here, since file completion results are blanketChris Toshok2002-08-201-0/+23
* add an "addresses" property, to get the "Dan Winship <danw@ximian.com>"Dan Winship2002-08-201-0/+10
* fix c&p error that was losing the ssl setting.Chris Toshok2002-08-171-0/+6
* Import into the default book not the local oneIain Holmes2002-08-161-0/+7
* new function to save a little typing. (find_book_view): same.Chris Toshok2002-08-161-0/+25
* [ fix 27333 ] "local" -> "do-initial-query".Chris Toshok2002-08-161-0/+18
* If invoked from a non-contact folder, add the contact to the defaultDan Winship2002-08-131-0/+45
* initialize summary->upgraded to quiet valgrind.Chris Toshok2002-08-091-0/+5
* Use "\r" rather than including literal CRs in the string, which confusesDan Winship2002-08-071-0/+7
* [ fixes bug #25958 ] use FULL_NAME in the case where we're untoggling aChris Toshok2002-08-021-0/+8
* no more search_entry.Chris Toshok2002-08-021-0/+12
* remove folders and folders_by_uri, and the 2 listeners.Chris Toshok2002-08-021-0/+11
* (create_component): UseEttore Perazzoli2002-08-021-0/+5
* Change the order so that "New Contact" is first and "New Contact List" isEttore Perazzoli2002-08-011-0/+6
* Pass "contacts" as the @folder_type toEttore Perazzoli2002-08-011-0/+6
* [ roll in the following change from the 1.0 branch.] change the CALURI andChris Toshok2002-08-011-0/+11
* (activate_factories_for_uri): Don'tEttore Perazzoli2002-07-311-0/+7
* don't save empty strings. (pas_backend_summary_save): print out the errnoChris Toshok2002-07-281-0/+6
* Don't set up the ContactNew andEttore Perazzoli2002-07-271-0/+9
* Change libversit.la -> libversit.a for danw's changes.Peter Williams2002-07-251-0/+5
* s/libversit_lt/libversit/Dan Winship2002-07-241-0/+5
* Split pas-backend-file and pas-backend-ldap out of libpas and build themDan Winship2002-07-231-0/+9
* Install libversit.a so that people compiling against the addressbook canPeter Williams2002-07-181-0/+8
* remove the option menu and browse button, and add a custom widgetChris Toshok2002-07-171-0/+30
* Install the SelectNames IDL and ancillary changes.Peter Williams2002-07-171-0/+5
* free the full_name (as well as given_name. oops.)Chris Toshok2002-07-131-0/+14
* Make the ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST case not crash, althoughDan Winship2002-07-131-0/+7
* e_book_get_book_view => e_book_get_completion_view, so the backends haveChris Toshok2002-07-111-0/+7
* actually remove the items from the pointer array too, so an error whileChris Toshok2002-07-111-0/+21
* Oops, missed this one.Peter Williams2002-07-111-0/+7
* Add include lines to get ebook headers relative to <ebook/foo.h>, notPeter Williams2002-07-111-0/+28
* Pass zero as the @sorting_priority to evolution_storage_new_folder().Ettore Perazzoli2002-07-101-0/+6
* add Book.getCompletionView.Chris Toshok2002-07-101-0/+73
* Pass NULL @custom_icon_name to evolution_storage_new_folder().Ettore Perazzoli2002-07-101-0/+7
* New arg @tooltip; pass it toEttore Perazzoli2002-07-021-0/+7
* don't unref selection_model (otherwise 3 clicks of "Show Supported Bases"Sean Atkinson2002-07-011-0/+6
* add pas-backend-summary.[ch].Chris Toshok2002-06-301-0/+26
* reorder the adding of creatable items so the default is a new contact, notChris Toshok2002-06-261-0/+6