Commit Graph

1689 Commits

Author SHA1 Message Date
Alex Roitman
b840180846 * src/events.png, src/repos.png, src/repos24.png: Add GNOME icons
for the stock calendar and drawer.
* src/events24.png: Update small icon.
* src/gramps.glade: Use new icons for the Event View and
Repository View side bar buttons. Add small icons to the main
notebook tabs.


svn: r4822
2005-06-14 13:45:09 +00:00
Alex Roitman
96d8bc1dc8 * src/ChooseParents.py: Correct use of types; Use family relations
between parents; Use EventRef for birth; Remove obsolete code.
* src/gramps.glade (familyDialog): Typo in widget name.


svn: r4816
2005-06-09 01:54:11 +00:00
Alex Roitman
20eeda40e8 * src/AutoComp.py (StandardCustomSelector.__init__): Compare
active_key to None.
* src/gramps.glade (marriageDialog): Remove displayed strings from
the Sttributes tab.
* src/Marriage.py: Delegate attribute handling to ListBox.
* src/ListBox.py (AttrListBox): Support both personal and family
attributes.


svn: r4815
2005-06-09 01:18:03 +00:00
Alex Roitman
c0590d4e7e * src/gramps.glade: Minor update.
svn: r4814
2005-06-08 21:22:32 +00:00
Alex Roitman
30168ace63 * src/EditPerson.py: Commit events, since there may be changes
made no in the editor.
* src/EventEdit.py: Use combined mapping for all events.
* src/FamilyView.py: Proper display of child relations.
* src/Marriage.py: Commit events; properly call common event/ref
editor.
* src/Utils.py: Minor.


svn: r4813
2005-06-08 21:17:18 +00:00
Martin Hawlisch
7f76c26a59 * src/EditPerson.py: Make gender guessing work again
svn: r4812
2005-06-08 21:12:32 +00:00
Alex Roitman
35935f491f * src/gramps.glade (Marriage): Re-work dialog similar to EditPerson.
* src/Utils.py (family_event_roles): Add mapping.
* src/RelLib.py (EventRef): Add FAMILY role.
* src/Marriage.py: Start using Listbox, so far for Events only.
* src/ListBox.py: Support both person and family primaries.
* src/EventEdit.py: Support both person and family primaries.
* src/EditPerson.py (on_apply_person_clicked): Do not commit
event, as this is done in the editor.


svn: r4809
2005-06-08 18:47:55 +00:00
Alex Roitman
778000cd38 * src/EventView.py (Module): Remove extra column.
* src/EventEdit.py (EventEditor.__init__): Remove obsolete code.


svn: r4808
2005-06-08 16:32:13 +00:00
Alex Roitman
d4705aeb25 * src/gramps_main.py (init_interface): Set proper color for new icons.
* src/gramps.glade (gramps): Label new buttons, left-align labels.
* src/GrampsDbBase.py (get_event_column_order): Show date column.
* src/EventView.py (Module): Add "Last Changed" column; do not
hard-code handle column.
* src/DisplayModels.py (EventModel.__init__): Switch column order.


svn: r4807
2005-06-08 15:50:19 +00:00
Martin Hawlisch
97642f79f6 * src/gramps_main.py (column_order): add Repository View; (init_interface): Remove unneeded callback
svn: r4806
2005-06-08 15:37:44 +00:00
Martin Hawlisch
ac91138900 * src/EventView.py (column_names): Add missing column
* src/RepositoryView.py (column_names): Add missing columns
* src/GrampsDbBase.py: fix column_order methods
* src/DisplayModels.py (RepositoryModel): Remove parish column because it is not editable anyway


svn: r4805
2005-06-08 15:35:31 +00:00
Alex Roitman
4575a43faa * src/RelLib.py (add_parent_family_handle,
change_parent_family_handle): Correct the docstring to reflect
tuple relationships.


svn: r4804
2005-06-08 14:02:45 +00:00
Alex Roitman
6408226085 * src/ChooseParens.py: Support for (int,str) relationships.
* src/FamilyView.py (new_child_after_edit): Use tuple relationships.
* src/SelectChild.py: Support for (int,str) relationships.
* src/gramps.glade (selec_child,modparents,familyDialog): Replace
ComboBoxes with ComboBoxEntries.


