[gimp/gimp-2-8] Installer: adjust associations label height automatically according to text length

[Jernej SimonÄiÄ <jernejs src gnome org>]

commit 049258a70133dea606c498e2b9dcfd465fa13971
Author: Jernej SimonÄiÄ <jernej+s-gnome eternallybored org>
Date:   Fri Jul 27 22:05:13 2012 +0200

    Installer: adjust associations label height automatically according to text length

 build/windows/installer/files.isi    |    2 +-
 build/windows/installer/gimp3264.iss |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index f4de274..d409360 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -23,5 +23,5 @@ Source: "{#DEPS_DIR}\{#DDIR}\bin\libgs-8.dll"; DestDir: "{app}\bin"; Components:
 Source: "{#DEPS_DIR}\{#DDIR}\bin\gspawn-win*.exe"; DestDir: "{app}\bin"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
 Source: "{#DEPS_DIR}\{#DDIR}\bin\bzip2.exe"; DestDir: "{app}\bin"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace uninsrestartdelete
 Source: "{#DEPS_DIR}\{#DDIR}\lib\*.dll"; DestDir: "{app}\lib"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
-Source: "{#DEPS_DIR}\{#DDIR}\lib\bonobo\servers\*"; DestDir: "{app}\lib\bonobo\servers"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace uninsrestartdelete
+;Source: "{#DEPS_DIR}\{#DDIR}\lib\bonobo\servers\*"; DestDir: "{app}\lib\bonobo\servers"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace uninsrestartdelete
 Source: "{#DEPS_DIR}\{#DDIR}\libexec\*.exe"; DestDir: "{app}\libexec"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index ec2d8d9..8437b47 100644
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -662,6 +662,8 @@ begin
 		Top := 0;
 		Width := Associations.AssociationsPage.Page.SurfaceWidth;
 		Height := ScaleY(13);
+		WordWrap := True;
+		AutoSize := True;
 		Caption := CustomMessage('SelectAssociationsInfo1')+#13+CustomMessage('SelectAssociationsInfo2')+#13;
 	end;	
 	Associations.AssociationsPage.lblAssocInfo2 := TNewStaticText.Create(Associations.AssociationsPage.Page);