From 02dcf41c2ccbb636a9f305bd96f194426b91af51 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Thu, 22 Sep 2011 23:39:01 +0000
Subject: [PATCH] Adjust to recent ObjFW changes.

FossilOrigin-Name: e398c849f23f68c426b4172cdfde8ff21469414133abf4e87c12b3a143626096
---
 src/IRCConnection.m |  1 -
 src/IRCUser.m       | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/IRCConnection.m b/src/IRCConnection.m
index fb3323f..3fdfe15 100644
--- a/src/IRCConnection.m
+++ b/src/IRCConnection.m
@@ -173,7 +173,6 @@
 	@try {
 		line = [sock tryReadLine];
 	} @catch (OFInvalidEncodingException *e) {
-		[e dealloc];
 		line = [sock tryReadLineWithEncoding:
 		    OF_STRING_ENCODING_WINDOWS_1252];
 	}
diff --git a/src/IRCUser.m b/src/IRCUser.m
index 3718ac8..ea894f8 100644
--- a/src/IRCUser.m
+++ b/src/IRCUser.m
@@ -48,17 +48,19 @@
 
 		if ((tmp2 = strdup([string UTF8String])) == NULL)
 			@throw [OFOutOfMemoryException
-			     newWithClass: isa
-			    requestedSize: [string UTF8StringLength]];
+			     exceptionWithClass: isa
+				  requestedSize: [string UTF8StringLength]];
 
 		if ((tmp = strchr(tmp2, '@')) == NULL)
-			@throw [OFInvalidFormatException newWithClass: isa];
+			@throw [OFInvalidFormatException
+			    exceptionWithClass: isa];
 
 		*tmp = '\0';
 		hostname = [[OFString alloc] initWithUTF8String: tmp + 1];
 
 		if ((tmp = strchr(tmp2, '!')) == NULL)
-			@throw [OFInvalidFormatException newWithClass: isa];
+			@throw [OFInvalidFormatException
+			    exceptionWithClass: isa];
 
 		*tmp = '\0';
 		username = [[OFString alloc] initWithUTF8String: tmp + 1];