diff -p -up vidalia-0.1.15/src/vidalia/config/torsettings.cpp.paths vidalia-0.1.15/src/vidalia/config/torsettings.cpp --- vidalia-0.1.15/src/vidalia/config/torsettings.cpp.paths 2009-12-24 01:55:26.000000000 +0100 +++ vidalia-0.1.15/src/vidalia/config/torsettings.cpp 2009-12-24 02:00:26.000000000 +0100 @@ -65,14 +65,14 @@ TorSettings::TorSettings(TorControl *tor else setDefault(SETTING_TOR_EXECUTABLE, programFiles + "\\Tor\\tor.exe"); #else - setDefault(SETTING_TOR_EXECUTABLE, "tor"); + setDefault(SETTING_TOR_EXECUTABLE, "/usr/bin/tor"); #endif - setDefault(SETTING_TORRC, Vidalia::dataDirectory() + "/torrc"); + setDefault(SETTING_TORRC, "/etc/tor/torrc"); setDefault(SETTING_CONTROL_ADDR, "127.0.0.1"); setDefault(SETTING_CONTROL_PORT, 9051); setDefault(SETTING_AUTH_METHOD, toString(DEFAULT_AUTH_METHOD)); - setDefault(SETTING_DATA_DIRECTORY, ""); + setDefault(SETTING_DATA_DIRECTORY, "/var/lib/tor"); setDefault(SETTING_CONTROL_PASSWORD, ""); setDefault(SETTING_USE_RANDOM_PASSWORD, true); } diff -p -up vidalia-0.1.15/src/vidalia/log/messagelog.cpp.paths vidalia-0.1.15/src/vidalia/log/messagelog.cpp --- vidalia-0.1.15/src/vidalia/log/messagelog.cpp.paths 2009-12-24 02:07:49.000000000 +0100 +++ vidalia-0.1.15/src/vidalia/log/messagelog.cpp 2009-12-24 01:50:09.000000000 +0100 @@ -40,7 +40,7 @@ #define DEFAULT_LOGFILE \ (win32_program_files_folder()+"\\Tor\\tor-log.txt") #else -#define DEFAULT_LOGFILE (QDir::homePath() + "/.tor/tor-log.txt") +#define DEFAULT_LOGFILE ("/var/log/tor/tor.log") #endif #define ADD_TO_FILTER(f,v,b) (f = ((b) ? ((f) | (v)) : ((f) & ~(v)))) diff -p -up vidalia-0.1.15/src/vidalia/vidalia.cpp.paths vidalia-0.1.15/src/vidalia/vidalia.cpp --- vidalia-0.1.15/src/vidalia/vidalia.cpp.paths 2009-12-24 02:06:24.000000000 +0100 +++ vidalia-0.1.15/src/vidalia/vidalia.cpp 2009-12-24 01:52:59.000000000 +0100 @@ -326,7 +326,7 @@ Vidalia::pidFile() if (_args.contains(ARG_PIDFILE)) { return _args.value(ARG_PIDFILE); } - return QDir::convertSeparators(dataDirectory() + "/vidalia.pid"); + return QDir::convertSeparators("/var/run/tor/tor.pid"); } /** Writes <b>msg</b> with severity <b>level</b> to Vidalia's log. */