Merge branch 'sjoerd-mc5' into mc5

[empathy.git] / libempathy-gtk / empathy-protocol-chooser.c

diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 79adbac9fbceadef437d5864b81a50f866a24dbc..ecd26d8ff60eda766a866ef51783da0f8e75f2ee 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -167,7 +167,7 @@ protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
       const gchar *display_name;
       gchar *display_name_set;
 
-      icon_name = g_strdup_printf ("im-%s", proto->name);
+      icon_name = empathy_protocol_icon_name (proto->name);
       display_name = protocol_chooser_proto_name_to_display_name (proto->name);
 
       if (display_name == NULL)
@@ -326,7 +326,8 @@ empathy_protocol_chooser_class_init (EmpathyProtocolChooserClass *klass)
  *
  * Return value: a pointer to the selected #TpConnectionManagerProtocol
  */
-TpConnectionManager *empathy_protocol_chooser_dup_selected (
+TpConnectionManager *
+empathy_protocol_chooser_dup_selected (
     EmpathyProtocolChooser *protocol_chooser,
     TpConnectionManagerProtocol **protocol)
 {