Remove extraneous @synthesize lines

IRCClient/IRCClientChannel.h

@@ -27,7 +27,9 @@
  *  for a given session when the client joins an IRC channel.
  */
 
+/**********************************************/
 #pragma mark IRCClientChannel class declaration
+/**********************************************/
 
 @interface IRCClientChannel : NSObject
 

IRCClient/IRCClientChannel.m

@@ -21,9 +21,9 @@
 #import "IRCClientChannel_Private.h"
 #import "NSData+SA_NSDataExtensions.h"
 
-/*********************************************/
-#pragma mark IRCClientChannel private category
-/*********************************************/
+/********************************************/
+#pragma mark IRCClientChannel class extension
+/********************************************/
 
 @interface IRCClientChannel()
 {
@@ -44,16 +44,6 @@
 
 @implementation IRCClientChannel
 
-/********************************/
-#pragma mark - Property synthesis
-/********************************/
-
-@synthesize delegate = _delegate;
-@synthesize name = _name;
-@synthesize encoding = _encoding;
-@synthesize topic = _topic;
-@synthesize modes = _modes;
-
 /******************************/
 #pragma mark - Custom accessors
 /******************************/

IRCClient/IRCClientChannel_Private.h

@@ -18,6 +18,10 @@
 #import "IRCClientChannel.h"
 #include "libircclient.h"
 
+/********************************************/
+#pragma mark IRCClientChannel class extension
+/********************************************/
+
 @interface IRCClientChannel ()
 
 /** initWithName:andIRCSession:

IRCClient/IRCClientSession.h

@@ -93,11 +93,6 @@
 /** delegate to send events to. */
 @property (assign) id <IRCClientSessionDelegate> delegate;
 
-/** User-defined session ID (for one delegate to keep track of multiple sessions,
-    if desired).
- */
-@property (assign) NSUInteger sessionID;
-
 /** The version string for the client to send back on CTCP VERSION requests.
 	There is usually no reason to set this, as IRCClient correctly sets its
 	own version string automatically, but this can be any string you like.

IRCClient/IRCClientSession.m

@@ -54,12 +54,12 @@ static void onCtcpAction(irc_session_t *session, const char *event, const char *
 static void onUnknownEvent(irc_session_t *session, const char *event, const char *origin, const char **params, unsigned int count);
 static void onNumericEvent(irc_session_t *session, unsigned int event, const char *origin, const char **params, unsigned int count);
 
-/***********************************************************/
-#pragma mark - IRCClientSession private category declaration
-/***********************************************************/
-
 static NSDictionary* ircNumericCodeList;
 
+/**********************************************/
+#pragma mark - IRCClientSession class extension
+/**********************************************/
+
 @interface IRCClientSession()
 {
 	irc_callbacks_t		_callbacks;
@@ -81,24 +81,6 @@ static NSDictionary* ircNumericCodeList;
 
 @implementation IRCClientSession
 
-/********************************/
-#pragma mark - Property synthesis
-/********************************/
-
-@synthesize delegate = _delegate;
-@synthesize sessionID = _sessionID;
-@synthesize version = _version;
-
-@synthesize server = _server;
-@synthesize port = _port;
-@synthesize password = _password;
-
-@synthesize nickname = _nickname;
-@synthesize username = _username;
-@synthesize realname = _realname;
-
-@synthesize encoding = _encoding;
-
 /******************************/
 #pragma mark - Custom accessors
 /******************************/
@@ -337,14 +319,16 @@ static NSDictionary* ircNumericCodeList;
 
 - (void)nickChangedFrom:(NSData *)oldNick to:(NSData *)newNick
 {
-	if ([_nickname isEqualToData:oldNick])
+	NSData* oldNickOnly = getNickFromNickUserHost(oldNick);
+	
+	if ([_nickname isEqualToData:oldNickOnly])
 	{
 		_nickname = newNick;
-		[_delegate nickChangedFrom:oldNick to:newNick own:YES];
+		[_delegate nickChangedFrom:oldNickOnly to:newNick own:YES];
 	}
 	else
 	{
-		[_delegate nickChangedFrom:oldNick to:newNick own:NO];
+		[_delegate nickChangedFrom:oldNickOnly to:newNick own:NO];
 	}
 }