From 0a39af61f6bab052ead17918ab372e0cbb8eab3c Mon Sep 17 00:00:00 2001 From: Felix Kaser Date: Tue, 8 Dec 2009 19:41:57 +0100 Subject: refactor friendly status reason messages the friendly status reason can be asked from empathy-utils --- src/empathy-accounts-dialog.c | 62 +++++++++---------------------------------- 1 file changed, 12 insertions(+), 50 deletions(-) (limited to 'src/empathy-accounts-dialog.c') diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 016e8b6c3..49c65f071 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -212,57 +212,19 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, gtk_widget_hide (priv->throbber); break; case TP_CONNECTION_STATUS_DISCONNECTED: - switch (reason) + message = g_strdup_printf (_("Offline - %s"), + empathy_status_reason_get_default_message (reason)); + + if (reason == TP_CONNECTION_STATUS_REASON_REQUESTED) { - case TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED: - message = _("Disconnected - No error specified"); - break; - case TP_CONNECTION_STATUS_REASON_REQUESTED: - message = _("Disconnected - Requested"); - break; - case TP_CONNECTION_STATUS_REASON_NETWORK_ERROR: - message = _("Disconnected - Network error"); - break; - case TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED: - message = _("Disconnected - Authentication failed"); - break; - case TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR: - message = _("Disconnected - Encryption error"); - break; - case TP_CONNECTION_STATUS_REASON_NAME_IN_USE: - message = _("Disconnected - Name in use"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED: - message = _("Disconnected - Certificate not provided"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED: - message = _("Disconnected - Certificate untrusted"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_EXPIRED: - message = _("Disconnected - Certificate expired"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED: - message = _("Disconnected - Certificate not activated"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH: - message = _("Disconnected - Certificate hostname mismatch"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH: - message = _("Disconnected - Certificate fingerprint mismatch"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED: - message = _("Disconnected - Certificate self-signed"); - break; - case TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR: - message = _("Disconnected - Certificate error"); - break; - default: - message = _("Disconnected - Unknown reason"); - break; + gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), + GTK_MESSAGE_WARNING); + } + else + { + gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), + GTK_MESSAGE_ERROR); } - - gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), - GTK_MESSAGE_ERROR); ephy_spinner_stop (EPHY_SPINNER (priv->throbber)); gtk_widget_show (priv->image_status); @@ -280,7 +242,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, } else { - message = _("Disconnected - Account disabled"); + message = _("Offline - Account disabled"); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_WARNING); ephy_spinner_stop (EPHY_SPINNER (priv->throbber)); -- cgit v1.2.3