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/empathy-utils.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/empathy-utils.c')
-rw-r--r-- | libempathy/empathy-utils.c | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index b06edeb01..ee245d90f 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -428,21 +428,6 @@ empathy_uint_compare (gconstpointer a, return *(guint *) a - *(guint *) b; } -gchar * -empathy_protocol_icon_name (const gchar *protocol) -{ - if (!tp_strdiff (protocol, "yahoojp")) - /* Yahoo Japan uses the same icon as Yahoo */ - protocol = "yahoo"; - else if (!tp_strdiff (protocol, "simple")) - /* SIMPLE uses the same icon as SIP */ - protocol = "sip"; - else if (!tp_strdiff (protocol, "sms")) - return g_strdup ("phone"); - - return g_strdup_printf ("im-%s", protocol); -} - GType empathy_type_dbus_ao (void) { @@ -454,77 +439,6 @@ empathy_type_dbus_ao (void) return t; } -const char * -empathy_protocol_name_to_display_name (const gchar *proto_name) -{ - int i; - static struct { - const gchar *proto; - const gchar *display; - gboolean translated; - } names[] = { - { "jabber", "Jabber", FALSE }, - { "msn", "Windows Live (MSN)", FALSE, }, - { "local-xmpp", N_("People Nearby"), TRUE }, - { "irc", "IRC", FALSE }, - { "icq", "ICQ", FALSE }, - { "aim", "AIM", FALSE }, - { "yahoo", "Yahoo!", FALSE }, - { "yahoojp", N_("Yahoo! Japan"), TRUE }, - { "groupwise", "GroupWise", FALSE }, - { "sip", "SIP", FALSE }, - { "gadugadu", "Gadu-Gadu", FALSE }, - { "mxit", "Mxit", FALSE }, - { "myspace", "Myspace", FALSE }, - { "sametime", "Sametime", FALSE }, - { "skype-dbus", "Skype (D-BUS)", FALSE }, - { "skype-x11", "Skype (X11)", FALSE }, - { "zephyr", "Zephyr", FALSE }, - { NULL, NULL } - }; - - for (i = 0; names[i].proto != NULL; i++) - { - if (!tp_strdiff (proto_name, names[i].proto)) - { - if (names[i].translated) - return gettext (names[i].display); - else - return names[i].display; - } - } - - return proto_name; -} - -const char * -empathy_service_name_to_display_name (const gchar *service_name) -{ - int i; - static struct { - const gchar *service; - const gchar *display; - gboolean translated; - } names[] = { - { "google-talk", N_("Google Talk"), FALSE }, - { "facebook", N_("Facebook Chat"), TRUE }, - { NULL, NULL } - }; - - for (i = 0; names[i].service != NULL; i++) - { - if (!tp_strdiff (service_name, names[i].service)) - { - if (names[i].translated) - return gettext (names[i].display); - else - return names[i].display; - } - } - - return service_name; -} - gboolean empathy_account_manager_get_accounts_connected (gboolean *connecting) { |