aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
Commit message (Expand)AuthorAgeFilesLines
* Coding style and whitespace cleanup.Matthew Barnes2010-07-1213-132/+312
* Fix some compiler warnings.Matthew Barnes2010-07-111-0/+3
* Bug 624011 - EMeetingTimeSelector tries to change mouse cursor before it's re...Matthew Barnes2010-07-101-9/+15
* Bug #623204 - Be able to report detailed errors from backendsMilan Crha2010-07-0911-56/+92
* Migrate from CamelException to GError.Matthew Barnes2010-07-091-1/+1
* Fix transience problems with ENameSelectorDialogs ...Michael Meeks2010-07-084-21/+8
* Work around sudden disappearance of GdkRegion in GTK+ 2.90.5.Matthew Barnes2010-06-302-0/+4
* Bug #623029 - Work week days not restored on startMilan Crha2010-06-281-0/+3
* Bug #553104 - Ambiguous "for" in calendar translationsMilan Crha2010-06-252-12/+12
* Bug #621770 - Bottom-left calendar too bigMilan Crha2010-06-251-1/+1
* Bug #617854 - Critical warnings in calendar viewMilan Crha2010-06-251-2/+0
* Bug #611165 - Use memo start date from a calendar view, if activeMilan Crha2010-06-242-0/+57
* Bug #620246 - Increase size of 'group' combo box in taskMilan Crha2010-06-241-1/+2
* Bug 620951 - A11y support still thinks GnomeCalendar is a widgetMatthew Barnes2010-06-212-4/+0
* Coding style and whitespace cleanup.Matthew Barnes2010-06-202-8/+21
* Fix all remaining GTK3 issues.Matthew Barnes2010-06-163-15/+27
* Remove gnome-pilot integration.Matthew Barnes2010-06-1614-5846/+1
* Revert "Fix all remaining GTK3 issues."Matthew Barnes2010-06-153-27/+15
* Fix all remaining GTK3 issues.Matthew Barnes2010-06-153-15/+27
* Bug #573228 - Make the "This event has alarms" icon clickableMilan Crha2010-06-071-9/+28
* Coding style and whitespace cleanups.Matthew Barnes2010-06-075-310/+375
* Bug 620150 - EventEditor: Disconnect signal handlers before disposing modelMatthew Barnes2010-06-061-0/+2
* Fix orientations in task-page.ui.Matthew Barnes2010-06-061-295/+108
* More GTK3 preparation.Matthew Barnes2010-06-045-24/+59
* Bug 257776 - Import assistant shows wrong extension for vCalendar filesMatthew Barnes2010-06-031-1/+1
* Bug 617094 - System timezone label not initialized in preferencesMatthew Barnes2010-05-302-9/+15
* Bug 619417 - system_tz_label is not translated in cal-prefs-dialogGert Michael Kulyk2010-05-291-1/+1
* Bug 619637 - Inconsistent buttons in delete confirmation dialogsMatthew Barnes2010-05-291-14/+14
* Bug 619903 - Event editor is too small in express modeMatthew Barnes2010-05-291-2/+2
* CompEditor cleanup.Matthew Barnes2010-05-291-41/+24
* Fix a runtime warning on calendar startup.Matthew Barnes2010-05-282-6/+7
* Bug 619904 - Mnemonic issues in express modeMatthew Barnes2010-05-282-6/+6
* Install evolution-alarm-notify into bindir for windowsFridrich Štrba2010-05-281-0/+4
* [win32] Set a path in evolution-alarm-notify binary,Fridrich Štrba2010-05-281-0/+10
* Bug #313791 - Delegator can be repeated when delegating a meetingMilan Crha2010-05-283-55/+46
* Bug #248105 - No warning if you create an appointment in the pastMilan Crha2010-05-275-15/+161
* Refix bug #613798 - Marcus Bains line is greyMatthew Barnes2010-05-271-2/+0
* Coding style and whitespace cleanup.Matthew Barnes2010-05-275-21/+43
* Merge branch 'express2'Matthew Barnes2010-05-2723-229/+407
|\
| * Coding style and whitespace cleanup.Matthew Barnes2010-05-258-22/+27
| * Merge branch 'gnome-2-30' into express2Matthew Barnes2010-05-257-14/+58
| |\
| | * Bug #616889 - Force 24h format for locales not supporting 12h formatGert Michael Kulyk2010-05-211-0/+5
| | * Bug 594153 (3/3) - Allow setting alarms on any meetingJim Ramsay2010-05-191-0/+9
| | * Bug 594153 (2/3) - Allow setting alarms on any meetingJim Ramsay2010-05-191-4/+4
| | * Bug 594153 (1/3) - Allow setting alarms on any meetingJim Ramsay2010-05-195-13/+43
| | * Bug 617865 - Various data file cleanupsMatthew Barnes2010-05-181-1/+1
| * | Merge branch 'gnome-2-30' into express2Matthew Barnes2010-05-172-0/+5
| |\|
| | * Bug 618113 - Missing icon in alarm dialogMatthew Barnes2010-05-092-0/+5
| | * Bug #615384 - Use contact's free/busy URL only when not emptyHolger Mickler2010-04-271-0/+5
| | * include missing headerMichael Meeks2010-04-231-0/+1
| | * Initialize dbus threading to avoid loosing alarmsMichael Meeks2010-04-231-0/+1
| | * Remove 3 leftover references to non-existing librariesFridrich Štrba2010-04-231-4/+0
| * | don't setup the watch cursor if we have no attendees.Michael Meeks2010-05-101-0/+4
| * | Bug #615384 - Use contact's free/busy URL only when not emptyHolger Mickler2010-04-301-0/+5
| * | Remove 3 leftover references to non-existing librariesFridrich Štrba2010-04-301-4/+0
| * | Handle the side pane's date navigator size. Set a minimum size of 150pxSrinivasa Ragavan2010-04-271-1/+1
| * | Have (Work)Week view as default.Srinivasa Ragavan2010-04-271-1/+1
| * | Don't use gconf to store the names of widgets to hideFederico Mena Quintero2010-04-272-21/+10
| * | improve alarm debugging outputMichael Meeks2010-04-231-1/+2
| * | include missing headerMichael Meeks2010-04-231-0/+1
| * | Initialize dbus threading to avoid loosing alarmsMichael Meeks2010-04-231-0/+1
| * | fix dumb buffer overrunMichael Meeks2010-04-231-2/+5
| * | de-confuse debugging, two back-to-back ctime calls would overwriteMichael Meeks2010-04-231-10/+27
| * | Merge commit 'origin/gnome-2-30' into express2Michael Meeks2010-04-227-14/+45
| |\|
| | * Don't bundle 256x256 icon since it does not work anywayFridrich Štrba2010-04-201-0/+0
| | * Give the windows version of evolution-alarm-notify a nice win32 iconFridrich Štrba2010-04-203-2/+14
| | * Bug 596601 (bnc) - monitor system timezone changes in evolutionChenthill Palanisamy2010-04-164-12/+31
| | * Remove duplicate use_system_timezone pref, set default to trueSandy Armstrong2010-04-161-14/+2
| * | get window transience right for source copying error dialogs.Michael Meeks2010-04-201-6/+8
| * | Hide attendees boxSrinivasa Ragavan2010-04-191-1/+1
| * | Remove duplicate use_system_timezone pref, set default to trueSandy Armstrong2010-04-191-14/+2
| * | Re-work the over-complicated event editor as a tabbed notebook.Michael Meeks2010-04-195-54/+172
| * | Hide the 'Show appointment end times' option when in Express modeFederico Mena Quintero2010-04-181-1/+1
| * | Hide the options for Time Divisions when in Express modeFederico Mena Quintero2010-04-182-2/+2
| * | Hide the 'Scroll month view by a week' option when in Express modeFederico Mena Quintero2010-04-181-2/+2
| * | Combine the preferences widgets for week numbersFederico Mena Quintero2010-04-183-22/+5
| * | Remove /apps/evolution/calendar/date_navigator/show_week_numbersFederico Mena Quintero2010-04-183-22/+0
| * | Use a single /apps/evolution/calendar/display/show_week_numbersFederico Mena Quintero2010-04-183-9/+9
| * | Hack the row spacing of a single-row tableFederico Mena Quintero2010-04-181-0/+11
| * | Hook up the calendar's preferences in a sensible placeFederico Mena Quintero2010-04-181-4/+7
| * | Move the 12/24 hour widgets to the top of their sectionFederico Mena Quintero2010-04-171-43/+44
| * | Hide some calendar preferences in Express modeFederico Mena Quintero2010-04-161-0/+4
| * | Schema with calendar widgets to hide in Express modeFederico Mena Quintero2010-04-161-0/+20
| * | Give meaningful names to widgets in the calendar's General preferencesFederico Mena Quintero2010-04-161-5/+5
| * | cleanup for non-express modeMichael Meeks2010-04-152-5/+9
| * | Adapt the event editor for MeeGo / small-screen.Michael Meeks2010-04-152-13/+24
| * | Merge branch 'gnome-2-30' into express2Matthew Barnes2010-04-131-0/+2
| |\|
| | * Bug #611646 - Calendar shows recurring birthdays incorrectlyMilan Crha2010-04-131-0/+2
| * | Put the for-today/overdue tasks preferences in the same line, to save spaceFederico Mena Quintero2010-04-101-32/+31
| * | Fix mismatched quotes.Matthew Barnes2010-04-071-1/+1
| * | Move the day start / day end widgets to the same lineFederico Mena Quintero2010-04-071-45/+59
| * | Remove a superfluous row in a GtkTableFederico Mena Quintero2010-04-071-172/+95
| * | Add extensions to configure calender widgets.Matthew Barnes2010-04-0725-389/+51
| |/
| * Bug #592117 - Calendar compressed weekend print improvementpepp2010-04-021-5/+5
| * Bug #613352 - Changed time range not propagated to calendarMilan Crha2010-04-013-27/+172
| * Bug #612821 - Uses freed memory when changing task's sourceMilan Crha2010-04-011-4/+13
| * Bug #569945 - Recurrence icon not removed after changing to single eventMilan Crha2010-04-011-0/+1
* | Add tooltips for print button on CompEditor toolbar.Matthew Barnes2010-05-243-0/+11
* | Bug #616889 - Force 24h format for locales not supporting 12h formatGert Michael Kulyk2010-05-211-0/+5
* | Bug 594153 (3/3) - Allow setting alarms on any meetingJim Ramsay2010-05-191-0/+9
* | Bug 594153 (2/3) - Allow setting alarms on any meetingJim Ramsay2010-05-191-4/+4
* | Bug 594153 (1/3) - Allow setting alarms on any meetingJim Ramsay2010-05-195-13/+43
* | Bug #499320 - Preview before import from command lineMilan Crha2010-05-192-4/+514
* | Bug 617865 - Various data file cleanupsMatthew Barnes2010-05-181-1/+1
* | Bug #607257 - Add checks for event->comp_data != NULLMilan Crha2010-05-1410-34/+571
* | Bug #617496 - Critical warnings when open a taskMilan Crha2010-05-101-1/+1
* | Bug 618113 - Missing icon in alarm dialogMatthew Barnes2010-05-092-0/+5
* | Adapt to Camel API changes.Matthew Barnes2010-05-081-0/+1
* | Coding style and whitespace cleanup.Matthew Barnes2010-05-022-7/+12
* | Bug #609052 - Proper warning should be shown.Punit Jain2010-04-282-9/+9
* | Bug #614900 - Description field in calendar list view.Punit Jain2010-04-281-0/+1
* | Bug #615384 - Use contact's free/busy URL only when not emptyHolger Mickler2010-04-271-0/+5
* | include missing headerMichael Meeks2010-04-251-1/+2
* | Camel is now GObject-based.Matthew Barnes2010-04-242-3/+3
* | Initialize dbus threading to avoid loosing alarmsMichael Meeks2010-04-231-0/+1
* | Remove 3 leftover references to non-existing librariesFridrich Štrba2010-04-231-4/+0
* | Bug #360461 - Avoid markup in translatable messagesMilan Crha2010-04-231-33/+46
* | Don't bundle 256x256 icon since it does not work anywayFridrich Štrba2010-04-201-0/+0
* | Give the windows version of evolution-alarm-notify a nice win32 iconFridrich Štrba2010-04-203-2/+14
* | Adapt to libedataserverui API changes.Matthew Barnes2010-04-202-2/+6
* | Remove duplicate use_system_timezone pref, set default to trueSandy Armstrong2010-04-161-14/+2
* | Use accessor functions instead direct access (GSEAL work)Javier Jardón2010-04-135-11/+15
* | Bug #611646 - Calendar shows recurring birthdays incorrectlyMilan Crha2010-04-131-0/+2
* | Adapt to Camel API changes.Matthew Barnes2010-04-131-6/+9
* | Forgot to commit some bits.Matthew Barnes2010-04-081-0/+1
* | Giant leap towards GSEAL compliance.Matthew Barnes2010-04-0839-585/+875
* | Bug #571714 - Remove obsolete stringsMilan Crha2010-04-071-12/+0
* | Bug #567304 - Review strings for translationMilan Crha2010-04-077-107/+19
* | Adapt to Camel API changes.Matthew Barnes2010-04-041-1/+1
* | Generate ChangeLog files for tarball releases.Matthew Barnes2010-04-033-40453/+0
* | Remove dead Bonobo-era source files.Matthew Barnes2010-04-034-1189/+0
* | Only #include Camel's top-level header.Matthew Barnes2010-04-036-15/+5
* | Miscellaneous cleanup bits from WebKit branch.Matthew Barnes2010-04-021-6/+0
* | Bug #347330 - Mark forgotten strings for translationMilan Crha2010-04-021-1/+1
* | Bug #333039 - Merge some i18n stringsMilan Crha2010-04-022-11/+16
* | Bug #592117 - Calendar compressed weekend print improvementpepp2010-04-021-5/+5
* | Bug #325121 - Do not translate developer strings in g_param_spec_*Milan Crha2010-04-023-5/+5
* | Bug #261979 - Untranslatable string due to sentence splittingUshveen Kaur2010-04-021-1/+1
* | Bug #261062 - Do not translate untranslatable textsMilan Crha2010-04-021-1/+1
* | Bug #613352 - Changed time range not propagated to calendarMilan Crha2010-04-013-27/+172
* | Bug #612821 - Uses freed memory when changing task's sourceMilan Crha2010-04-011-4/+13
* | Bug #569945 - Recurrence icon not removed after changing to single eventMilan Crha2010-04-011-0/+1
* | Fix mismatched quotes.Matthew Barnes2010-03-291-1/+1
* | Bug 611882 - Missing mnemonics in Date/Time format preferencesMatthew Barnes2010-03-281-2/+2
* | Move the day start / day end widgets to the same lineFederico Mena Quintero2010-03-271-45/+59
* | Remove a superfluous row in a GtkTableFederico Mena Quintero2010-03-271-172/+95
* | Bug 613798 - Marcus Bains line is greyMatthew Barnes2010-03-243-2/+16
* | Add extensions to configure calender widgets.Matthew Barnes2010-03-2025-390/+51
|/
* Fix runtime warnings when opening calendar for the first timeMilan Crha2010-03-161-1/+1
* Revert some bad assumptions I made in EPluginUI.Matthew Barnes2010-03-163-6/+6
* Make the gconf schemas installation rules consistent in all Makefiles.amFridrich Strba2010-03-161-10/+12
* Actually respect the --disable-schemas-install configure optionFridrich Strba2010-03-151-0/+4
* Shell and UI manager cleanups.Matthew Barnes2010-03-144-7/+8
* improve locking for async query update, share code for object disposal,Michael Meeks2010-03-142-61/+78
* Fix GnomeCalendar lifecycle; not being a widget meant we didn'tMichael Meeks2010-03-142-11/+14
* More relocation cleanup EVOLUTION_ICONSDIR -> EVOLUTION_ICONDIRFridrich Strba2010-03-111-1/+2
* Clean up GalView and related classes.Matthew Barnes2010-03-112-2/+2
* Some more directories relocated on windowsFridrich Strba2010-03-112-0/+2
* Bug 612374 - Build failure due to recent GTK+ deprecationsMatthew Barnes2010-03-101-4/+7
* Update win32 directory relocation and some consistency cleanupFridrich Strba2010-03-101-1/+1
* Bug 611727 - Date navigator marks dates for inactive calendarsMatthew Barnes2010-03-101-0/+7
* Remove more unnecessary terminal messages.Matthew Barnes2010-03-101-3/+0
* tag-calendar.c cleanups.Matthew Barnes2010-03-101-49/+42
* Work around recent GTK+ deprecations.Matthew Barnes2010-03-0520-1/+153
* Bug #529331 - Deletes appointments when moving to the same calendarMilan Crha2010-02-253-3/+6
* Restore some calendar headers that got dropped.Matthew Barnes2010-02-251-0/+3
* Do less output on an evolution-alarm-notify consoleMilan Crha2010-02-233-9/+10
* Bug #602396 - Crashed on Reply to all in meeting pop up menuMilan Crha2010-02-221-2/+1
* Add DnD support to e-selection.c.Matthew Barnes2010-02-094-71/+51
* Coding style and whitespace cleanup.Matthew Barnes2010-02-089-170/+340
* Coding style and whitespace cleanup.Matthew Barnes2010-01-314-50/+50
* Improve sidebar and ECalModel interaction.Matthew Barnes2010-01-301-12/+36
* Sidebar cleanups for Memos and Tasks.Matthew Barnes2010-01-304-46/+0
* Remove a bunch of dead code in GnomeCalendar.Matthew Barnes2010-01-302-425/+0
* Revert "Without this evo 2.28.2 will not link/run at all"Matthew Barnes2010-01-293-59/+0
* Without this evo 2.28.2 will not link/run at allFridrich Strba2010-01-283-0/+59
* Bug 607566 - Cause calendar view widget to redraw when dates shown changedGustavo Noronha Silva2010-01-271-0/+1
* Expose ECalendarSelectorGustavo Noronha Silva2010-01-271-0/+1
* Make authentication functionality availableGustavo Noronha Silva2010-01-2715-28/+32
* Bug #607751 - Double free while copying whole calendarMilan Crha2010-01-271-3/+46
* Fix include paths for some files to also work when installedGustavo Noronha Silva2010-01-272-2/+2
* Remove a couple silly ECalModel functions.Matthew Barnes2010-01-256-35/+10
* Bug 607952 - "Hours" used as both singular and plural formsMatthew Barnes2010-01-251-1/+1
* Coding style and whitespace cleanups.Matthew Barnes2010-01-232-3/+8
* Bug 607572 - Date navigator should be synced with the GnomeCalendar upon set...Gustavo Noronha2010-01-221-0/+3
* Bug #606301 - Slow sort by subjectMilan Crha2010-01-205-111/+92
* Bug #390973 - Changing meeting organizer should also change default attendeeMilan Crha2010-01-182-2/+64
* Improve clipboard behavior.Matthew Barnes2010-01-186-26/+242
* Remove dead assignments found by clang.Matthew Barnes2010-01-1626-210/+44
* Also ship gnome-cal.h as a public headerGustavo Noronha Silva2010-01-151-0/+1
* Whitespace cleanup.Matthew Barnes2010-01-111-1/+1
* Cleanup delete actions in shell views.Matthew Barnes2010-01-116-401/+411
* Bug #605600 - Meeting reminders with wrong timesMilan Crha2010-01-091-3/+5
* Bug 606250 - Remove usage of deprecated GTK+ symbolsMatthew Barnes2010-01-086-8/+8
* Teach ETable to prefer themed icon names over pixbufs.Matthew Barnes2010-01-072-27/+8
* Bug #605645 - Crash on exit in calendar_view_disposeMilan Crha2010-01-061-41/+9
* Coding style and whitespace cleanup.Matthew Barnes2010-01-055-275/+301
* Kill e_popup_menu().Matthew Barnes2010-01-056-6/+0
* Coding style and whitespace cleanup.Matthew Barnes2010-01-0410-79/+106
* Compiler and linker flag cleanups.Matthew Barnes2009-12-285-7/+11
* Rename ECalendarTable to ETaskTable.Matthew Barnes2009-12-275-269/+268
* Coding style and whitespace cleanup.Matthew Barnes2009-12-264-6/+12
* Introduce ESelectable and EFocusTracker.Matthew Barnes2009-12-2613-841/+1101
* Bug #329693 - Add contexts to translated "None" wordsMilan Crha2009-12-246-7/+14
* Bug #342935 - Do not choose disabled accounts for meeting requestsMilan Crha2009-12-231-2/+31
* Bug #372921 - Meeting invites sent from wrong email accountMilan Crha2009-12-231-3/+13
* Bug #592117 - Calendar Day view All Day events print improvementspepp2009-12-231-11/+12
* Bug 604822 - Drop more alert titlesPaul Bolle2009-12-201-5/+0
* Coding style and whitespace cleanup.Matthew Barnes2009-12-203-4/+4
* Bug #499322 - Use extension for "Save as" suggested file nameMilan Crha2009-12-102-0/+21
* Bug #591938 - Update translator's commentsMilan Crha2009-12-102-10/+9
* Kill ETableScrolled.Matthew Barnes2009-12-086-723/+606
* Port all error code to use GObject-ified EAlert / EAlertDialogJonathon Jongsma2009-12-087-12/+12
* Rename EError to EAlert to match general use betterJonathon Jongsma2009-12-019-26/+25
* port calendar/ to the new EError APIJonathon Jongsma2009-12-017-15/+15
* Fixed bug 364618, solve the chinese character issue.Jeff Cai2009-11-305-41/+75
* Coding style and whitespace cleanups.Matthew Barnes2009-11-292-3/+3
* Bug #551603 - Special case "positive zero alarms"Paul Bolle2009-11-281-28/+34
* Bug #554779 - Removal of task due date does not sync from PalmMatt McCutchen 22009-11-271-1/+2
* Fix uninitialized variable from a patch for bug #591330 (yet another)Milan Crha2009-11-271-3/+1
* Fix uninitialized variable from a patch for bug #591330Milan Crha2009-11-271-0/+1
* Bug #591330 - Do not clear task preview every minuteMilan Crha2009-11-263-0/+115
* Bug #550025 - Add error dialogs for MeetingsPaul Bolle2009-11-263-5/+35
* Bug 602102 - [regression] evolution-alarm-notify segv on login to desktopChenthill Palanisamy2009-11-251-7/+7
* Remove the last traces of libglade.Matthew Barnes2009-11-211-2/+0
* Header file cleanup.Matthew Barnes2009-11-211-78/+131
* Kill Evolution's icon cache once and for all.Matthew Barnes2009-11-201-3/+0
* Assemble HTML code in a GString instead of a GtkHTMLStream.Matthew Barnes2009-11-202-185/+182
* Bug #602165 - Meeting window doesn't show status, role fieldsMilan Crha2009-11-182-11/+5
* Bug #602098 - No progress notification from GnomeCalendarMilan Crha2009-11-185-24/+70
* Remove markup from translatable strings in ui filesClaude Paroz2009-11-174-33/+68
* Bug 360461 - Do not hardcode invisible_char in ui filesClaude Paroz2009-11-174-9/+0
* Bug 589153 - Use GtkBuilder instead of libgladeMatthew Barnes2009-11-1748-7813/+7584
* Bug #602081 - Calendar purge doesn't seem to workMilan Crha2009-11-161-17/+10
* Bug #600133 - Crash on day view print preview without all day eventsMilan Crha2009-11-131-28/+35
* Simplify clipboard handling in addressbook.Matthew Barnes2009-11-126-404/+3
* Simplify clipboard handling in calendar.Matthew Barnes2009-11-126-239/+489
* Enable building without Canberra-GTKTor Lillqvist2009-11-111-0/+5
* Kill more redundant save dialogs and related utilities.Matthew Barnes2009-11-114-202/+0
* Bug #601218 - Accepted meeting doesn't show attachments in calendar viewMilan Crha2009-11-101-1/+8
* Kill e-cursor(s) (both of them).Matthew Barnes2009-11-101-3/+16
* Bug 601219 - Transient dialogs in composer window blocks main windowMatthew Barnes2009-11-101-0/+15
* Bug #596827 - Don't remove meeting attendees after editMilan Crha2009-11-042-3/+25
* Bug #599627 - Crash when adding a new task in a tableC de-Avillez2009-11-031-6/+2
* Prefer G_N_ELEMENTS over sizeof calculations.Matthew Barnes2009-10-273-12/+10
* Prefer GQueue (or GNode) over EDList.Matthew Barnes2009-10-271-1/+1
* Coding style and whitespace cleanups.Matthew Barnes2009-10-241-5/+4
* Bug #596860 - Duplicate event gets shown in calendar viewMilan Crha2009-10-161-0/+5
* Bug #555901 - Preserve Start/End/Due timezone when editing in list viewMilan Crha2009-10-164-120/+72
* Bug #322261 - vCalendar replies are sent out using the default accountMilan Crha2009-10-161-12/+25