# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1180937743 0
# Node ID 01021bb5c709844055634bddcd67df332d8e76db
# Parent  6608a7ab0fd96d269c99e78d326ef4f4eea9967c# Parent  246dc6e0014f0bb0689dcca811e37569c45bcc3d
merge of 'a58972b72c7aa0fa0899c5a6b96e51cd6c427ab4'
     and 'c81dcebd2a5d9d2f7d8cd80ba8c673bc9b8ad6d5'

diff -r 6608a7ab0fd9 -r 01021bb5c709 libpurple/protocols/oscar/flap_connection.c
--- a/libpurple/protocols/oscar/flap_connection.c	Mon Jun 04 05:54:48 2007 +0000
+++ b/libpurple/protocols/oscar/flap_connection.c	Mon Jun 04 06:15:43 2007 +0000
@@ -902,7 +902,7 @@
 	ret = send(conn->fd, conn->buffer_outgoing->outptr, writelen, 0);
 	if (ret <= 0)
 	{
-		if (ret < 0 && ((errno == EAGAIN)) || ((errno == EWOULDBLOCK)))
+		if (ret < 0 && ((errno == EAGAIN) || (errno == EWOULDBLOCK)))
 			/* No worries */
 			return;
 
diff -r 6608a7ab0fd9 -r 01021bb5c709 libpurple/purple-remote
--- a/libpurple/purple-remote	Mon Jun 04 05:54:48 2007 +0000
+++ b/libpurple/purple-remote	Mon Jun 04 06:15:43 2007 +0000
@@ -31,7 +31,7 @@
         return result
             
 def show_help():
-    print """This program uses DBus to communicate with purple.
+    print """This program uses D-Bus to communicate with purple.
 
 Usage:
 
@@ -96,8 +96,6 @@
     protocol = match.group(2)
     if protocol == "xmpp":
         protocol = "jabber"
-    if protocol == "aim" or protocol == "icq":
-        protocol = "oscar"
     if protocol is not None:
         protocol = "prpl-" + protocol
     command = match.group(5)