aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-03 23:47:23 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-05 18:27:41 +0800
commit76a6ff433280ed7bee6346ab05caa00ceb2aba49 (patch)
tree9bde58aef5df51afebe9d0e93e2fab087bf51a0a /src
parentd4397c1120f65ce0f4051156c255857d08b1b4ae (diff)
downloadgsoc2013-empathy-76a6ff433280ed7bee6346ab05caa00ceb2aba49.tar
gsoc2013-empathy-76a6ff433280ed7bee6346ab05caa00ceb2aba49.tar.gz
gsoc2013-empathy-76a6ff433280ed7bee6346ab05caa00ceb2aba49.tar.bz2
gsoc2013-empathy-76a6ff433280ed7bee6346ab05caa00ceb2aba49.tar.lz
gsoc2013-empathy-76a6ff433280ed7bee6346ab05caa00ceb2aba49.tar.xz
gsoc2013-empathy-76a6ff433280ed7bee6346ab05caa00ceb2aba49.tar.zst
gsoc2013-empathy-76a6ff433280ed7bee6346ab05caa00ceb2aba49.zip
main-window: pass the TpConnectionStatusReason to main_window_error_display
Diffstat (limited to 'src')
-rw-r--r--src/empathy-main-window.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index f0dac6392..54496414c 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -418,7 +418,7 @@ main_window_error_close_clicked_cb (GtkButton *button,
static void
main_window_error_display (EmpathyMainWindow *window,
TpAccount *account,
- const gchar *message)
+ TpConnectionStatusReason reason)
{
EmpathyMainWindowPriv *priv = GET_PRIV (window);
GtkWidget *info_bar;
@@ -432,6 +432,9 @@ main_window_error_display (EmpathyMainWindow *window,
GtkWidget *action_table;
gchar *str;
const gchar *icon_name;
+ const gchar *message;
+
+ message = empathy_status_reason_get_default_message (reason);
str = g_markup_printf_escaped ("<b>%s</b>\n%s",
tp_account_get_display_name (account),
@@ -571,11 +574,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, reason);
}
if (current == TP_CONNECTION_STATUS_DISCONNECTED) {