diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-08-12 16:44:09 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-08-12 16:44:09 +0800 |
| commit | 2d265825401de6bc45b00a75bf20a870fc46ad53 (patch) | |
| tree | d9177924b2dd9f91b94c2a196ecd95c5321ad96d /addressbook/gui/widgets | |
| parent | 6fba643462c13075d543c41d961fdf355426602d (diff) | |
| download | gsoc2013-evolution-2d265825401de6bc45b00a75bf20a870fc46ad53.tar.gz gsoc2013-evolution-2d265825401de6bc45b00a75bf20a870fc46ad53.tar.zst gsoc2013-evolution-2d265825401de6bc45b00a75bf20a870fc46ad53.zip | |
** Fix for bug #547308
2008-08-12 Milan Crha <mcrha@redhat.com>
** Fix for bug #547308
* gui/component/addressbook.c: (load_source_auth_cb):
Do not try to authenticate to the server more than twice when knows
the password and it didn't fail because of wrong user name/password.
* gui/widgets/eab-gui-util.c: (const char *status_to_string[]):
New string for new status code.
* gui/widgets/eab-gui-util.c: (eab_load_error_dialog):
Include detailed error in generic failure error, if available and is
not a repository offline error.
svn path=/trunk/; revision=35964
Diffstat (limited to 'addressbook/gui/widgets')
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 1b59371935..42ce9cd8f2 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -75,7 +75,8 @@ static const char *status_to_string[] = { /* E_BOOK_ERROR_NO_SUCH_SOURCE */ N_("No such source"), /* E_BOOK_ERROR_OFFLINE_UNAVAILABLE */ N_("Not available in offline mode"), /* E_BOOK_ERROR_OTHER_ERROR */ N_("Other error"), - /* E_BOOK_ERROR_INVALID_SERVER_VERSION */ N_("Invalid server version") + /* E_BOOK_ERROR_INVALID_SERVER_VERSION */ N_("Invalid server version"), + /* E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD */ N_("Unsupported authentication method") }; void @@ -131,6 +132,12 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) _("We were unable to open this addressbook. This either " "means you have entered an incorrect URI, or the server " "is unreachable."); + + /* do not show repository offline message, it's kind of generic error */ + if (status != E_BOOK_ERROR_REPOSITORY_OFFLINE && status > 0 && status < G_N_ELEMENTS (status_to_string) && status_to_string [status]) { + label = g_strconcat (label_string, "\n\n", _("Detailed error:"), " ", _(status_to_string [status]), NULL); + label_string = label; + } } dialog = e_error_new ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL); |