comparison libpurple/protocols/irc/msgs.c @ 31901:dc3ea8f6381a

Use purple_notify_user_info_add_pair_plaintext in some places where we were using purple_notify_user_info_add_pair (which expects an html string for the value). Feel free to double check these if you care about one of these protocols.
author Mark Doliner <mark@kingant.net>
date Sun, 21 Aug 2011 18:43:00 +0000
parents a5b556ac1de5
children 99ca503ea087
comparison
equal deleted inserted replaced
31900:ce6ef84fb8a0 31901:dc3ea8f6381a
355 purple_notify_user_info_add_pair(user_info, _("Nick"), tmp); 355 purple_notify_user_info_add_pair(user_info, _("Nick"), tmp);
356 g_free(tmp2); 356 g_free(tmp2);
357 g_free(tmp); 357 g_free(tmp);
358 358
359 if (irc->whois.away) { 359 if (irc->whois.away) {
360 tmp = g_markup_escape_text(irc->whois.away, strlen(irc->whois.away)); 360 purple_notify_user_info_add_pair_plaintext(user_info, _("Away"), irc->whois.away);
361 g_free(irc->whois.away); 361 g_free(irc->whois.away);
362 purple_notify_user_info_add_pair(user_info, _("Away"), tmp);
363 g_free(tmp);
364 } 362 }
365 if (irc->whois.userhost) { 363 if (irc->whois.userhost) {
366 tmp = g_markup_escape_text(irc->whois.name, strlen(irc->whois.name)); 364 purple_notify_user_info_add_pair_plaintext(user_info, _("Username"), irc->whois.userhost);
365 purple_notify_user_info_add_pair_plaintext(user_info, _("Real name"), irc->whois.name);
366 g_free(irc->whois.userhost);
367 g_free(irc->whois.name); 367 g_free(irc->whois.name);
368 purple_notify_user_info_add_pair(user_info, _("Username"), irc->whois.userhost);
369 purple_notify_user_info_add_pair(user_info, _("Real name"), tmp);
370 g_free(irc->whois.userhost);
371 g_free(tmp);
372 } 368 }
373 if (irc->whois.server) { 369 if (irc->whois.server) {
374 tmp = g_strdup_printf("%s (%s)", irc->whois.server, irc->whois.serverinfo); 370 tmp = g_strdup_printf("%s (%s)", irc->whois.server, irc->whois.serverinfo);
375 purple_notify_user_info_add_pair(user_info, _("Server"), tmp); 371 purple_notify_user_info_add_pair_plaintext(user_info, _("Server"), tmp);
376 g_free(tmp); 372 g_free(tmp);
377 g_free(irc->whois.server); 373 g_free(irc->whois.server);
378 g_free(irc->whois.serverinfo); 374 g_free(irc->whois.serverinfo);
379 } 375 }
380 if (irc->whois.channels) { 376 if (irc->whois.channels) {
381 purple_notify_user_info_add_pair(user_info, _("Currently on"), irc->whois.channels->str); 377 purple_notify_user_info_add_pair_plaintext(user_info, _("Currently on"), irc->whois.channels->str);
382 g_string_free(irc->whois.channels, TRUE); 378 g_string_free(irc->whois.channels, TRUE);
383 } 379 }
384 if (irc->whois.idle) { 380 if (irc->whois.idle) {
385 gchar *timex = purple_str_seconds_to_string(irc->whois.idle); 381 gchar *timex = purple_str_seconds_to_string(irc->whois.idle);
386 purple_notify_user_info_add_pair(user_info, _("Idle for"), timex); 382 purple_notify_user_info_add_pair_plaintext(user_info, _("Idle for"), timex);
387 g_free(timex); 383 g_free(timex);
388 purple_notify_user_info_add_pair(user_info, 384 purple_notify_user_info_add_pair_plaintext(user_info,
389 _("Online since"), purple_date_format_full(localtime(&irc->whois.signon))); 385 _("Online since"), purple_date_format_full(localtime(&irc->whois.signon)));
390 } 386 }
391 if (!strcmp(irc->whois.nick, "Paco-Paco")) { 387 if (!strcmp(irc->whois.nick, "elb")) {
392 purple_notify_user_info_add_pair(user_info, 388 purple_notify_user_info_add_pair_plaintext(user_info,
393 _("<b>Defining adjective:</b>"), _("Glorious")); 389 _("<b>Defining adjective:</b>"), _("Glorious"));
394 } 390 }
395 391
396 gc = purple_account_get_connection(irc->account); 392 gc = purple_account_get_connection(irc->account);
397 393