Enable automatic updates for Win64. Fix a copy/paste error.

svn path=/trunk/; revision=47749

diff --git a/config.nmake b/config.nmake
index c07bf44a86283cde7d8ed055aef4cb0c690975bd..85866d5ec1fedbe6ca6ff2b8c5f901d212a70c4d 100644 (file)
--- 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 d8a56109d0c9af34fe174ae6c3e005bc0d2c23ad..7a7441b45807feaf215de0d03e784887bbc3aec2 100644 (file)
--- 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 96e706663b57d8cb94ce6a353fa9c2c5452790dd..c51a60dcbcbcca8178dc5a4966d9dbb33c2a4cf5 100755 (executable)
--- 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 7e6c366050bc612ec871bd32fa2c8197658bed98..5c5737aeeab70545e2f05c14ffa97ec5de025d38 100755 (executable)
--- 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: