Merge branch 'highlight-regex'

2 files changed, 11 insertions, 8 deletions

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 1bb9de4aa..3e197796d 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1437,6 +1437,7 @@ static void
 chat_window_new_message_cb (EmpathyChat       *chat,
 			    EmpathyMessage    *message,
 			    gboolean pending,
+			    gboolean should_highlight,
 			    EmpathyChatWindow *window)
 {
 	EmpathyChatWindowPriv *priv;
@@ -1496,7 +1497,7 @@ chat_window_new_message_cb (EmpathyChat       *chat,
 		if (chatroom != NULL && empathy_chatroom_is_always_urgent (chatroom)) {
 			needs_urgency = TRUE;
 		} else {
-			needs_urgency = empathy_message_should_highlight (message);
+			needs_urgency = should_highlight;
 		}
 	} else {
 		needs_urgency = TRUE;
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 6775d4a24..cd755a9ae 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -678,7 +678,8 @@ static void
 preferences_preview_theme_append_message (EmpathyChatView *view,
 					  EmpathyContact *sender,
 					  EmpathyContact *receiver,
-					  const gchar *text)
+					  const gchar *text,
+					  gboolean should_highlight)
 {
 	EmpathyMessage *message;
 
@@ -688,7 +689,7 @@ preferences_preview_theme_append_message (EmpathyChatView *view,
 		"body", text,
 		NULL);
 
-	empathy_chat_view_append_message (view, message);
+	empathy_chat_view_append_message (view, message, should_highlight);
 	g_object_unref (message);
 }
 
@@ -735,19 +736,20 @@ preferences_preview_theme_changed_cb (EmpathyThemeManager *manager,
 
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("O Romeo, Romeo, wherefore art thou Romeo?"));
+		juliet, romeo, _("O Romeo, Romeo, wherefore art thou Romeo?"),
+		TRUE /* this message mentions Romeo */);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("Deny thy father and refuse thy name;"));
+		juliet, romeo, _("Deny thy father and refuse thy name;"), FALSE);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("Or if thou wilt not, be but sworn my love"));
+		juliet, romeo, _("Or if thou wilt not, be but sworn my love"), FALSE);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		juliet, romeo, _("And I'll no longer be a Capulet."));
+		juliet, romeo, _("And I'll no longer be a Capulet."), FALSE);
 	preferences_preview_theme_append_message (priv->chat_theme_preview,
 		/* translators: Quote from Romeo & Julier, for chat theme preview */
-		romeo, juliet, _("Shall I hear more, or shall I speak at this?"));
+		romeo, juliet, _("Shall I hear more, or shall I speak at this?"), FALSE);
 
 	/* translators: Quote from Romeo & Julier, for chat theme preview */
 	empathy_chat_view_append_event (priv->chat_theme_preview, _("Juliet has disconnected"));