aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-accounts-dialog.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-13 01:13:21 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-13 18:21:33 +0800
commit07cb259462d9958e65d2f94aef6e5728e83ccf29 (patch)
treefda228e3ecd55e0d8d25044561b2dbae80d37106 /src/empathy-accounts-dialog.c
parent801db029900423dd230edfda4731205c3c2a91a3 (diff)
downloadgsoc2013-empathy-07cb259462d9958e65d2f94aef6e5728e83ccf29.tar
gsoc2013-empathy-07cb259462d9958e65d2f94aef6e5728e83ccf29.tar.gz
gsoc2013-empathy-07cb259462d9958e65d2f94aef6e5728e83ccf29.tar.bz2
gsoc2013-empathy-07cb259462d9958e65d2f94aef6e5728e83ccf29.tar.lz
gsoc2013-empathy-07cb259462d9958e65d2f94aef6e5728e83ccf29.tar.xz
gsoc2013-empathy-07cb259462d9958e65d2f94aef6e5728e83ccf29.tar.zst
gsoc2013-empathy-07cb259462d9958e65d2f94aef6e5728e83ccf29.zip
move code generating the default display name of new account to account-widget
This will allow us to: - Use this function from other places, like in the assistant. - Delegate special cases to the specialized versions of the widget.
Diffstat (limited to 'src/empathy-accounts-dialog.c')
-rw-r--r--src/empathy-accounts-dialog.c53
1 files changed, 2 insertions, 51 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index d2161a27f..e4e963c9a 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -208,56 +208,6 @@ empathy_account_dialog_widget_cancelled_cb (
g_object_unref (settings);
}
-static gchar *
-get_default_display_name (EmpathyAccountSettings *settings)
-{
- const gchar *login_id;
- const gchar *protocol, *p;
- gchar *default_display_name;
-
- login_id = empathy_account_settings_get_string (settings, "account");
- protocol = empathy_account_settings_get_protocol (settings);
-
- if (login_id != NULL)
- {
- if (!tp_strdiff (protocol, "irc"))
- {
- const gchar* server;
- server = empathy_account_settings_get_string (settings, "server");
-
- /* To translators: The first parameter is the login id and the
- * second one is the server. The resulting string will be something
- * like: "MyUserName on chat.freenode.net".
- * You should reverse the order of these arguments if the
- * server should come before the login id in your locale.*/
- default_display_name = g_strdup_printf (_("%1$s on %2$s"),
- login_id, server);
- }
- else
- {
- default_display_name = g_strdup (login_id);
- }
-
- return default_display_name;
- }
-
- 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" */
- default_display_name = g_strdup_printf (_("%s Account"), protocol);
- }
- else
- {
- default_display_name = g_strdup (_("New account"));
- }
-
- return default_display_name;
-}
-
static void
empathy_account_dialog_account_created_cb (EmpathyAccountWidget *widget_object,
EmpathyAccountsDialog *dialog)
@@ -266,7 +216,8 @@ empathy_account_dialog_account_created_cb (EmpathyAccountWidget *widget_object,
EmpathyAccountSettings *settings =
accounts_dialog_model_get_selected_settings (dialog);
- display_name = get_default_display_name (settings);
+ display_name = empathy_account_widget_get_default_display_name (
+ widget_object);
empathy_account_settings_set_display_name_async (settings,
display_name, NULL, NULL);