Enable a --with-distributor-name configure option, defaulting to Epiphany.

Use it on an error page to designate the distributors/developers to contact.
Fixes bug #433796.

svn path=/trunk/; revision=7643

2 files changed, 22 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index c62007af7..91b5cb647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -789,6 +789,24 @@ if test "$have_gvfs" = "yes"; then
 fi
 AM_CONDITIONAL([HAVE_GVFS],[test "$have_gvfs" = "yes"])
 
+# Distributor name
+
+AC_ARG_WITH(distributor-name,
+[  --with-distributor-name=name      Distributor name.],LSB_DISTRIBUTOR="$withval",)
+
+if test "x$LSB_DISTRIBUTOR" = "x"; then
+	AC_CHECK_PROGS([LSB_RELEASE], [lsb_release],)
+	if test -n "$LSB_RELEASE"; then
+		# Fallback on lsb_release if available
+		LSB_DISTRIBUTOR=$($LSB_RELEASE -i -s)
+	else
+		# Fallback on the product name
+		LSB_DISTRIBUTOR="Epiphany"
+	fi
+fi
+
+AC_DEFINE_UNQUOTED(LSB_DISTRIBUTOR, "$LSB_DISTRIBUTOR", [Distributor name.])
+
 # compat cruft
 GGE_VERSION=0
 AC_SUBST([GGE_VERSION])
diff --git a/embed/mozilla/EphyAboutModule.cpp b/embed/mozilla/EphyAboutModule.cpp
index 8e0d760b9..45af4a70d 100644
--- a/embed/mozilla/EphyAboutModule.cpp
+++ b/embed/mozilla/EphyAboutModule.cpp
@@ -534,9 +534,10 @@ EphyAboutModule::CreateRecoverPage(nsIURI *aRecoverURI,
 	NS_ENSURE_SUCCESS (rv, rv);
 
 	char *secondary = g_markup_printf_escaped
-		(_("The page “%s” in this tab was not fully loaded yet when "
-		   "the web browser crashed; it could have caused the crash."),
-		 url.get());
+		(_("This page was loading when Epiphany closed unexpectedly."
+		   "This might happen again if you reload the page. If it does, please report"
+		   "the problem to the %s developers."),
+		   LSB_DISTRIBUTOR);
 
 	nsCOMPtr<nsIChannel> channel;
 	rv = WritePage (aRecoverURI, uri, uri, rawurl, title.get(),