Including the file path in the error string. Fixes #309624.

svn path=/trunk/; revision=29683

2 files changed, 12 insertions, 4 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 48eb103d87..6cb42eabd0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-08  Frederic Crozat  <fcrozat@mandriva.com>
+
+	* gui/widgets/eab-gui-util.c (eab_load_error_dialog): Including the
+	file path in the error string. Fixes #309624
+
 2005-07-07  Frederic Crozat  <fcrozat@mandriva.com>
 
 	* gui/component/addressbook-component.c: (ensure_sources):
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 836843da10..7c867ed516 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -80,7 +80,7 @@ eab_error_dialog (const char *msg, EBookStatus status)
 void
 eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 {
-	char *label_string, *uri;
+	char *label_string, *label = NULL, *uri;
 	
 	g_return_if_fail (source != NULL);
 
@@ -94,9 +94,11 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 	}
 		
 	else if (!strncmp (uri, "file:", 5)) {
-		label_string = 
+		const char *path = uri+7; /* file:// */
+		label = g_strdup_printf (
 			_("We were unable to open this addressbook.  Please check that the "
-			  "path exists and that you have permission to access it.");
+			  "path %s exists and that you have permission to access it."), path);
+		label_string = label;
 	}
 	else if (!strncmp (uri, "ldap:", 5)) {
 		/* special case for ldap: contact folders so we can tell the user about openldap */
@@ -120,7 +122,8 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status)
 	}
 	
 	e_error_run ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL);
-	
+
+	g_free (label);	
 	g_free (uri);
 }