Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,942 Commits 28 Branches 95 Tags 527 MiB
bcae939e84
Commit Graph

9996 Commits

Author SHA1 Message Date
Peter Landgren
e328d7473b Fix of issue 5282, white spaces should be kept. 
svn: r18253
 2011-10-06 16:49:31 +00:00
Rob G. Healey
c36fa756e4 Fixed the map zoomlevel for Family Maps. The map was zoomed in so far that the Family Links were not being shown. 
svn: r18249
 2011-10-04 04:39:10 +00:00
Stéphane Charette
66576a4209 bump gramps33 branch version to 3.3.2 
svn: r18237
 2011-10-02 05:28:56 +00:00
Michiel Nauta
8f8ebf2012 4927: Narrated Web test - layout 
svn: r18199
 2011-09-24 07:52:38 +00:00
Michiel Nauta
15649b4d1a 4937: Clipboard - unable to added second source 
svn: r18192
 2011-09-21 19:14:30 +00:00
Michiel Nauta
0374c99a33 5246: NarWeb crash when using Family Links option for maps with a place with invalid lat/long 
svn: r18190
 2011-09-21 13:45:41 +00:00
Michiel Nauta
6096cd9a41 5029: Attributes in websites; again, Nebraska en Visually stylesheets 
svn: r18188
 2011-09-21 12:21:52 +00:00
Jérôme Rapinat
4a4b66be9f update list to 3.3 ... 
svn: r18177
 2011-09-20 14:20:41 +00:00
Rob G. Healey
02840b9cb5 Make a few modifications to IndividualPage() Family Section's Attributes and LDS Ordinance. 
svn: r18170
 2011-09-18 04:32:13 +00:00
Michiel Nauta
85db1564bb 5029: again, add attribute table in family infolist table cell 
svn: r18162
 2011-09-14 11:41:26 +00:00
Michiel Nauta
4f9117e14b 5063: again, rewritten Mainz stylesheet 
svn: r18161
 2011-09-13 21:50:00 +00:00
Rob G. Healey
c6a6c972bd Bug#5029; Attributes in Websites... Moved family attributes into the family section of IndividualPage(). 
svn: r18157
 2011-09-13 02:36:25 +00:00
Michiel Nauta
610449b58c 5227: NarWeb, multiple persons are not seperated by comma 
svn: r18153
 2011-09-11 20:27:58 +00:00
Michiel Nauta
202405d748 5226: again, husband and wife links 
svn: r18149
 2011-09-11 10:55:44 +00:00
Michiel Nauta
213a4cd942 5226: NarWeb, family events don't list persons on event page and event list page 
svn: r18147
 2011-09-11 10:33:41 +00:00
Michiel Nauta
ea309b3c53 5225: again, place page title 
svn: r18145
 2011-09-11 08:09:45 +00:00
Michiel Nauta
aa2d2bb309 5225: NarWeb, map page title misses and event page title is strange 
svn: r18138
 2011-09-09 22:03:05 +00:00
Michiel Nauta
992f862c32 5224: NarWeb, associations table appends 1 to person name 
svn: r18136
 2011-09-09 21:09:24 +00:00
Michiel Nauta
fc6732c949 5223: NarWeb, first image thumbnail description errors 
svn: r18134
 2011-09-09 20:27:16 +00:00
Michiel Nauta
0598a33ee2 4305: again for mimeless images 
svn: r18132
 2011-09-09 19:32:04 +00:00
Michiel Nauta
281ebad8c2 5209: Narrated Web Site - Mainz - Year At A Glance - Rendering Error 
svn: r18130
 2011-09-09 19:09:44 +00:00
Michiel Nauta
2501ea0704 5222: WebCal, days of next month not greyed out 
svn: r18128
 2011-09-09 18:52:01 +00:00
Jérôme Rapinat
2040d729b6 4400: add chinese date handler for testing (not enabled on Makefile.am, see __init__.py and DateHandler.py) 
svn: r18121
 2011-09-07 12:41:33 +00:00
Nick Hall
368d2432d5 5012: Move custom rule configuration file into the version directory and provide upgrade from previous version 
svn: r18114
 2011-09-06 14:42:33 +00:00
Peter Landgren
fcf3cf7f40 Fix of first issue in 5194. 
svn: r18106
 2011-09-03 11:27:09 +00:00
