[empathy: 1/11] main-window: pass the TpConnectionStatusReason to main_window_error_display
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 1/11] main-window: pass the TpConnectionStatusReason to main_window_error_display
- Date: Thu, 5 Aug 2010 12:19:34 +0000 (UTC)
commit 76a6ff433280ed7bee6346ab05caa00ceb2aba49
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Aug 3 17:47:23 2010 +0200
main-window: pass the TpConnectionStatusReason to main_window_error_display
src/empathy-main-window.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index f0dac63..5449641 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) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]