diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-05-06 21:39:09 +0800 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
| commit | 4e0f97a1942d1ae0b4b3846d43e3769fdb076b44 (patch) | |
| tree | ef82dba3325ec71b80ed3deb7ed48fc130a36ddc /libempathy-gtk/empathy-theme-adium.c | |
| parent | 88819ece017f0693803f33bb560e4d01140174c1 (diff) | |
| download | gsoc2013-empathy-4e0f97a1942d1ae0b4b3846d43e3769fdb076b44.tar gsoc2013-empathy-4e0f97a1942d1ae0b4b3846d43e3769fdb076b44.tar.gz gsoc2013-empathy-4e0f97a1942d1ae0b4b3846d43e3769fdb076b44.tar.bz2 gsoc2013-empathy-4e0f97a1942d1ae0b4b3846d43e3769fdb076b44.tar.lz gsoc2013-empathy-4e0f97a1942d1ae0b4b3846d43e3769fdb076b44.tar.xz gsoc2013-empathy-4e0f97a1942d1ae0b4b3846d43e3769fdb076b44.tar.zst gsoc2013-empathy-4e0f97a1942d1ae0b4b3846d43e3769fdb076b44.zip | |
tpaw-utils: move functions for protocol and service display information
The following functions were moved from empathy to tp-aw and renamed
accordingly:
* empathy_protocol_icon_name;
* empathy_protocol_name_to_display_name;
* empathy_service_name_to_display_name.
This commit also changes the licence of the moved code (all copyrighted
by Collabora Ltd.) from GPL to LGPL.
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 31715c305..d5b935681 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -23,6 +23,7 @@ #include "empathy-theme-adium.h" #include <glib/gi18n-lib.h> +#include <tp-account-widgets/tpaw-utils.h> #include "empathy-gsettings.h" #include "empathy-images.h" @@ -901,7 +902,7 @@ theme_adium_add_message (EmpathyThemeAdium *self, /* Get information */ sender = empathy_message_get_sender (msg); account = empathy_contact_get_account (sender); - service_name = empathy_protocol_name_to_display_name + service_name = tpaw_protocol_name_to_display_name (tp_account_get_protocol_name (account)); if (service_name == NULL) service_name = tp_account_get_protocol_name (account); |