Nick Hall
33d8ac0fa0 5112: Fix error when moving empty surname row 
svn: r18101
 2011-09-02 20:09:55 +00:00
Brian Matherly
5f629d221e Patch from Nick Hall - 0005193: Web Calendar report gives an error for the default style sheet. 
svn: r18098
 2011-09-02 01:43:36 +00:00
Nick Hall
221087f01d 5191: Remove family heading when the active person has no families 
svn: r18088
 2011-08-30 18:35:29 +00:00
Michiel Nauta
1c03354f25 5151: Latin American surname guessing fails 
svn: r18084
 2011-08-29 19:06:59 +00:00
Michiel Nauta
845883ac90 3963: Webreport, Individual's side, bug in event's note 
svn: r18079
 2011-08-27 10:09:11 +00:00
Michiel Nauta
16cb40dfb6 3893: [NarWeb] Narrated Website does not export all sources 
svn: r18077
 2011-08-27 10:02:17 +00:00
Michiel Nauta
3c2a6fed35 4523: WebCal generates wrong path slash -\ instead of / 
svn: r18075
 2011-08-27 09:52:31 +00:00
Michiel Nauta
7610af42db 4486: Validate webpages again, single parent families 
svn: r18073
 2011-08-27 09:44:20 +00:00
Nick Hall
03919314c5 5108: Fix bug in context menu when no database is connected 
svn: r18066
 2011-08-25 20:48:53 +00:00
Michiel Nauta
623f59d5ad 4486: NarrativeWeb does not validate 
svn: r18065
 2011-08-25 20:48:41 +00:00
Kees Bakker
e0a98019ee Bugfix for 5146 and 5106 - ImportProGen fails on Windows because some files 
must be read as "binary".


svn: r18058
 2011-08-23 20:01:03 +00:00
Kees Bakker
ff951f3f52 Comment out set_patronymic in ImportProGen plugin. This is a temporary measure 
and we have to see how many PG30 users actually want it.


svn: r18057
 2011-08-23 19:58:29 +00:00
Michiel Nauta
a6c67d07bf 4305: p element in W3 compliance 
svn: r18049
 2011-08-19 19:11:42 +00:00
Michiel Nauta
658cee2587 5159: Import of xml file with note linking to duplicate object points to original object 
svn: r18039
 2011-08-16 20:32:17 +00:00
Michiel Nauta
737594d43e 5140: Import of Gramps XML file with cross table duplicate handles crashes 
svn: r18037
 2011-08-16 20:07:28 +00:00
Brian Matherly
89a4032499 Additional changes for 0004605: Multiple improvements for LaTeX output (patch from Harald Rosemann) 
svn: r18034
 2011-08-14 14:11:24 +00:00
Michiel Nauta
9ac8ef272b Use correct thumbnail for unthumbnailable images, see bug 5017 
svn: r18029
 2011-08-11 20:01:28 +00:00
Serge Noiraud
fb0095ca72 Geography : first try to solve bug 5053. 
svn: r18025
 2011-08-11 07:51:17 +00:00
Brian Matherly
85fd6b0886 0004605: Multiple improvements for LaTeX output (patch from Harald Rosemann) 
svn: r18022
 2011-08-10 04:07:31 +00:00
Michiel Nauta
4e85f80613 5145: attempted deletion stopped 
svn: r18021
 2011-08-09 20:35:04 +00:00
Jérôme Rapinat
cd4d026b65 more confort for small screen 
svn: r18016
 2011-08-09 16:13:26 +00:00
Michiel Nauta
a01c8e68b5 5109: Error when merging duplicate records 
svn: r18013
 2011-08-08 21:05:20 +00:00
Jérôme Rapinat
e78a33fcdf openstreet_jsc not initialized on body according to htmlconst 
svn: r18010
 2011-08-08 16:10:36 +00:00
Jérôme Rapinat
94b7f1794b Add Japanese to the list 
svn: r18007
 2011-08-08 06:43:41 +00:00
Serge Noiraud
9596efc731 GeoView : removing mapstraction which is now unused. 
svn: r17999
 2011-08-07 10:55:21 +00:00
