From 571db231509577fe1e528595c3aae61e2f8ccf3f Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Fri, 7 Nov 2014 21:05:51 +0000
Subject: [PATCH] Use message theme settings in chat rooms

---
 src/ui/core.c   | 6 +++---
 themes/boothj5  | 4 +++-
 themes/original | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ui/core.c b/src/ui/core.c
index 8e37c4e2..e959e94e 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -1739,14 +1739,14 @@ _ui_room_message(const char * const room_jid, const char * const nick,
         int num = wins_get_num(window);
         char *my_nick = muc_nick(room_jid);
 
-        if (strcmp(nick, my_nick) != 0) {
+        if (g_strcmp0(nick, my_nick) != 0) {
             if (g_strrstr(message, my_nick) != NULL) {
                 win_save_print(window, '-', NULL, NO_ME, COLOUR_ROOMMENTION, nick, message);
             } else {
-                win_save_print(window, '-', NULL, NO_ME, 0, nick, message);
+                win_save_print(window, '-', NULL, NO_ME, COLOUR_TEXT_THEM, nick, message);
             }
         } else {
-            win_save_print(window, '-', NULL, 0, 0, nick, message);
+            win_save_print(window, '-', NULL, 0, COLOUR_TEXT_ME, nick, message);
         }
 
         // currently in groupchat window
diff --git a/themes/boothj5 b/themes/boothj5
index 172c881f..50ce7d94 100644
--- a/themes/boothj5
+++ b/themes/boothj5
@@ -9,6 +9,8 @@ statusbar.brackets=white
 statusbar.active=black
 statusbar.new=white
 main.text=white
+main.text.me=cyan
+main.text.them=yellow
 input.text=green
 main.time=yellow
 main.splash=red
@@ -23,7 +25,7 @@ gone=red
 error=red
 incoming=yellow
 roominfo=yellow
-roommention=cyan
+roommention=red
 me=blue
 them=green
 titlebar.unencrypted=red
diff --git a/themes/original b/themes/original
index e554868b..9ee1e15b 100644
--- a/themes/original
+++ b/themes/original
@@ -9,6 +9,8 @@ statusbar.brackets=cyan
 statusbar.active=cyan
 statusbar.new=white
 main.text=white
+main.text.me=white
+main.text.them=white
 input.text=white
 main.time=white
 main.splash=cyan