adium 5162:d59705c34be0: - Fix messaging IRC contacts directly.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/d59705c34be0
revision:	5162:d59705c34be0
branch:		adium-1.6
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Oct 22 00:38:23 2012 +0200

- Fix messaging IRC contacts directly.
- Fix building on whatever rob-to86 is using which doesn't have a @property hidden in NSViews.

diffs (116 lines):

diff -r 2638995be987 -r d59705c34be0 Frameworks/Adium Framework/Source/AIChat.h
--- a/Frameworks/Adium Framework/Source/AIChat.h	Mon Oct 22 00:27:03 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIChat.h	Mon Oct 22 00:38:23 2012 +0200
@@ -113,6 +113,7 @@
 	NSMutableSet		*ignoredListContacts;
 	
 	BOOL				enableTypingNotifications;
+	BOOL				hideUserIconAndStatus;
 	
 	NSMutableSet		*customEmoticons;
 	
@@ -192,6 +193,8 @@
 
 @property (readonly, nonatomic) BOOL shouldLog;
 
+ at property (readwrite, nonatomic) BOOL hideUserIconAndStatus;
+
 // Compatibility. I don't like this here.
 - (NSArray *)containedObjects;
 - (BOOL)isGroupChat;
diff -r 2638995be987 -r d59705c34be0 Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m	Mon Oct 22 00:27:03 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIChat.m	Mon Oct 22 00:38:23 2012 +0200
@@ -54,6 +54,7 @@
 static int nextChatNumber = 0;
 
 @synthesize listObject = _listObject;
+ at synthesize hideUserIconAndStatus;
 
 + (id)chatForAccount:(AIAccount *)inAccount
 {
diff -r 2638995be987 -r d59705c34be0 Frameworks/Adium Framework/Source/AIGroupChat.h
--- a/Frameworks/Adium Framework/Source/AIGroupChat.h	Mon Oct 22 00:27:03 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIGroupChat.h	Mon Oct 22 00:38:23 2012 +0200
@@ -24,7 +24,6 @@
 	NSMutableDictionary	*participatingContactsAliases;
 	NSMutableArray		*participatingContacts;
 	
-	BOOL				hideUserIconAndStatus;
 	BOOL				showJoinLeave;
 	BOOL				expanded;
     
@@ -33,7 +32,6 @@
 
 @property (readwrite, nonatomic) BOOL showJoinLeave;
 
- at property (readwrite, nonatomic) BOOL hideUserIconAndStatus;
 @property (readonly, nonatomic) BOOL supportsTopic;
 
 - (void)updateTopic:(NSString *)inTopic withSource:(AIListContact *)contact;
diff -r 2638995be987 -r d59705c34be0 Frameworks/Adium Framework/Source/AIGroupChat.m
--- a/Frameworks/Adium Framework/Source/AIGroupChat.m	Mon Oct 22 00:27:03 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIGroupChat.m	Mon Oct 22 00:38:23 2012 +0200
@@ -40,7 +40,7 @@
 
 static int nextChatNumber = 0;
 
- at synthesize lastMessageDate, showJoinLeave, hideUserIconAndStatus;
+ at synthesize lastMessageDate, showJoinLeave;
 
 - (id)initForAccount:(AIAccount *)inAccount
 {
diff -r 2638995be987 -r d59705c34be0 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Oct 22 00:27:03 2012 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Oct 22 00:38:23 2012 +0200
@@ -149,7 +149,7 @@
 
         AIAccountSelectionViewController *sourceDestination = [[AIAccountSelectionViewController alloc] init];
 
-        sourceDestination.view.hidden = TRUE;
+        [sourceDestination.view setHidden:TRUE];
         
         [self addTopBarController:sourceDestination];
         [sourceDestination setChat:chat];
@@ -1366,9 +1366,9 @@
 {
     NSParameterAssert([topBarControllers containsObject:controller]);
     
-    if (controller.view.isHidden) return;
+    if ([controller.view isHidden]) return;
     
-    controller.view.hidden = TRUE;
+    [controller.view setHidden:TRUE];
     
     [self didResizeTopbarController:controller];
 }
@@ -1377,9 +1377,9 @@
 {
     NSParameterAssert([topBarControllers containsObject:controller]);
     
-    if (!controller.view.isHidden) return;
+    if (![controller.view isHidden]) return;
     
-    controller.view.hidden = FALSE;
+    [controller.view setHidden:FALSE];
     
     [self didResizeTopbarController:controller];
 }
@@ -1390,7 +1390,7 @@
     
     CGFloat yPosition = 0.0f;
     for (AIMessageViewTopBarController *existingController in topBarControllers) {
-        if (!existingController.view.isHidden) yPosition += NSHeight(existingController.view.frame);
+        if (![existingController.view isHidden]) yPosition += NSHeight(existingController.view.frame);
     }
     
     NSSize splitViewSize = NSMakeSize(NSWidth(view_contents.frame), NSHeight(view_contents.frame) - yPosition);
@@ -1403,7 +1403,7 @@
     
     yPosition = 0.0f;
     for (AIMessageViewTopBarController *existingController in topBarControllers.reverseObjectEnumerator) {
-        if (!existingController.view.isHidden) {
+        if (![existingController.view isHidden]) {
             [existingController.view setFrameOrigin:NSMakePoint(0.0f, yPosition)];
             [existingController.view setFrameSize:NSMakeSize(NSWidth(view_contents.frame), NSHeight(existingController.view.frame))];
             yPosition += NSHeight(existingController.view.frame);