Merge revisions 35951:35992 from trunk.

svn path=/branches/kill-bonobo/; revision=35994

2 files changed, 18 insertions, 4 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index b30ece1581..ecae7ed8c3 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -31,7 +31,6 @@
 #include <filter/rule-editor.h>
 #include <widgets/menus/gal-view-etable.h>
 #include <e-util/e-xml-utils.h>
-#include <e-util/e-icon-factory.h>
 #include <libgnomeui/gnome-dialog-util.h>
 
 #include "addressbook/printing/e-contact-print.h"
@@ -1476,8 +1475,16 @@ generate_viewoption_menu (EABSearchBarItem *subitems)
 			char *str = NULL;
 			str = e_str_without_underscores (subitems[i].search.text);
 			menu_item = gtk_image_menu_item_new_with_label (str);
-/*			if (subitems[i].image)
-				gtk_image_menu_item_set_image (menu_item, e_icon_factory_get_image (subitems[i].image, E_ICON_SIZE_MENU)); */
+                        if (subitems[i].image) {
+                                GtkWidget *image;
+
+                                image = gtk_image_new_from_icon_name (
+                                        subitems[i].image,
+                                        GTK_ICON_SIZE_MENU);
+                                gtk_image_menu_item_set_image (
+                                        GTK_IMAGE_MENU_ITEM (menu_item),
+                                        image);
+                        }
 			g_free (str);
 		} else {
 			menu_item = gtk_menu_item_new ();
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);