# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1069527276 0
# Node ID f48c6e4db102b06606b9e0bbbf32bdb4a60aff79
# Parent  c3fb280f5ad25e68ffddc4beacb337cebc384a55
[gaim-migrate @ 8222]
Last minute 0.73 changes

committer: Tailor Script <tailor@pidgin.im>

diff -r c3fb280f5ad2 -r f48c6e4db102 ChangeLog.win32
--- a/ChangeLog.win32	Sat Nov 22 17:21:00 2003 +0000
+++ b/ChangeLog.win32	Sat Nov 22 18:54:36 2003 +0000
@@ -1,9 +1,9 @@
-version 0.73:
+version 0.73 (11/21/2003):
 	* Fix the close button on the first tab in each window.
 	* Fix for carriage return pileups in userinfo.
 	* Window flashing is back.
 	* Fix for gaim settings move bug (#838621).
-	* Update to latest NSIS cvs snapshot.
+	* Update to NSIS v2.0 b4 final release.
 	* Ability to perform unattended installations.
 	* Installer translations for: Spanish.
 
diff -r c3fb280f5ad2 -r f48c6e4db102 gaim-installer.nsi
--- a/gaim-installer.nsi	Sat Nov 22 17:21:00 2003 +0000
+++ b/gaim-installer.nsi	Sat Nov 22 18:54:36 2003 +0000
@@ -86,6 +86,7 @@
 ;--------------------------------
 ;Pages
   
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE		preWelcomePage
   !insertmacro MUI_PAGE_WELCOME
   !insertmacro MUI_PAGE_LICENSE			"./COPYING"
   !insertmacro MUI_PAGE_COMPONENTS
@@ -541,6 +542,7 @@
     Delete "$INSTDIR\plugins\libtoc.dll"
     Delete "$INSTDIR\plugins\libyahoo.dll"
     Delete "$INSTDIR\plugins\perl.dll"
+    Delete "$INSTDIR\plugins\relnot.dll"
     Delete "$INSTDIR\plugins\spellchk.dll"
     Delete "$INSTDIR\plugins\ssl-nss.dll"
     Delete "$INSTDIR\plugins\ssl.dll"
@@ -975,20 +977,11 @@
 
   Call ParseParameters
 
-  ; If this installer dosn't have GTK, check whether we need it.
-  !ifndef WITH_GTK
-    Call DoWeNeedGtk
-    Pop $0
-    Pop $GTK_FOLDER
-
-    StrCmp $0 "0" have_gtk need_gtk
-    need_gtk:
-      IfSilent skip_mb
-      MessageBox MB_OK $(GTK_INSTALLER_NEEDED) IDOK
-      skip_mb:
-      Quit
-    have_gtk:
-  !endif
+  ; Select Language
+  IntCmp $LANG_IS_SET 1 skip_lang
+    ; Display Language selection dialog
+    !insertmacro MUI_LANGDLL_DISPLAY
+    skip_lang:
 
   ; If install path was set on the command, use it.
   StrCmp $INSTDIR "" 0 instdir_done
@@ -1009,10 +1002,6 @@
 
   instdir_done:
 
-  IntCmp $LANG_IS_SET 1 skip_lang
-    ; Display Language selection dialog
-    !insertmacro MUI_LANGDLL_DISPLAY
-    skip_lang:
 FunctionEnd
 
 Function un.onInit
@@ -1074,6 +1063,25 @@
 
 ; Page enter and exit functions..
 
+Function preWelcomePage
+  ; If this installer dosn't have GTK, check whether we need it.
+  ; We do this here an not in .onInit because language change in
+  ; .onInit doesn't take effect until it is finished.
+  !ifndef WITH_GTK
+    Call DoWeNeedGtk
+    Pop $0
+    Pop $GTK_FOLDER
+
+    StrCmp $0 "0" have_gtk need_gtk
+    need_gtk:
+      IfSilent skip_mb
+      MessageBox MB_OK $(GTK_INSTALLER_NEEDED) IDOK
+      skip_mb:
+      Quit
+    have_gtk:
+  !endif
+FunctionEnd
+
 !ifdef WITH_GTK
 Function preGtkDirPage
   Call DoWeNeedGtk
diff -r c3fb280f5ad2 -r f48c6e4db102 src/main.c
--- a/src/main.c	Sat Nov 22 17:21:00 2003 +0000
+++ b/src/main.c	Sat Nov 22 18:54:36 2003 +0000
@@ -839,7 +839,7 @@
 
 	plugin_search_paths[0] = LIBDIR;
 	plugin_search_paths[1] = gaim_user_dir();
-	plugin_search_paths[2] = g_strdup_printf("%s/plugins", gaim_user_dir());
+	plugin_search_paths[2] = g_build_filename(gaim_user_dir(), "plugins", NULL);
 
 	gaim_plugins_set_search_paths(sizeof(plugin_search_paths) /
 								  sizeof(*plugin_search_paths),
diff -r c3fb280f5ad2 -r f48c6e4db102 src/win32/nsis/translations/swedish.nsh
--- a/src/win32/nsis/translations/swedish.nsh	Sat Nov 22 17:21:00 2003 +0000
+++ b/src/win32/nsis/translations/swedish.nsh	Sat Nov 22 18:54:36 2003 +0000
@@ -5,11 +5,16 @@
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Tore Lundqvist <tlt@mima.x.se>, 2003.
+;;  Version 2
 ;;
 
 ; Startup GTK+ check
 !define GTK_INSTALLER_NEEDED			"$\"GTK+ runtime environment$\" saknas eller behöver uppgraderas$\rInstallera v${GTK_VERSION} eller högre av GTK+."
 
+; License Page
+!define GAIM_LICENSE_BUTTON			"Nästa >"
+!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) är utgiven med GPL (GNU General Public License). Licensen visas här endast för att informera. $_CLICK"
+
 ; Components Page
 !define GAIM_SECTION_TITLE			"Gaim-snabbmeddelandeklient (obligatorisk)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
@@ -29,6 +34,9 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"En äldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! Gaim kommer kanske inte att fungera om du inte uppgraderar."
 
+; Installer Finish Page
+!define GAIM_FINISH_VISIT_WEB_SITE		"Besök Windows-Gaims hemsida"
+
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (enbart för avinstallation)"
 !define GAIM_PROMPT_WIPEOUT			"Din gamla Gaim-katalog kommer att raderas, vill du fortsätta?$\r$\rOBS! om du har installerat några extra insticksmoduler kommer de raderas.$\rGaims användarinställningar kommer inte påverkas."