March 2012 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit a586f1a3cc78fbd1be86eb64636595ed3c3e71ac Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 08:45:11 2012 +0000 Update translations for vidalia --- ja/vidalia_ja.po | 168 +++++++++++++++++++++++++++--------------------------- 1 files changed, 85 insertions(+), 83 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index 1785fa2..64ef941 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -2,6 +2,8 @@ # Translators: # まつ <&… [View More]gt;, 2012. # Chris Harris <praisebe4him(a)gmail.com>, 2012. +# Eshin Kunishima <kaoru(a)mikosu.ddo.jp>, 2012. +# <kaoru(a)mikosu.ddo.jp>, 2012. # <pentive(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # siomiz <>, 2012. @@ -10,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-22 08:51+0000\n" -"Last-Translator: まつ <>\n" +"PO-Revision-Date: 2012-03-24 08:45+0000\n" +"Last-Translator: Eshin Kunishima <kaoru(a)mikosu.ddo.jp>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -556,7 +558,7 @@ msgstr "ボリビア" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" -msgstr "" +msgstr "ボスニア・ヘルツェゴビナ" msgctxt "CountryInfo" msgid "Botswana" @@ -640,127 +642,127 @@ msgstr "コートジボワール" msgctxt "CountryInfo" msgid "Croatia" -msgstr "" +msgstr "クロアチア" msgctxt "CountryInfo" msgid "Cuba" -msgstr "" +msgstr "キューバ" msgctxt "CountryInfo" msgid "Cyprus" -msgstr "" +msgstr "キプロス" msgctxt "CountryInfo" msgid "Czech Republic" -msgstr "" +msgstr "チェコ" msgctxt "CountryInfo" msgid "Denmark" -msgstr "" +msgstr "デンマーク" msgctxt "CountryInfo" msgid "Djibouti" -msgstr "" +msgstr "ジブチ" msgctxt "CountryInfo" msgid "Dominica" -msgstr "" +msgstr "ドミニカ" msgctxt "CountryInfo" msgid "Dominican Republic" -msgstr "" +msgstr "ドミニカ共和国" msgctxt "CountryInfo" msgid "Ecuador" -msgstr "" +msgstr "エクアドル" msgctxt "CountryInfo" msgid "Egypt" -msgstr "" +msgstr "エジプト" msgctxt "CountryInfo" msgid "El Salvador" -msgstr "" +msgstr "エルサルバドル" msgctxt "CountryInfo" msgid "Equatorial Guinea" -msgstr "" +msgstr "赤道ギニア" msgctxt "CountryInfo" msgid "Eritrea" -msgstr "" +msgstr "エリトリア" msgctxt "CountryInfo" msgid "Estonia" -msgstr "" +msgstr "エストニア" msgctxt "CountryInfo" msgid "France" -msgstr "" +msgstr "フランス" msgctxt "CountryInfo" msgid "Gabon" -msgstr "" +msgstr "ガボン" msgctxt "CountryInfo" msgid "Gambia" -msgstr "" +msgstr "ガンビア" msgctxt "CountryInfo" msgid "Georgia" -msgstr "" +msgstr "グルジア" msgctxt "CountryInfo" msgid "Germany" -msgstr "" +msgstr "ドイツ" msgctxt "CountryInfo" msgid "Ghana" -msgstr "" +msgstr "ガーナ" msgctxt "CountryInfo" msgid "Grenada" -msgstr "" +msgstr "グレナダ" msgctxt "CountryInfo" msgid "Guatemala" -msgstr "" +msgstr "グアテマラ" msgctxt "CountryInfo" msgid "Guinea" -msgstr "" +msgstr "ギニア" msgctxt "CountryInfo" msgid "Guinea-Bissau" -msgstr "" +msgstr "ギニアビサウ" msgctxt "CountryInfo" msgid "Guyana" -msgstr "" +msgstr "ガイアナ" msgctxt "CountryInfo" msgid "Hong Kong" -msgstr "" +msgstr "香港" msgctxt "CountryInfo" msgid "Haiti" -msgstr "" +msgstr "ハイチ" msgctxt "CountryInfo" msgid "Honduras" -msgstr "" +msgstr "ホンジュラス" msgctxt "CountryInfo" msgid "Israel" -msgstr "" +msgstr "イスラエル" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "イタリア" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "ジャマイカ" msgctxt "CountryInfo" msgid "Japan" @@ -768,147 +770,147 @@ msgstr "日本" msgctxt "CountryInfo" msgid "Jordan" -msgstr "" +msgstr "ヨルダン" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "" +msgstr "カザフスタン" msgctxt "CountryInfo" msgid "Kenya" -msgstr "" +msgstr "ケニア" msgctxt "CountryInfo" msgid "Kiribati" -msgstr "" +msgstr "キリバス" msgctxt "CountryInfo" msgid "Kuwait" -msgstr "" +msgstr "クウェート" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "" +msgstr "キルギス" msgctxt "CountryInfo" msgid "Laos" -msgstr "" +msgstr "ラオス" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "ラトビア" msgctxt "CountryInfo" msgid "Lebanon" -msgstr "" +msgstr "レバノン" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "" +msgstr "レソト" msgctxt "CountryInfo" msgid "Liberia" -msgstr "" +msgstr "リベリア" msgctxt "CountryInfo" msgid "Liechtenstein" -msgstr "" +msgstr "リヒテンシュタイン" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "リトアニア" msgctxt "CountryInfo" msgid "Luxembourg" -msgstr "" +msgstr "ルクセンブルク" msgctxt "CountryInfo" msgid "Macedonia" -msgstr "" +msgstr "マケドニア" msgctxt "CountryInfo" msgid "Madagascar" -msgstr "" +msgstr "マダガスカル" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "マラウイ" msgctxt "CountryInfo" msgid "Malaysia" -msgstr "" +msgstr "マレーシア" msgctxt "CountryInfo" msgid "Mali" -msgstr "" +msgstr "マリ" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "マルタ" msgctxt "CountryInfo" msgid "Marshall Islands" -msgstr "" +msgstr "マーシャル諸島" msgctxt "CountryInfo" msgid "Mauritania" -msgstr "" +msgstr "モーリタニア" msgctxt "CountryInfo" msgid "Mauritius" -msgstr "" +msgstr "モーリシャス" msgctxt "CountryInfo" msgid "Micronesia" -msgstr "" +msgstr "ミクロネシア" msgctxt "CountryInfo" msgid "Moldova" -msgstr "" +msgstr "モルドバ" msgctxt "CountryInfo" msgid "Monaco" -msgstr "" +msgstr "モナコ" msgctxt "CountryInfo" msgid "Mongolia" -msgstr "" +msgstr "モンゴル" msgctxt "CountryInfo" msgid "Montenegro" -msgstr "" +msgstr "モンテネグロ" msgctxt "CountryInfo" msgid "Morocco" -msgstr "" +msgstr "モロッコ" msgctxt "CountryInfo" msgid "Mozambique" -msgstr "" +msgstr "モザンビーク" msgctxt "CountryInfo" msgid "Namibia" -msgstr "" +msgstr "ナミビア" msgctxt "CountryInfo" msgid "Nauru" -msgstr "" +msgstr "ナウル" msgctxt "CountryInfo" msgid "Nepal" -msgstr "" +msgstr "ネパール" msgctxt "CountryInfo" msgid "Netherlands" -msgstr "" +msgstr "オランダ" msgctxt "CountryInfo" msgid "New Zealand" -msgstr "" +msgstr "ニュージーランド" msgctxt "CountryInfo" msgid "Nicaragua" -msgstr "" +msgstr "ニカラグア" msgctxt "CountryInfo" msgid "Niger" @@ -932,23 +934,23 @@ msgstr "パキスタン" msgctxt "CountryInfo" msgid "Palau" -msgstr "" +msgstr "パラオ" msgctxt "CountryInfo" msgid "Palestine" -msgstr "" +msgstr "パレスチナ" msgctxt "CountryInfo" msgid "Panama" -msgstr "" +msgstr "パナマ" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "" +msgstr "パプアニューギニア" msgctxt "CountryInfo" msgid "Paraguay" -msgstr "" +msgstr "パラグアイ" msgctxt "CountryInfo" msgid "Peru" @@ -956,15 +958,15 @@ msgstr "ペルー" msgctxt "CountryInfo" msgid "Philippines" -msgstr "" +msgstr "フィリピン" msgctxt "CountryInfo" msgid "Poland" -msgstr "" +msgstr "ポーランド" msgctxt "CountryInfo" msgid "Portugal" -msgstr "" +msgstr "ポルトガル" msgctxt "CountryInfo" msgid "Qatar" @@ -972,15 +974,15 @@ msgstr "" msgctxt "CountryInfo" msgid "Romania" -msgstr "" +msgstr "ルーマニア" msgctxt "CountryInfo" msgid "Russia" -msgstr "" +msgstr "ロシア" msgctxt "CountryInfo" msgid "Rwanda" -msgstr "" +msgstr "ルワンダ" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" @@ -1052,7 +1054,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Spain" -msgstr "" +msgstr "スペイン" msgctxt "CountryInfo" msgid "Sri Lanka" @@ -1140,7 +1142,7 @@ msgstr "" msgctxt "CountryInfo" msgid "United Kingdom" -msgstr "" +msgstr "イギリス" msgctxt "CountryInfo" msgid "United States" [View Less]

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Mar '12

