aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-main-window.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2010-08-19 01:07:17 +0800
committerCosimo Cecchi <cosimoc@gnome.org>2010-08-19 01:19:00 +0800
commitea19d00b74b36acc40115a3b48218ccc6af54d04 (patch)
treef9e65efd2d79406f47bd86e11cf72cc18007ec19 /src/empathy-main-window.c
parent92aee43c95f51aa828c34c828c18c38a3e1fdcb6 (diff)
downloadgsoc2013-empathy-ea19d00b74b36acc40115a3b48218ccc6af54d04.tar
gsoc2013-empathy-ea19d00b74b36acc40115a3b48218ccc6af54d04.tar.gz
gsoc2013-empathy-ea19d00b74b36acc40115a3b48218ccc6af54d04.tar.bz2
gsoc2013-empathy-ea19d00b74b36acc40115a3b48218ccc6af54d04.tar.lz
gsoc2013-empathy-ea19d00b74b36acc40115a3b48218ccc6af54d04.tar.xz
gsoc2013-empathy-ea19d00b74b36acc40115a3b48218ccc6af54d04.tar.zst
gsoc2013-empathy-ea19d00b74b36acc40115a3b48218ccc6af54d04.zip
Don't show the error if user-requested is set
Diffstat (limited to 'src/empathy-main-window.c')
-rw-r--r--src/empathy-main-window.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index ff8bb5e98..0efa4a97d 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -475,10 +475,19 @@ main_window_error_display (EmpathyMainWindow *window,
GtkWidget *action_table;
gchar *str;
const gchar *icon_name;
+ const gchar *error_message;
+ gboolean user_requested;
+
+ error_message =
+ empathy_account_get_error_message (account, &user_requested);
+
+ if (user_requested) {
+ return;
+ }
str = g_markup_printf_escaped ("<b>%s</b>\n%s",
tp_account_get_display_name (account),
- empathy_account_get_error_message (account));
+ error_message);
info_bar = g_hash_table_lookup (priv->errors, account);
if (info_bar) {