From: Florian Zeitz <florob@babelmonkeys.de>
Date: Sat, 9 Jul 2011 16:11:46 +0000 (+0200)
Subject: Get rid of most occurences of of_log()
X-Git-Url: https://git.babelmonkeys.de/?a=commitdiff_plain;h=811f94951f504cabc7f12091bd0f0fdca6ab6240;p=mpdbot.git

Get rid of most occurences of of_log()
---

diff --git a/src/PEPThread.m b/src/PEPThread.m
index e857ae3..e00db9d 100644
--- a/src/PEPThread.m
+++ b/src/PEPThread.m
@@ -47,8 +47,8 @@
 				       port: 6600];
 			return;
 		} @catch (id e) {
-			of_log(@"Connection failed, retrying in %" PRIi64
-					" seconds", pause);
+			[of_stderr writeFormat: @"Connection failed, retrying"
+				" in %" PRIi64 " seconds\n", pause];
 			[OFThread sleepForTimeInterval: pause];
 			if (pause < 120)
 				pause *= 2;
diff --git a/src/mpdbot.m b/src/mpdbot.m
index d5273a8..f55e4b7 100644
--- a/src/mpdbot.m
+++ b/src/mpdbot.m
@@ -49,7 +49,8 @@ OF_APPLICATION_DELEGATE(AppDelegate)
 	[conn setDelegate: self];
 
 	if ([arguments count] != 3) {
-		of_log(@"Invalid count of command line arguments!");
+		[of_stdout writeFormat: @"Usage: %@ <server> <user> <passwd>\n",
+		    [OFApplication programName]];
 		[OFApplication terminateWithStatus: 1];
 	}
 
@@ -68,7 +69,7 @@ OF_APPLICATION_DELEGATE(AppDelegate)
 
 - (void)connectionWasAuthenticated: (XMPPConnection*)conn
 {
-	of_log(@"Auth successful");
+	[of_stdout writeLine: @"Auth successful"];
 }
 
 - (void)connection: (XMPPConnection*)conn
@@ -77,7 +78,7 @@ OF_APPLICATION_DELEGATE(AppDelegate)
 	XMPPPresence *pres;
 	XMPPIQ *disco;
 
-	of_log(@"Bound to JID: %@", [jid fullJID]);
+	[of_stdout writeFormat: @"Bound to JID: %@\n", [jid fullJID]];
 
 	pres = [XMPPPresence presence];
 	[pres addPriority: 0];
@@ -133,6 +134,6 @@ OF_APPLICATION_DELEGATE(AppDelegate)
 
 - (void)connectionWasClosed: (XMPPConnection*)conn
 {
-	of_log(@"Connection was closed!");
+	[of_stdout writeLine: @"Connection was closed!"];
 }
 @end