Merge branch 'master' into mc5

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

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index e9548f30350c18c8dc855117506dd8123af1af8f..2889aa304bf0526e0ba9e8e423dac157c29588ef 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -31,7 +31,6 @@
 
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-utils.h>
-#include <libmissioncontrol/mc-profile.h>
 
 #include "empathy-theme-adium.h"
 #include "empathy-smiley-manager.h"
@@ -475,7 +474,6 @@ theme_adium_append_html (EmpathyThemeAdium *theme,
                } else if (theme_adium_match (&cur, "%time")) {
                        gchar *format = NULL;
                        gchar *end;
-
                        /* Time can be in 2 formats:
                         * %time% or %time{strftime format}%
                         * Extract the time format if provided. */
@@ -520,7 +518,6 @@ theme_adium_append_message (EmpathyChatView *view,
        EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
        EmpathyContact        *sender;
        EmpathyAccount        *account;
-       McProfile             *account_profile;
        gchar                 *dup_body = NULL;
        const gchar           *body;
        const gchar           *name;
@@ -544,8 +541,7 @@ theme_adium_append_message (EmpathyChatView *view,
        /* Get information */
        sender = empathy_message_get_sender (msg);
        account = empathy_contact_get_account (sender);
-       account_profile = empathy_account_get_profile (account);
-       service_name = mc_profile_get_display_name (account_profile);
+       service_name = empathy_account_get_protocol (account);
        timestamp = empathy_message_get_timestamp (msg);
        body = empathy_message_get_body (msg);
        dup_body = theme_adium_parse_body (theme, body);