commit c9e4c5a1ab46896cf187d7f18138537dac999373 Author: Tomás Touceda chiiph@torproject.org Date: Thu Jun 28 21:32:31 2012 -0300

Save what version of Vidalia wrote the configuration file --- changes/bug5123 | 3 +++ src/vidalia/config/VidaliaSettings.cpp | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/changes/bug5123 b/changes/bug5123 new file mode 100644 index 0000000..6abe02c --- /dev/null +++ b/changes/bug5123 @@ -0,0 +1,3 @@ + New features: + o Set what version of Vidalia wrote the configuration file. Resolves ticket + 5123. diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 03dde13..4c92a1f 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -41,6 +41,7 @@ #define SETTING_ALLOW_PANIC "AllowPanic" #define SETTING_PANIC_PATH "PanicPath" #define SETTING_FIRST_RUN "FirstRun" +#define SETTING_VIDALIA_VERSION "VidaliaVersion"

#if defined(Q_OS_WIN32) #define STARTUP_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Run" @@ -91,6 +92,8 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_PANIC_PATH, ""); setDefault(SETTING_FIRST_RUN, true); setDefault(SETTING_REMEMBER_DONTWARNEXIT, true); + + setValue(SETTING_VIDALIA_VERSION, Vidalia::version()); }

/** Gets the currently preferred language code for Vidalia. */