aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/widgets
Commit message (Expand)AuthorAgeFilesLines
* check the status, not the book, and unref the book here.Chris Toshok2003-02-072-10/+5
* Remove cruft. (gladedir, etspecdir): Remove definitions. (glade_DATA):Dan Winship2003-02-067-31/+30
* updated for e scroll frame --> gtk scrolled windowRadek Doulik2003-02-051-8/+8
* [ fixes bug #34898 ] handle modifications to email addresses in contactSean Gao2003-01-241-0/+27
* Version using $(BASE_VERSION). (etspecdir): Likewise. (iconsdir):Ettore Perazzoli2003-01-232-21/+22
* applied patch from Frederic Crozat <fcrozat@mandrakesoft.com>Radek Doulik2003-01-221-18/+18
* Change dialog from Yes/No/Cancel to Discard/Cancel/Save to match the HIG.Ettore Perazzoli2003-01-151-2/+2
* fix parameter types here (this signal isn't generated from an ETable.)Chris Toshok2003-01-105-1/+5
* oops, don't include e-treeview-selection-model.h unless we're building theChris Toshok2003-01-091-1/+1
* add E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out.Chris Toshok2003-01-093-18/+159
* add parent arg.Chris Toshok2003-01-097-1/+1063
* $(datadir)/evolution/images instead of $(datadir)/images/evolution.Ettore Perazzoli2003-01-091-18/+18
* [ fixes bug #34897 ] don't free the return of e_card_simple_get_const, asChris Toshok2002-12-191-1/+1
* g_string_sprintfa -> g_string_append_printf. (create_alphabet): same.Chris Toshok2002-12-192-7/+7
* drop use of "font" arg. (get_left_width): use pango to calculate thisChris Toshok2002-12-193-14/+9
* #define MINICARD_CONTROL_ID.Ettore Perazzoli2002-12-101-0/+3
* connect ::response to gtk_widget_destroy so the dialog goes away.Chris Toshok2002-12-092-4/+7
* this uses pango now. (addressbook_height): same.Chris Toshok2002-12-091-23/+12
* #include <string.h>.Ettore Perazzoli2002-12-072-28/+20
* gnomedialog -> gtkdialog stuff. print dialog is a gtkdialog now.Not Zed2002-12-021-3/+4
* the detail is supposed to go after the signal id, not at the end of theChris Toshok2002-11-301-1/+1
* remove the button_press_event handler (that did nothing). this makes it soChris Toshok2002-11-291-9/+0
* add include for gtkstock.h.Chris Toshok2002-11-272-7/+7
* remove redundant setting of y2.Chris Toshok2002-11-271-5/+1
* remove the cast to (int) - column_width is a double.Chris Toshok2002-11-193-11/+11
* clean this up a tad.Chris Toshok2002-11-155-133/+28
* change signature to that of a weak ref notify function. (main): ::destroyChris Toshok2002-11-129-98/+74
* guard against multiple invocations. (remove_book_view): same.Chris Toshok2002-11-095-19/+41
* oops, missed these casts.Chris Toshok2002-11-091-3/+3
* port work.Chris Toshok2002-11-0914-339/+410
* gobjectify this.Chris Toshok2002-11-0723-293/+268
* fix the gnome-xml headers.Chris Toshok2002-11-064-57/+76
* Port to GObject/gnome2.Chris Toshok2002-11-0627-922/+1064
* Disconnect from the book's backend_died signal.Dan Winship2002-10-271-1/+5
* [ fix for #23764 ] handle multiple letters associated with a singleChris Toshok2002-10-221-11/+25
* [ Fix #7094, #7064, #7095, #31944, #31945 ] Hook up new etspec file.Kjartan Maraas2002-10-103-101/+60
* [ Fix #28392 ] #if 0 out the gal_view submenu, since it's not spec'ed toChris Toshok2002-10-051-0/+2
* It's a grand old string-review! Nitpicky and minor changes; details in the ap...Aaron Weber2002-10-011-2/+2
* Rename "ldap-contacts" to "contacts/ldap" and add "contacts/public".Dan Winship2002-09-261-1/+1
* free adapter->priv.Chris Toshok2002-09-262-0/+4
* [ fixes #20347 ] hook up the backend_died signal. (backend_died): newChris Toshok2002-08-293-2/+45
* [ fixes #25038 ] need to have EVOLUTION_ICONSDIR defined.Chris Toshok2002-08-291-1/+1
* stop the view before unref, in case the listener has pending events.Mike Kestner2002-08-271-0/+1
* take and pass the CallStatus to our listener.Chris Toshok2002-08-204-0/+44
* [ fix 27333 ] "local" -> "do-initial-query".Chris Toshok2002-08-161-1/+1
* If invoked from a non-contact folder, add the contact to the defaultDan Winship2002-08-131-0/+1
* Add include lines to get ebook headers relative to <ebook/foo.h>, notPeter Williams2002-07-111-0/+1
* pass NULL to e_contact_list_save_as. modality sucks. fixes broken build.Chris Toshok2002-06-181-2/+2
* Made double clicking on read only folders not do anything.Christopher James Lahey2002-06-121-8/+9
* Call e_minicard_selected in the GDK_BUTTON_RELEASE case here.Christopher James Lahey2002-06-061-0/+7
* Set the title of our GalVIewCollection.Christopher James Lahey2002-06-041-0/+2
* make sure we map status -> string correctly (add missing strings).Chris Toshok2002-05-211-0/+3
* Added this function so that there would be less duplication of cardsChristopher James Lahey2002-05-013-61/+104
* Added a "Browse..." button to switch to a different addressbook folder.Christopher James Lahey2002-04-251-1/+2
* Make unused menu items disappear instead of graying out.Christopher James Lahey2002-04-241-1/+29
* Removed e_addressbook_reflow_adapter_right_click andChristopher James Lahey2002-04-247-691/+454
* Removed an unused variable here.Christopher James Lahey2002-04-231-1/+16
* Allow GDK_ACTION_COPY also, since the composer for example does not acceptJeffrey Stedfast2002-04-231-2/+2
* Bumped required gal version number to 0.19.99.11.Christopher James Lahey2002-04-182-32/+34
* Include addressbook-config.h here as this file uses it.Christopher James Lahey2002-04-125-42/+172
* Update for evolution_shell_client_user_select_folder API change.Dan Winship2002-04-051-16/+13
* Update to use new EPopupMenu API.Jeffrey Stedfast2002-03-162-28/+30
* since I've gone ahead and made the file backend (by way ofChris Toshok2002-03-101-12/+4
* don't set "editable" here, as the way things work the backend isn't ableChris Toshok2002-03-051-1/+0
* [ Fixes bugs 20740, 16680, and god knows what else :) ] double theChris Toshok2002-02-231-6/+9
* Make sure to only set the query once when creating a new book and not atChristopher James Lahey2002-02-141-17/+25
* Attach to the emvw instead of the emv here.Christopher James Lahey2002-02-145-39/+78
* Finishing commit that failed in the middle:Christopher James Lahey2002-02-146-43/+316
* Attach the GalViewMinicard to the EMinicardView here.Christopher James Lahey2002-02-133-15/+91
* Added an argument to get the model.Christopher James Lahey2002-02-134-27/+93
* Missed one.Chris Lahey2002-02-071-3/+5
* Bumped the required version of gal.Christopher James Lahey2002-02-071-155/+274
* Clean up some of the Makefiles so we dont' link every library multipleEttore Perazzoli2002-01-251-15/+6
* From addressbook/ChangeLog:Christopher James Lahey2002-01-185-35/+120
* Handle setting the search bar to "Advanced..." when the alphabet buttonsChristopher James Lahey2002-01-112-8/+35
* Use toggle buttons here.Christopher James Lahey2002-01-112-8/+48
* Add cut/copy/paste to right-click menu.Jon Trowbridge2001-12-202-2/+74
* Merging changes:Christopher James Lahey2001-12-181-19/+5
* Make the pre_changes and changes match here.Christopher James Lahey2001-10-311-0/+3
* correct include typoJP Rosevear2001-10-301-1/+1
* Require gal 0.15.99.8Joe Shaw2001-10-301-2/+1
* 2001-10-29 Jon Trowbridge <trow@ximian.com.Jon Trowbridge2001-10-302-1/+13
* new function, a "Do you want to save changes?" dialog.Chris Toshok2001-10-302-0/+19
* Comment out spew.Jon Trowbridge2001-10-302-2/+2
* Check that our BonoboUIComponent has a container so we don't get a lot ofJon Trowbridge2001-10-301-1/+1
* Handle returning dates here. (e_card_simple_get_allow_newlines): NewChristopher James Lahey2001-10-292-1/+27
* change to EBookCallback signature, and unref the book. (add_card_idle_cb):Chris Toshok2001-10-282-3/+13
* Fixing the license text.Ettore Perazzoli2001-10-285-33/+50
* Fixing the license text.Ettore Perazzoli2001-10-2814-14/+0
* Update the licensing information to require version 2 of the GPLEttore Perazzoli2001-10-2714-28/+28
* Added has_cursor argument. Setting the argument to TRUE if the minicardChristopher James Lahey2001-10-262-16/+44
* Removed key_press handler here since delete and backspace are now handledChristopher James Lahey2001-10-241-27/+0
* right_click_up here when we let go of the popup.Christopher James Lahey2001-10-212-0/+3
* Call e_addressbook_model_force_folder_bar_message when we activate theJon Trowbridge2001-10-212-0/+8
* Fix memory leak.Jon Trowbridge2001-10-211-0/+1
* Filter out empty destinations. (also Bug #13036)Jon Trowbridge2001-10-211-1/+1
* Handle focus_change in event by selecting that contact. Fixes Ximian bugChristopher James Lahey2001-10-211-0/+11
* Added #include <gal/widgets/e-unicode.h>.Christopher James Lahey2001-10-201-62/+90
* Changed this to not grab on a right click. Fixes Ximian bug #12660.Christopher James Lahey2001-10-201-1/+5
* Did a bit of clean up here. Might fix some crashes, specifically XimianChristopher James Lahey2001-10-171-38/+38
* Changed these to use the new ref and unref functions for ECard auxillaryChristopher James Lahey2001-10-121-1/+0
* Check that view->view != NULL. (save_contact_cb): Check that view->view !=Jon Trowbridge2001-10-112-21/+41
* Check to make sure our call to e_addressbook_model_get_card doesn't returnJon Trowbridge2001-10-061-1/+1
* don't set the editable field on the model - let the book do that.Chris Toshok2001-10-061-1/+1
* Fixed these to determine the fields to use properly.Christopher James Lahey2001-10-042-5/+2
* when creating the cards, don't display any of the subname fields (surname,Chris Toshok2001-09-231-1/+1
* Hooked up print preview button.Christopher James Lahey2001-09-222-1/+51
* free the dup'd capabilities.Larry Ewing2001-09-181-0/+1
* Code implicitly assumed that event->button.button is 1, 2, or 3, causingJon Trowbridge2001-09-181-17/+20
* add -DEVOLUTION_IMAGESDIR.Chris Toshok2001-09-072-8/+1
* This file is no longer needed.Chyla Zbigniew2001-09-031-355/+0
* I18n fixes (mainly making buttons on the right side less Anglocentric :-)Chyla Zbigniew2001-09-036-110/+153
* Use e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here sinceChristopher James Lahey2001-09-022-2/+2
* s/_/U_/Chyla Zbigniew2001-09-012-2/+4
* Removed some debugging spew that I left in by mistake.Jon Trowbridge2001-08-281-3/+0
* Display localized status string (added missing _()).Chyla Zbigniew2001-08-271-1/+1
* add BUTTON_PRESS_MASK so double clicks still work.Chris Toshok2001-08-241-0/+1
* if we're dragging, drag_button_down won't be true in the BUTTON_RELEASEChris Toshok2001-08-211-21/+1
* fix arg info - we're only passing 1 GTK_TYPE_POINTER arg, not 2.Chris Toshok2001-08-213-17/+53
* Set the folder bar message here.Christopher James Lahey2001-08-204-3/+110
* Changed the messages here in the right click menus.Christopher James Lahey2001-08-182-4/+4
* Got rid of an extraneous _ here.Christopher James Lahey2001-08-141-1/+1
* Upped the minimum width on all addressbook columns to 75. Fixes Ximian bugChristopher James Lahey2001-08-091-39/+39
* new function, used by the context menu.Chris Toshok2001-08-091-3/+37
* Fixes Clahey bug #2200 :-)Nat Friedman2001-08-082-0/+8
* Made this change the query based on which letter is clicked.Christopher James Lahey2001-08-041-2/+71
* Added ContactsSaveAsVCard, ContactsSendContactToOther, andChristopher James Lahey2001-08-022-29/+63
* need the EDestination magic here too for when we modify an already shownChris Toshok2001-07-251-0/+11
* Added a call to e_table_view_to_model_row here.Christopher James Lahey2001-07-151-3/+7
* CVS is unhappy this evening. My commit keeps dying in the middle.Jon Trowbridge2001-07-071-0/+11
* Upped the required version of gal.Christopher James Lahey2001-07-051-2/+7
* srcdir != builddir compile fix.Peter Williams2001-07-021-0/+1
* Added related_contacts field.Christopher James Lahey2001-07-021-55/+57
* add EVOLUTION_IMAGESDIR define.Chris Toshok2001-06-293-1/+35
* pop up list editor for lists, contact editor otherwise.Chris Toshok2001-06-294-10/+33
* memmove counts were off in this function. (remove_card, modify_card):Christopher James Lahey2001-06-271-5/+9
* correct path to libecontacteditor.a. (minicard_widget_test_LDADD): same.Chris Toshok2001-06-254-23/+50
* Update the copyrights, replacing Helix Code with Ximian andEttore Perazzoli2001-06-2319-46/+46
* track change to e_addressbook_show_contact_editor signature.Chris Toshok2001-06-206-73/+33
* Added e-card-merging-book-commit-duplicate-detected.glade here.Christopher James Lahey2001-06-113-7/+8
* Made e_card_simple_get_id return const char *.Christopher James Lahey2001-06-112-5/+7
* Null terminate the strv here. (e_card_locate_match): ref here instead ofChristopher James Lahey2001-06-096-10/+14
* remove the gtk_widget_show call... (e_contact_editor_show): and put itChris Toshok2001-06-097-250/+231
* remove spew, and don't call the ShellView CORBA method if the interfaceChris Toshok2001-06-046-11/+80
* Added fields for the GalViewMenus and GalViewCollection; we need to keepFederico Mena Quintero2001-06-012-18/+66
* decrement data_count before emitting the card_removed signal, and breakChris Toshok2001-06-012-5/+27
* new function, for the Cut verb. (copy_contacts_cb): new function, for theChris Toshok2001-05-304-14/+242
* Correct the height calculation here to not include theChristopher James Lahey2001-05-262-1/+5
* add sequence_complete_id to EAddressbookModel and stop_state_changed toChris Toshok2001-05-233-10/+69
* update_view_type is gone, since the menu item is gone.Chris Toshok2001-05-221-1/+1
* add our selection_change signal. (e_minicard_view_widget_realize): connectChris Toshok2001-05-186-8/+186
* Fixed up the lifetime of the drag_data_get signal a bit.Christopher James Lahey2001-05-161-23/+5
* MinicardViewModel -> ReflowAdapter name change. (get_card_list): same.Chris Toshok2001-05-1615-1131/+1290
* Fix a small error not decreasing the data_count here.Christopher James Lahey2001-05-151-1/+2
* use e_card_list_get_vcard to build up the data to send.Chris Toshok2001-05-124-18/+86
* Reordered the includes here. (string_to_dbt): The sleepycat libdbChristopher James Lahey2001-05-122-0/+5
* Removed e-card-pairs.h since we're not using it.Christopher James Lahey2001-05-086-549/+1018
* Added E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING.Christopher James Lahey2001-04-112-11/+15
* i18n fixes, added missing includes.Gediminas Paulauskas2001-04-114-24/+36
* on BUTTON_PRESS: if it's button 1, store the button x, y, and setChris Toshok2001-04-105-0/+177
* Here goes my additional simple include fixes.Gediminas Paulauskas2001-04-054-23/+19
* Fix headers. Same here. Same here. Same here. Same here. Same here. SameKjartan Maraas2001-04-058-1/+25
* Fixed a crash here.Christopher James Lahey2001-04-041-1/+1
* Made this table model more consistent in the number of columns it has.Christopher James Lahey2001-04-031-5/+7
* Clean up #includes. Replace <gnome.h>, <bonobo.h> and <gtk/gtk.h> withKjartan Maraas2001-03-3020-38/+37
* Added. Call me old-fashioned, but I just prefer to have a real API ratherJon Trowbridge2001-03-232-12/+28
* Bumped gal requirement to 0.5.99.8.Christopher James Lahey2001-03-201-2/+2
* new function. (impl_BookListener_report_writable): new function.Chris Toshok2001-03-1811-15/+108
* Update arguments to e_canvas_item_grab_focus.Dan Winship2001-03-162-3/+3
* Change to ld order from Greg Williams.Christopher James Lahey2001-03-141-1/+1
* add is_read_only param.Chris Toshok2001-03-133-3/+3
* Cleaned up the formatting in this file a bit.Christopher James Lahey2001-03-043-36/+46
* new function. (e_minicard_view_event): split out the creation of theChris Toshok2001-03-023-37/+65
* Used ESelectionModelSimple and the changes to EReflow and EReflowSorted toChristopher James Lahey2001-03-015-67/+189
* Undefine E_STRING_PROP and E_LIST_PROP here.Christopher James Lahey2001-02-153-22/+34
* Marked strings for translation in this newly created file. Hook up theKjartan Maraas2001-02-131-0/+1
* Getting almost full and proper use of xml-i18n-tools.Gediminas Paulauskas2001-02-113-12/+1
* Added N_("* Click here to add a contact *").Christopher James Lahey2001-02-081-0/+1
* Added -DEVOLUTION_DATADIR=\""$(datadir)"\".Christopher James Lahey2001-02-072-2/+3
* Added gal-view-factory-minicard.c, gal-view-factory-minicard.h,Christopher James Lahey2001-02-066-8/+367
* Setup the view collection properly and handle the "display_view" signal.Christopher James Lahey2001-01-261-2/+18
* Update for e_popup_menu_run prototype change.Dan Winship2001-01-202-2/+2
* changed the signature of the property_bag get/set functionsDietmar Maurer2001-01-151-0/+2
* added i18n for etable.Miguel de Icaza2001-01-121-0/+33
* More Makefile organization to compileMiguel de Icaza2001-01-101-12/+12
* connect with the EAddressbookView's status_message signal.Chris Toshok2001-01-102-2/+26
* register our status_message signal. (status_message): new function, emitChris Toshok2001-01-107-7/+143
* check capabilities is valid before doing a strstr.Michael Meeks2001-01-041-5/+5
* Make sure this won't crash if the given contact is removed from theChristopher James Lahey2001-01-031-29/+104
* Set draw background to FALSE.Miguel de Icaza2000-12-252-0/+3
* Made it so that if you select multiple contacts, the right click menu toChristopher James Lahey2000-12-201-9/+53
* NUL-terminate the returned vcard so we don't sometimes end up withDan Winship2000-12-141-6/+6
* Fixed some formatting.Christopher James Lahey2000-12-091-2/+2
* Got rid of code referencing the ETableScrolled proxy functions.Christopher James Lahey2000-12-081-2/+4
* Moved the gal view menu stuff from here to EAddressbookView.Christopher James Lahey2000-12-072-4/+41
* return NULL if we can't create a view.Michael Meeks2000-12-051-1/+1
* Clear the rdate and exrule lists from the component if we are setting aFederico Mena Quintero2000-11-131-29/+3
* Link in composer bonobo code.Christopher James Lahey2000-11-122-19/+43
* Switched from EAddressbookSearch to ESearchBar.Christopher James Lahey2000-11-073-418/+0
* Add menus items to the envelope printing stuff.Christopher James Lahey2000-11-064-7/+113
* Removed these unnecessary .cvsignores.Christopher James Lahey2000-11-033-0/+332
* The big api rename ...Michael Meeks2000-11-021-1/+1
* Remove Family name column since it's a bit weird. This also fixes theChristopher James Lahey2000-10-201-1/+0
* Move a bunch of CPPFLAGS defs into INCLUDES so they doesn't overrideDan Winship2000-10-161-3/+1
* Changed these for boolean ascending attribute instead of int ascendingChristopher James Lahey2000-10-141-1/+1
* Fixed the column elements, the no-headers attribute and added aChristopher James Lahey2000-10-111-5/+5
* Updated these to the new style ETables.Christopher James Lahey2000-10-111-56/+45
* Made it so that minicard doesn't write out changes to the backend unlessChristopher James Lahey2000-10-012-24/+34
* Look for ename in /e-util/ename instead of /addressbook/enameJeffrey Stedfast2000-09-261-3/+3
* Added evolution-addressbook-ldap.xml.Christopher James Lahey2000-09-228-24/+103
* Added a wants_html field to cards. Uses "x-mozilla-html".Christopher James Lahey2000-09-212-2/+4
* Fixed display of the minicards when the addressbook was first loading. (ItChristopher James Lahey2000-09-201-3/+2
* Added check for gnome-app-lib. Removed directories that have been moved toChristopher James Lahey2000-09-1812-44/+34
* Fixed the paths of some .h #includes.Christopher James Lahey2000-09-189-15/+820
* *Sigh.*Ettore Perazzoli2000-09-161-0/+10
* Added $(GNOME_PRINT_LIBS) to all of the test files in these directories.Christopher James Lahey2000-09-141-0/+3
* fix path.Michael Meeks2000-09-141-1/+1
* Added widgets/e-reflow/Makefile. ReplacedChristopher James Lahey2000-09-142-5/+17
* Some UTF-8 fixes and experimental 16-bit unicode font supportLauris Kaplinski2000-09-092-9/+7
* Comment out minicard-view-test since its gnorba dependentJP Rosevear2000-08-261-18/+18
* Die gnorba die.JP Rosevear2000-08-261-7/+0
* Remove gnorba stuffJP Rosevear2000-08-261-5/+0
* Started adding a time zone field to ECard.Christopher James Lahey2000-08-232-0/+4
* Moved e-text to UTF-8Lauris Kaplinski2000-08-201-2/+2
* Changed this to use ECardSimple.Christopher James Lahey2000-08-201-2/+8
* use style colors for the selected state. This doesn't properly redraw theLarry Ewing2000-08-161-7/+13
* Ref our book view listener.Christopher James Lahey2000-08-123-0/+342
* Added a button to save to your addressbook.Christopher James Lahey2000-08-101-1/+56
* Changed e_popup_menu_run call to match the new arguments.Christopher James Lahey2000-08-092-44/+15
* use x-evolution-any-field.Chris Toshok2000-08-092-2/+2
* Emit "model_pre_change" signal as appropriate.Christopher James Lahey2000-08-031-0/+2
* Adapted this to supply the new append_row API of ETableModel.Christopher James Lahey2000-08-021-7/+17
* Fixed a warning.Christopher James Lahey2000-07-271-2/+0
* Fixed the oaf info.Christopher James Lahey2000-07-214-42/+194
* Added "text/vCard" to the list of mime types we support.Christopher James Lahey2000-07-181-1/+3
* Added gui/minicard/e-minicard-control.c,Christopher James Lahey2000-07-185-60/+89
* New files for using a minicard as a widget or a bonobo control.Christopher James Lahey2000-07-184-0/+605
* Switched the order of compilation of printing and contact-editor.Christopher James Lahey2000-07-142-1/+48
* Switched from ETable to ETableScrolled.Christopher James Lahey2000-07-101-1/+1
* Added a field that gives the name if it exists and the company nameChristopher James Lahey2000-07-101-1/+2
* Several contacts list bugfixes.Anders Carlsson2000-07-092-9/+13
* Added an "editable" argument.Christopher James Lahey2000-07-082-12/+26
* Calculate height including if clip_height is set to -1.Christopher James Lahey2000-06-271-1/+21
* Remove usage of "x" and "y" arguments.Christopher James Lahey2000-06-213-6/+0
* Made the left column of minicards not get any wider than the widestChristopher James Lahey2000-06-173-9/+65
* Removed the ETableModel thaw handler. Likewise.Federico Mena Quintero2000-06-131-11/+2
* Added glade files.Christopher James Lahey2000-06-111-4/+8
* Make ETable use EScrollFrame instead of GtkScrolledWindow.Ettore Perazzoli2000-06-111-2/+5
* Now this derives from GtkObject. It follows the same strategy as theFederico Mena Quintero2000-06-092-73/+93
* Fix Makefiles so that (guess what?) they work with builddir != srcdir.Ettore Perazzoli2000-06-081-12/+12