From 1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 5 Aug 2010 14:14:34 +0200 Subject: no need to pass the reason to empathy_account_get_error_message --- libempathy/empathy-utils.c | 6 ++++-- libempathy/empathy-utils.h | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index b0abaa948..b47987f85 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -387,11 +387,11 @@ empathy_dbus_error_name_get_default_message (const gchar *error) } const gchar * -empathy_account_get_error_message (TpAccount *account, - TpConnectionStatusReason reason) +empathy_account_get_error_message (TpAccount *account) { const gchar *dbus_error; const gchar *message; + TpConnectionStatusReason reason; dbus_error = tp_account_get_detailed_error (account, NULL); message = empathy_dbus_error_name_get_default_message (dbus_error); @@ -401,6 +401,8 @@ empathy_account_get_error_message (TpAccount *account, DEBUG ("Don't understand error '%s'; fallback to the status reason (%u)", dbus_error, reason); + tp_account_get_connection_status (account, &reason); + return empathy_status_reason_get_default_message (reason); } diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 9930e6536..47b9b84ad 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -76,8 +76,7 @@ gboolean empathy_check_available_state (void); gint empathy_uint_compare (gconstpointer a, gconstpointer b); -const gchar * empathy_account_get_error_message (TpAccount *account, - TpConnectionStatusReason reason); +const gchar * empathy_account_get_error_message (TpAccount *account); gchar *empathy_protocol_icon_name (const gchar *protocol); const gchar *empathy_protocol_name_to_display_name (const gchar *proto_name); -- cgit v1.2.3