[empathy/gnome-2-28] get_default_display_name: use the real protocol name to check if it's IRC or not
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-28] get_default_display_name: use the real protocol name to check if it's IRC or not
- Date: Tue, 3 Nov 2009 15:24:36 +0000 (UTC)
commit 54179096d53c0f18a36ac56982853af10ed47bbd
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 b138c81..7322dea 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -216,9 +216,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"))
@@ -238,8 +235,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" */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]