diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2009-11-02 18:41:20 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-11-02 18:41:20 +0800 |
| commit | 8c4fe70aad3622138957c49732fa612b1e2e9eb7 (patch) | |
| tree | 2f80938787489bc774bf8849a14a2ad24354f978 /libempathy-gtk/empathy-theme-adium.c | |
| parent | 1b4acf8fcf47d928f525a4640f27323e13fd25ea (diff) | |
| parent | b6bb173fe0840ec0857a145e265853e2a9083ee6 (diff) | |
| download | gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.gz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.bz2 gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.lz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.xz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.zst gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.zip | |
Merge branch 'accountz'
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index fcf95ca02..a41cbd6c0 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -441,7 +441,7 @@ theme_adium_append_message (EmpathyChatView *view, EmpathyThemeAdium *theme = EMPATHY_THEME_ADIUM (view); EmpathyThemeAdiumPriv *priv = GET_PRIV (theme); EmpathyContact *sender; - EmpathyAccount *account; + TpAccount *account; gchar *dup_body = NULL; const gchar *body; const gchar *name; @@ -467,9 +467,9 @@ theme_adium_append_message (EmpathyChatView *view, sender = empathy_message_get_sender (msg); account = empathy_contact_get_account (sender); service_name = empathy_protocol_name_to_display_name - (empathy_account_get_protocol (account)); + (tp_account_get_protocol (account)); if (service_name == NULL) - service_name = empathy_account_get_protocol (account); + service_name = tp_account_get_protocol (account); timestamp = empathy_message_get_timestamp (msg); body = empathy_message_get_body (msg); dup_body = theme_adium_parse_body (theme, body); |