From: Nathan W. <fac...@us...> - 2003-04-19 06:28:43
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber In directory sc8-pr-cvs1:/tmp/cvs-serv9865/src/protocols/jabber Modified Files: jabber.c Log Message: made jabber xhtml stuff even better, and fixed a couple bugs in the process Index: jabber.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- jabber.c 15 Apr 2003 04:17:58 -0000 1.130 +++ jabber.c 19 Apr 2003 06:28:40 -0000 1.131 @@ -2290,6 +2290,8 @@ struct jabber_data *jd = gc->proto_data = g_new0(struct jabber_data, 1); char *loginname = create_valid_jid(account->username, DEFAULT_SERVER, "Gaim"); + gc->flags |= OPT_CONN_HTML; + jd->buddies = g_hash_table_new(g_str_hash, g_str_equal); jd->chats = NULL; /* we have no chats yet */ @@ -3381,11 +3383,18 @@ /* oh goody. Gaim is telling us what to do. */ if (message) { /* Gaim wants us to be away */ + char *stripped; + + /* Jabber supports XHTML in IMs, but not in away messages. */ + html_to_xhtml(message, NULL, &stripped); + y = xmlnode_insert_tag(x, "show"); xmlnode_insert_cdata(y, "away", -1); y = xmlnode_insert_tag(x, "status"); - xmlnode_insert_cdata(y, message, -1); - gc->away = g_strdup(message); + xmlnode_insert_cdata(y, stripped, -1); + + gc->away = g_strdup(stripped); + g_free(stripped); } else { /* Gaim wants us to not be away */ /* but for Jabber, we can just send presence with no other information. */ |