# HG changeset patch # User Herman Bloggs # Date 1065734971 0 # Node ID 471c2850ca512c0e4cb5fa1412e71727ef0248e4 # Parent 8d8b3ab13607cf34bcf9e853591da7731616033e [gaim-migrate @ 7783] Removing gtk-wimp for now.. committer: Tailor Script diff -r 8d8b3ab13607 -r 471c2850ca51 gaim-installer.nsi --- a/gaim-installer.nsi Thu Oct 09 21:22:51 2003 +0000 +++ b/gaim-installer.nsi Thu Oct 09 21:29:31 2003 +0000 @@ -425,22 +425,22 @@ done: SectionEnd - Section $(GTK_WIMP_SECTION_TITLE) SecGtkWimp - Call CanWeInstallATheme - Pop $R1 - StrCmp $R1 "" done - - SetOverwrite on - Rename $R1\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc $R1\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc.old - SetOutPath $R1\${GTK_DEFAULT_THEME_ENGINE_DIR} - File ${GTK_THEME_DIR}\engines\libwimp.dll - SetOutPath $R1\${GTK_DEFAULT_THEME_GTKRC_DIR} - File ${GTK_THEME_DIR}\themes\gtkrc.gtkwimp - File /oname=gtkrc ${GTK_THEME_DIR}\themes\gtkrc.gtkwimp - SetOverwrite off - - done: - SectionEnd +; Section $(GTK_WIMP_SECTION_TITLE) SecGtkWimp +; Call CanWeInstallATheme +; Pop $R1 +; StrCmp $R1 "" done +; +; SetOverwrite on +; Rename $R1\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc $R1\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc.old +; SetOutPath $R1\${GTK_DEFAULT_THEME_ENGINE_DIR} +; File ${GTK_THEME_DIR}\engines\libwimp.dll +; SetOutPath $R1\${GTK_DEFAULT_THEME_GTKRC_DIR} +; File ${GTK_THEME_DIR}\themes\gtkrc.gtkwimp +; File /oname=gtkrc ${GTK_THEME_DIR}\themes\gtkrc.gtkwimp +; SetOverwrite off +; +; done: +; SectionEnd Section $(GTK_BLUECURVE_SECTION_TITLE) SecGtkBluecurve Call CanWeInstallATheme @@ -593,8 +593,8 @@ $(GTK_THEMES_SECTION_DESCRIPTION) !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkNone} \ $(GTK_NO_THEME_DESC) - !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkWimp} \ - $(GTK_WIMP_THEME_DESC) +; !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkWimp} \ +; $(GTK_WIMP_THEME_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkBluecurve} \ $(GTK_BLUECURVE_THEME_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkLighthouseblue} \ @@ -976,7 +976,7 @@ ; Set up Theme sections.. StrCpy $1 ${SecGtkNone} ; Sets global to remember which theme is set. !insertmacro SelectSection ${SecGtkNone} - !insertmacro UnselectSection ${SecGtkWimp} +; !insertmacro UnselectSection ${SecGtkWimp} !insertmacro UnselectSection ${SecGtkBluecurve} !insertmacro UnselectSection ${SecGtkLighthouseblue} @@ -999,15 +999,15 @@ StrCpy $2 ${SF_SELECTED} SectionGetFlags ${SecGtkNone} $0 IntOp $2 $2 & $0 - SectionGetFlags ${SecGtkWimp} $0 - IntOp $2 $2 & $0 +; SectionGetFlags ${SecGtkWimp} $0 +; IntOp $2 $2 & $0 SectionGetFlags ${SecGtkBluecurve} $0 IntOp $2 $2 & $0 SectionGetFlags ${SecGtkLighthouseblue} $0 IntOp $2 $2 & $0 StrCmp $2 0 skip SectionSetFlags ${SecGtkNone} 0 - SectionSetFlags ${SecGtkWimp} 0 +; SectionSetFlags ${SecGtkWimp} 0 SectionSetFlags ${SecGtkBluecurve} 0 SectionSetFlags ${SecGtkLighthouseblue} 0 skip: @@ -1022,10 +1022,10 @@ IntOp $0 $0 & ${SF_SELECTED} IntCmp $0 ${SF_SELECTED} 0 +2 +2 StrCpy $1 ${SecGtkNone} - SectionGetFlags ${SecGtkWimp} $0 - IntOp $0 $0 & ${SF_SELECTED} - IntCmp $0 ${SF_SELECTED} 0 +2 +2 - StrCpy $1 ${SecGtkWimp} +; SectionGetFlags ${SecGtkWimp} $0 +; IntOp $0 $0 & ${SF_SELECTED} +; IntCmp $0 ${SF_SELECTED} 0 +2 +2 +; StrCpy $1 ${SecGtkWimp} SectionGetFlags ${SecGtkBluecurve} $0 IntOp $0 $0 & ${SF_SELECTED} IntCmp $0 ${SF_SELECTED} 0 +2 +2