24 Mar '12

commit 72581feacd005dc16d3908df061f71b679b2dc33 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 24 08:45:03 2012 +0000 Update translations for gettor --- ja/gettor.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/gettor.po b/ja/gettor.po index 1677628..179fb9d 100644 --- a/ja/gettor.po +++ b/ja/gettor.po @@ -4,14 +4,15 @@ # # Translators: # Chris Harris <praisebe4him(a)gmail.com>, 2012. +# Eshin Kunishima &… [View More]

1 0

[vidalia-plugins/master] Migrate tbb.js to the new browser directory handling for a multiplatform plugin
by chiiph＠torproject.org 23 Mar '12

23 Mar '12

commit 39154a487eaac2ae8de34567b0d1cf4924c425fe Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 23 20:22:13 2012 -0300 Migrate tbb.js to the new browser directory handling for a multiplatform plugin --- tbb/tbb.js | 46 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 12 deletions(-) diff --git a/tbb/tbb.js b/tbb/tbb.js index b6df554..5bd3dda 100644 --- a/tbb/tbb.js +++ b/tbb/tbb.js @@ -6,6 +6,10 @@ importExtension("qt.uitools"); … [View More]var tbb = { BrowserExecutable: "BrowserExecutable", BrowserDirectory: "BrowserDirectory", + DefaultProfileDirectory: "DefaultProfileDirectory", + ProfileDirectory: "ProfileDirectory", + DefaultPluginsDirectory: "DefaultPluginsDirectory", + PluginsDirectory: "PluginsDirectory", // We don't want polipo anymore? // ProxyExecutable: "ProxyExecutable", // RunProxyAtStart: "RunProxyAtStart", @@ -187,27 +191,44 @@ var tbb = { launchBrowserFromDirectory: function() { vdebug("TBB@launchBrowserFromDirectory"); - var browserDirectoryFilename = this.tab.getSetting(this.BrowserExecutable, ""); + /** Directory for the browser */ var browserDirectory = this.tab.getSetting(this.BrowserDirectory, ""); + if(QDir(browserDirectory).isRelative()) + browserDirectory = QDir.toNativeSeparators(QCoreApplication.applicationDirPath() + + "/" + browserDirectory); - this.browserProcess.setEnvironment(this.updateBrowserEnv()); + /** Relative path to the browser executable from the browserDirectory */ + var browserExecutable = QDir.toNativeSeparators(browserDirectory + "/" + + this.tab.getSetting(this.BrowserExecutable, "")); + + /** Relative path to profile from the browserDirectory */ + var profileDirectory = QDir.toNativeSeparators(this.tab.getSetting(this.ProfileDirectory, "")); + /** Default profile to copy from */ + var defaultProfileDirectory = QDir.toNativeSeparators(this.tab.getSetting(this.DefaultProfileDirectory, "")); + + /** Relative path to the plugins directory from the browserDirectory */ + var pluginsDirectory = QDir.toNativeSeparators(this.tab.getSetting(this.PluginsDirectory, "")); + /** Relative path to the default plugins directory from the browserDirectory */ + var defaultPluginsDirectory = QDir.toNativeSeparators(this.tab.getSetting(this.DefaultPluginsDirectory, "")); - var browserExecutable = QDir.toNativeSeparators(browserDirectory + "/App/Firefox/" + - browserDirectoryFilename); + var profileDir = browserDirectory + "/" + profileDirectory; + + this.browserProcess.setEnvironment(this.updateBrowserEnv()); - var profileDir = QDir.toNativeSeparators(browserDirectory + "/Data/profile"); var browserDirObj = new QDir(browserDirectory); /* Copy the profile directory if it's not already there */ - if(!browserDirObj.exists("Data/profile")) { - browserDirObj.mkpath("Data/profile"); - this.copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); + if (!browserDirObj.exists(profileDirectory)) { + browserDirObj.mkdir(profileDirectory); + this.copy_dir(browserDirectory + "/" + defaultProfileDirectory, + browserDirectory + "/" + profileDirectory); } /* Copy the plugins directory if it's not already there */ - if (!browserDirObj.exists("Data/plugins")) { - browserDirObj.mkpath("Data/plugins"); - this.copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins"); + if (!browserDirObj.exists(pluginsDirectory)) { + browserDirObj.mkdir(pluginsDirectory); + this.copy_dir(browserDirectory + "/" + defaultPluginsDirectory, + browserDirectory + "/" + pluginsDirectory); } /* Build the command line arguments */ @@ -229,7 +250,8 @@ var tbb = { while(!torControl.isCircuitEstablished()) { vdebug("Waiting on circuit established"); - sleep(1); // sleep 1s + //sleep(1); // sleep 1s + QCoreApplication.processEvents(); } var proxyExecutable = this.tab.getSetting(this.ProxyExecutable, ""); [View Less]

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 23 Mar '12

23 Mar '12

commit b872d2fa5edf34c9769d2126f772137bb9828416 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 23 22:45:33 2012 +0000 Update translations for https_everywhere_completed --- es/https-everywhere.dtd | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 93a1d4e..772282a 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -28,3 +28,10 @@ <!ENTITY https-… [View More]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Mar '12

23 Mar '12

commit cf835be177836f49ed14ef2c94f71f01099f3778 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 23 22:45:28 2012 +0000 Update translations for https_everywhere --- es/https-everywhere.dtd | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 28adc2a..772282a 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -28,10 +28,10 @@ <!ENTITY https-everywhere.… [View More]

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 23 Mar '12

23 Mar '12

commit 505017def1ba28703ebc6e3b4199f04056a18829 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 23 17:15:05 2012 +0000 Update translations for orbot --- values-zh/strings.xml | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 65efb65..ef10fcc 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -74,10 +74,7 @@ <string name="wizard_tips_otrchat">Gibberbot -… [View More]

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Mar '12

23 Mar '12

commit 4e215d42191b90621ae42c35c688663c44e655f4 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Mar 23 10:22:18 2012 -0300 Add a changes file --- changes/featBrowserSettings | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/featBrowserSettings b/changes/featBrowserSettings new file mode 100644 index 0000000..5227847 --- /dev/null +++ b/changes/featBrowserSettings @@ -0,0 +1,4 @@ + o Add ProfileDirectory, DefaultProfileDirectory, … [View More]

1 0

[vidalia/master] Add {Default, }{Plugin, Profile}Directory settings
by chiiph＠torproject.org 23 Mar '12

23 Mar '12

commit e36785b3bc90fd33eed45e5ca6d334780d5fab30 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Mar 22 19:54:20 2012 -0300 Add {Default,}{Plugin,Profile}Directory settings If defined relative, make Vidalia's binary path the start point. --- src/vidalia/MainWindow.cpp | 54 +++++++++++++++++++--------- src/vidalia/config/VidaliaSettings.cpp | 61 ++++++++++++++++++++++++++++++- src/vidalia/config/VidaliaSettings.h | 10 +++++ 3 files changed, … [View More]106 insertions(+), 19 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index e45919d..e116269 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -624,31 +624,43 @@ MainWindow::launchBrowserFromDirectory() { VidaliaSettings settings; + /** Directory for the browser */ QString browserDirectory = settings.getBrowserDirectory(); - QString browserDirectoryFilename = settings.getBrowserExecutable(); + if(QDir(browserDirectory).isRelative()) + browserDirectory = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + + "/" + browserDirectory); - _browserProcess->setEnvironment(updateBrowserEnv()); + /** Relative path to the browser executable from the browserDirectory */ + QString browserExecutable = QDir::toNativeSeparators(browserDirectory + "/" + settings.getBrowserExecutable()); - /* The browser is in <browserDirectory>/App/Firefox/<browserDirectoryFilename> */ - QString browserExecutable = - QDir::toNativeSeparators(browserDirectory + "/App/Firefox/" + browserDirectoryFilename); - /* The profile is in <browserDirectory>/Data/profile */ - QString profileDir = - QDir::toNativeSeparators(browserDirectory + "/Data/profile"); + /** Relative path to profile from the browserDirectory */ + QString profileDirectory = QDir::toNativeSeparators(settings.getProfileDirectory()); + /** Default profile to copy from */ + QString defaultProfileDirectory = QDir::toNativeSeparators(settings.getDefaultProfileDirectory()); + + /** Relative path to the plugins directory from the browserDirectory */ + QString pluginsDirectory = QDir::toNativeSeparators(settings.getPluginsDirectory()); + /** Relative path to the default plugins directory from the browserDirectory */ + QString defaultPluginsDirectory = QDir::toNativeSeparators(settings.getDefaultPluginsDirectory()); + + QString profileDir = browserDirectory + "/" + profileDirectory; + + _browserProcess->setEnvironment(updateBrowserEnv()); - /* Copy the profile directory if it's not already there */ QDir browserDirObj = QDir(browserDirectory); /* Copy the profile directory if it's not already there */ - if (!browserDirObj.exists("Data/profile")) { - browserDirObj.mkdir("Data/profile"); - copy_dir(browserDirectory + "/App/DefaultData/profile", browserDirectory + "/Data/profile"); + if (!browserDirObj.exists(profileDirectory)) { + browserDirObj.mkdir(profileDirectory); + copy_dir(browserDirectory + "/" + defaultProfileDirectory, + browserDirectory + "/" + profileDirectory); } - /* Copy the plugins directory if it's not already there */ - if (!browserDirObj.exists("Data/plugins")) { - browserDirObj.mkdir("Data/plugins"); - copy_dir(browserDirectory + "/App/DefaultData/plugins", browserDirectory + "/Data/plugins"); + /* Copy the pluginss directory if it's not already there */ + if (!browserDirObj.exists(pluginsDirectory)) { + browserDirObj.mkdir(pluginsDirectory); + copy_dir(browserDirectory + "/" + defaultPluginsDirectory, + browserDirectory + "/" + pluginsDirectory); } /* Build the command line arguments */ @@ -1054,6 +1066,8 @@ MainWindow::start() } QString torrc = settings.getTorrc(); + if(QDir(QFileInfo(torrc).filePath()).isRelative()) + torrc = QCoreApplication::applicationDirPath() + "/" + torrc; if(settings.bootstrap()) { QString boottorrc = settings.bootstrapFrom(); @@ -1075,6 +1089,9 @@ MainWindow::start() /* Specify Tor's data directory, if different from the default */ QString dataDirectory = settings.getDataDirectory(); + if(QDir(dataDirectory).isRelative()) + dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + QString expDataDirectory = expand_filename(dataDirectory); if (!dataDirectory.isEmpty()) args << "DataDirectory" << expDataDirectory; @@ -1129,7 +1146,10 @@ MainWindow::start() * start. */ _isIntentionalExit = true; /* Kick off the Tor process */ - _torControl->start(settings.getExecutable(), args); + QString torExecutable = settings.getExecutable(); + if(QDir(QFileInfo(torExecutable).filePath()).isRelative()) + torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; + _torControl->start(torExecutable, args); } /** Called when the user changes a setting that needs Tor restarting */ diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 7273f10..7d317dc 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -29,8 +29,12 @@ #define SETTING_RUN_TOR_AT_START "RunTorAtStart" #define SETTING_DATA_DIRECTORY "DataDirectory" #define SETTING_SHOW_MAINWINDOW_AT_START "ShowMainWindowAtStart" -#define SETTING_BROWSER_EXECUTABLE "BrowserExecutable" -#define SETTING_BROWSER_DIRECTORY "BrowserDirectory" +#define SETTING_BROWSER_EXECUTABLE "BrowserExecutable" +#define SETTING_BROWSER_DIRECTORY "BrowserDirectory" +#define SETTING_PROFILE_DIRECTORY "ProfileDirectory" +#define SETTING_DEFAULT_PROFILE_DIRECTORY "DefaultProfileDirectory" +#define SETTING_PLUGINS_DIRECTORY "PluginsDirectory" +#define SETTING_DEFAULT_PLUGINS_DIRECTORY "DefaultPluginsDirectory" #define SETTING_IM_EXECUTABLE "IMExecutable" #define SETTING_RUN_PROXY_AT_START "RunProxyAtStart" #define SETTING_PROXY_EXECUTABLE "ProxyExecutable" @@ -86,6 +90,11 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_LOCAL_GEOIP_DATABASE, ""); setDefault(SETTING_ICON_PREF, Both); setDefault(SETTING_SKIP_VERSION_CHECK, false); + + setDefault(SETTING_PROFILE_DIRECTORY, ""); + setDefault(SETTING_DEFAULT_PROFILE_DIRECTORY, ""); + setDefault(SETTING_PLUGINS_DIRECTORY, ""); + setDefault(SETTING_DEFAULT_PLUGINS_DIRECTORY, ""); } /** Gets the currently preferred language code for Vidalia. */ @@ -363,3 +372,51 @@ VidaliaSettings::skipVersionCheck() const { return value(SETTING_SKIP_VERSION_CHECK).toBool(); } + +QString +VidaliaSettings::getDefaultProfileDirectory() const +{ + return QDir::convertSeparators(value(SETTING_DEFAULT_PROFILE_DIRECTORY).toString()); +} + +void +VidaliaSettings::setDefaultProfileDirectory(const QString &dir) +{ + setValue(SETTING_DEFAULT_PROFILE_DIRECTORY, dir); +} + +QString +VidaliaSettings::getProfileDirectory() const +{ + return QDir::convertSeparators(value(SETTING_PROFILE_DIRECTORY).toString()); +} + +void +VidaliaSettings::setProfileDirectory(const QString &dir) +{ + setValue(SETTING_PROFILE_DIRECTORY, dir); +} + +QString +VidaliaSettings::getPluginsDirectory() const +{ + return QDir::convertSeparators(value(SETTING_PLUGINS_DIRECTORY).toString()); +} + +void +VidaliaSettings::setPluginsDirectory(const QString &dir) +{ + setValue(SETTING_PLUGINS_DIRECTORY, dir); +} + +QString +VidaliaSettings::getDefaultPluginsDirectory() const +{ + return QDir::convertSeparators(value(SETTING_DEFAULT_PLUGINS_DIRECTORY).toString()); +} + +void +VidaliaSettings::setDefaultPluginsDirectory(const QString &dir) +{ + setValue(SETTING_DEFAULT_PLUGINS_DIRECTORY, dir); +} diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index b378d9b..6967740 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -82,6 +82,16 @@ public: * If set to the empty string, the browser will not be started. */ void setBrowserDirectory(const QString &browserDirectory); + /** Browser directories */ + QString getDefaultProfileDirectory() const; + void setDefaultProfileDirectory(const QString &dir); + QString getProfileDirectory() const; + void setProfileDirectory(const QString &dir); + QString getPluginsDirectory() const; + void setPluginsDirectory(const QString &dir); + QString getDefaultPluginsDirectory() const; + void setDefaultPluginsDirectory(const QString &dir); + /** Returns a fully-qualified path to the IM client, including the * executable name. */ QString getIMExecutable() const; [View Less]

1 0

[onionoo/master] Make sure country codes are lower-case as specified.
by karsten＠torproject.org 23 Mar '12

23 Mar '12

commit 1f34e85c33e1757279a41c21eb309f1bd8d1c7b6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 23 12:42:38 2012 +0100 Make sure country codes are lower-case as specified. --- src/org/torproject/onionoo/CurrentNodes.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 2264510..6c3798b 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java … [View More]

1 0

[metrics-lib/master] Fix copy-paste bug in calculating descriptor digests.
by karsten＠torproject.org 23 Mar '12

23 Mar '12

commit e3a8d5f068726af30f6c46115a8e8de0127a0cd9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Mar 23 13:02:05 2012 +0100 Fix copy-paste bug in calculating descriptor digests. Also, fix the check that had the only purpose of detecting problems, which it totally failed to do. --- .../descriptor/impl/ExtraInfoDescriptorImpl.java | 4 ++-- .../descriptor/impl/ServerDescriptorImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) … [View More]

1 0