diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-05 20:19:18 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-05 20:19:18 +0800 |
| commit | fe3dade449f6c4ef735166696fe86de968122b94 (patch) | |
| tree | 887af6870c31ee7e8a8bb2a5363effd63c3a4fa0 /src/empathy-main-window.c | |
| parent | c735abd4a11c57d0cabb50051e45b57cdb80652d (diff) | |
| parent | 717184f6d506b0fe6ea316accbb6aeebb3253919 (diff) | |
| download | gsoc2013-empathy-fe3dade449f6c4ef735166696fe86de968122b94.tar gsoc2013-empathy-fe3dade449f6c4ef735166696fe86de968122b94.tar.gz gsoc2013-empathy-fe3dade449f6c4ef735166696fe86de968122b94.tar.bz2 gsoc2013-empathy-fe3dade449f6c4ef735166696fe86de968122b94.tar.lz gsoc2013-empathy-fe3dade449f6c4ef735166696fe86de968122b94.tar.xz gsoc2013-empathy-fe3dade449f6c4ef735166696fe86de968122b94.tar.zst gsoc2013-empathy-fe3dade449f6c4ef735166696fe86de968122b94.zip | |
Merge branch 'connection-error-523895'
Diffstat (limited to 'src/empathy-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index f0dac6392..826cda487 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -417,8 +417,7 @@ main_window_error_close_clicked_cb (GtkButton *button, static void main_window_error_display (EmpathyMainWindow *window, - TpAccount *account, - const gchar *message) + TpAccount *account) { EmpathyMainWindowPriv *priv = GET_PRIV (window); GtkWidget *info_bar; @@ -435,7 +434,7 @@ main_window_error_display (EmpathyMainWindow *window, str = g_markup_printf_escaped ("<b>%s</b>\n%s", tp_account_get_display_name (account), - message); + empathy_account_get_error_message (account)); info_bar = g_hash_table_lookup (priv->errors, account); if (info_bar) { @@ -571,11 +570,7 @@ main_window_connection_changed_cb (TpAccount *account, if (current == TP_CONNECTION_STATUS_DISCONNECTED && reason != TP_CONNECTION_STATUS_REASON_REQUESTED) { - const gchar *message; - - message = empathy_status_reason_get_default_message (reason); - - main_window_error_display (window, account, message); + main_window_error_display (window, account); } if (current == TP_CONNECTION_STATUS_DISCONNECTED) { |