aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
Commit message (Expand)AuthorAgeFilesLines
* removed uih from the argument list, added cal. use cal as user_data inSeth Alves2000-04-074-163/+92
* forgot to commitSeth Alves2000-04-061-0/+7
* removed (setup_appbar): removed (calendar_control_activate): new functionSeth Alves2000-04-063-9/+111
* build test-calendar-widget and evolution-calendar, common stuff is in aSeth Alves2000-04-0626-889/+1219
* + + * tests/.cvsignore: Added test-movemail. + + * art/.cvsignore: NewMatthew Loper2000-04-012-0/+5
* cal_client_get_events_in_range returns a list of CalObjInstance *, not aSeth Alves2000-03-311-3/+4
* readded the gui directorySeth Alves2000-03-303-2/+16
* + * Makefile.am: add calendar compilation back in.Matthew Loper2000-03-302-1/+5
* + * wombat/wombat.gnorba: new file.Matthew Loper2000-03-293-0/+24
* added libeutil.la and libetext.aSeth Alves2000-03-283-16/+68
* Use ical_object_to_string().Federico Mena Quintero2000-03-2810-184/+116
* Fix includes. (e_day_view_on_delete_occurance): Do not callFederico Mena Quintero2000-03-234-13/+30
* Fix for srcdir != builddir.Elliot Lee2000-03-184-19/+18
* New widget for Day/Work-Week views. Unfinished.Damon Chaplin2000-03-149-0/+6749
* Removed function now that it is no CORBA server in the GUI.Federico Mena Quintero2000-03-1216-83/+85
* Do not pass the INIT_SERVER flag to gnome_CORBA_init_with_popt_table().Federico Mena Quintero2000-03-112-22/+51
* Initialize the alarm types here. Do not call default_alarm() anymore,Federico Mena Quintero2000-03-113-45/+15
* Removed the corba-cal stuff. Commented out the Pilot conduit stuff forFederico Mena Quintero2000-03-102-109/+78
* Random #ifdefs to make it build, although this file is going away.Federico Mena Quintero2000-03-107-67/+41
* replaced "Calendar *cal" with "CalClient *calc" in the GnomeCalendarSeth Alves2000-03-0929-128/+478
* track movement of calobj.[ch]Seth Alves2000-03-089-15/+10
* ignore *.lo instead of a list of .lo filesSeth Alves2000-03-081-2/+1
* calobj.[ch] has moved into cal-util/Seth Alves2000-03-081-2/+0
* back out recent commit, and remove calendar.[ch] from Makefile.amSeth Alves2000-03-087-112/+62
* back out recent commitSeth Alves2000-03-082-97/+0
* calobj.[ch] live in cal-util nowSeth Alves2000-03-081-0/+2
* More file moving - FedericoFederico Mena Quintero2000-03-084-1873/+5
* track moveSeth Alves2000-03-062-14/+18
* move all but the subdir line into gui/Makefile.am, since the codeSeth Alves2000-03-061-236/+1
* stubs for client side access to alarm structures. this will probablySeth Alves2000-03-0617-79/+269
* More file moving action - FedericoFederico Mena Quintero2000-03-0666-20102/+0
* this is not right, but it gets this closer to building.Seth Alves2000-03-043-3/+3
* added some .cvsignore filesSeth Alves2000-03-044-0/+33
* new file -- things shared between the client and server go in thisSeth Alves2000-03-0447-1951/+806
* I always forget to add the stupid files - FedericoFederico Mena Quintero2000-03-041-0/+66
* At this point the calendar client and personal calendar server files wereFederico Mena Quintero2000-03-026-12/+23
* More reorganization - FedericoFederico Mena Quintero2000-03-026-247/+11
* Moved to the pcs/ directory - FedericoFederico Mena Quintero2000-03-0212-2776/+21
* At this point the calendar client and personal calendar server files wereFederico Mena Quintero2000-03-026-204/+61
* Moved to cal-client/ - FedericoFederico Mena Quintero2000-03-026-1514/+0
* Moved to idl/evolution-calendar.idlFederico Mena Quintero2000-03-021-127/+0
* Use the gnome-config flags for orbit-idl. Create a libcal-client libraryFederico Mena Quintero2000-03-025-6/+59
* Removed stale rule for the conduit.Federico Mena Quintero2000-03-013-18/+18
* don't put .libs in the link command, let libtool do itSeth Alves2000-02-232-2/+2
* + * calendar/.cvsignore: Added *.lo.Matthew Loper2000-02-222-1/+6
* trying to link libicalSeth Alves2000-02-212-2/+2
* + * widgets/e-minicard/.cvsignore: Added minicard-label-test,Matthew Loper2000-02-202-0/+6
* DOHSeth Alves2000-02-191-0/+6
* Use BONOBO_VFS_GNOME_CFLAGS instead of GNOMEUI_INCLUDES, as we use BonoboMiguel de Icaza2000-02-193-2/+7
* moved CalendarFormat type def hereSeth Alves2000-02-1812-115/+307
* Implemented.Federico Mena Quintero2000-02-1713-14/+282
* added skel and stub filesSeth Alves2000-02-161-0/+5
* forgot this oneSeth Alves2000-02-161-0/+722
* Change iCalObject.organizer from char* to iCalPerson*Russell Steinthal2000-02-1621-61/+418
* Implemented.Federico Mena Quintero2000-02-1227-188/+769
* Connect to the Cal's destroy signal. (cal_backend_remove_cal): KilledFederico Mena Quintero2000-02-1133-356/+1696
* Added inline documentation comment - FedericoArturo Espinosa2000-02-092-0/+20
* Added get_uids() method to get a list of UIDs based on object types.Federico Mena Quintero2000-02-0944-358/+1040
* Add the files, stupid me - FedericoArturo Espinosa2000-02-084-0/+200
* New struct to wrap instances of calendar objects for recurrencies andFederico Mena Quintero2000-02-0817-26/+567
* New function to create the base VObject for a calendar.Federico Mena Quintero2000-02-0413-38/+149
* Sync to laptop - FedericoArturo Espinosa2000-02-035-50/+141
* Added the get_object() method.Federico Mena Quintero2000-02-0219-158/+410
* Handle the cal_loaded signal from the listener. Store the calendar clientFederico Mena Quintero2000-02-017-0/+288
* Sync to desktop - FedericoArturo Espinosa2000-01-317-10/+29
* Changed the namespace from GNOME::Calendar to Evolution::Calendar.Federico Mena Quintero2000-01-2927-250/+267
* Make Evolution compile with the latest Bonobo changes.Arturo Espinosa2000-01-2626-138/+140
* Calendar client side work - FedericoArturo Espinosa2000-01-255-0/+731
* Check that the listener is not nil and emit and exception if it is.Federico Mena Quintero2000-01-257-18/+147
* When will I ever learn to add the files... - FedericoArturo Espinosa2000-01-254-0/+206
* Added the gnome-pilot and capplet checks; they will likely be reworked forFederico Mena Quintero2000-01-2517-84/+207
* New function to remove a calendar client interface object from a backend.Federico Mena Quintero2000-01-249-84/+342
* Take in a GnomeVFSURI, not a string.Federico Mena Quintero2000-01-2213-120/+308
* Moved the calendar backend here. This is the actual calendar-handlingFederico Mena Quintero2000-01-1915-222/+1147
* Sync, take two - FedericoArturo Espinosa2000-01-182-0/+2
* Forgot these - FedericoArturo Espinosa2000-01-184-0/+262
* Sync - FedericoArturo Espinosa2000-01-1811-28/+251
* Removed the CORBA listener methods, adjusted for the new IDL.Federico Mena Quintero2000-01-128-91/+241
* New IDL for the personal calendar server.Federico Mena Quintero2000-01-1215-0/+2408
* Removed todo capplet stuff.Eskil Heyn Olsen2000-01-093-6/+14
* Update to use gpilotd_get_pilot_basedir and gnome_pilot_conduit_standard_abs...Vadim Strizhevsky2000-01-084-9/+9
* Added an argument to the corba get_number_of_objects, so you can decideEskil Heyn Olsen2000-01-058-162/+192
* Committed fixes for the end-on-day recurrence bug where the lastEskil Heyn Olsen1999-12-3115-26/+71
* Added Galician translationJesus Bravo Alvarez1999-12-312-0/+4
* Minor unmiportant changes, but my laptop is acting up, so IEskil Heyn Olsen1999-12-303-9/+24
* Fix sensitivity bug when used to create default alarm box (widgets in thatRussell Steinthal1999-12-113-2/+15
* Capplets now sets first_sync on enable, this should make the conduit copyEskil Heyn Olsen1999-12-084-3/+18
* Check if local store is empty. If, force slow sync.Eskil Heyn Olsen1999-12-0714-84/+193
* Added a sub package to the .spec file, it now generatesEskil Heyn Olsen1999-12-063-0/+11
* Removed intlEskil Heyn Olsen1999-12-053-0/+8
* Sigh. Get this oneArturo Espinosa1999-12-042-0/+4
* 1.1.0Arturo Espinosa1999-12-031-0/+20
* The long-awaited and much-needed (IMNSHO) snooze button for gnomecal alarms.Russell Steinthal1999-12-039-16/+168
* undef DEBUG_CALCONDUT, suppresses debug output.Eskil Heyn Olsen1999-12-034-6/+10
* Debugging enhancements: report alarms not added (because they have alreadyRussell Steinthal1999-12-034-30/+131
* Fixed compare bug. Also neated up some of the if's in set_status.Eskil Heyn Olsen1999-11-304-33/+44
* <self_serving> Add myself to AUTHORS, about box </self_serving>Russell Steinthal1999-11-234-1/+5
* Merged Rusty's last todo list coloring patch from stable to HEAD.Russell Steinthal1999-11-229-124/+640
* Writes some warning messages when pre_sync fails.Eskil Heyn Olsen1999-11-224-0/+11
* added greek descriptionsPablo Saratxaga1999-11-172-0/+4
* Stupid misplaced endif cause gncal to depend on an install gnome-pilot...Eskil Heyn Olsen1999-11-143-14/+21
* The long-awaited audio alarm timeout patch. Implements wishlist bug #3089.Russell Steinthal1999-11-1311-20/+212
* Schedule a new day_change_alarm in the day_change_alarm callback, so that theRussell Steinthal1999-11-113-2/+9
* Forgot my changelog yesterday.Eskil Heyn Olsen1999-11-101-0/+6
* Enabled debug output. Sets a g_log_domain, now version 0.8.5. ConsistentEskil Heyn Olsen1999-11-103-288/+948
* Fixed an unwanted conditional on libcalendar_conduit_la_LDFLAGSEskil Heyn Olsen1999-11-093-2/+7
* Commented the code out, thus the capplet works again.Eskil Heyn Olsen1999-11-054-0/+11
* Uses the PISOCK_LIBDIR, for people with odd install dirs for theirEskil Olsen1999-11-0419-251/+606
* Add default alarm support, Beep on display alarms optionRussell Steinthal1999-11-0314-65/+466
* Fix calendar_day_begin/calendar_day_end initialization bug on HEAD. For fullRussell Steinthal1999-10-243-0/+13
* Style fix.Russell Steinthal1999-10-223-3/+6
* Commit debugging support to HEAD as well; there's no good reason to have debu...Russell Steinthal1999-10-226-5/+135
* now it doesn't build todo conduit anymore. Since the conduit is just aEskil Heyn Olsen1999-10-2217-893/+1116
* Fix bug #1818 on HEAD.Russell Steinthal1999-10-223-8/+37
* Fix bug #2561 in HEADRussell Steinthal1999-10-203-2/+7
* Add paned windows to Day View so user can adjust relative size of dailyRussell Steinthal1999-10-203-50/+53
* Added swedish desktop entryMartin Norback1999-10-183-0/+8
* Fixed the much-hated gnome-pilot dependencyEskil Heyn Olsen1999-10-143-2/+9
* moved the pilot_status = MOD up, so even a CHANGE_SUMMARY will set theEskil Heyn Olsen1999-10-086-216/+312
* checks return values from gpilotd_init/connect.Eskil Heyn Olsen1999-10-0613-90/+150
* Now has correct return values wrt the conduit api ref.Eskil Heyn Olsen1999-09-293-165/+261
* Use tm.gmtoff or timezone to get correct offset from UTC, according toTimur Bakeyev1999-09-282-3/+15
* added pt_BR translationsJorge Godoy1999-09-282-0/+4
* Small fix -miguelArturo Espinosa1999-09-2831-238/+270
* Fix #2340 on HEAD -miguelArturo Espinosa1999-09-284-8/+8
* the g_free that was commented out since glib said was a duplicate free,Eskil Heyn Olsen1999-09-2511-146/+531
* better merge of summary/description when doing ical_from_remoteEskil Heyn Olsen1999-09-2314-19/+45
* better merge of summary/description when doing ical_from_remoteEskil Heyn Olsen1999-09-234-302/+457
* commented out a g_free that glib reported as being a duplicate free. gotEskil Heyn Olsen1999-09-236-23/+64
* - fix which allow "make insytall DESTDIR=</install/prefix>".Tomasz Kłoczko1999-09-231-3/+3
* lot of rework, implemented various set_* functions, transmit andEskil Heyn Olsen1999-09-218-514/+1206
* added Estonian tranlationsLauris Kaplinski1999-09-203-0/+8
* About to rehash conduit.Eskil Heyn Olsen1999-09-196-15/+117
* changed to be a .la file instead of .a, this allows lib*_conduit to useEskil Heyn Olsen1999-09-1910-155/+578
* fixed the exception throwing. The conduit can now actually insertEskil Heyn Olsen1999-09-152-10/+50
* added sources to calendar-conduitEskil Heyn Olsen1999-09-1510-101/+746
* Set the data pointers for all the items.Federico Mena Quintero1999-09-153-2/+9
* Small correctionKjartan Maraas1999-09-141-1/+1
* Merge from HEAD. Synced with newest user-guide.Kjartan Maraas1999-09-142-96/+100
* ja Update from ITANI EiichoroYukihiro Nakai1999-09-082-0/+4
* forgot the .desktop files...`Eskil Heyn Olsen1999-09-086-0/+36
* uses GNOME_PILOT_CHECKEskil Heyn Olsen1999-09-0824-47/+3329
* Added Russian translations to the desktop filesSergey I. Panov1999-09-032-0/+4
* Make the OK button the default button per Russell's suggestion.Miguel de Icaza1999-09-023-2/+7
* Added call to GNOME_COMPILE_WARNINGS.Miguel de Icaza1999-09-022-4/+0
* Modify the object->last_mod field. (calendar_add_object): Ditto.Miguel de Icaza1999-08-315-4/+32
* "GenericFactoy" is wrong...Tomas Ogren1999-08-223-2/+6
* Fix the hostname part.Miguel de Icaza1999-08-154-9/+13
* Finnish translation updates.Mikko Rauhala1999-08-152-0/+4
* BUGFIX: 1515JP Rosevear1999-08-132-2/+12
* sync correctly for objects created on the pilot, but not dirty (becausePeter Teichman1999-08-083-8/+12
* Updated from users-guide.Kjartan Maraas1999-08-061-125/+118
* Release points here.Miguel de Icaza1999-08-066-5/+11
* BUGFIX #1819JP Rosevear1999-08-054-20/+52
* fix this.Jonathan Blandford1999-08-033-0/+9
* don't try to run GNOME_CONDUIT_CHECK if it doesn't existPeter Teichman1999-08-033-2/+7
* Add nl to list of languages.Elliot Lee1999-08-032-4/+24
* do deletion of appointments correctly, when they are deleted on the pilotPeter Teichman1999-08-023-12/+71
* gnome-pim actually compiles without libpisock nowPeter Teichman1999-08-022-8/+8
* The multi-day appointment corruption bug is dead. Whoo!Peter Teichman1999-08-023-8/+25
* More auto* cleanups. The new calendar conduit now compiles conditionally,Peter Teichman1999-08-012-6/+8
* more autoconf, again. need to make the conduit compile conditionallyPeter Teichman1999-08-013-6/+8
* add thisJonathan Blandford1999-07-313-0/+615
* more auto* stuffJonathan Blandford1999-07-313-2/+50
* Add scrolling to the yearview.Jonathan Blandford1999-07-303-50/+58
* If the enddate is not set, set the repeatForever to 1. This fixes all ofMiguel de Icaza1999-07-303-7/+17
* Make the code not take arguments (sync_cal_to_pilot): Nice event updateMiguel de Icaza1999-07-2914-82/+83
* Lots of more work on the sync stuff. It works pretty well now.Arturo Espinosa1999-07-2919-88/+833
* Add the missing files -miguelArturo Espinosa1999-07-2813-0/+848
* New file. Implements PalmPilot syncronization with the Gnome Calendar.Miguel de Icaza1999-07-2824-36/+1461
* Generate unique IDs on Vevents we load that lack it. WE need this for theMiguel de Icaza1999-07-274-3/+17
* Handle the 'Z' parameter to the ISO date format to convert from GMT time.Matt Martin1999-07-193-0/+16
* Copy the new UID into the iCalObject structure.Nat Friedman1999-07-193-0/+7
* Merge fix from gnome-pim-1-0: Fixed cut&paste bug for day fontsets.Miguel de Icaza1999-07-173-2/+7
* Changed gnome-pim.keys to use the --file flagMiguel de Icaza1999-07-175-14/+110
* Tell ktime' that we don't know about daylight saving time so that it doesMike McEwan1999-06-232-0/+15
* Fixing a segfault when gnomecal is started with --hiddenAnders Carlsson1999-06-163-0/+9
* updated spanish & walon languages.Pablo Saratxaga1999-06-082-8/+32
* Fix abort() problem with the year view. (Bug #1367). Thanks to Owen CliffeRobert Brady1999-06-065-16/+22
* One line bug fix from Sergey I Panov.Miguel de Icaza1999-06-044-3/+7
* Use %H instead of %k, as %k is a GNU extension, not available in otherMiguel de Icaza1999-06-033-4/+9
* Work around broken software that writes a broken month-of-day as "zero".Miguel de Icaza1999-06-024-0/+30
* help files be gone. They are now installed from the Docbook stuff.Miguel de Icaza1999-06-014-6/+13
* added pics for the help file.Kjartan Maraas1999-05-286-6/+6
* Added preliminary support for todo item priorities: they can be set, displayed,Russell Steinthal1999-05-269-22/+157
* Added content from gnome-user-guide (Miguel, I will probably sleep muchKjartan Maraas1999-05-261-0/+309
* Add cvsignore filesArturo Espinosa1999-05-262-0/+7
* Added missing break here. It was causing core dumps when invoked withMiguel de Icaza1999-05-263-2/+7
* Add some assertions here, to pin point the bug reported on gnome-list.Miguel de Icaza1999-05-263-4/+91
* Make intervals always exist. a 0 interval is wrong.Miguel de Icaza1999-05-264-0/+17
* Added 'Untimed events'Tomas Ögren1999-05-261-0/+2
* Removed unused macro CALENDAR_HEIGHT.Federico Mena Quintero1999-05-263-4/+4
* Set the canvas scroll region here, not in size_allocate(). Also, use theFederico Mena Quintero1999-05-2611-34/+54
* This is the fix Miguel and I hacked in the car at Expo to make theNat Friedman1999-05-268-13/+51
* Add missing file -miguelArturo Espinosa1999-05-181-0/+110
* Add Docbook framework for documenting Gnomecal -miguelArturo Espinosa1999-05-188-6/+209
* - fix: allow use $DESTDIR on "make install DESTDIR=</install/prefix>".Tomasz Kłoczko1999-05-032-8/+8
* Add --todo supportArturo Espinosa1999-04-267-2/+122
* Bumped version number to 1.0.3.Federico Mena Quintero1999-04-203-0/+14
* Kill all grabs from the CList before running the new dialog box.Miguel de Icaza1999-04-173-0/+19
* Make sure we can get events for button3. The code for the nice popup menuMiguel de Icaza1999-04-093-0/+8
* Added this routine so Monthly recurrences use the weekday field as aSteve Murphy1999-04-048-33/+308
* Made static. Make it use the full year format for strftime().Federico Mena Quintero1999-03-313-18/+17
* Include <config.h> so that strings get translated. Correct spelling.Nuno Ferreira1999-03-284-0/+7
* Made it respect 12/24h settings.. Doesn't show until next time you openTomas Ogren1999-03-273-2/+17
* Did some i18n work Did some i18n workTomas Ogren1999-03-245-22/+25
* Made clist titles i18n:able Added which views that are possible for --viewTomas Ogren1999-03-245-16/+45
* Set the recur->interval to the value of the recur_rr_month_period spinNat Friedman1999-03-243-0/+13
* Added 2 paranthesis.. "foobar = d / 60*60" is _NOT_ the same as "foobar =Tomas Ogren1999-03-243-3/+3
* Add Summary editing for TODO items -rconoverArturo Espinosa1999-03-172-4/+96
* Add support for Due Date when adding a TODO item here. (column_resized):Clifford R. Conover1999-03-1125-72/+888
* 1999-03-10 Craig A Soules (soules+@andrew.cmu.edu)Arturo Espinosa1999-03-119-16/+102
* For DRAG_MOVE, DRAG_SIZE_TOP and DRAG_SIZE_BOTTOM: call child_focus_out ()Martin Baulig1999-03-013-0/+32
* gtk_widget_get_requisition fix for Gtk+ 1.2.Martin Baulig1999-03-012-2/+2
* Added Korean font to the fontset string. Likewise.Changwoo Ryu1999-02-275-20/+26
* Implemented new panel groups as suggested on gnome-hackersMichael Fulbright1999-02-262-2/+2
* Updated spanish language file;Pablo Saratxaga1999-02-258-14/+22
* Save the owner/organizer of the event. (ical_object_create_from_vobject):Miguel de Icaza1999-02-246-2/+41
* tzname issuesTimur Bakeyev1999-02-225-4/+38
* Made use of g_get_{user,real}_name() instead of our own home-brew...Tomas Ogren1999-02-203-48/+9
* will define fonts via fontset. Friendlier to locales that use iso8859-[^1]Sergey I. Panov1999-02-1817-58/+131
* Updated to install desktop into $(datadir)/gnome/appsMichael Fulbright1999-02-182-2/+2
* added danish language to the menu filePablo Saratxaga1999-02-172-4/+8
* Internationalization Police (Interpol)Sergey I. Panov1999-02-163-14/+19
* Indentation fixes.Federico Mena Quintero1999-02-163-2/+6
* Made a private copy of what localtime() returns, to be able to keep theTomas Ogren1999-02-163-10/+15
* Gnomecal now autosaves all the time.Arturo Espinosa1999-02-1213-6/+63
* Removed the gtk_widget_realize call.Tomas Ogren1999-02-093-2/+4
* Added Korean translations.Changwoo Ryu1999-02-063-0/+8
* New convenience function to create a properly-configured date editorFederico Mena Quintero1999-02-053-8/+37
* Make the calendar start weeks on Monday if appropriate.Federico Mena Quintero1999-02-0511-20/+113
* Set the title of the event editor window.Federico Mena Quintero1999-02-023-0/+7
* Do not remove the clipping rectangle here.Federico Mena Quintero1999-02-015-2/+13
* Improve this draw routine. Now it can split the text in lines and fit asMiguel de Icaza1999-02-017-106/+268
* if the user clicks on an event that is an occurance, the menu will allowJason Tackaberry1999-01-315-30/+108
* Add --hidden key to hide the calendar at startup. Only works with GNOMEMiguel de Icaza1999-01-295-16/+79
* Schedule an alarm for midnight to change theMiguel de Icaza1999-01-2911-31/+127
* Insert the summary text here. (child_focus_in): No need to raise theFederico Mena Quintero1999-01-285-136/+139
* Warn if the calendar file has changed.Miguel de Icaza1999-01-287-36/+118
* Only trap printable characters such that hotkeys work. (UNSELECT_TIMEOUT):Nat Friedman1999-01-205-48/+89
* Do not grab the mouse here (it was being grabbed incorrectly, anyways).Federico Mena Quintero1999-01-203-50/+78
* do gtk_widget_realize on the toplevel window..Tomas Ogren1999-01-193-0/+6
* Make the little calendar start up with the correct date.Federico Mena Quintero1999-01-143-2/+17
* Add the month to the date range display label.Federico Mena Quintero1999-01-143-4/+9
* Converted some more stuff to use the standards.Nat Friedman1999-01-093-38/+16
* New function to create the status bar. (setup_menu): Install menu hints.Nat Friedman1999-01-083-50/+114
* Wed, 30 Dec 1998 23:04:25 +0100 [Vincent]Vincent Renardias1998-12-312-2/+2
* s/g_copy_strings/g_strconcat/Jeff Garzik1998-12-319-14/+20
* Rewrote the old and broken alarm system. It never actually workedMiguel de Icaza1998-12-1715-47/+198
* Use the allocation size instead of the old fields in the canvas structure.Federico Mena Quintero1998-12-157-8/+17