=== Release 2.17.91 ===RELEASE_2_17_91

2007-02-12  Christian Persch  <chpe@svn.gnome.org>

	=== Release 2.17.91 ===

	* configure.ac:
	* data/mime-types-permissions.xml:

svn path=/trunk/; revision=6904

5 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 85ea4851e..c6ec8c83f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-12  Christian Persch  <chpe@svn.gnome.org>
+
+	=== Release 2.17.91 ===
+
+	* configure.ac:
+	* data/mime-types-permissions.xml:
+
 2007-02-08  Jean-François Rameau  <jframeau@cvs.gnome.org>
 
 	* embed/mozilla/EphyAboutModule.cpp:
diff --git a/configure.ac b/configure.ac
index d082f85b4..d79eac452 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,8 @@ xulrunner) min_version=1.8 ;;
 *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
 esac
 
-PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version $gecko_cv_extra_pkg_dependencies])
+# Added $gecko_cv_gecko-js for debian xulrunner brokenness
+PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
 AC_SUBST([GECKO_CFLAGS])
 AC_SUBST([GECKO_LIBS])
 
diff --git a/data/mime-types-permissions.xml b/data/mime-types-permissions.xml
index 6132cb69e..b118ea101 100755
--- a/data/mime-types-permissions.xml
+++ b/data/mime-types-permissions.xml
@@ -242,6 +242,7 @@
 <mime-type type="audio/x-tta"/>
 <mime-type type="audio/x-voc"/>
 <mime-type type="audio/x-wav"/>
+<mime-type type="audio/x-wavpack"/>
 <mime-type type="audio/x-xi"/>
 <mime-type type="audio/x-xm"/>
 <mime-type type="image/bmp"/>
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index dd190f0c0..f4f1ac604 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -377,6 +377,7 @@ NS_METHOD GContentHandler::MIMEInitiateAction (void)
 	{
 		const char *id = gnome_vfs_mime_application_get_desktop_id (mHelperApp);
 
+		/* FIXME! menu editing can make this check fail!!!! */
 		if (id && strcmp (id, "epiphany.desktop") == 0)
 		{
 			mHelperApp = nsnull;
diff --git a/embed/mozilla/GeckoPrintSession.cpp b/embed/mozilla/GeckoPrintSession.cpp
index e433d71a7..8e4f7ebc7 100644
--- a/embed/mozilla/GeckoPrintSession.cpp
+++ b/embed/mozilla/GeckoPrintSession.cpp
@@ -490,7 +490,7 @@ GeckoPrintSession::OpenProgressDialog (nsIDOMWindowInternal *aParent,
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
   gtk_box_set_spacing (GTK_BOX (dialog->vbox), 14); /* 2 * 5 + 14 = 24 */
-  gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
+  gtk_box_set_spacing (GTK_BOX (dialog->action_area), 5);
 
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);