diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-02-12 20:26:20 +1300 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-02-12 20:26:20 +1300 |
| commit | 5ebe625399d5116e222d6389434f645e906265ec (patch) | |
| tree | 91a48ae6564ed891a23b1f5de2f630185fd0b39d /protocols/jabber/jabber.c | |
| parent | a323a22773714a19254db34156500a67e5916451 (diff) | |
| parent | 58bc4e69967a8feec0a60dfab716985191c12817 (diff) | |
Merge
Diffstat (limited to 'protocols/jabber/jabber.c')
| -rw-r--r-- | protocols/jabber/jabber.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index c9fd4e3a..ba652b8a 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -412,7 +412,7 @@ static void gjab_recv(gjconn gjc) XML_Parse(gjc->parser, buf, len, 0); if (jd->die) signoff(GJ_GC(gjc)); - } else if (len < 0 || errno != EAGAIN) { + } else if (len == 0 || (len < 0 && (!sockerr_again() || gjc->ssl))) { STATE_EVT(JCONN_STATE_OFF) } } @@ -1855,11 +1855,7 @@ static void jabber_set_away(struct gaim_connection *gc, char *state, char *messa y = xmlnode_insert_tag(x, "show"); xmlnode_insert_cdata(y, "away", -1); y = xmlnode_insert_tag(x, "status"); - { - char *utf8 = str_to_utf8(message); - xmlnode_insert_cdata(y, utf8, -1); - g_free(utf8); - } + xmlnode_insert_cdata(y, message, -1); gc->away = ""; } else { /* Gaim wants us to not be away */ |