[vidalia-svn] r3432: If I explicitly set the path to use for Marble data, Marble (marble/trunk/src/lib)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-01-15 19:25:38 -0500 (Thu, 15 Jan 2009)
New Revision: 3432

Modified:
   marble/trunk/src/lib/MarbleDirs.cpp
Log:
If I explicitly set the path to use for Marble data, Marble should not
override me and drop everything into ~/.marble/.


Modified: marble/trunk/src/lib/MarbleDirs.cpp
===================================================================
--- marble/trunk/src/lib/MarbleDirs.cpp	2009-01-15 23:52:52 UTC (rev 3431)
+++ marble/trunk/src/lib/MarbleDirs.cpp	2009-01-16 00:25:38 UTC (rev 3432)
@@ -145,10 +145,6 @@
     }
 #endif   // mac bundle
 
-// Should this happen before the Mac bundle already?
-if ( !runTimeMarbleDataPath.isEmpty() )
-    return runTimeMarbleDataPath;
-
 #ifdef MARBLE_DATA_PATH
     //MARBLE_DATA_PATH is a compiler define set by cmake
     QString compileTimeMarbleDataPath(MARBLE_DATA_PATH);
@@ -194,10 +190,6 @@
     }
 #endif   // mac bundle
 
-// Should this happen before the Mac bundle already?
-if ( !runTimeMarblePluginPath.isEmpty() )
-    return runTimeMarblePluginPath;
-
 #ifdef MARBLE_PLUGIN_PATH
     //MARBLE_PLUGIN_PATH is a compiler define set by cmake
     QString compileTimeMarblePluginPath(MARBLE_PLUGIN_PATH);
@@ -218,6 +210,9 @@
 
 QString MarbleDirs::localPath() 
 {
+    if ( !runTimeMarbleDataPath.isEmpty() )
+        return runTimeMarbleDataPath;
+
 #ifndef Q_OS_WIN
     return QString( QDir::homePath() + "/.marble/data" ); // local path
 #else
@@ -233,6 +228,9 @@
 
 QString MarbleDirs::pluginLocalPath() 
 {
+    if ( !runTimeMarblePluginPath.isEmpty() )
+        return runTimeMarblePluginPath;
+
 #ifndef Q_OS_WIN
     return QString( QDir::homePath() + "/.marble/plugins" ); // local path
 #else