svn: r4803
2005-06-08 13:41:51 +00:00
Alex Roitman
f4d4c73129 * src/gramps.glade (selecty_person): Change positioning; add icon.
* src/edit_person.glade (event_tab): Correct tooltips.
* src/SelectEvent.py: Add to CVS.
* src/Makefile.am: Ship SelectEvent.py file.
* src/SelectChild.py (build_list): Use mapping from Utils.
* src/ReadGrdb.py (importData): Properly copy event table.
* src/ListBox.py: Properly fill in the Combo maps without
collisions; Add Role to the EventListbox; Support selecting an
existing Event object.
* src/GrampsInMemDB.py: Support for event id table.
* src/GrampsDbBase.py: Support for event id table.
* src/GrampsBSDDB.py: Support for event id table; emit
event-delete signal when events are deleted.
* src/EventView.py: Support deleting events.
* src/EventEdit.py: Support deleting events; Proper adding events.


svn: r4801
2005-06-08 04:40:33 +00:00
Martin Hawlisch
16723828fd * various: const to RelLib transitition.
svn: r4800
2005-06-07 19:22:10 +00:00
Alex Roitman
5b1feeff12 * src/EventView.py (build_columns): Do not artificially create
an extra column.


svn: r4798
2005-06-07 13:53:46 +00:00
Alex Roitman
f2cf13f469 * src/DisplayModels.py: Support for event view.
* src/EventEdit.py: Commit event on OK.
* src/GrampsDbBase.py: Event column order and event cursor.
* src/GrampsInMemDB.py: Event cursor.
* src/gramps.glade: Event View, rework buttons.
* src/gramps_main.py: Event View support.
* src/EventView.py: Add to CVS.
* src/Makefile.am: Ship EventView.


svn: r4797
2005-06-07 05:08:50 +00:00
Alex Roitman
0d9a076141 * src/AttrEdit.py: proper type selector support.
* src/AutoComp.py (by_value): Use locale-aware sorting.
* src/EditPerson.py: Support select button for the event tab.
* src/EventEdit.py (EventRefEditor): Editor for both events and
event refs.
* src/ListBox.py: Support for select button; Proper removal of
entries; Proper Event/ref editing support; fixes for combos.
* src/NameEdit.py: Typo.
* src/edit_person.glade: Add select button to the event tab.
* src/gramps.glade: Add new editor for both events and refs.


svn: r4796
2005-06-06 23:50:33 +00:00
Alex Roitman
b1db9871c3 * src/DateHandler.py: Fix typo caught in gramps20 branch.
svn: r4793
2005-06-05 17:26:30 +00:00
Alex Roitman
e651cfd29f * src/RelLib.py (Event): Add a list to store external witnesses.
svn: r4787
2005-06-05 05:16:27 +00:00
Julio Sánchez
5ead07af98 * src/po/es.po: version merge fix
svn: r4786
2005-06-05 05:11:32 +00:00
Alex Roitman
4a642b4e8d Merge changes between 2.0.1 and 2.0.2 with the main trunk
svn: r4785
2005-06-05 04:01:56 +00:00
Don Allingham
af5df18bcd * src/AttrEdit.py: support get_type/set_type in dropdown menu
* src/EditPerson.py: remove items properly based off EventRef


svn: r4781
2005-06-04 02:54:59 +00:00
Don Allingham
271f9d6a8b event/name type fixes
svn: r4780
2005-06-03 22:38:14 +00:00
Martin Hawlisch
118e7dd628 * src/EditSource.py (ReposRefListView): Display repository type as text
svn: r4773
2005-06-03 14:18:06 +00:00
Martin Hawlisch
6af02b72af * src/DisplayModels.py (RepositoryModel): Display repository type as text
* src/RelLib.py (Repository): Serialize type as tuple not unicode


svn: r4767
2005-06-03 10:02:50 +00:00
Don Allingham
aa942771ea * src/DisplayModels.py: Handle EventRefs properly
* src/FamilyView.py: handle relationship types
* src/ReadXML.py: start of upgrade process
* src/RelLib.py: ROLE_PRIMARY -> PRIMARY


svn: r4765
2005-06-03 04:34:21 +00:00
Alex Roitman
e1c3cb3989 * src/RelLib.py (Family.set_relationship): Update doc string.
svn: r4763
2005-06-03 04:18:38 +00:00
Alex Roitman
a13ae8e96d * src/ListModel.py: Check for the list to be long enough.
* src/gramps.glade: Replace ComboBox with ComboBoxEntry; remove
unneeded scrollwed window (caused warning).


