aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-account-assistant.c
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@0d.be>2009-08-27 16:27:35 +0800
committerFrédéric Péters <fpeters@0d.be>2009-08-28 20:08:42 +0800
commita72c1e74b5865aed5a132dc568c01038f4050281 (patch)
tree229bc55ce997041b9fb25105b76ff0e97d3d82ac /src/empathy-account-assistant.c
parent9e9c41e83b05829519a4ed5fe1cadd288b74ac8d (diff)
downloadgsoc2013-empathy-a72c1e74b5865aed5a132dc568c01038f4050281.tar
gsoc2013-empathy-a72c1e74b5865aed5a132dc568c01038f4050281.tar.gz
gsoc2013-empathy-a72c1e74b5865aed5a132dc568c01038f4050281.tar.bz2
gsoc2013-empathy-a72c1e74b5865aed5a132dc568c01038f4050281.tar.lz
gsoc2013-empathy-a72c1e74b5865aed5a132dc568c01038f4050281.tar.xz
gsoc2013-empathy-a72c1e74b5865aed5a132dc568c01038f4050281.tar.zst
gsoc2013-empathy-a72c1e74b5865aed5a132dc568c01038f4050281.zip
Do not construct a sentence for an assistant error string (GNOME bug 593257)
Diffstat (limited to 'src/empathy-account-assistant.c')
-rw-r--r--src/empathy-account-assistant.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 03c23df0c..68376733e 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -97,8 +97,7 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
GError *error, gint page_num)
{
GtkWidget *main_vbox, *w, *hbox;
- GString *str;
- char *message;
+ const char *message;
PangoAttrList *list;
EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
@@ -115,24 +114,16 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
gtk_widget_show (w);
- /* translators: this is followed by the "while ..." strings some lines
- * down this file.
- */
- str = g_string_new (_("There has been an error "));
-
if (page_num == PAGE_IMPORT)
- /* translators: this follows the "There has been an error " string */
- str = g_string_append (str, _("while importing the accounts."));
+ message = _("There has been an error while importing the accounts.");
else if (page_num >= PAGE_ENTER_CREATE &&
priv->first_resp == RESPONSE_ENTER_ACCOUNT)
- /* translators: this follows the "There has been an error " string */
- str = g_string_append (str, _("while parsing the account details."));
+ message = _("There has been an error while parsing the account details.");
else if (page_num >= PAGE_ENTER_CREATE &&
priv->first_resp == RESPONSE_CREATE_ACCOUNT)
- /* translators: this follows the "There has been an error " string */
- str = g_string_append (str, _("while creating the account."));
-
- message = g_string_free (str, FALSE);
+ message = _("There has been an error while creating the account.");
+ else
+ message = _("There has been an error.")
w = gtk_label_new (message);
gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
@@ -144,7 +135,6 @@ account_assistant_build_error_page (EmpathyAccountAssistant *self,
gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
gtk_widget_show (w);
- g_free (message);
pango_attr_list_unref (list);
message = g_markup_printf_escaped