evolution r37034 - trunk/e-util

[mbarnes svn gnome org]

Author: mbarnes
Date: Sun Jan 11 01:49:39 2009
New Revision: 37034
URL: http://svn.gnome.org/viewvc/evolution?rev=37034&view=rev

Log:
2009-01-10  Matthew Barnes  <mbarnes redhat com>

	* e-util/e-util.c (e_display_help):
	Now that we require GTK+ 2.14, use gtk_show_uri() instead of
	gnome_help_display().



Modified:
   trunk/e-util/ChangeLog
   trunk/e-util/e-util.c

Modified: trunk/e-util/e-util.c
==============================================================================
--- trunk/e-util/e-util.c	(original)
+++ trunk/e-util/e-util.c	Sun Jan 11 01:49:39 2009
@@ -38,7 +38,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <libgnome/gnome-help.h>
 #include <libgnome/gnome-init.h>
 
 #ifdef G_OS_WIN32
@@ -106,11 +105,23 @@
 e_display_help (GtkWindow *parent,
                 const gchar *link_id)
 {
+	GString *uri;
 	GtkWidget *dialog;
+	GdkScreen *screen = NULL;
 	GError *error = NULL;
+	guint32 timestamp;
 
-	if (gnome_help_display ("evolution.xml", link_id, &error))
-		return;
+	uri = g_string_new ("ghelp:" PACKAGE);
+	timestamp = gtk_get_current_event_time ();
+
+	if (parent != NULL)
+		screen = gtk_widget_get_screen (GTK_WIDGET (parent));
+
+	if (link_id != NULL)
+		g_string_append_printf (uri, "?%s", link_id);
+
+	if (gtk_show_uri (screen, uri->str, timestamp, &error))
+		goto exit;
 
 	dialog = gtk_message_dialog_new_with_markup (
 		parent, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -125,6 +136,9 @@
 
 	gtk_widget_destroy (dialog);
 	g_error_free (error);
+
+exit:
+	g_string_free (uri, TRUE);
 }
 
 /**