svn: r4757
2005-06-02 13:23:20 +00:00
Don Allingham
ea089b6b25 * src/gramps.glade:
svn: r4756
2005-06-02 04:44:51 +00:00
Don Allingham
015d602722 * src/EditPerson.py: Start event_ref integration
* src/EventEdit.py: Start event_ref integration
* src/ListModel.py: Start event_ref integration
* src/PersonModel.py: Start event_ref integration
* src/ListBox.py: Start event_ref integration


svn: r4754
2005-06-02 03:20:42 +00:00
Alex Roitman
4e8e4ee636 * various: More support for event refs.
svn: r4753
2005-06-01 20:45:45 +00:00
Alex Roitman
f242e619e0 * src/AutoComp.py (StandardCustomSelector): Provide an option to
use an existing ComboBoxEntry instance; add set_values method.
* src/RelLib.py (Family.__init__): Use tuple for type.
* src/Utils.py: Add event_roles mapping.
* src/AddSpouse.py, src/EditPerson.py, src/FamilyView.py,
src/ListBox.py, src/Marriage.py, src/NameEdit.py: Support tuple
types.
* src/gramps.glade: Replace ComboBox with ComboBoxEntry; add icons.


svn: r4748
2005-06-01 13:14:29 +00:00
Martin Hawlisch
d8e28d4c4c * src/EditSource.py, src/ListBox.py, src/ReadGedcom.py, src/WriteGedcom.py: Constants moved from const to Utils and RelLib
svn: r4746
2005-05-31 19:36:28 +00:00
Alex Roitman
7db59a7cab * src/AutoComp.py (StandardCustomSelector): Add autocompletion.
svn: r4745
2005-05-31 18:40:17 +00:00
Alex Roitman
476fdeafb7 * src/RelLib.py (Witness): Remove class, as it is obsoleted by the
EventRef class.


svn: r4744
2005-05-31 18:34:14 +00:00
Alex Roitman
74e71e5df5 * src/AutoComp.py (StandardCustomSelector): Add class to handle
(int,str) selections including custom strings.


svn: r4741
2005-05-31 18:17:38 +00:00
Alex Roitman
3a53aeda5d * src/RelLib.py: Move constants back to RelLib, as class attributes.
* src/Utils.py: Move constant mappings from const.py.in.
* src/const.py.in: Move constants and mappings elsewhere.
* various: Use constants from RelLib, not const.

* src/RelLib.py: Fix (int,str) types.

* src/GrampsBSDDB.py (upgrade_7): Handle case of not set default person


svn: r4737
2005-05-30 21:38:09 +00:00
Martin Hawlisch
a766caa5b9 * src/src/GrampsBSDDB.py (upgrade_7): Handle case of not set default person
svn: r4735
2005-05-30 15:25:17 +00:00
Alex Roitman
88593afd19 * src/RelLib.py: Delegate event handle reference lookup from
Person to EventRef class; (RepoRef.get_handle_referents): Remove
unneeded method (inherited from BaseObject).


svn: r4729
2005-05-28 16:21:58 +00:00
Alex Roitman
2c6f08b9e3 * src/GrampsBSDDB.py (upgrade_7): Enforce str for the default handle.
svn: r4726
2005-05-28 06:35:15 +00:00
Martin Hawlisch
bb50c0f5df * src/const.py.in: Replace static definition of lds_temple_to_abrev by dynamic generation from lds_temple_codes so they need to be defined only once.
svn: r4723
2005-05-27 21:39:39 +00:00
Martin Hawlisch
bcf7649b87 * src/gramps.glade: Add ScrolledWindow to RepositoryView to make it look like Source and Place View.
svn: r4722
2005-05-27 21:10:37 +00:00
Martin Hawlisch
c980a56abe * src/RelLib.py: Move constants from RelLib to const
* src/plugins/TestcaseGenerator.py: Move constants from RelLib to const


