summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-03-05 18:46:50 +0000
committerGerald Combs <gerald@wireshark.org>2013-03-05 18:46:50 +0000
commit75847e552ae4524944766c475b95b671236b2f37 (patch)
tree5f1c47684c87335cd464ab62823e3a1baace522f
parent177b69dc236db080655adf278b0cd5b779aae5ad (diff)
downloadwireshark-75847e552ae4524944766c475b95b671236b2f37.tar.gz
"HKEY_CURRENT_USER\Software\The Wireshark developer community, http://www.wireshark.org/\Wireshark\WinSparkle" isn't the prettiest registry path.
svn path=/trunk/; revision=48089
-rwxr-xr-xpackaging/nsis/uninstall.nsi1
-rwxr-xr-xui/software_update.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index ada80413b9..c215667bf1 100755
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -259,6 +259,7 @@ SectionIn 2
SetShellVarContext current
Delete "$APPDATA\${PROGRAM_NAME}\*.*"
RMDir "$APPDATA\${PROGRAM_NAME}"
+DeleteRegKey HKCU "Software\${PROGRAM_NAME}"
SectionEnd
;VAR un.WINPCAP_UNINSTALL
diff --git a/ui/software_update.c b/ui/software_update.c
index 2a837254d5..1e2d513232 100755
--- a/ui/software_update.c
+++ b/ui/software_update.c
@@ -96,6 +96,7 @@ void
software_update_init(void) {
const char *update_url = get_appcast_update_url(prefs.gui_update_channel);
+ win_sparkle_set_registry_path("Software\\Wireshark\\WinSparkle Settings");
win_sparkle_set_appcast_url(update_url);
win_sparkle_set_automatic_check_for_updates(prefs.gui_update_enabled ? 1 : 0);
win_sparkle_set_update_check_interval(prefs.gui_update_interval);