Rob G. Healey
2dbf98feee The bugtracker for this one has a lot of others attached to it. Bug#5026, #4029, #2313, and #5103. Benny has given permission for me to add this to NarrativeWeb so that we could get rid of the mapstraction/mxn javascript files... 
svn: r17994
 2011-08-06 17:09:09 +00:00
Jérôme Rapinat
e43b3fa3f1 5120: 'Export view' to odt file crashs (patch by PaulFranklin) 
svn: r17985
 2011-08-02 06:00:38 +00:00
Rob G. Healey
924adb2a45 Fixed and updated Place Maps to work with the new google v3 maps javascript code. Error reported by Jerome Rapinet. 
svn: r17942
 2011-07-21 01:44:50 +00:00
Michiel Nauta
7943e42395 4861: Relationship view doesn't show marriage if no spouse 
svn: r17933
 2011-07-15 17:14:44 +00:00
Michiel Nauta
b894c45afe 4907: Do not create links to AddressBookPage on Main Nav Menu if addrlist is empty 
svn: r17922
 2011-07-12 21:18:25 +00:00
Michiel Nauta
84801e88be 5063: Mainz stylesheet bugs: align subtables and fix source ref links 
svn: r17920
 2011-07-12 20:49:22 +00:00
Michiel Nauta
8aa44642a9 5063: Mainz stylesheet bugs 
svn: r17914
 2011-07-10 19:02:33 +00:00
Jérôme Rapinat
a732aecb73 typo on docstring 
svn: r17904
 2011-07-08 15:48:13 +00:00
Peter Landgren
6652ed2942 Fix of issue 5045 and 5073, double progress bars ic now one. 
svn: r17901
 2011-07-07 08:30:16 +00:00
Nick Hall
73b2862daf 5069: Fix bug preventing info objects being added to a root node of a tree 
svn: r17890
 2011-07-02 14:05:14 +00:00
Michiel Nauta
f50f7cecd7 5059: Reordering Gramps IDs fails 
svn: r17887
 2011-07-01 11:45:43 +00:00
Michiel Nauta
5cd666ca53 5054: ID format conversion creates duplicates 
svn: r17885
 2011-07-01 11:23:53 +00:00
Rob G. Healey
eb57c5279b Cleanup some code in tooltips. 
svn: r17877
 2011-07-01 02:17:20 +00:00
Rob G. Healey
f57c89c3c0 Fixed error in KeyError. Thanks Helge privat 
svn: r17876
 2011-07-01 01:59:47 +00:00
Nick Hall
ce076e98c7 5055: Issue warning when attempting to edit media reference when media object is already being edited 
svn: r17872
 2011-06-30 20:40:42 +00:00
Rob G. Healey
e601f073c2 Minor cleanup 
svn: r17861
 2011-06-29 04:56:11 +00:00
John Ralls
4973798c00 Bug #5044: Unable to enter valid dates when the (full) month contains accented letters. [r17859] 
This turns out to be a codeset-setting issue, where unicode() returns different (perfectly valid) encodings of the words depending upon which codeset it's given.

There's also a problem with using locale.getpreferredencoding() on OSX: It returns "mac roman", pretty much regardless of the environment locale settings. This isn't correct for recent versions of OSX under any circumstances, so this change also disables calling it on macs.

svn: r17860
 2011-06-28 23:07:09 +00:00
Michiel Nauta
2bb51675ae 5046: GEDCOM import fails on aka name 
svn: r17839
 2011-06-27 15:21:40 +00:00
Jérôme Rapinat
2b25ffec5b 5023: Textual reports are crashing with HTML format without stylesheet set 
svn: r17836
 2011-06-27 07:35:54 +00:00
Jérôme Rapinat
49a448dcd9 5032: Report selection logic 
svn: r17834
 2011-06-27 07:11:59 +00:00
Rob G. Healey
04d9b96dc8 Removed ImageMagick and Jhead dependencies as requested using PIL.Image, exiv2, and os.remove. Thank you, Nick Hall, John Ralls, Benny Malengier, and Brian Matherly. 
svn: r17833
 2011-06-27 04:46:27 +00:00
Rob G. Healey
23967fae03 Fixed an error in color for the WebCal report. 
svn: r17832
 2011-06-27 03:33:34 +00:00
Michiel Nauta
495dab9654 Hardened thumbnailer for errors such as bug 5017 
svn: r17831
 2011-06-25 11:56:51 +00:00
