Yet another GTK+ update...

Overview of Changes from GTK+ 2.14.2 to 2.14.3
==============================================

* Revert problematic GtkAdjustment changes

* Bugs fixed: 
 552837 mem leak in gtkimmulticontext
 553000 incorrect i18n header in gtkfilesystem.c
 553135 eog crash: assertion failed
 552545 leaks GpImage

svn path=/trunk/; revision=26273

3 files changed, 14 insertions, 14 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index bb427dd23f..97a06da4d8 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -773,19 +773,19 @@ process_libs:
 !IFDEF GTK_DIR
 !IF "$(GTK_INST_VERSION)" == "2.14"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/gtk+_2.14.2-1_win32.zip
+		gtk2 gtk2.14/gtk+_2.14.3-2_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/gtk+-dev_2.14.2-1_win32.zip
+		gtk2 gtk2.14/gtk+-dev_2.14.3-2_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/cairo-1.6.4-2.zip
+		gtk2 gtk2.14/cairo_1.7.6-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/cairo-dev-1.6.4-2.zip
+		gtk2 gtk2.14/cairo-dev_1.7.6-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/atk-1.22.0.zip
+		gtk2 gtk2.14/atk_1.24.0-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/atk-dev-1.22.0.zip
+		gtk2 gtk2.14/atk-dev_1.24.0-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/libpng-1.2.29.zip
+		gtk2 gtk2.14/libpng_1.2.32-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		gtk2 gtk2.14/tiff-3.8.2-1-bin.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -812,11 +812,11 @@ process_libs:
 !ELSE
 !ERROR ? Unknown or invalid GTK_INST_VERSION
 !ENDIF
-!IF "$(PANGO_INST_VERSION)" == "1.20"
+!IF "$(PANGO_INST_VERSION)" == "1.22"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/pango-1.20.5.zip
+		gtk2 gtk2.14/pango_1.22.0-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.12/pango-dev-1.20.5.zip
+		gtk2 gtk2.14/pango-dev_1.22.0-1_win32.zip
 !ELSE
 !ERROR ? Unknown or invalid PANGO_INST_VERSION
 !ENDIF
diff --git a/config.nmake b/config.nmake
index f21171dddd..32eb805039 100644
--- a/config.nmake
+++ b/config.nmake
@@ -41,7 +41,7 @@ WIRESHARK_LIBS=C:\wireshark-$(PLATFORM)-libs
 # Base directory, where your programs reside.
 # This setting is used only inside this file.
 #
-PROGRAM_FILES=C:/Program Files
+PROGRAM_FILES=$(PROGRAMFILES)
 
 #
 # Machine type for the compiler and linker
@@ -146,7 +146,7 @@ GTK_DIR=$(WIRESHARK_LIBS)\gtk2
 #
 # GTK 2.12 is the mainline since Wireshark 0.99.7
 GTK_INST_VERSION=2.14
-PANGO_INST_VERSION=1.20
+PANGO_INST_VERSION=1.22
 
 #
 # Optional: WinPcap developer's pack to capture network traffic.
@@ -649,7 +649,7 @@ GTK_WIMP_RCDST_DIR=etc\gtk-2.0
 !ERROR ? Unknown or invalid GTK_INST_VERSION
 !ENDIF
 
-!IF "$(PANGO_INST_VERSION)" == "1.20"
+!IF "$(PANGO_INST_VERSION)" == "1.22"
 PANGO_LIB_DIR=1.5.0
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.18"
 PANGO_LIB_DIR=1.5.0
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index c00c4d98fb..b4997cb87a 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -7,7 +7,7 @@
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
 # Save previous tag.
-DOWNLOAD_TAG="2008-09-23"
+DOWNLOAD_TAG="2008-09-25"
 DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/"
 TAG_FILE="current_tag.txt"