[Kstars-devel] branches/KDE/3.5/kdeedu/kstars/kstars

[Jason Harris]

SVN commit 463316 by harris:

Fixing follow-up in bug report #112925
The reported crash is already fixed; this commit *might* fix the 
remaining issue with the Moon not being found by 
KStarsData::readURLData(), and not appearing in the Find Dialog.
I actually don't understand the problem with the moon.  Its name in the 
KSPlanetBase ctor was wrapped in I18N_NOOP() like the rest of the 
planets, but readURLData() still complains, as if the argument was 
getting passed as the localized string.

To check, I have removed I18N_NOOP() from the KSMoon ctor argument.  Its 
name is now definitely being passed as "Moon".  I then placed a dummy 
line inside the ctor, just containing I18N_NOOP("Moon").

Please update and test again.  I also modified the image_url.dat and 
info_url.dat files to fix the mis-named objects causing complaints at 
startup.  Unfortunately, you have to delete your copies of these files 
under ~/.kde/share/apps/kstars to get the messages to go away.  Also 
note that the first time you run Kstars, you'll get a readURLData() 
complaint about object "XXX", but this will only happen once.

CCMAIL: kstars-devel at kde.org
CCBUG: 112925


 M  +1 -1      data/image_url.dat  
 M  +3 -2      data/info_url.dat  
 M  +7 -1      ksmoon.cpp  


--- branches/KDE/3.5/kdeedu/kstars/kstars/data/image_url.dat #463315:463316
@@ -660,7 +660,7 @@
 NGC 1232:Show NOAO Image:http://www.noao.edu/image_gallery/images/d2/ngc1232a.jpg
 NGC 1300:Show NOAO Image:http://www.noao.edu/image_gallery/images/d3/ngc1300a.jpg
 NGC 1333:Show NOAO Image:http://www.noao.edu/image_gallery/images/d2/ngc1333_400.jpg
-MGC 1435:Show NOAO Image:http://www.noao.edu/image_gallery/images/d3/meropea.jpg
+NGC 1435:Show NOAO Image:http://www.noao.edu/image_gallery/images/d3/meropea.jpg
 NGC 1530:Show NOAO Image:http://www.noao.edu/image_gallery/images/d2/02334a.jpg
 NGC 1532:Show NOAO Image:http://www.noao.edu/image_gallery/images/d2/ngc1532-31_500.jpg
 NGC 1854:Show NOAO Image:http://www.noao.edu/image_gallery/images/d2/02208a.jpg
--- branches/KDE/3.5/kdeedu/kstars/kstars/data/info_url.dat #463315:463316
@@ -155,7 +155,7 @@
 NGC 6537:Wikipedia Page:http://en.wikipedia.org/wiki/Red_Spider_Nebula
 NGC 6543:Wikipedia Page:http://en.wikipedia.org/wiki/Cat's_Eye_Nebula
 NGC 7000:Wikipedia Page:http://en.wikipedia.org/wiki/North_American_Nebula
-NGC_7742:Wikipedia Page:http://en.wikipedia.org/wiki/NGC_7742
+NGC 7742:Wikipedia Page:http://en.wikipedia.org/wiki/NGC_7742
 #
 # IC Objects
 IC 10:Wikipedia Page:http://en.wikipedia.org/wiki/IC_10
@@ -226,7 +226,8 @@
 Mathilde:Wikipedia Page:http://en.wikipedia.org/wiki/253_Mathilde
 Eros:Wikipedia Page:http://en.wikipedia.org/wiki/433_Eros
 Hektor:Wikipedia Page:http://en.wikipedia.org/wiki/624_Hektor
-Gaspra:Wikipedia Page:http://en.wikipedia.org/wiki/951_Gaspra
+## --==>> FIXME: Gaspra is missing from asteroids.dat!
+#Gaspra:Wikipedia Page:http://en.wikipedia.org/wiki/951_Gaspra
 ## --==>> There are two objects named "Chiron"...asteroid and comet
 Chiron:Wikipedia Page:http://en.wikipedia.org/wiki/2060_Chiron
 #
--- branches/KDE/3.5/kdeedu/kstars/kstars/ksmoon.cpp #463315:463316
@@ -27,9 +27,15 @@
 #include "kstarsdata.h"
 
 KSMoon::KSMoon(KStarsData *kd)
- : KSPlanetBase( kd, I18N_NOOP( "Moon" ), "", 3474.8 /*diameter in km*/ ) {
+ : KSPlanetBase( kd, "Moon", "", 3474.8 /*diameter in km*/ ) {
 	BData.setAutoDelete(true);
 	LRData.setAutoDelete(true);
+	
+	//This shouldn't be necessary, but butting "I18N_NOOP()"
+	//in the KSPlanetBase ctor arg seems to make KSMoon
+	//get localized string for Name, rather than "Moon"
+	//(see BR #112925)
+	I18N_NOOP( "Moon" );
 }
 
 KSMoon::~KSMoon() {