Mercurial > pidgin3 / changeset

--- a/pidgin/win32/nsis/langmacros.nsh	Wed Apr 18 07:42:23 2007 +0000
+++ b/pidgin/win32/nsis/langmacros.nsh	Wed Apr 18 19:19:08 2007 +0000
@@ -50,11 +50,6 @@
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SECTION_DESCRIPTION		${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_SECTION_DESCRIPTION		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_DESCRIPTION	${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_NO_THEME_DESC			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WIMP_THEME_DESC			${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_THEME_DESC		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_THEME_DESC	${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_DESC		${CUR_LANG}
   !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_DESC	${CUR_LANG}

--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed Apr 18 07:42:23 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Apr 18 19:19:08 2007 +0000
@@ -9,7 +9,6 @@
 ;Global Variables
 Var name
 Var GTK_FOLDER
-Var GTK_THEME_SEL
 Var ISSILENT
 Var STARTUP_RUN_KEY
 Var SPELLCHECK_SEL
@@ -49,9 +48,6 @@
 !insertmacro VersionCompare
 !insertmacro WordFind
 
-!include "TextFunc.nsh"
-!insertmacro ConfigWriteS
-
 ;--------------------------------
 ;Defines
 
@@ -78,7 +74,7 @@
 !define GTK_RUNTIME_INSTALLER			"..\..\..\..\gtk_installer\gtk-runtime*.exe"
 
 !define ASPELL_REG_KEY				"SOFTWARE\Aspell"
-!define DOWNLOADER_URL				"http://www.pidgin.im/win32/download_redir.php"
+!define DOWNLOADER_URL				"http://pidgin.im/win32/download_redir.php"
 
 ;--------------------------------
 ;Version resource
@@ -121,7 +117,7 @@
   !define MUI_FINISHPAGE_RUN			"$INSTDIR\pidgin.exe"
   !define MUI_FINISHPAGE_RUN_NOTCHECKED
   !define MUI_FINISHPAGE_LINK			$(PIDGIN_FINISH_VISIT_WEB_SITE)
-  !define MUI_FINISHPAGE_LINK_LOCATION		"http://www.pidgin.im/win32"
+  !define MUI_FINISHPAGE_LINK_LOCATION		"http://pidgin.im/win32"
 
 ;--------------------------------
 ;Pages
@@ -521,31 +517,6 @@
 SectionGroupEnd