# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1090254933 0
# Node ID c60809a33460f5d14d7dab3d5d99b8585cb4fd46
# Parent  8faa2e191ba840c1c2ee2ab341a882b57693c994
[gaim-migrate @ 10404]
0.80 changes

committer: Tailor Script <tailor@pidgin.im>

diff -r 8faa2e191ba8 -r c60809a33460 Makefile.mingw
--- a/Makefile.mingw	Sun Jul 18 23:30:34 2004 +0000
+++ b/Makefile.mingw	Mon Jul 19 16:35:33 2004 +0000
@@ -11,7 +11,7 @@
 GAIM_PIXMAPS = ./pixmaps
 GAIM_SOUNDS = ./sounds
 GAIM_INSTALL_DIR = ./win32-install-dir
-GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.4/gtkspell
+GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.6/gtkspell
 IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker
 GTKRC_TOP = ../win32-dev/gtkrc
 OSCAR = $(GAIM_PROTOS)/oscar
diff -r 8faa2e191ba8 -r c60809a33460 gaim-installer.nsi
--- a/gaim-installer.nsi	Sun Jul 18 23:30:34 2004 +0000
+++ b/gaim-installer.nsi	Mon Jul 19 16:35:33 2004 +0000
@@ -51,7 +51,7 @@
 !define GAIM_UNINST_EXE				"gaim-uninst.exe"
 !define GAIM_REG_LANG				"Installer Language"
 
-!define GTK_VERSION				"2.2.4"
+!define GTK_VERSION				"2.4.3"
 !define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
 !define PERL_REG_KEY				"SOFTWARE\Perl"
 !define PERL_DLL				"perl58.dll"
@@ -59,7 +59,7 @@
 !define GTK_RUNTIME_INSTALLER			"..\gtk_installer\gtk-runtime*.exe"
 !define GTK_THEME_DIR				"..\gtk_installer\gtk_themes"
 !define GTK_DEFAULT_THEME_GTKRC_DIR		"share\themes\Default\gtk-2.0"
-!define GTK_DEFAULT_THEME_ENGINE_DIR		"lib\gtk-2.0\2.2.0\engines"
+!define GTK_DEFAULT_THEME_ENGINE_DIR		"lib\gtk-2.0\2.4.0\engines"
 
 ;--------------------------------
 ;Modern UI Configuration
@@ -550,6 +550,7 @@
     RMDir /r "$INSTDIR\perlmod"
     Delete "$INSTDIR\plugins\autorecon.dll"
     Delete "$INSTDIR\plugins\docklet.dll"
+    Delete "$INSTDIR\plugins\extplacement.dll"
     Delete "$INSTDIR\plugins\history.dll"
     Delete "$INSTDIR\plugins\iconaway.dll"
     Delete "$INSTDIR\plugins\idle.dll"
@@ -850,16 +851,15 @@
 
 
 ; CheckGtkVersion
-; inputs: Push 2 GTK+ version strings to check. The major and minor values
-; need to be equal, for success.  If the micro val to check is equal or greater
-; to the refrence micro value, then we have success.
+; inputs: Push 2 GTK+ version strings to check. The major value needs to
+; be equal and the minor value needs to be greater or equal.
 ;
 ; Usage:
-;   Push "2.2.0"  ; Refrence version
+;   Push "2.1.0"  ; Refrence version
 ;   Push "2.2.1"  ; Version to check
 ;   Call CheckGtkVersion
 ;   Pop $R0
-;   $R0 will now equal "0", because 2.2.0 is less than 2.2.1
+;   $R0 will now equal "1", because 2.2 is greater than 2.1
 ;
 Function CheckGtkVersion
   ; Version we want to check
@@ -874,18 +874,11 @@
   ; Major version check
   StrCpy $7 $6 1
   StrCpy $9 $8 1
-  IntCmp $7 $9 check_minor
-    Goto bad_version
+  IntCmp $7 $9 check_minor bad_version bad_version
 
   check_minor:
     StrCpy $7 $6 1 2
     StrCpy $9 $8 1 2
-    IntCmp $7 $9 check_micro
-      Goto bad_version
-
-  check_micro:
-    StrCpy $7 $6 1 4
-    StrCpy $9 $8 1 4
     IntCmp $7 $9 good_version bad_version good_version
 
   bad_version:
diff -r 8faa2e191ba8 -r c60809a33460 src/Makefile.mingw
--- a/src/Makefile.mingw	Sun Jul 18 23:30:34 2004 +0000
+++ b/src/Makefile.mingw	Mon Jul 19 16:35:33 2004 +0000
@@ -13,7 +13,7 @@
 GAIM_TOP :=		..
 GAIM_SRC :=		.
 ASPELL_TOP :=		../../win32-dev/aspell-dev-0-50-3-3
-GTKSPELL_TOP :=		../../win32-dev/gtkspell-2.0.4
+GTKSPELL_TOP :=		../../win32-dev/gtkspell-2.0.6
 IDLETRACK_TOP :=	$(GAIM_TOP)/src/win32/IdleTracker
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 MINGW_PLUS_DIR :=	$(GAIM_SRC)/win32/mingw_plus
@@ -173,7 +173,7 @@
 			-lws2_32 \
 			-liberty \
 			-lwinmm \
-			-llibz \
+			-lzdll \
 			-lidletrack \
 			-lnss3 \
 			-lnspr4 \