diff options
| -rw-r--r-- | config.nmake | 7 | ||||
| -rw-r--r-- | epan/prefs.c | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 | ||||
| -rwxr-xr-x | ui/software_update.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index c07bf44a86..85866d5ec1 100644 --- a/config.nmake +++ b/config.nmake @@ -665,6 +665,13 @@ SMI_PKG=svn-40773 # GEOIP_PKG=1.4.8-2 +# +# Optional: WinSparkle, software updates +# +# Used for automatic software updates +# +WINSPARKLE_PKG=0.3-44-g2c8d9d3-win64ws + !endif # win32 / win64 diff --git a/epan/prefs.c b/epan/prefs.c index d8a56109d0..7a7441b458 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -2080,7 +2080,7 @@ prefs_register_modules(void) prefs_register_enum_preference(gui_module, "update.channel", "Update channel", "The type of update to fetch", - (gint*)(void*)(&prefs.gui_update_channel), gui_version_placement_type, FALSE); + (gint*)(void*)(&prefs.gui_update_channel), gui_update_channel, FALSE); prefs_register_string_preference(gui_module, "window_title", "Custom window title", "Custom window title. (Appended to existing titles.)", (const char**)(&prefs.gui_window_title)); diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh index 96e706663b..c51a60dcbc 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -4,7 +4,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2012-12-19" +export DOWNLOAD_TAG="2013-02-19" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` diff --git a/ui/software_update.c b/ui/software_update.c index 7e6c366050..5c5737aeea 100755 --- a/ui/software_update.c +++ b/ui/software_update.c @@ -66,12 +66,10 @@ static const char *get_appcast_update_url(software_update_channel_e chan) { update_url_str = g_string_new(""); } -#if 0 /* XXX Add WOW64 checks similar to version_info.c? */ if (sizeof(arch) != 4) { arch = "x86-64"; } -#endif switch (chan) { case UPDATE_CHANNEL_DEVELOPMENT: |