Index: configure.in
===================================================================
--- configure.in	(révision 2256)
+++ configure.in	(copie de travail)
@@ -109,11 +109,29 @@
 	libglade-2.0		>= 2.3.6
 "
 goffice_gnome_reqs="
-	gconf-2.0
 	libgnomeui-2.0		>= 2.0.0
 "
 
 dnl *******************
+dnl Should we use gconf ?
+dnl *******************
+goffice_with_gconf=true
+AC_ARG_WITH(gtk, [  --without-gconf           Build without gconf use])
+if test "x$with_gconf" = xno; then
+	ui_msg="None (Gconf disabled by request)"
+	goffice_with_gconf=false
+else
+	dnl We shouldn't silently default to --without-gconf.
+	dnl If the requirements are not met, fail.
+	ui_msg="Gtk"
+	PKG_CHECK_MODULES(GCONF, gconf-2.0)
+fi
+if test "x$goffice_with_gconf" = "xtrue" ; then
+	AC_DEFINE(GOFFICE_WITH_GCONF, 1, [Define if GConf is used])
+	goffice_reqs="$goffice_reqs gconf-2.0"
+fi
+
+dnl *******************
 dnl Should we use gtk ?
 dnl *******************
 goffice_with_gtk=true
@@ -133,27 +151,44 @@
 	AC_DEFINE(GOFFICE_WITH_GTK, 1, [Define if UI is built])
 	goffice_reqs="$goffice_reqs $goffice_gtk_reqs"
 
-	dnl ************************************
-	dnl Are the GNOME extensions available ?
-	dnl ************************************
+	dnl ***************************
+	dnl Is gtk_show_uri available ?
+	dnl ***************************
 
-	goffice_with_gnome=true
-	AC_ARG_WITH(gnome,
-		[  --{with,without}-gnome  Use GNOME extensions],
-		[if test "x$withval" = xno; then
-			goffice_with_gnome=false
-			ui_msg="Gtk+ (Gnome disabled by request)"
-		fi]
-	)
-	if test "x$goffice_with_gnome" = "xtrue"; then
-		PKG_CHECK_MODULES(GNOME, [$goffice_gnome_reqs],
-			[ui_msg="Gnome"],
-			[ui_msg="Gtk (missing gnome dependencies)" ; goffice_with_gnome=false])
-	fi
+	SAVE_CFLAGS=$CFLAGS
+	SAVE_LIBS=$LIBS
+	CFLAGS="$CFLAGS $TK_CFLAGS"
+	LIBS="$GTK_LIBS $LIBS"
+	AC_CHECK_FUNC ([gtk_show_uri],[have_gtk_show_uri=yes],[have_gtk_show_uri=false])
+	CFLAGS=$SAVE_CFLAGS
+	LIBS=$SAVE_LIBS
+	if test "x$have_gtk_show_uri" = xyes; then
+		AC_DEFINE(HAVE_GTK_SHOW_URI, 1, [Define to 1 if you have the `gtk_tool_item_set_tooltip_text' function.])
+		goffice_with_gnome=false
+	else
 
-	if test "x$goffice_with_gnome" = "xtrue"; then
-		AC_DEFINE(GOFFICE_WITH_GNOME, 1, [Define if GNOME extensions are available])
-		goffice_reqs="$goffice_reqs $goffice_gnome_reqs"
+		dnl ************************************
+		dnl Are the GNOME extensions available ?
+		dnl ************************************
+
+		goffice_with_gnome=true
+		AC_ARG_WITH(gnome,
+			[  --{with,without}-gnome  Use GNOME extensions],
+			[if test "x$withval" = xno; then
+				goffice_with_gnome=false
+				ui_msg="Gtk+ (Gnome disabled by request)"
+			fi]
+		)
+		if test "x$goffice_with_gnome" = "xtrue"; then
+			PKG_CHECK_MODULES(GNOME, [$goffice_gnome_reqs],
+				[ui_msg="Gnome"],
+				[ui_msg="Gtk (missing gnome dependencies)" ; goffice_with_gnome=false])
+		fi
+
+		if test "x$goffice_with_gnome" = "xtrue"; then
+			AC_DEFINE(GOFFICE_WITH_GNOME, 1, [Define if GNOME extensions are available])
+			goffice_reqs="$goffice_reqs $goffice_gnome_reqs"
+		fi
 	fi
 fi
 AM_CONDITIONAL(WITH_GTK,   $goffice_with_gtk)
Index: goffice/app/go-conf.c
===================================================================
--- goffice/app/go-conf.c	(révision 2256)
+++ goffice/app/go-conf.c	(copie de travail)
@@ -38,7 +38,7 @@
 #define d(code)
 #endif
 
-#ifdef GOFFICE_WITH_GNOME
+#ifdef GOFFICE_WITH_GCONF
 #include "go-conf-gconf.c"
 #elif defined G_OS_WIN32
 #include "go-conf-win32.c"
Index: goffice/gtk/goffice-gtk.c
===================================================================
--- goffice/gtk/goffice-gtk.c	(révision 2256)
+++ goffice/gtk/goffice-gtk.c	(copie de travail)
@@ -842,12 +842,19 @@
 		g_free (path);
 	}
 #else
+#ifdef HAVE_GTK_SHOW_URI
+	char *uri = g_strconcat ("ghelp://", paths->app, "#", paths->link, NULL);
+	gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
+	g_free (uri);
+	return;
+#else
 #ifdef GOFFICE_WITH_GNOME
 	if (gnome_program_get () != NULL) {
 		gnome_help_display (paths->app, paths->link, NULL);
 		return;
 	}
 #endif
+#endif
 	go_gtk_notice_dialog (NULL, GTK_MESSAGE_ERROR,
 			      "TODO : launch help browser for %s", paths->link);
 #endif
Index: goffice/utils/go-file.c
===================================================================
--- goffice/utils/go-file.c	(révision 2256)
+++ goffice/utils/go-file.c	(copie de travail)
@@ -922,6 +922,7 @@
 	return g_string_free (result, FALSE);
 }
 
+#ifndef HAVE_GTK_SHOW_URI
 #ifndef GOFFICE_WITH_GNOME
 #ifndef G_OS_WIN32
 static char *
@@ -938,11 +939,16 @@
 }
 #endif
 #endif
+#endif
 
 GError *
 go_url_show (gchar const *url)
 {
-#ifdef G_OS_WIN32
+#ifdef HAVE_GTK_SHOW_URI
+	GError *err = NULL;
+	gtk_show_uri (NULL, url, GDK_CURRENT_TIME, &error);
+	return error;
+#elif defined(G_OS_WIN32)
 	ShellExecute (NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
 
 	return NULL;
@@ -1087,7 +1093,7 @@
 	 */
 	return g_strdup ("text/plain");
 #else
-	GFile *file = g_vfs_get_file_for_uri (g_vfs_get_default (), uri);
+	GFile *file = g_file_new_for_uri (uri);
 	GError *error = NULL;
 	gchar *content_type = NULL, *mime_type = NULL;
 	GFileInfo *info = g_file_query_info (file,
Index: goffice/goffice-features.h.in
===================================================================
--- goffice/goffice-features.h.in	(révision 2256)
+++ goffice/goffice-features.h.in	(copie de travail)
@@ -51,6 +51,9 @@
 /* Define if Goffice uses Cairo */
 #undef GOFFICE_WITH_CAIRO
 
+/* Define if GOffice uses GConf */
+#undef GOFFICE_WITH_GCONF
+
 /* Define if GOffice uses Gtk+ */
 #undef GOFFICE_WITH_GTK
 
