From ea19d00b74b36acc40115a3b48218ccc6af54d04 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Wed, 18 Aug 2010 19:07:17 +0200
Subject: Don't show the error if user-requested is set

---
 src/empathy-main-window.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

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) {
-- 
cgit v1.2.3