From fc4059e17da2a94a3864f396b5de12d93865090d Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 17 Sep 2010 15:35:07 +0200 Subject: 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. --- libempathy-gtk/empathy-protocol-chooser.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libempathy-gtk') 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", -- cgit v1.2.3