svn: r4721
2005-05-27 20:59:59 +00:00
Alex Roitman
28f5eb383f * src/ChooseParents.py: Fix constants.
* src/FamilyView.py: Fix constants.
* src/PedView.py: Fix constants.
* src/ReadGedcom.py: Fix constants.
* src/ReadXML.py: Fix constants.
* src/SelectChild.py: Fix constants.
* src/WriteXML.py: Fix constants.


svn: r4718
2005-05-27 20:32:33 +00:00
Alex Roitman
f1e31b8270 * src/const.py.in: Get rid of TransTable use in favor of int contsants.
* src/GrampsBSDDB.py (upgrade_2): Use proper constants.
* src/RelLib.py: Move constants out to const.py.in.


svn: r4716
2005-05-27 20:09:28 +00:00
Martin Hawlisch
9eaf68f135 update
svn: r4715
2005-05-27 19:37:55 +00:00
Alex Roitman
62b8e334af * src/GrampsBSDDB.py (upgrade_*): Use transaction for commits.
svn: r4713
2005-05-27 19:14:20 +00:00
Alex Roitman
5610229889 Merge SOUR_REPO branch with main trunk
svn: r4712
2005-05-27 17:43:04 +00:00
Alex Roitman
557638b510 * src/const.py.in: Define integer constants for standard events.
svn: r4707
2005-05-27 14:04:53 +00:00
Martin Hawlisch
8d2be247db * src/plugins/TestcaseGenerator.py: Support for event references.
svn: r4705
2005-05-27 13:48:47 +00:00
Martin Hawlisch
7454281990 * src/EditPerson.py: typo
svn: r4704
2005-05-27 11:23:46 +00:00
Martin Hawlisch
9dc724d32f * src/RelLib.py: Add wrappers for old event handle API including a DeprecationWarning (this makes HEAD no longer completely defunct); Add checks for EventRef class type
svn: r4703
2005-05-27 09:47:31 +00:00
Alex Roitman
50ac810074 * src/EditPerson.py: Support for event references.
* src/FamilyView.py: Support for event references.
* src/ListBox.py: Support for event references.
* src/PedView.py: Support for event references.
* src/RelLib.py: Support for event references.


svn: r4700
2005-05-27 05:07:26 +00:00
Alex Roitman
2ef5c5bfd2 * src/RelLib.py (EventRef): Add class.
svn: r4693
2005-05-26 21:03:24 +00:00
Martin Hawlisch
e4c5d452de * src/PedView.py (rebuild_trees): Resize matching is now done later by idle callback; (add_table_to_notebook): Work with PyGtk < 2.4;(format_relation): Adapt format to availably space.
svn: r4685
2005-05-26 06:33:48 +00:00
Martin Hawlisch
bce9cf71b9 * src/plugins/TestcaseGenerator.py: Add place, media and source references.
svn: r4684
2005-05-26 05:48:14 +00:00
Alex Roitman
d9c8ebef56 * src/EditPlace.py: WATCH cursor and temp label for References tab.
* src/EditSource.py: Improve manipulating notebook tab labels.
* src/Utils.py (temp_label): Add function;
(bold_label,unbold_label): Properly set cursor to default.
* src/gramps.glade (event editor, source editor, place editor):
Add icons to notebook tabs.


svn: r4683
2005-05-26 05:04:36 +00:00
Richard Taylor
06913ac261 2005-05-25 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
* src/plugins/ScratchPad.py: disabled search because it does not do
		  what the user expects.


svn: r4671
2005-05-25 07:24:39 +00:00
Richard Taylor
4cb7fdabd0 fix ScratchPad window close bug.
svn: r4670
2005-05-25 06:56:41 +00:00
Alex Roitman
8a2270ff07 * src/EditSource.py (__init__): set cursor to WATCH before displaying
references; call display_references when idle;
(display_references): set cursor to LEFT_PTR when done.
* src/ListModel.py (__init__): Typo.
* src/Utils.py (bold_label,unbold_label): make work with both
labels and their parent containers.


