Mercurial > pidgin
changeset 17482:01021bb5c709
merge of 'a58972b72c7aa0fa0899c5a6b96e51cd6c427ab4'
and 'c81dcebd2a5d9d2f7d8cd80ba8c673bc9b8ad6d5'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 04 Jun 2007 06:15:43 +0000 |
| parents | 6608a7ab0fd9 (current diff) 246dc6e0014f (diff) |
| children | 794abbe3e14e 38a72d6dce7f |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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)