gaim/gaim

jabber stuff
oldstatus
2005-01-03, Nathan Walp
8886acba8713
Parents 6d32744ff6db
Children 0e346ae692db
jabber stuff
2 files changed, 8 insertions(+), 4 deletions(-)
  • +7 -3
    src/protocols/jabber/auth.c
  • +1 -1
    src/protocols/jabber/presence.c
    • --- a/src/protocols/jabber/auth.c Mon Jan 03 00:10:28 2005 -0500
    +++ b/src/protocols/jabber/auth.c Mon Jan 03 01:52:11 2005 -0500
    @@ -48,7 +48,11 @@
    "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
    return TRUE;
    } else if(xmlnode_get_child(starttls, "required")) {
    - gaim_connection_error(js->gc, _("Server requires SSL for login"));
    + if(gaim_ssl_is_supported()) {
    + gaim_connection_error(js->gc, _("Server requires TLS/SSL for login. Select \"Enable TLS if available\" in account properties"));
    + } else {
    + gaim_connection_error(js->gc, _("Server requires TLS/SSL for login. No TLS/SSL support found."));
    + }
    return TRUE;
    }
    }
    @@ -61,7 +65,7 @@
    if(js->auth_type == JABBER_AUTH_PLAIN) {
    xmlnode *auth;
    GString *response;
    - char *enc_out;
    + unsigned char *enc_out;
    auth = xmlnode_new("auth");
    xmlnode_set_attrib(auth, "xmlns", "urn:ietf:params:xml:ns:xmpp-sasl");
    @@ -300,7 +304,7 @@
    md5_byte_t result[16];
    size_t a1len;
    - char *x, *a1, *ha1, *ha2, *kd, *z, *convnode, *convpasswd;
    + unsigned char *x, *a1, *ha1, *ha2, *kd, *z, *convnode, *convpasswd;
    if((convnode = g_convert(jid->node, strlen(jid->node), "iso-8859-1", "utf-8",
    NULL, NULL, NULL)) == NULL) {
    --- a/src/protocols/jabber/presence.c Mon Jan 03 00:10:28 2005 -0500
    +++ b/src/protocols/jabber/presence.c Mon Jan 03 01:52:11 2005 -0500
    @@ -433,7 +433,7 @@
    }
    g_free(room_jid);
    } else {
    - if(state != JABBER_STATE_ERROR && !(jb->subscription & JABBER_SUB_TO)) {
    + if(state != JABBER_STATE_ERROR && !(jb->subscription & JABBER_SUB_TO || jb->subscription & JABBER_SUB_PENDING)) {
    gaim_debug(GAIM_DEBUG_INFO, "jabber",
    "got unexpected presence from %s, ignoring\n", from);
    jabber_id_free(jid);