svn: r4669
2005-05-25 05:09:11 +00:00
Don Allingham
6d002fb835 conflict resolution
svn: r4668
2005-05-25 03:58:27 +00:00
Martin Hawlisch
7da67a91a3 * src/plugins/PHPGedViewConnector.py: Enhanced version.
svn: r4667
2005-05-24 21:39:49 +00:00
Alex Roitman
ce05310959 Merge from 2.0.1
svn: r4666
2005-05-24 13:08:06 +00:00
Don Allingham
16b52bcb0f * configure.in: bump up verison number to 2.1.0
svn: r4610
2005-05-18 03:42:01 +00:00
Julio Sánchez
db0780e453 * src/po/es.po: remerge from 2.0.0
svn: r4556
2005-05-11 19:25:32 +00:00
Don Allingham
5ceb929937 * src/EditPerson.py: remerge from 2.0.0
svn: r4553
2005-05-11 17:25:14 +00:00
Alex Roitman
69287c81f8 Merge changes made in gramps20 into HEAD
svn: r4549
2005-05-11 14:04:47 +00:00
Don Allingham
7178dc86d7 * src/gramps_main.py: fix beta warning dialog
svn: r4499
2005-05-07 02:41:08 +00:00
Don Allingham
19a362f865 * src/ListBox.py: added to CVS
* src/Makefile.am: added ListBox.py


svn: r4470
2005-05-03 11:50:33 +00:00
Don Allingham
9b7fe2ab46 * src/EditPerson.py: start of new gallery
* src/ImageSelect.py: start of new gallery
* src/Witness.py: fix listmodel
* src/const.py.in: LDS temple names
* src/edit_person.glade: start of new gallery


svn: r4465
2005-05-03 04:06:03 +00:00
Don Allingham
f844fb5bf1 * src/const.py.in: convert Alternate Birth and Alternate Death to
Birth and Death


svn: r4448
2005-05-01 04:22:08 +00:00
Don Allingham
f1bdbd1ebd * src/EditPerson.py: Add support for inline editing
* src/EventEdit.py: Don't commit events here - should be commited
elsewhere
* src/ListModel.py: Add support for table callback functions
to update data after inline editing


svn: r4447
2005-04-30 23:45:17 +00:00
Alex Roitman
3fe467503f * src/edit_person.glade: Compact name edit button.
* src/EditPerson.py: remove dead logic for birth/death editing,


svn: r4446
2005-04-29 15:52:06 +00:00
Martin Hawlisch
f4ee9a4418 * src/plugins/PHPGedViewConnector.py, src/plugins/phpgedview.glade: New files. Start of a client interface for phpGedView. unfinished. Put them in CVS to not loose them.
svn: r4445
2005-04-29 15:45:34 +00:00
Don Allingham
7a6dc34425 fix some eventlist handling errors
svn: r4442
2005-04-28 22:21:20 +00:00
Don Allingham
de0ab260d4 * src/EditPerson.py: rewrite of tabbed lists
* src/EventEdit.py: bold the label
* src/ListModel.py: allow column types to be specified
* src/edit_person.glade: tab improvements


svn: r4437
2005-04-28 04:48:30 +00:00
Martin Hawlisch
32aae7d0e7 * src/StartupDialog.py (__init__): Catch Schema errors
svn: r4436
2005-04-27 19:48:24 +00:00
Martin Hawlisch
62af2a64fc * src/gramps_main.py (__init__): Avoid TypeError in schema error message
svn: r4434
2005-04-27 18:30:57 +00:00
Alex Roitman
9c92bf317f Merge changes made in gramps20 into HEAD
svn: r4431
2005-04-26 16:04:21 +00:00
Martin Hawlisch
1493ed9ee1 * src/PedView.py: Removed navigation buttons in flavour of a menu
svn: r4430
2005-04-26 13:53:25 +00:00
Don Allingham
5a620927b6 * src/ListModel.py: keep track of data index
* src/EventEdit.py: use new label scheme for tabs that uses an
icon to indicate used tabs


svn: r4410
2005-04-24 03:39:07 +00:00
Don Allingham
1b1291065a * src/AddrEdit.py: use new label scheme for tabs that uses an
icon to indicate used tabs
* src/AttrEdit.py: use new label scheme for tabs that uses an
icon to indicate used tabs
* src/NameEdit.py: use new label scheme for tabs
* src/Date.py: incorporate instance check form gramps20 branch
* src/EditPerson.py: add additional fields for name edit, handle
lds page better, adapt to new label scheme
* src/GrampsDbBase.py: fix typos
* src/GrampsGEDDB.py: fix undo handling
* src/GrampsInMemDB.py: fix undo handling
* src/GrampsXMLDB.py: fix undo handling
* src/PeopleView.py: don't reselect an already selected person
* src/Utils.py: new tab scheme
* src/edit_person.glade new tab scheme
* src/gramps_main.py: 1->True, 0->False replacements
* src/DbPrompter.py: bring up to date with gramps20 branch
* src/DisplayModels.py: bring up to date with gramps20 branch
* src/ReadGedcom.py: bring up to date with gramps20 branch
* src/Relationship.py: bring up to date with gramps20 branch


