[vidalia-svn] r4050: This probably should've been in 0.2.2, but at least version (in vidalia/trunk: . src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-08-15 00:48:59 -0400 (Sat, 15 Aug 2009)
New Revision: 4050

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/Vidalia.cpp
Log:

This probably should've been in 0.2.2, but at least version numbers are
cheap.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2009-08-15 04:20:37 UTC (rev 4049)
+++ vidalia/trunk/CHANGELOG	2009-08-15 04:48:59 UTC (rev 4050)
@@ -1,3 +1,10 @@
+0.2.3   xx-xxx-2009
+  o Create the data directory before trying to copy over the default
+    Vidalia configuration file from inside the application bundle on Mac 
+    OS X. Affects only OS X drag-and-drop installer users without a
+    previous Vidalia installation.
+
+
 0.2.2   14-Aug-2009
   o When the user clicks "Browse" in the Advanced settings page to locate
     a new torrc, set the initial directory shown in the file dialog to the

Modified: vidalia/trunk/src/vidalia/Vidalia.cpp
===================================================================
--- vidalia/trunk/src/vidalia/Vidalia.cpp	2009-08-15 04:20:37 UTC (rev 4049)
+++ vidalia/trunk/src/vidalia/Vidalia.cpp	2009-08-15 04:48:59 UTC (rev 4050)
@@ -479,8 +479,12 @@
   if (path) {
     QString defaultConfFile = QString::fromLocal8Bit(path);
     QFileInfo fi(defaultConfFile);
-    if (fi.exists())
-      QFile::copy(defaultConfFile, VidaliaSettings::settingsFile());
+    if (fi.exists()) {
+      QFileInfo out(VidaliaSettings::settingsFile());
+      if (! out.dir().exists())
+        out.dir().mkpath(".");
+      QFile::copy(defaultConfFile, out.absoluteFilePath());
+    }
   }
   CFRelease(confUrlRef);
   CFRelease(pathRef);