Mercurial > pidgin

comparison src/protocols/silc/silc.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 82d6760ba000
children bf5e48215158
comparison
equal deleted inserted replaced
10731:783ca1f1ebdb 10732:c4cb90065e1d
742 gc, _("Message of the Day"), _("No Message of the Day available"), 742 gc, _("Message of the Day"), _("No Message of the Day available"),
743 _("There is no Message of the Day associated with this connection")); 743 _("There is no Message of the Day associated with this connection"));
744 return; 744 return;
745 } 745 }
746 746
747 tmp = gaim_escape_html(sg->motd); 747 tmp = g_markup_escape_text(sg->motd, -1);
748 gaim_notify_formatted(gc, NULL, _("Message of the Day"), NULL, 748 gaim_notify_formatted(gc, NULL, _("Message of the Day"), NULL,
749 tmp, NULL, NULL); 749 tmp, NULL, NULL);
750 g_free(tmp); 750 g_free(tmp);
751 } 751 }
752 752
1000 return GAIM_CMD_RET_FAILED; 1000 return GAIM_CMD_RET_FAILED;
1001 1001
1002 if (!args || !args[0]) { 1002 if (!args || !args[0]) {
1003 topic = gaim_conv_chat_get_topic (GAIM_CONV_CHAT(conv)); 1003 topic = gaim_conv_chat_get_topic (GAIM_CONV_CHAT(conv));
1004 if (topic) { 1004 if (topic) {
1005 tmp = gaim_escape_html(topic); 1005 tmp = g_markup_escape_text(topic, -1);
1006 tmp2 = gaim_markup_linkify(tmp); 1006 tmp2 = gaim_markup_linkify(tmp);
1007 buf = g_strdup_printf(_("current topic is: %s"), tmp2); 1007 buf = g_strdup_printf(_("current topic is: %s"), tmp2);
1008 g_free(tmp); 1008 g_free(tmp);
1009 g_free(tmp2); 1009 g_free(tmp2);
1010 } else 1010 } else
1142 if (!sg->motd) { 1142 if (!sg->motd) {
1143 *error = g_strdup(_("There is no Message of the Day associated with this connection")); 1143 *error = g_strdup(_("There is no Message of the Day associated with this connection"));
1144 return GAIM_CMD_RET_FAILED; 1144 return GAIM_CMD_RET_FAILED;
1145 } 1145 }
1146 1146
1147 tmp = gaim_escape_html(sg->motd); 1147 tmp = g_markup_escape_text(sg->motd, -1);
1148 gaim_notify_formatted(gc, NULL, _("Message of the Day"), NULL, 1148 gaim_notify_formatted(gc, NULL, _("Message of the Day"), NULL,
1149 tmp, NULL, NULL); 1149 tmp, NULL, NULL);
1150 g_free(tmp); 1150 g_free(tmp);
1151 1151
1152 return GAIM_CMD_RET_OK; 1152 return GAIM_CMD_RET_OK;