From f2da9afab3cdd7f7ce5964e2cddff8a822d822ce Mon Sep 17 00:00:00 2001
From: Evan Schoenberg <evan@adiumx.com>
Date: Thu, 17 Nov 2005 18:09:38 +0000
Subject: [PATCH] Merged [14029]: Tweaking [14026]

git-svn-id: svn://svn.adiumx.com/adium/branches/adium-0.8@14030 1c916fce-81e2-0310-a464-8ca513f45935
---
 .../Adium Framework/ESTextAndButtonsWindowController.h | 10 ----------
 .../Adium Framework/ESTextAndButtonsWindowController.m | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Frameworks/Adium Framework/ESTextAndButtonsWindowController.h b/Frameworks/Adium Framework/ESTextAndButtonsWindowController.h
index 6fbac3ccf..1b2afab80 100644
--- a/Frameworks/Adium Framework/ESTextAndButtonsWindowController.h	
+++ b/Frameworks/Adium Framework/ESTextAndButtonsWindowController.h	
@@ -70,16 +70,6 @@ typedef enum {
 								 target:(id)inTarget
 							   userInfo:(id)inUserInfo;
 
-- (id)initWithWindowNibName:(NSString *)windowNibName
-				  withTitle:(NSString *)inTitle
-			  defaultButton:(NSString *)inDefaultButton
-			alternateButton:(NSString *)inAlternateButton
-				otherButton:(NSString *)inOtherButton
-		  withMessageHeader:(NSString *)inMessageHeader
-				 andMessage:(NSAttributedString *)inMessage
-					 target:(id)inTarget
-				   userInfo:(id)inUserInfo;
-
 - (IBAction)pressedButton:(id)sender;
 
 - (void)setAllowsCloseWithoutResponse:(BOOL)inAllowsCloseWithoutResponse;
diff --git a/Frameworks/Adium Framework/ESTextAndButtonsWindowController.m b/Frameworks/Adium Framework/ESTextAndButtonsWindowController.m
index fd12c01db..f847eea49 100644
--- a/Frameworks/Adium Framework/ESTextAndButtonsWindowController.m	
+++ b/Frameworks/Adium Framework/ESTextAndButtonsWindowController.m	
@@ -22,6 +22,16 @@
 
 @interface ESTextAndButtonsWindowController (PRIVATE)
 - (void)showWindowWithDict:(NSDictionary *)infoDict;
+- (id)initWithWindowNibName:(NSString *)windowNibName
+				  withTitle:(NSString *)inTitle
+			  defaultButton:(NSString *)inDefaultButton
+			alternateButton:(NSString *)inAlternateButton
+				otherButton:(NSString *)inOtherButton
+		  withMessageHeader:(NSString *)inMessageHeader
+				 andMessage:(NSAttributedString *)inMessage
+					  image:(NSImage *)inImage
+					 target:(id)inTarget
+				   userInfo:(id)inUserInfo;
 @end
 
 @implementation ESTextAndButtonsWindowController
@@ -155,9 +165,13 @@
 /*!
  * @brief Set the image
  */
-- (void)setImage:(NSImage *)image;
+- (void)setImage:(NSImage *)inImage;
 {
-	[imageView setImage:image];
+	if (inImage != image) {
+		[image release];
+		image = [inImage retain];
+		[imageView setImage:image];
+	}
 }
 
 /*!
-- 
2.11.4.GIT