Mercurial > pidgin.yaz

comparison src/protocols/jabber/message.c @ 7095:c8bf2da398e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7660] html.[ch] is gone. Everything inside was namespaced and put in util.[ch]. One less ugly part of gaim in the tree. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Wed, 01 Oct 2003 03:43:18 +0000
parents 67c4e9d39242
children bf630f7dfdcd
comparison
equal deleted inserted replaced
7094:2343c3aa1dec 7095:c8bf2da398e3
19 * 19 *
20 */ 20 */
21 #include "internal.h" 21 #include "internal.h"
22 22
23 #include "debug.h" 23 #include "debug.h"
24 #include "html.h"
25 #include "notify.h" 24 #include "notify.h"
26 #include "server.h" 25 #include "server.h"
26 #include "util.h"
27 27
28 #include "buddy.h" 28 #include "buddy.h"
29 #include "chat.h" 29 #include "chat.h"
30 #include "message.h" 30 #include "message.h"
31 #include "xmlnode.h" 31 #include "xmlnode.h"
346 jm->events = JABBER_MESSAGE_EVENT_COMPOSING; 346 jm->events = JABBER_MESSAGE_EVENT_COMPOSING;
347 jm->to = g_strdup(who); 347 jm->to = g_strdup(who);
348 348
349 buf = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body>%s</body></html>", msg); 349 buf = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body>%s</body></html>", msg);
350 350
351 html_to_xhtml(buf, &xhtml, &plain); 351 gaim_markup_html_to_xhtml(buf, &xhtml, &plain);
352 g_free(buf); 352 g_free(buf);
353 353
354 jm->body = plain; 354 jm->body = plain;
355 if(!jbr || jbr->capabilities & JABBER_CAP_XHTML) 355 if(!jbr || jbr->capabilities & JABBER_CAP_XHTML)
356 jm->xhtml = xhtml; 356 jm->xhtml = xhtml;
376 jm = g_new0(JabberMessage, 1); 376 jm = g_new0(JabberMessage, 1);
377 jm->js = gc->proto_data; 377 jm->js = gc->proto_data;
378 jm->type = JABBER_MESSAGE_CHAT; 378 jm->type = JABBER_MESSAGE_CHAT;
379 jm->to = g_strdup_printf("%s@%s", chat->room, chat->server); 379 jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
380 380
381 html_to_xhtml(message, NULL, &jm->body); 381 gaim_markup_html_to_xhtml(message, NULL, &jm->body);
382 382
383 jabber_message_send(jm); 383 jabber_message_send(jm);
384 jabber_message_free(jm); 384 jabber_message_free(jm);
385 return 1; 385 return 1;
386 } 386 }