use the 48x48 version of the local-xmpp icon

[empathy.git] / libempathy-gtk / empathy-theme-irc.c

diff --git a/libempathy-gtk/empathy-theme-irc.c b/libempathy-gtk/empathy-theme-irc.c
index 479108ce33f37b05c739a61e600aa0c66fc0d324..ed8e3b38049c6303e45c66df5342141daf01e299 100644 (file)
--- a/libempathy-gtk/empathy-theme-irc.c
+++ b/libempathy-gtk/empathy-theme-irc.c
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
@@ -50,7 +50,8 @@ theme_irc_create_tags (EmpathyThemeIrc *theme)
 
 static void
 theme_irc_append_message (EmpathyChatTextView *view,
-                         EmpathyMessage      *message)
+                         EmpathyMessage      *message,
+                         gboolean             should_highlight)
 {
        GtkTextBuffer *buffer;
        const gchar   *name;
@@ -62,11 +63,11 @@ theme_irc_append_message (EmpathyChatTextView *view,
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
        contact = empathy_message_get_sender (message);
-       name = empathy_contact_get_name (contact);
+       name = empathy_contact_get_logged_alias (contact);
 
        if (empathy_message_get_tptype (message) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
-               tmp = g_strdup_printf (" * %s %s", 
-                                      empathy_contact_get_name (contact),
+               tmp = g_strdup_printf (" * %s %s",
+                                      empathy_contact_get_logged_alias (contact),
                                       empathy_message_get_body (message));
                empathy_chat_text_view_append_body (view, tmp,
                                                    EMPATHY_CHAT_TEXT_VIEW_TAG_ACTION);
@@ -77,13 +78,13 @@ theme_irc_append_message (EmpathyChatTextView *view,
        if (empathy_contact_is_user (contact)) {
                nick_tag = EMPATHY_THEME_IRC_TAG_NICK_SELF;
        } else {
-               if (empathy_message_should_highlight (message)) {
+               if (should_highlight) {
                        nick_tag = EMPATHY_THEME_IRC_TAG_NICK_HIGHLIGHT;
                } else {
                        nick_tag = EMPATHY_THEME_IRC_TAG_NICK_OTHER;
                }
        }
-               
+
        gtk_text_buffer_get_end_iter (buffer, &iter);
 
        /* The nickname. */