Don't show the error if user-requested is set

[empathy.git] / src / empathy-main-window.c

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index ff8bb5e982829fce4884262b75567d03a5aedcfb..0efa4a97d13c054ab4423402137c9b9439ea4abe 100644 (file)
--- 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) {