ephy_gui_help: use gtk_show_uri to open help

We were doing some ugly path searching for this. The correct method is to use
gtk_show_uri.

Bug #604024

8 files changed, 9 insertions, 15 deletions

diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index ed8f9b2cd..e08e2add0 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -383,8 +383,7 @@ bookmark_properties_response_cb (GtkDialog *dialog,
 	switch (response_id)
 	{
 		case GTK_RESPONSE_HELP:
-			ephy_gui_help (GTK_WINDOW (dialog),
-				       "epiphany", 
+			ephy_gui_help (GTK_WIDGET (dialog),
 				       "to-edit-bookmark-properties");
 			return;
 	 	case GTK_RESPONSE_ACCEPT:
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index ea5c37f7a..db892ba68 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1114,9 +1114,7 @@ static void
 cmd_help_contents (GtkAction *action,
 		   EphyBookmarksEditor *editor)
 {
-	ephy_gui_help (GTK_WINDOW (editor), 
-		       "epiphany", 
-		       "ephy-managing-bookmarks");
+	ephy_gui_help (GTK_WINDOW (editor), "ephy-managing-bookmarks");
 }
 
 static void
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index eb986a837..7bb055c73 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -235,7 +235,7 @@ ephy_encoding_dialog_response_cb (GtkWidget *widget,
 {
 	if (response == GTK_RESPONSE_HELP)
 	{
-		ephy_gui_help (GTK_WINDOW (widget), "epiphany", "text-encoding");
+		ephy_gui_help (widget, "text-encoding");
 		return;
 	}
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 731b20e51..4500c155d 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -490,9 +490,7 @@ static void
 cmd_help_contents (GtkAction *action,
 		   EphyHistoryWindow *editor)
 {
-	ephy_gui_help (GTK_WINDOW (editor),
-		       "epiphany", 
-		       "ephy-managing-history");
+	ephy_gui_help (GTK_WIDGET (editor), "ephy-managing-history");
 }
 
 static void
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c
index 8400a4d0c..a583ede62 100644
--- a/src/ephy-toolbar-editor.c
+++ b/src/ephy-toolbar-editor.c
@@ -134,7 +134,7 @@ ephy_toolbar_editor_response (GtkDialog *dialog,
 	}
 	else if (response == GTK_RESPONSE_HELP)
 	{
-		ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "to-edit-toolbars");
+		ephy_gui_help (GTK_WIDGET (dialog), "to-edit-toolbars");
 		return;
 	}
 
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 39fa7b709..8b1633f83 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -183,7 +183,7 @@ pdm_dialog_show_help (PdmDialog *pd)
 	id = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
 	g_return_if_fail (id == 0 || id == 1);
 
-	ephy_gui_help (GTK_WINDOW (window), "epiphany", help_preferences[id]);
+	ephy_gui_help (window, help_preferences[id]);
 }
 
 typedef struct
@@ -255,8 +255,7 @@ clear_all_dialog_response_cb (GtkDialog *dialog,
 	if (response == GTK_RESPONSE_HELP)
 	{
 		/* Show help and return early */
-
-		ephy_gui_help (GTK_WINDOW (dialog), "epiphany", "clearing-personal-data");
+		ephy_gui_help (GTK_WIDGET (dialog), "clearing-personal-data");
 		return;
 	}
 
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index ca94c28f4..60936b2c0 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -241,7 +241,7 @@ prefs_dialog_show_help (EphyDialog *dialog)
 	id = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
 	id = CLAMP (id, 0, 3);
 
-	ephy_gui_help (GTK_WINDOW (window), "epiphany", help_preferences[id]);
+	ephy_gui_help (window, help_preferences[id]);
 }
 
 static void
diff --git a/src/window-commands.c b/src/window-commands.c
index c94035682..e4c799897 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -895,7 +895,7 @@ void
 window_cmd_help_contents (GtkAction *action,
 			 EphyWindow *window)
 {
-	ephy_gui_help (GTK_WINDOW (window), "epiphany", NULL);
+	ephy_gui_help (GTK_WIDGET (window), NULL);
 }
 
 #define ABOUT_GROUP "About"