Mercurial > pidgin

comparison src/protocols/silc/ops.c @ 10732:c4cb90065e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 12334] "gaim_escape_html (according to Ethan) predates g_markup_escape_text. Current code in Gaim uses both functions. This patch removes gaim_escape_html from the API and replaces all calls in the Gaim tree with g_markup_escape_text. I included a ChangeLog.API note. As far as I can tell, this still works perfectly. This is obviously intended for HEAD only, as it removes a public function." --rlaager this was discussed extensively this morning committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 26 Mar 2005 02:43:49 +0000
parents 0f7452b1f777
children 94cc67130789
comparison
equal deleted inserted replaced
10731:783ca1f1ebdb 10732:c4cb90065e1d
88 msg = g_strdup_printf("/me %s", 88 msg = g_strdup_printf("/me %s",
89 (const char *)message); 89 (const char *)message);
90 if (!msg) 90 if (!msg)
91 return; 91 return;
92 92
93 tmp = gaim_escape_html(msg); 93 tmp = g_markup_escape_text(msg, -1);
94 /* Send to Gaim */ 94 /* Send to Gaim */
95 serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)), 95 serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)),
96 sender->nickname ? 96 sender->nickname ?
97 sender->nickname : "<unknown>", 0, 97 sender->nickname : "<unknown>", 0,
98 tmp, time(NULL)); 98 tmp, time(NULL));
115 g_free(msg); 115 g_free(msg);
116 return; 116 return;
117 } 117 }
118 118
119 if (flags & SILC_MESSAGE_FLAG_UTF8) { 119 if (flags & SILC_MESSAGE_FLAG_UTF8) {
120 tmp = gaim_escape_html((const char *)message); 120 tmp = g_markup_escape_text((const char *)message, -1);
121 /* Send to Gaim */ 121 /* Send to Gaim */
122 serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)), 122 serv_got_chat_in(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)),
123 sender->nickname ? 123 sender->nickname ?
124 sender->nickname : "<unknown>", 0, 124 sender->nickname : "<unknown>", 0,
125 tmp, time(NULL)); 125 tmp, time(NULL));
167 msg = g_strdup_printf("/me %s", 167 msg = g_strdup_printf("/me %s",
168 (const char *)message); 168 (const char *)message);
169 if (!msg) 169 if (!msg)
170 return; 170 return;
171 171
172 tmp = gaim_escape_html(msg); 172 tmp = g_markup_escape_text(msg, -1);
173 /* Send to Gaim */ 173 /* Send to Gaim */
174 serv_got_im(gc, sender->nickname ? 174 serv_got_im(gc, sender->nickname ?
175 sender->nickname : "<unknown>", 175 sender->nickname : "<unknown>",
176 tmp, 0, time(NULL)); 176 tmp, 0, time(NULL));
177 g_free(msg); 177 g_free(msg);
193 g_free(msg); 193 g_free(msg);
194 return; 194 return;
195 } 195 }
196 196
197 if (flags & SILC_MESSAGE_FLAG_UTF8) { 197 if (flags & SILC_MESSAGE_FLAG_UTF8) {
198 tmp = gaim_escape_html((const char *)message); 198 tmp = g_markup_escape_text((const char *)message, -1);
199 /* Send to Gaim */ 199 /* Send to Gaim */
200 serv_got_im(gc, sender->nickname ? 200 serv_got_im(gc, sender->nickname ?
201 sender->nickname : "<unknown>", 201 sender->nickname : "<unknown>",
202 tmp, 0, time(NULL)); 202 tmp, 0, time(NULL));
203 g_free(tmp); 203 g_free(tmp);
329 break; 329 break;
330 330
331 if (!tmp) 331 if (!tmp)
332 break; 332 break;
333 333
334 esc = gaim_escape_html(tmp); 334 esc = g_markup_escape_text(tmp, -1);
335 tmp2 = gaim_markup_linkify(esc); 335 tmp2 = gaim_markup_linkify(esc);
336 g_free(esc); 336 g_free(esc);
337 337
338 if (idtype == SILC_ID_CLIENT) { 338 if (idtype == SILC_ID_CLIENT) {
339 client_entry = (SilcClientEntry)entry; 339 client_entry = (SilcClientEntry)entry;
959 idle = va_arg(vp, SilcUInt32); 959 idle = va_arg(vp, SilcUInt32);
960 (void)va_arg(vp, unsigned char *); 960 (void)va_arg(vp, unsigned char *);
961 user_modes = va_arg(vp, SilcBuffer); 961 user_modes = va_arg(vp, SilcBuffer);
962 962
963 s = g_string_new(""); 963 s = g_string_new("");
964 tmp2 = gaim_escape_html(client_entry->nickname); 964 tmp2 = g_markup_escape_text(client_entry->nickname, -1);
965 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp2); 965 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp2);
966 g_free(tmp2); 966 g_free(tmp2);
967 if (client_entry->realname) { 967 if (client_entry->realname) {
968 tmp2 = gaim_escape_html(client_entry->realname); 968 tmp2 = g_markup_escape_text(client_entry->realname, -1);
969 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp2); 969 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp2);
970 g_free(tmp2); 970 g_free(tmp2);
971 } 971 }
972 if (client_entry->username) { 972 if (client_entry->username) {
973 tmp2 = gaim_escape_html(client_entry->username); 973 tmp2 = g_markup_escape_text(client_entry->username, -1);
974 if (client_entry->hostname) 974 if (client_entry->hostname)
975 g_string_append_printf(s, "<br><b>%s:</b> %s@%s", _("Username"), tmp2, client_entry->hostname); 975 g_string_append_printf(s, "<br><b>%s:</b> %s@%s", _("Username"), tmp2, client_entry->hostname);
976 else 976 else
977 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Username"), tmp2); 977 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Username"), tmp2);
978 g_free(tmp2); 978 g_free(tmp2);
991 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Mood"), moodstr); 991 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Mood"), moodstr);
992 g_free(moodstr); 992 g_free(moodstr);
993 } 993 }
994 994
995 if (statusstr) { 995 if (statusstr) {
996 tmp2 = gaim_escape_html(statusstr); 996 tmp2 = g_markup_escape_text(statusstr, -1);
997 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Status Text"), tmp2); 997 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Status Text"), tmp2);
998 g_free(statusstr); 998 g_free(statusstr);
999 g_free(tmp2); 999 g_free(tmp2);
1000 } 1000 }
1001 1001
1051 silc_strncat(tmp, sizeof(tmp) - 1, name, name_len); 1051 silc_strncat(tmp, sizeof(tmp) - 1, name, name_len);
1052 silc_strncat(tmp, sizeof(tmp) - 1, " ", 1); 1052 silc_strncat(tmp, sizeof(tmp) - 1, " ", 1);
1053 silc_free(m); 1053 silc_free(m);
1054 1054
1055 } 1055 }
1056 tmp2 = gaim_escape_html(tmp); 1056 tmp2 = g_markup_escape_text(tmp, -1);
1057 g_string_append_printf(s, "%s", tmp2); 1057 g_string_append_printf(s, "%s", tmp2);
1058 g_free(tmp2); 1058 g_free(tmp2);
1059 silc_free(umodes); 1059 silc_free(umodes);
1060 } 1060 }
1061 } 1061 }
1110 realname = va_arg(vp, char *); 1110 realname = va_arg(vp, char *);
1111 if (!nickname) 1111 if (!nickname)
1112 break; 1112 break;
1113 1113
1114 s = g_string_new(""); 1114 s = g_string_new("");
1115 tmp = gaim_escape_html(nickname); 1115 tmp = g_markup_escape_text(nickname, -1);
1116 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp); 1116 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp);
1117 g_free(tmp); 1117 g_free(tmp);
1118 if (realname) { 1118 if (realname) {
1119 tmp = gaim_escape_html(realname); 1119 tmp = g_markup_escape_text(realname, -1);
1120 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp); 1120 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp);
1121 g_free(tmp); 1121 g_free(tmp);
1122 } 1122 }
1123 if (username) { 1123 if (username) {
1124 tmp = gaim_escape_html(username); 1124 tmp = g_markup_escape_text(username, -1);
1125 if (client_entry && client_entry->hostname) 1125 if (client_entry && client_entry->hostname)
1126 g_string_append_printf(s, "<br><b>%s:</b> %s@%s", _("Username"), tmp, client_entry->hostname); 1126 g_string_append_printf(s, "<br><b>%s:</b> %s@%s", _("Username"), tmp, client_entry->hostname);
1127 else 1127 else
1128 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Username"), tmp); 1128 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Username"), tmp);
1129 g_free(tmp); 1129 g_free(tmp);