Use the latest GTK packages, changes:

Overview of Changes from GLib 2.18.0 to GLib 2.18.1
===================================================

* Bugs fixed:
 550433 g_test_init doesn't recognize --help
 523463 Core dump in gmain.c:2482:IA__g_main_context_check
 551228 G_STRFUNC on recent Sun compiler should be expanded...
 551410 gtestutils.c: using printf without prototype
 551731 g_date_set_time[_t] docs should mention what timezone
 548321 <string.h> is not included in gi18n-lib.h
 551149 xdgmime mem leak
 550647 synchronous pipe I/O when reading mount reply
 551887 Docs for g_desktop_app_info_new_from_filename aren't...
 551681 g_content_type_guess() too naive with filenames
 552352 g_app_info_launch doesn't work if "Path" key...
 551408 gmodule.def generated to builddir...
 552359 g_file_info_get_icon should return GThemedIcon, and...

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

* Don't use XRRGetScreenResources, since it doesn't work well

* Bugs fixed:
 551063 deprecated marking without a link to what new code should use
 319849 gtkcalendar look in RTL locales
 550989 gdk_display_put_event should call g_main_context_wakeup
 550062 Small update in gdk/gdkkeysyms.h
 551325 Reference to wrong parameter in gtk_editable_insert_text
 551386 gtk_printer_set_is_default() always sets TRUE
 550676 Memory leak, update keyboard layout data structure
 551699 gtk_scrolled_window_destroy() is broken
 551567 DND mark broken
 551378 Print dialog: should try UDS when fetching PPD for localhost
 536542 gtk_list_store_set() documentation doesn't say whether...
 552153 GtkModules loading with XSettings doesn't work...
 552001 gtkimcontextsimple.c: variable is declared at middle...
 551987 GtkPaned redrawing problem
 551722 gtk_widget_set_scroll_adjustments() should check...
 552107 Small libtool fixes
 552500 GtkPrintSettings API doc not precise enough
 408154 Change GtkEntryCompletion max-items to style property
 329593 Entering characters on a line very cpu intensive and slow
 552667 gtkimage containing gicon leaks memory
 552668 format not a string literal and no format arguments...
 346903 gtk_enumerate_printers needs events to complete
 550969 fix a typo which breaks the static build
 517233 Calling gdk_pixbuf_loader_close causes "GError set over...
 551063 deprecated marking without a link to what new code should use
 540967 docs build slowly because of entities

svn path=/trunk/; revision=26255

1 files changed, 4 insertions, 4 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 8ccd49f9c1..bb427dd23f 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -705,9 +705,9 @@ process_libs:
     if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
 !IF "$(GTK_INST_VERSION)" == "2.14"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		glib gtk2.14/glib_2.18.0-2_win32.zip
+		glib gtk2.14/glib_2.18.1-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		glib gtk2.14/glib-dev_2.18.0-2_win32.zip
+		glib gtk2.14/glib-dev_2.18.1-1_win32.zip
 !ELSEIF "$(GTK_INST_VERSION)" == "2.12"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		glib gtk2.12/glib_2.18.0-1_win32.zip
@@ -773,9 +773,9 @@ 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.1-1_win32.zip
+		gtk2 gtk2.14/gtk+_2.14.2-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.14/gtk+-dev_2.14.1-1_win32.zip
+		gtk2 gtk2.14/gtk+-dev_2.14.2-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		gtk2 gtk2.14/cairo-1.6.4-2.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \