diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-05 20:14:34 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-05 20:14:34 +0800 |
| commit | 1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567 (patch) | |
| tree | 0f290f2b143f24c80238962d4463737e1152dda4 | |
| parent | b5e7268ebc857928c6672d84b23c1c05f9a45bd5 (diff) | |
| download | gsoc2013-empathy-1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567.tar gsoc2013-empathy-1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567.tar.gz gsoc2013-empathy-1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567.tar.bz2 gsoc2013-empathy-1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567.tar.lz gsoc2013-empathy-1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567.tar.xz gsoc2013-empathy-1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567.tar.zst gsoc2013-empathy-1707cb8bb953cb4886a8e3b8ab0eeddf0d6b0567.zip | |
no need to pass the reason to empathy_account_get_error_message
| -rw-r--r-- | libempathy/empathy-utils.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-utils.h | 3 | ||||
| -rw-r--r-- | src/empathy-accounts-dialog.c | 4 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 2 |
4 files changed, 8 insertions, 7 deletions
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); diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index a3a771cc4..e7977894c 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -310,7 +310,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, gchar *message; message = g_strdup_printf (_("Offline — %s"), - empathy_account_get_error_message (account, reason)); + empathy_account_get_error_message (account)); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_WARNING); @@ -322,7 +322,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, gchar *message; message = g_strdup_printf (_("Disconnected — %s"), - empathy_account_get_error_message (account, reason)); + empathy_account_get_error_message (account)); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_ERROR); diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index afca30281..c6519be7f 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -435,7 +435,7 @@ main_window_error_display (EmpathyMainWindow *window, str = g_markup_printf_escaped ("<b>%s</b>\n%s", tp_account_get_display_name (account), - empathy_account_get_error_message (account, reason)); + empathy_account_get_error_message (account)); info_bar = g_hash_table_lookup (priv->errors, account); if (info_bar) { |