3 files changed, 4 insertions, 12 deletions
diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c
index 36b426b0f5..fd72818612 100644
--- a/e-util/e-name-selector-dialog.c
+++ b/e-util/e-name-selector-dialog.c
@@ -1157,14 +1157,9 @@ book_client_connect_cb (GObject *source_object,
 	}
 
 	if (error != NULL) {
-		gchar *message;
-
-		message = g_strdup_printf (
-			_("Error loading address book: %s"), error->message);
 		gtk_label_set_text (
-			name_selector_dialog->priv->status_label, message);
-		g_free (message);
-
+			name_selector_dialog->priv->status_label,
+			error->message);
 		g_error_free (error);
 		goto exit;
 	}
diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c
index 58c7b391fd..25b018326a 100644
--- a/e-util/e-name-selector-entry.c
+++ b/e-util/e-name-selector-entry.c
@@ -2227,7 +2227,7 @@ book_client_connect_cb (GObject *source_object,
 	}
 
 	if (error != NULL) {
-		g_warning ("%s", error->message);
+		g_warning ("%s: %s", G_STRFUNC, error->message);
 		g_error_free (error);
 		goto exit;
 	}
diff --git a/e-util/e-name-selector.c b/e-util/e-name-selector.c
index 66d93512d0..21cd93cc1a 100644
--- a/e-util/e-name-selector.c
+++ b/e-util/e-name-selector.c
@@ -95,7 +95,6 @@ name_selector_book_client_connect_cb (GObject *source_object,
                                       gpointer user_data)
 {
 	ENameSelector *name_selector = user_data;
-	ESource *source = E_SOURCE (source_object);
 	EBookClient *book_client;
 	EClient *client;
 	GArray *sections;
@@ -115,9 +114,7 @@ name_selector_book_client_connect_cb (GObject *source_object,
 		    && !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_OFFLINE_UNAVAILABLE)
 		    && !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED)
 		    && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-			g_warning (
-				"ENameSelector: Could not load \"%s\": %s",
-				e_source_get_display_name (source), error->message);
+			g_warning ("%s: %s", G_STRFUNC, error->message);
 		g_error_free (error);
 		goto exit;
 	}