Index: components/html-editor/menubar.c
===================================================================
--- components/html-editor/menubar.c	(revision 8499)
+++ components/html-editor/menubar.c	(working copy)
@@ -33,12 +33,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifdef USE_GTKFILECHOOSER
 #include <gtk/gtkfilechooser.h>
 #include <gtk/gtkfilechooserdialog.h>
-#else
-#include <gtk/gtkfilesel.h>
-#endif
 #include <bonobo.h>
 
 #include "htmlengine.h"
@@ -97,7 +93,6 @@ insert_image_cb (BonoboUIComponent *uic,
 	GtkWidget *filesel;
 	HTMLObject *img;
 
-#ifdef USE_GTKFILECHOOSER
 	filesel = gtk_file_chooser_dialog_new (_("Insert image"),
 					       NULL,
 					       GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -105,23 +100,12 @@ insert_image_cb (BonoboUIComponent *uic,
 					       GTK_STOCK_OPEN, GTK_RESPONSE_OK,
 					       NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
-#else
-	filesel = gtk_file_selection_new (_("Insert image"));
-#endif
 	if (filesel) {
 		if (gtk_dialog_run (GTK_DIALOG (filesel)) == GTK_RESPONSE_OK) {
-#ifdef USE_GTKFILECHOOSER
 			char *filename;
-#else
-			const char *filename;
-#endif
 			char *url = NULL;
 
-#ifdef USE_GTKFILECHOOSER
 			filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
-#else
-			filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
-#endif
 			url = gtk_html_filename_to_uri (filename);
 			g_free(filename);
 			img = html_image_new (html_engine_get_image_factory (cd->html->engine), url,
@@ -224,11 +208,7 @@ file_dialog_ok (GtkWidget *w, GtkHTMLCon
 	gsize len = 0;
 	const char *charset;
 
-#ifdef USE_GTKFILECHOOSER
 	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (cd->file_dialog));
-#else	
-	filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (cd->file_dialog));
-#endif
 	io = g_io_channel_new_file (filename, "r", &error);
 
 	if (error || !io)
@@ -316,7 +296,6 @@ insert_file_dialog (GtkHTMLControlData *
 		return;
 	}
 
-#ifdef USE_GTKFILECHOOSER
 	cd->file_dialog = gtk_file_chooser_dialog_new (html ? _("Insert HTML File") : _("Insert Text File"),
 						       NULL,
 						       GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -325,10 +304,6 @@ insert_file_dialog (GtkHTMLControlData *
 						       NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (cd->file_dialog), GTK_RESPONSE_OK);
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (cd->file_dialog), g_get_home_dir ());
-#else
-	cd->file_dialog = gtk_file_selection_new (html ? _("Insert HTML File") : _("Insert Text File"));
-	gtk_file_selection_set_filename (GTK_FILE_SELECTION (cd->file_dialog), "~/");
-#endif
 
 	if (cd->file_dialog) {
 		if (gtk_dialog_run (GTK_DIALOG (cd->file_dialog)) == GTK_RESPONSE_OK) {
Index: configure.in
===================================================================
--- configure.in	(revision 8499)
+++ configure.in	(working copy)
@@ -5,6 +5,14 @@ AM_CONFIG_HEADER(config.h)
 
 PACKAGE=gtkhtml
 
+# Required Package Versions
+m4_define([gtk_minimum_version], [2.10.0])
+m4_define([gail_minimum_version], [1.1.0])
+m4_define([gnome_icon_theme_minimum_version], [1.2.0])
+m4_define([libbonoboui_minimum_version], [2.2.4])
+m4_define([libglade_minimum_version], [2.0.0])
+m4_define([libgnomeui_minimum_version], [2.0.0])
+
 GTKHTML_API_VERSION=3.14
 AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "${GTKHTML_API_VERSION}", [GtkHTML API Version])
 AC_SUBST(GTKHTML_API_VERSION)
@@ -67,24 +75,19 @@ AC_SUBST(LDFLAGS)
 
 AM_GLIB_GNU_GETTEXT
 
-GAIL_MODULES="gail >= 1.1.0"
+GAIL_MODULES="gail >= gail_minimum_version"
 PKG_CHECK_MODULES(GAIL, $GAIL_MODULES)
 AC_SUBST(GAIL_CFLAGS)
 AC_SUBST(GAIL_LIBS)
 AC_SUBST(GAIL_MODULES)
 
-GTKHTML_MODULES="libgnomeui-2.0 >= 2.0.0 gtk+-unix-print-2.0 >= 2.10.0 libglade-2.0 >= 2.0.0"
+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version libgnomeui-2.0 >= libgnomeui_minimum_version libglade-2.0 >= libglade_minimum_version"
 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
 AC_SUBST(GTKHTML_MODULES)
 
-if ${PKG_CONFIG} --atleast-version=1.5 pango
-then
-	AC_DEFINE([PANGO_1_5_OR_HIGHER], [], [Means that Pango 1.5 or higher is available])
-fi
-
-EDITOR_MODULES="${GTKHTML_MODULES} libbonoboui-2.0 >= 2.2.4"
+EDITOR_MODULES="${GTKHTML_MODULES} libbonoboui-2.0 >= libbonoboui_minimum_version"
 PKG_CHECK_MODULES(EDITOR, $EDITOR_MODULES)
 AC_SUBST(EDITOR_CFLAGS)
 AC_SUBST(EDITOR_LIBS)
@@ -110,19 +113,9 @@ AC_SUBST(SOUP_CFLAGS)
 AC_SUBST(SOUP_LIBS)
 
 dnl **************************************************
-dnl * File Chooser
-dnl **************************************************
-AC_ARG_ENABLE(file-chooser, [  --enable-file-chooser    Enable the usage of the GtkFileChooser in place of the GtkFileSelection dialog], enable_file_chooser="$enableval", enable_file_chooser="yes")
-if test "x$enable_file_chooser" = "xyes"; then
-  if $PKG_CONFIG --atleast-version=2.4.0 gtk+-2.0; then
-    AC_DEFINE(USE_GTKFILECHOOSER,1,[Use new GtkFileChooser])
-  fi
-fi
-
-dnl **************************************************
 dnl * Gnome Icon Theme
 dnl **************************************************
-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= 1.2.0)
+PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
 
 dnl **************************************************
 dnl * regex library
Index: src/htmlprinter.c
===================================================================
--- src/htmlprinter.c	(revision 8499)
+++ src/htmlprinter.c	(working copy)
@@ -452,15 +452,10 @@ draw_lines (HTMLPrinter *printer, double
 	cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
 
 	if (properties->underline) {
-#ifdef PANGO_1_5_OR_HIGHER
 		double thickness = pango_units_to_double (pango_font_metrics_get_underline_thickness (metrics));
 		double position = pango_units_to_double (pango_font_metrics_get_underline_position (metrics));
 		double ly = y + position - thickness / 2;
-#else
-		double thickness = 1.0;
-		double position = -1.0;
-		double ly = y + position - thickness / 2;
-#endif
+
 	    	cairo_new_path (cr);
 		cairo_move_to (cr, x, ly + 4);
 		cairo_line_to (cr, x + width, ly + 4);
@@ -469,15 +464,10 @@ draw_lines (HTMLPrinter *printer, double
 	}
 		
 	if (properties->strikethrough) {
-#ifdef PANGO_1_5_OR_HIGHER
 		double thickness = pango_units_to_double (pango_font_metrics_get_strikethrough_thickness (metrics));
 		double position = pango_units_to_double (pango_font_metrics_get_strikethrough_position (metrics));
 		double ly = y + position - thickness / 2;
-#else
-		double thickness = 1.0;
-		double position = pango_units_to_double (pango_font_metrics_get_ascent (metrics)/3);
-		double ly = y + position - thickness / 2;
-#endif
+
 		cairo_new_path (cr);
 		cairo_move_to (cr, x, ly - 8);
 		cairo_line_to (cr, x + width, ly - 8);
