commit d6fd66688c9c17912dfa04613bea1a63985d066c
Author: Halton Huo <halton.huo@sun.com>
Date:   Thu Jul 30 16:28:39 2009 +0800

    Replace gnome_help and gnome-open calls with gtk_show_uri. Closes #590225

diff --git a/applet/pilot.c b/applet/pilot.c
index 68fcff6..5c4158e 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -540,9 +540,10 @@ help_cb(BonoboUIComponent *uic, gpointer user_data, const gchar *verbname)
 	PilotApplet *applet = user_data;
 	GError *error = NULL;
 
-	gnome_help_display_on_screen  ("gnome-pilot", "pilot-applet",
-				       (gtk_widget_get_screen(GTK_WIDGET (applet->applet))),
-				       &error);
+	gtk_show_uri (gtk_widget_get_screen(GTK_WIDGET (applet->applet)),
+		      "ghelp:gnome-pilot#pilot-applet",
+		      gtk_get_current_event_time (),
+		      &error);
 
 	if (error)
 	{
@@ -566,9 +567,10 @@ static void
 pref_help_cb(GtkDialog *dialog)
 {
 	GError *error = NULL;
-	gnome_help_display_on_screen  ("gnome-pilot", NULL /* FIXME Add section id later */,
-				       gtk_widget_get_screen (GTK_WIDGET (dialog)),
-				       &error);
+	gtk_show_uri (gtk_widget_get_screen(GTK_WIDGET (dialog)),
+		      "ghelp:gnome-pilot", /* FIXME Add section id later */
+		      gtk_get_current_event_time (),
+		      &error);
 
 	if (error)
 	{
diff --git a/capplet/gnome-pilot-druid.c b/capplet/gnome-pilot-druid.c
index d8e8428..e63904d 100644
--- a/capplet/gnome-pilot-druid.c
+++ b/capplet/gnome-pilot-druid.c
@@ -549,7 +549,7 @@ gpd_canceled (GnomeDruid *druid, gpointer user_data)
 static void 
 gpd_help (GnomeDruid *druid, gpointer user_data)
 {
-	gnome_help_display_desktop (NULL, "gnome-pilot", "gnome-pilot.xml", "assistant", NULL);
+	gtk_show_uri (NULL, "ghelp:gnome-pilot#assistant", gtk_get_current_event_time (),NULL);
 }
 
 static void
diff --git a/capplet/gpilotd-control-applet.c b/capplet/gpilotd-control-applet.c
index 58a0427..683c349 100644
--- a/capplet/gpilotd-control-applet.c
+++ b/capplet/gpilotd-control-applet.c
@@ -63,7 +63,7 @@ static void
 response_cb (GtkDialog *dialog, gint response_id)
 {
 	if (response_id == GTK_RESPONSE_HELP) {
-		gnome_help_display_desktop (NULL, "gnome-pilot", "gnome-pilot.xml", "conftool-pilots", NULL);
+		gtk_show_uri (NULL, "ghelp:gnome-pilot#conftool-pilots", gtk_get_current_event_time (),NULL);
 	} else {
 		gtk_main_quit ();
 	}
