[empathy] get_default_display_name: use the real protocol name to check if it's IRC or not

[Guillaume Desmottes <gdesmott src gnome org>]

commit 2fdf42815677e4e7f41a73f77997af87d5ae5eb2
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Nov 3 15:15:08 2009 +0000

    get_default_display_name: use the real protocol name to check if it's IRC or not

 src/empathy-accounts-dialog.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index f12c451..7092e55 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -218,9 +218,6 @@ get_default_display_name (EmpathyAccountSettings *settings)
   login_id = empathy_account_settings_get_string (settings, "account");
   protocol = empathy_account_settings_get_protocol (settings);
 
-  if ((p = empathy_protocol_name_to_display_name (protocol)) != NULL)
-    protocol = p;
-
   if (login_id != NULL)
     {
       if (!tp_strdiff (protocol, "irc"))
@@ -240,8 +237,14 @@ get_default_display_name (EmpathyAccountSettings *settings)
         {
           default_display_name = g_strdup (login_id);
         }
+
+      return default_display_name;
     }
-  else if (protocol != NULL)
+
+  if ((p = empathy_protocol_name_to_display_name (protocol)) != NULL)
+    protocol = p;
+
+  if (protocol != NULL)
     {
       /* To translators: The parameter is the protocol name. The resulting
        * string will be something like: "Jabber Account" */