eog r4821 - in trunk: . src

[friemann svn gnome org]

Author: friemann
Date: Mon Oct 13 20:34:30 2008
New Revision: 4821
URL: http://svn.gnome.org/viewvc/eog?rev=4821&view=rev

Log:
2008-10-13  Felix Riemann  <friemann svn gnome org>

	* configure.ac: this requires at least GTK+-2.13.1
	* src/eog-util.c: (eog_util_show_help):
	Use gtk_show_uri instead of gnome-help to launch the help.
	Fixes bug #556086 (Diego Escalante Urrelo).


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/eog-util.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 13 20:34:30 2008
@@ -81,7 +81,7 @@
 # GNOME Libs 
 # **********
 
-GTK_REQUIRED=2.11.6
+GTK_REQUIRED=2.13.1
 GLIB_REQUIRED=2.15.3
 LIBGNOMEUI_REQUIRED=2.6.0
 GDKPIXBUF_REQUIRED=2.4.0

Modified: trunk/src/eog-util.c
==============================================================================
--- trunk/src/eog-util.c	(original)
+++ trunk/src/eog-util.c	Mon Oct 13 20:34:30 2008
@@ -42,15 +42,20 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-help.h>
 #include <libgnome/gnome-init.h>
 
 void 
 eog_util_show_help (const gchar *section, GtkWindow *parent)
 {
 	GError *error = NULL;
+	char *uri;
+
+	if (section)
+		uri = g_strdup_printf("ghelp:eog?%s", section);
+	else
+		uri = "ghelp:eog";
 
-	gnome_help_display ("eog.xml", section, &error);
+	gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error);
 
 	if (error) {
 		GtkWidget *dialog;