svn: r4406
2005-04-23 15:53:30 +00:00
Martin Hawlisch
7e102285e4 * src/GrampsDbBase.py (_find_from_handle,find_object_from_handle,
find_place_from_handle): Fix typo


svn: r4405
2005-04-23 06:56:05 +00:00
Martin Hawlisch
c1e1f31ace * GenericFilter.py: Don't crash on corrupt database
svn: r4382
2005-04-19 19:34:22 +00:00
Martin Hawlisch
1d6ec38629 * src/GrampsDbBase.py (create_id): Use sys.maxint to get the maximum possible integer number
svn: r4377
2005-04-19 14:47:02 +00:00
Martin Hawlisch
9bd9116204 * src/PedView.py: Replaced gnome canvas by an implementation that uses gtk+ only. Still incomplete.
* src/gramps_main.py: Removed canvas specific calls of the PedView


svn: r4376
2005-04-19 11:40:16 +00:00
Don Allingham
4dfc846191 * src/edit_person.glade: re-add edit_person.glade
* src/EditPerson.py: start of new EditPerson dialog
* src/ListModel.py: enhancements for the start of inline editing
* src/Makefile.am: add edit_person.glade
* src/ReadXML.py: commit transactions properly
* src/const.py.in: add edit_person.glade back in


svn: r4375
2005-04-19 04:20:17 +00:00
Don Allingham
e063c81249 * src/GrampsBSDDB.py: actually perform the commits during the
transaction_commit task, instead of the commit_* tasks
* src/GrampsInMem.py: actually perform the commits during the
transaction_commit task, instead of the commit_* tasks
* src/GrampsDbBase.py: actually perform the commits during the
transaction_commit task, instead of the commit_* tasks


svn: r4370
2005-04-17 22:34:56 +00:00
Eero Tamminen
958e07cace fix typo
svn: r4369
2005-04-17 19:27:54 +00:00
Eero Tamminen
315367e81d fix typos
svn: r4368
2005-04-17 17:48:42 +00:00
Martin Hawlisch
1f96107362 * src/plugins/WebPage.py (dump_gendex): Files are named by GRAMPS ID; Alway print fields for birth/death; Fixed typo in DateHandler
svn: r4367
2005-04-16 12:16:56 +00:00
Don Allingham
350ed9e36d * src/plugins/Check.py: loop through family relationships until all
problems are resolved


svn: r4364
2005-04-15 04:50:15 +00:00
Don Allingham
5617c42d2c * src/FamilyView.py: make load_family more robust to signals
svn: r4363
2005-04-14 20:43:14 +00:00
Martin Hawlisch
79af9bdb0c * src/gramps_main.py (undo): Dont emit "database-changed"
* src/plugins/plugins/TestcaseGenerator.py: Added option to generate a new transaction for every change on the database. Useful for UNDO and signal testing.


svn: r4361
2005-04-14 13:18:20 +00:00
Don Allingham
c289f6c04b * src/EditSource.py: allow double click on reference to bring up the referece
editor
* src/EventEdit.py: don't require a callback
* src/ImageSelect.py: horrible hack for handling removing parent windows.
Alex: HELP!


svn: r4360
2005-04-14 00:26:38 +00:00
Don Allingham
2059945bc6 * src/gramps_main.py: check for reentrancy into the undo handler
svn: r4359
2005-04-13 22:04:52 +00:00
Don Allingham
223c363a47 * src/plugins/WebPage.py: fixed check on dialog run() return value,
changed deprecated gtk.mainiteration to gtk.main_iteration


svn: r4358
2005-04-13 18:16:20 +00:00
Don Allingham
87bf5fa71a * src/WriteGedcom.py: fixed problem with skipping events
svn: r4357
2005-04-13 17:29:52 +00:00
Don Allingham
398985027a * src/FamilyView.py: commit family before people when committing
new spouse.


svn: r4355
2005-04-13 02:46:19 +00:00