Michiel Nauta
b17b0ecd1a 5022: Layout in website 3.0 
svn: r17823
 2011-06-20 21:39:30 +00:00
Michiel Nauta
d1e86b0c58 4808: Latitude and Longitude in the web report 
svn: r17821
 2011-06-20 21:34:46 +00:00
Michiel Nauta
f7aea3022d 5027: After export to XML and Import into new DB all surnames become primary 
svn: r17819
 2011-06-20 15:26:19 +00:00
Brian Matherly
72adcddf9d 0005018: CLI report claims to ignore pre-existing "note" option (Patch from Paul Franklin) 
svn: r17806
 2011-06-19 02:46:33 +00:00
Serge Noiraud
556807529a Geography : cursor driven region and autozoom ( #0004882 ) 
svn: r17803
 2011-06-16 17:44:41 +00:00
Jérôme Rapinat
99d2239a8d Add Danish DateHandler (contribution by Chris Darnell) 
svn: r17801
 2011-06-16 11:18:50 +00:00
Doug Blank
24661c2f2d 5000: feature request: make GRAMPSHOME's parent tree if needed, by PFranklin 
svn: r17799
 2011-06-16 10:44:50 +00:00
Brian Matherly
d449165c99 Clarify some command line report options. 
svn: r17794
 2011-06-15 12:14:32 +00:00
Jérôme Rapinat
86d35f1bb0 4934: Menu items on SimpleTable and ScratchPad ignore translation strings for object class 
svn: r17792
 2011-06-15 11:54:55 +00:00
Benny Malengier
14d08e2e06 5002: control n and p to move between categories not working 
svn: r17790
 2011-06-15 08:34:44 +00:00
Rob G. Healey
0ef1aa718e Fixed two small errors created by my last commit. 
svn: r17789
 2011-06-15 07:17:26 +00:00
Rob G. Healey
38e3b655e8 Fixed a missing character in _removesymbolsb4saving(). Thank you, Nick Hall. Added some error catching from subprocess in convert, delete, and re-initialize for ImageMagick and Jhead processes. 
svn: r17788
 2011-06-15 06:52:25 +00:00
Rob G. Healey
8a515f1745 Bug##4995; typo --thank you, jcreus. 
svn: r17785
 2011-06-14 23:05:37 +00:00
Benny Malengier
b30efed992 5004: hot key for bottombar and filter sidebar 
svn: r17783
 2011-06-14 21:11:39 +00:00
Benny Malengier
18ad358756 5004: hot key for bottombar and filter sidebar 
svn: r17781
 2011-06-14 21:01:46 +00:00
Benny Malengier
b57b773fc2 5002: control n and p to move between categories not workin 
5003: A hotkey to enable/disable the navigator is needed


svn: r17779
 2011-06-14 20:33:20 +00:00
Rob G. Healey
5db9dc6d87 Bug#4988; Fixed _help_page(). Thank you, Nick Hall. 
svn: r17773
 2011-06-14 05:41:28 +00:00
Rob G. Healey
6e83ddd852 Bug#4989; _removesymbolsb4saving() was fixed to remove other symbols to represent degrees, minutes, and seconds as in PlaceEditor. Thanks Nick Hall. 
svn: r17772
 2011-06-14 05:32:36 +00:00
Rob G. Healey
85b6835acb Bug#4990; Dates below the year 1900, need to be saved in raw format. Thanks Nick Hall 
svn: r17771
 2011-06-14 01:48:12 +00:00
Michiel Nauta
2942c94c94 4856: Gedcom import of empty note leads to invalid database 
svn: r17767
 2011-06-13 08:27:07 +00:00
Peter Landgren
f478fece11 Fix of issue 4992, same value in both lat and long. 
svn: r17761
 2011-06-12 18:41:43 +00:00
Stéphane Charette
fdd446d692 bump version number after the 3.3.0 release 
svn: r17757
 2011-06-12 10:03:27 +00:00
Rob G. Healey
a91ab5a3d9 Fixed an small error introduced by the last commit in pylint cleanup. 
svn: r17749
 2011-06-12 02:58:47 +00:00
Rob G. Healey
2b758e17a7 Bug#4984 fix button conversion and pylint cleanup. 
svn: r17748
 2011-06-12 02:12:07 +00:00
Rob G. Healey
869194525a Bug#4984-- Edit Image Exif metadata; GPS Coordinate processing causing crashes; Fixed... 
svn: r17745
 2011-06-11 07:23:54 +00:00
Michiel Nauta
937ecfd943 4316: [NarWeb] Missing document.png 
svn: r17743
 2011-06-10 17:06:30 +00:00
Rob G. Healey
cfc37a6760 Clean and made a lot of pylint improvements. Still working on this though. 
svn: r17737
 2011-06-09 23:14:50 +00:00
Peter Landgren
65c7aa80f1 Fix so that date, if any, in source reference is printed. 
svn: r17730
 2011-06-09 13:34:58 +00:00
Peter Landgren
35055c3850 Fix so that date, if any, in source reference is printed. 
svn: r17729
 2011-06-09 13:33:49 +00:00
Rob G. Healey
37c6af8b45 Fixed an error in updating the Exif metadata after saving it. 
svn: r17727
 2011-06-09 05:37:47 +00:00
Rob G. Healey
6f4cb3f832 Fix an error in format the date. Thanks Nick Hall. 
svn: r17724
 2011-06-09 01:23:25 +00:00
Gary Burton
8016541c15 Improve alignment of gallery objects and their text labels 
svn: r17720
 2011-06-08 19:51:42 +00:00
Michiel Nauta
70fb3feb60 Preserve import handle when family tree is empty 
svn: r17716
 2011-06-08 15:23:15 +00:00
Rob G. Healey
1d6017bde5 Fixed errors in _format_datetime() to match corrections from Nick Hall. 
svn: r17712
 2011-06-08 00:30:27 +00:00
Nick Hall
3b73e4f138 4969: Prevent a view being changed whilst a view change is already in progress 
svn: r17709
 2011-06-07 22:46:33 +00:00
John Ralls
20526c3933 Move Mac localization settings inside Gramps. (r17707) 
svn: r17708
 2011-06-07 16:31:58 +00:00
Nick Hall
0b45901f9f 4974: Fix formatting of dates before 1900 
svn: r17701
 2011-06-06 22:27:52 +00:00
Michiel Nauta
32e62f6cc2 Add comment clarifying use of modal during tag assignment/reÃmoval 
svn: r17700
 2011-06-06 20:20:42 +00:00
Gary Burton
93c5faab34 Bug #4825. Ensure that button is still clickable 
svn: r17694
 2011-06-06 16:06:59 +00:00
Brian Matherly
fba079931f Add support for paper margins from CLI. 
svn: r17692
 2011-06-06 03:09:43 +00:00
Brian Matherly
a896ef5457 Add support for lists on the command line. 
svn: r17690
 2011-06-06 02:02:13 +00:00
Doug Blank
a0f877f415 4964: Gramps crashed during web report generation with person place maps 
svn: r17686
 2011-06-04 13:59:29 +00:00
Doug Blank
59b324df39 4964: Gramps crashed during web report generation with person place maps 
svn: r17684
 2011-06-04 13:55:07 +00:00
Michiel Nauta
5acfb94f9d Make InfoDialog non modal 
svn: r17680
 2011-06-03 15:33:29 +00:00
Michiel Nauta
516b184925 Fix merge advice on import to merge places with identical ids 
svn: r17678
 2011-06-03 15:21:28 +00:00
Michiel Nauta
22cde3ec27 4959: Errors raised by Organize Tags window related to tag removal 
svn: r17676
 2011-06-03 12:12:21 +00:00
Michiel Nauta
2112b4ca2f 4951: AttributeError on removal of a tag 
svn: r17673
 2011-06-03 09:05:00 +00:00
Nick Hall
af9230afd6 4951: Fix bug introduced in r17423 
svn: r17670
 2011-06-02 23:13:25 +00:00
Tim G L Lyons
9a497b9264 3866 3976 3977: Two 'spell' entries; remove Enchant dependency; Gramps does spellcheck on/off menu, gtkspell does the different languages. Cleaned-up code to reflect fact that spellcheck can only be on or off (see 3866). 
svn: r17669
 2011-06-02 22:57:32 +00:00
Jérôme Rapinat
b86b1ae8ae revert r17624 
svn: r17668
 2011-06-02 20:25:58 +00:00
Jérôme Rapinat
a341c709f7 4952: Several grammar mistakes; update template for translations (also new strings for xml import) 
svn: r17663
 2011-06-02 10:00:45 +00:00
Jérôme Rapinat
8d23398f32 4952: Several grammar mistakes 
svn: r17659
 2011-06-02 08:27:36 +00:00
Benny Malengier
00ff6c9bef 4954: Error showing children if no spouse in family 
svn: r17657
 2011-06-02 08:04:29 +00:00
Rob G. Healey
7ddabca58f Bug#4919: Fixed error in reading and processing Xmp, Iptc keys in pyexiv2-0.1.3. Thanks Benny Malengier. 
svn: r17649
 2011-06-02 00:53:29 +00:00
Michiel Nauta
5d467fc7ea 4209: XML DTD rewrite, cleanup 
svn: r17648
 2011-06-01 21:33:49 +00:00
Doug Blank
5329944ca2 4950: Unhandled exception upon closing Gramps with an undocked gramplet 
svn: r17638
 2011-05-31 17:33:37 +00:00
Doug Blank
2f647a443c Corrupt gramplet file fixes 
svn: r17636
 2011-05-31 17:26:30 +00:00
Serge Noiraud
3ac9d3f824 Geography : GeoView : close the Place Selection window before editing place 
svn: r17635
 2011-05-31 14:09:24 +00:00
Peter Landgren
d05b5a100c Update for spell checking in Windows. 
svn: r17633
 2011-05-31 07:48:27 +00:00
Benny Malengier
1f4f650246 4398: [GEDCOM] Import Father AND Mother ages on a family event, does not check gender. 
svn: r17630
 2011-05-30 21:03:20 +00:00
Benny Malengier
b411dc467b 4825: Tag button opens tagwindow on all buttons including tab 
svn: r17628
 2011-05-30 20:45:24 +00:00
Michiel Nauta
536f15f53d 4906: Infinitive loop when trying to remove matched person/event filter rules 
svn: r17626
 2011-05-30 20:23:02 +00:00
Jérôme Rapinat
2cc2dcf7be typo 
svn: r17624
 2011-05-30 13:57:12 +00:00
Serge Noiraud
d3d2f0624c Geography : bug when linking to a place. 
svn: r17621
 2011-05-29 21:36:44 +00:00
Jérôme Rapinat
14c4b84b79 navigation history is for all objects 
svn: r17618
 2011-05-29 16:52:25 +00:00
Serge Noiraud
6d3b2920d4 Geography : filling place object ( feature request #0004867 ) 
adding to to place and place name in status bar ( feature request #0004882 )
            suppress trailing spaces on several lines.


svn: r17615
 2011-05-29 14:11:48 +00:00
Benny Malengier
47f634421a 4910: when no surname known, Narweb picks up the patronymic as Main surnames 
svn: r17607
 2011-05-28 15:50:31 +00:00
Benny Malengier
b0246b8108 Gramplets changed names, fix 
svn: r17604
 2011-05-28 12:38:46 +00:00
Doug Blank
e5699979fb Typo 
svn: r17588
 2011-05-27 13:54:15 +00:00
Serge Noiraud
9006d64969 Geography : bug correction in popup events map view 
adding dates in popup menu in events, person and family map views.


svn: r17586
 2011-05-27 13:39:07 +00:00
Doug Blank
e332b75caf Refined welcome statement 
svn: r17585
 2011-05-27 12:29:11 +00:00
Benny Malengier
17a1ddf8f9 update welcome gramplet for release 
svn: r17581
 2011-05-27 11:45:54 +00:00
Peter Landgren
418ee7de7d Added traceback print when dictionary error. 
svn: r17580
 2011-05-27 10:47:16 +00:00
Benny Malengier
a71636ec4e Allow modifier % on styledtext 
svn: r17578
 2011-05-27 09:06:35 +00:00
Benny Malengier
e08b1d4d3c Last column is an integer, not general object 
svn: r17565
 2011-05-26 08:18:01 +00:00
Jérôme Rapinat
c8153a581c 3866 3976 3977: Two 'spell' entries; remove Enchant dependency (patch by Tim Lyons) 
svn: r17564
 2011-05-26 08:07:43 +00:00
Doug Blank
43c21ef143 Fixed issue with state check 
svn: r17552
 2011-05-22 13:38:31 +00:00