Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 388051
Collapse All | Expand All

(-)a/libempathy-gtk/empathy-theme-adium.c (-4 / +6 lines)
Lines 436-442 theme_adium_append_message (EmpathyChatView *view, Link Here
436
	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
436
	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
437
	EmpathyContact        *sender;
437
	EmpathyContact        *sender;
438
	TpAccount             *account;
438
	TpAccount             *account;
439
	gchar                 *body_escaped;
439
	gchar                 *body_escaped, *name_escaped;
440
	const gchar           *body;
440
	const gchar           *body;
441
	const gchar           *name;
441
	const gchar           *name;
442
	const gchar           *contact_id;
442
	const gchar           *contact_id;
Lines 468-484 theme_adium_append_message (EmpathyChatView *view, Link Here
468
	body = empathy_message_get_body (msg);
468
	body = empathy_message_get_body (msg);
469
	body_escaped = theme_adium_parse_body (body);
469
	body_escaped = theme_adium_parse_body (body);
470
	name = empathy_contact_get_alias (sender);
470
	name = empathy_contact_get_alias (sender);
471
	name_escaped = g_markup_escape_text (name, -1);
471
	contact_id = empathy_contact_get_id (sender);
472
	contact_id = empathy_contact_get_id (sender);
472
473
473
	/* If this is a /me, append an event */
474
	/* If this is a /me, append an event */
474
	if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
475
	if (empathy_message_get_tptype (msg) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
475
		gchar *str;
476
		gchar *str;
476
477
477
		str = g_strdup_printf ("%s %s", name, body_escaped);
478
		str = g_strdup_printf ("%s %s", name_escaped, body_escaped);
478
		theme_adium_append_event_escaped (view, str);
479
		theme_adium_append_event_escaped (view, str);
479
480
480
		g_free (str);
481
		g_free (str);
481
		g_free (body_escaped);
482
		g_free (body_escaped);
483
		g_free (name_escaped);
482
		return;
484
		return;
483
	}
485
	}
484
486
Lines 600-606 theme_adium_append_message (EmpathyChatView *view, Link Here
600
602
601
	if (html != NULL) {
603
	if (html != NULL) {
602
		theme_adium_append_html (theme, func, html, len, body_escaped,
604
		theme_adium_append_html (theme, func, html, len, body_escaped,
603
					 avatar_filename, name, contact_id,
605
					 avatar_filename, name_escaped, contact_id,
604
					 service_name, message_classes->str,
606
					 service_name, message_classes->str,
605
					 timestamp, is_backlog);
607
					 timestamp, is_backlog);
606
	} else {
608
	} else {
Lines 616-621 theme_adium_append_message (EmpathyChatView *view, Link Here
616
	priv->last_is_backlog = is_backlog;
618
	priv->last_is_backlog = is_backlog;
617
619
618
	g_free (body_escaped);
620
	g_free (body_escaped);
621
	g_free (name_escaped);
619
	g_string_free (message_classes, TRUE);
622
	g_string_free (message_classes, TRUE);
620
}
623
}
621
624
622
- 

Return to bug 388051