aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-17 21:35:07 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-29 18:54:37 +0800
commitfc4059e17da2a94a3864f396b5de12d93865090d (patch)
treeb7e51c0ece0074708d6762786c88730c8cf20e6f /libempathy-gtk
parent3a6aca03ec70cb11d23cfd68e72a51a4a49220a2 (diff)
downloadgsoc2013-empathy-fc4059e17da2a94a3864f396b5de12d93865090d.tar
gsoc2013-empathy-fc4059e17da2a94a3864f396b5de12d93865090d.tar.gz
gsoc2013-empathy-fc4059e17da2a94a3864f396b5de12d93865090d.tar.bz2
gsoc2013-empathy-fc4059e17da2a94a3864f396b5de12d93865090d.tar.lz
gsoc2013-empathy-fc4059e17da2a94a3864f396b5de12d93865090d.tar.xz
gsoc2013-empathy-fc4059e17da2a94a3864f396b5de12d93865090d.tar.zst
gsoc2013-empathy-fc4059e17da2a94a3864f396b5de12d93865090d.zip
Add empathy_service_name_to_display_name()
Also makes empathy_protocol_name_to_display_name() fallbacks to the protocol name so caller doesn't have to.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 2017b3363..0ac268015 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -225,10 +225,8 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
g_strdup (proto->name), g_strdup (cm->name));
icon_name = empathy_protocol_icon_name (proto->name);
- display_name = empathy_protocol_name_to_display_name (proto->name);
- if (display_name == NULL)
- display_name = proto->name;
+ display_name = empathy_protocol_name_to_display_name (proto->name);
gtk_list_store_insert_with_values (priv->store,
NULL, 0,
@@ -241,7 +239,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
if (!tp_strdiff (proto->name, "jabber") &&
!tp_strdiff (cm->name, "gabble"))
{
- display_name = empathy_protocol_name_to_display_name ("gtalk");
+ display_name = empathy_service_name_to_display_name ("google-talk");
gtk_list_store_insert_with_values (priv->store,
NULL, 0,
COL_ICON, "im-google-talk",
@@ -251,7 +249,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
COL_SERVICE, "google-talk",
-1);
- display_name = empathy_protocol_name_to_display_name ("facebook");
+ display_name = empathy_service_name_to_display_name ("facebook");
gtk_list_store_insert_with_values (priv->store,
NULL, 0,
COL_ICON, "im-facebook",