adium-1.4 2910:1bcb24fe3222: Don't enable the header control if ...

commits at adium.im commits at adium.im
Tue Mar 16 19:31:33 UTC 2010


details:	http://hg.adium.im/adium-1.4/rev/1bcb24fe3222
revision:	2910:1bcb24fe3222
author:		Frank Dowsett <wixardy at adium.im>
date:		Tue Mar 16 06:35:39 2010 -0400

Don't enable the header control if there isn't a header or topic for regular or group chats respectively. Fixes #13791
(transplanted from 3629989a40f9c22595d5a7569d41e369729b3160)

diffs (15 lines):

diff -r 70f037439c89 -r 1bcb24fe3222 Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m
--- a/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m	Sun Mar 14 00:55:15 2010 -0500
+++ b/Plugins/WebKit Message View/ESWebKitMessageViewPreferences.m	Tue Mar 16 06:35:39 2010 -0400
@@ -363,7 +363,10 @@
 	[imageView_backgroundImage setEnabled:allowCustomBackground];
 	
 	//Disable the header control if this style doesn't have a header or topic
-	[checkBox_showHeader setEnabled:([messageStyle hasHeader] || [messageStyle hasTopic]) && anyControlsEnabled];
+	if (self.currentTab == AIWebkitGroupChat)
+		[checkBox_showHeader setEnabled:[messageStyle hasTopic] && anyControlsEnabled];
+	else
+		[checkBox_showHeader setEnabled:[messageStyle hasHeader] && anyControlsEnabled];
 	
 	//Disable user icon toggling if the style doesn't support them
 	[checkBox_showUserIcons setEnabled:[messageStyle allowsUserIcons] && anyControlsEnabled];




More information about the commits mailing list