[vidalia-svn] r4036: Updated WiX Windows bundle (not workign yet). Fixed oopsie i (in vidalia/branches/extension-api: pkg/win32 src/vidalia/config)

[tyree731@xxxxxxxxxxxxxxxxxxx]

Author: tyree731
Date: 2009-08-13 18:59:29 -0400 (Thu, 13 Aug 2009)
New Revision: 4036

Modified:
   vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in
   vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp
Log:
Updated WiX Windows bundle (not workign yet). Fixed oopsie in VidaliaSettings

Modified: vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in
===================================================================
--- vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in	2009-08-13 22:44:19 UTC (rev 4035)
+++ vidalia/branches/extension-api/pkg/win32/vidalia.wxs.in	2009-08-13 22:59:29 UTC (rev 4036)
@@ -51,26 +51,26 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="ProgramFilesDir">
         <Directory Id="INSTALLDIR" Name="Vidalia">
+          <Directory Id="PluginsDir" Name="plugins">
           <?if $(var.UseMarble) = "ON"?>
-            <Directory Id="PluginsDir" Name="plugins">
-              <Directory Id="QtPluginsDir" Name="qt">
-                <Directory Id="QtImageFormatPluginsDir" Name="imageformats" />
-              </Directory>
-              <Directory Id="MarblePluginsDir" Name="marble" />
+            <Directory Id="QtPluginsDir" Name="qt">
+              <Directory Id="QtImageFormatPluginsDir" Name="imageformats" />
             </Directory>
-            <Directory Id="MarbleDataDir" Name="data">
-              <Directory Id="MarbleMapsDir" Name="maps">
-                <Directory Id="MarbleEarthMapsDir" Name="earth">
-                  <Directory Id="MarbleBlueMarbleDataDir" Name="bluemarble" />
-                  <Directory Id="MarbleCityLightsDataDir" Name="citylights" />
-                  <Directory Id="MarbleSrtmDataDir" Name="srtm" />
-                </Directory>
+            <Directory Id="MarblePluginsDir" Name="marble" />
+          </Directory>
+          <Directory Id="MarbleDataDir" Name="data">
+            <Directory Id="MarbleMapsDir" Name="maps">
+              <Directory Id="MarbleEarthMapsDir" Name="earth">
+                <Directory Id="MarbleBlueMarbleDataDir" Name="bluemarble" />
+                <Directory Id="MarbleCityLightsDataDir" Name="citylights" />
+                <Directory Id="MarbleSrtmDataDir" Name="srtm" />
               </Directory>
-              <Directory Id="MarbleMwdbiiDir" Name="mwdbii" />
-              <Directory Id="MarblePlacemarkDataDir" Name="placemarks" />
-              <Directory Id="MarbleStarsDataDir" Name="stars" />
-              <Directory Id="MarbleSvgDataDir" Name="svg" />
             </Directory>
+            <Directory Id="MarbleMwdbiiDir" Name="mwdbii" />
+            <Directory Id="MarblePlacemarkDataDir" Name="placemarks" />
+            <Directory Id="MarbleStarsDataDir" Name="stars" />
+            <Directory Id="MarbleSvgDataDir" Name="svg" />
+          </Directory>
           <?endif?>
         </Directory>
       </Directory>
@@ -103,6 +103,19 @@
               Name="LICENSE-OPENSSL" Source="@Vidalia_SOURCE_DIR@\LICENSE-OPENSSL" />
       </Component>
 
+      <!-- Vidalia default plugins -->
+      <Component Id="VidaliaPlugins" Guid="$(var.VidaliaPluginsGuid)">
+        <File Id="VidaliaHomePlugin" DiskId="1"
+              NAME="libhomeplugin.dll"
+              Source="@Vidalia_SOURCE_DIR@\src\vidalia\HomePlugin\libhomeplugin.dll" />
+        <File Id="VidaliaNetworkPlugin" DiskId="1"
+              NAME="libnetworkmapplugin.dll"
+              Source="@Vidalia_SOURCE_DIR@\src\vidalia\NetworkMapPlugin\libnetworkmapplugin.dll" />
+        <File Id="VidaliaMessagePlugin" DiskId="1"
+              NAME="libmessagelogplugin.dll"
+              Source="@Vidalia_SOURCE_DIR@\src\vidalia\MessageLogPlugin\libmessagelogplugin.dll" />
+      </Component>
+
       <!-- Qt-related library files -->
       <Component Id="QtLibrary" Guid="$(var.QtLibraryGuid)">
         <File Id="QtCore4Dll" DiskId="1"

Modified: vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp	2009-08-13 22:44:19 UTC (rev 4035)
+++ vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp	2009-08-13 22:59:29 UTC (rev 4036)
@@ -252,7 +252,7 @@
   defaultPluginsDirectory.cd("Resources");
   defaultPluginsDirectory.cd("plugins");
 #else
-  defaultPluginsDirectory.cd(Vidalia::dataDirectory);
+  defaultPluginsDirectory.cd(Vidalia::dataDirectory());
   defaultPluginsDirectory.cd("plugins");
 #endif
   return value(SETTING_PLUGIN_DIRECTORY,