Mercurial > pidgin.yaz

comparison src/protocols/jabber/jabber.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 1350352f5818
children 6c8706109f92
comparison
equal deleted inserted replaced
7094:2343c3aa1dec 7095:c8bf2da398e3
32 */ 32 */
33 33
34 #include "account.h" 34 #include "account.h"
35 #include "accountopt.h" 35 #include "accountopt.h"
36 #include "debug.h" 36 #include "debug.h"
37 #include "html.h"
38 #include "message.h" 37 #include "message.h"
39 #include "multi.h" 38 #include "multi.h"
40 #include "notify.h" 39 #include "notify.h"
41 #include "prpl.h" 40 #include "prpl.h"
42 #include "request.h" 41 #include "request.h"
43 #include "server.h" 42 #include "server.h"
43 #include "util.h"
44 44
45 #include "auth.h" 45 #include "auth.h"
46 #include "buddy.h" 46 #include "buddy.h"
47 #include "chat.h" 47 #include "chat.h"
48 #include "iq.h" 48 #include "iq.h"
775 if(jb && !GAIM_BUDDY_IS_ONLINE(b) && (jb->subscription & JABBER_SUB_PENDING || !(jb->subscription & JABBER_SUB_TO))) { 775 if(jb && !GAIM_BUDDY_IS_ONLINE(b) && (jb->subscription & JABBER_SUB_PENDING || !(jb->subscription & JABBER_SUB_TO))) {
776 ret = g_strdup(_("Not Authorized")); 776 ret = g_strdup(_("Not Authorized"));
777 } else if(jb && !GAIM_BUDDY_IS_ONLINE(b) && jb->error_msg) { 777 } else if(jb && !GAIM_BUDDY_IS_ONLINE(b) && jb->error_msg) {
778 ret = g_strdup(jb->error_msg); 778 ret = g_strdup(jb->error_msg);
779 } else { 779 } else {
780 char *stripped = strip_html(jabber_buddy_get_status_msg(jb)); 780 char *stripped;
781
782 stripped = gaim_markup_strip_html(jabber_buddy_get_status_msg(jb));
781 783
782 if(!stripped && b->uc & UC_UNAVAILABLE) 784 if(!stripped && b->uc & UC_UNAVAILABLE)
783 stripped = g_strdup(jabber_get_state_string(b->uc)); 785 stripped = g_strdup(jabber_get_state_string(b->uc));
784 786
785 if(stripped) { 787 if(stripped) {
800 802
801 if(jbr) { 803 if(jbr) {
802 char *text = NULL; 804 char *text = NULL;
803 if(jbr->status) { 805 if(jbr->status) {
804 char *stripped; 806 char *stripped;
805 stripped = strip_html(jbr->status); 807 stripped = gaim_markup_strip_html(jbr->status);
806 text = g_markup_escape_text(stripped, -1); 808 text = g_markup_escape_text(stripped, -1);
807 g_free(stripped); 809 g_free(stripped);
808 } 810 }
809 811
810 ret = g_strdup_printf("<b>%s:</b> %s%s%s", 812 ret = g_strdup_printf("<b>%s:</b> %s%s%s",