Changeset 5ebe625 for protocols/jabber/jabber.c

Timestamp:

2006-02-12T07:26:20Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f665dab

Parents:

a323a22 (diff), 58bc4e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

File:

• protocols/jabber/jabber.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -413 +413 @@
                 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)
         }
@@ -1856 +1856 @@
                         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 {