diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-08-24 21:24:38 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-08-24 21:24:38 +0800 |
| commit | 3bd33b4812d0b909a8a44b12791fcac75fcf365d (patch) | |
| tree | 6c92c15512f3440f93f064a9cb2740ff781158f2 /src/empathy-main-window.c | |
| parent | 180d83485a0d10d8c45760852d8d588e20a7d3e2 (diff) | |
| parent | dc73f3d3e51958edaf3b0508c4205c387e735547 (diff) | |
| download | gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.gz gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.bz2 gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.lz gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.xz gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.tar.zst gsoc2013-empathy-3bd33b4812d0b909a8a44b12791fcac75fcf365d.zip | |
Merge branch 'tls-connection'
Diffstat (limited to 'src/empathy-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 11 |
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) { |