comparison src/protocols/silc/ops.c @ 10774:d83f745c997b

[gaim-migrate @ 12383] Some escaping stuff, all over the place. Various escaping fixes in the IRC prpl. The core and plugins only need to escape text if it's going to be shown in a gtkimhtml or equivalent - such as writing to a conversation window, or gaim_notify_{formatted,userinfo} The primary and secondary text for all notify and request API functions do NOT need to be escaped by the core or plugins, because whether html-like markup is required for these is UI dependent. Now we always escape these in the Gtk UI request & notify ops. Should I backport any of the above to oldstatus? I also removed gaim_chat_get_display_name() - it was almost a duplicate of gaim_chat_get_name(), and it leaked. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 02 Apr 2005 17:18:43 +0000
parents bf5e48215158
children 2d3a935462aa
comparison
equal deleted inserted replaced
10773:888d4c328be5 10774:d83f745c997b
1292 { 1292 {
1293 1293
1294 SilcServerEntry server_entry; 1294 SilcServerEntry server_entry;
1295 char *server_name; 1295 char *server_name;
1296 char *server_info; 1296 char *server_info;
1297 char tmp[256], *msg; 1297 char tmp[256];
1298 1298
1299 if (!success) { 1299 if (!success) {
1300 gaim_notify_error(gc, _("Server Information"), 1300 gaim_notify_error(gc, _("Server Information"),
1301 _("Cannot get server information"), 1301 _("Cannot get server information"),
1302 silc_get_status_message(status)); 1302 silc_get_status_message(status));
1308 server_info = va_arg(vp, char *); 1308 server_info = va_arg(vp, char *);
1309 1309
1310 if (server_name && server_info) { 1310 if (server_name && server_info) {
1311 g_snprintf(tmp, sizeof(tmp), "Server: %s\n%s", 1311 g_snprintf(tmp, sizeof(tmp), "Server: %s\n%s",
1312 server_name, server_info); 1312 server_name, server_info);
1313 msg = g_markup_escape_text(tmp, strlen(tmp)); 1313 gaim_notify_info(gc, NULL, _("Server Information"), tmp);
1314 gaim_notify_info(gc, NULL, _("Server Information"), msg);
1315 g_free(msg);
1316 } 1314 }
1317 } 1315 }
1318 break; 1316 break;
1319 1317
1320 case SILC_COMMAND_STATS: 1318 case SILC_COMMAND_STATS: