[baobab] Fix display of preference help

[Paolo Borelli <pborelli src gnome org>]

commit 45ad57ef726eeb6c77bf5667b2139fb2ce20974b
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Jan 29 17:58:37 2012 +0100

    Fix display of preference help
    
    Fix the utility used to show the help file to use the proper uri format
    and use it in the prefs dialog. Based on a patch by Ekaterina Gerasimova
    <kittykat3756 googlemail com>

 src/baobab-prefs.c |    3 +--
 src/baobab-utils.c |   10 +++++-----
 src/baobab-utils.h |    2 +-
 src/callbacks.c    |    2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/baobab-prefs.c b/src/baobab-prefs.c
index cc7946e..3246b1f 100644
--- a/src/baobab-prefs.c
+++ b/src/baobab-prefs.c
@@ -111,8 +111,7 @@ filechooser_response_cb (GtkDialog *dialog,
 {
 	switch (response_id) {
 		case GTK_RESPONSE_HELP:
-			baobab_help_display (GTK_WINDOW (baobab.window), 
-			                     "baobab.xml", "baobab-preferences");
+			baobab_help_display (GTK_WINDOW (baobab.window), "baobab-preferences");
 			break;
 		case GTK_RESPONSE_DELETE_EVENT:
 		case GTK_RESPONSE_CLOSE:
diff --git a/src/baobab-utils.c b/src/baobab-utils.c
index f5a02be..686cc7f 100644
--- a/src/baobab-utils.c
+++ b/src/baobab-utils.c
@@ -154,7 +154,7 @@ show_bars (GtkTreeModel *mdl,
 		if (readelements == -1) {
 			gtk_tree_store_set (GTK_TREE_STORE (mdl), iter,
 					    COL_DIR_SIZE, "--",
-					    COL_ELEMENTS, "--", -1);				    
+					    COL_ELEMENTS, "--", -1);
 			return FALSE;
 		}
 
@@ -455,16 +455,16 @@ trash_file (GFile *file)
 
 gboolean
 baobab_help_display (GtkWindow   *parent,
-		     const gchar *file_name,
 		     const gchar *link_id)
 {
 	GError *error = NULL;
 	char *uri;
 	gboolean ret;
 
-	uri = (link_id) ? 
-		g_strdup_printf ("ghelp:%s#%s", file_name, link_id) :
-		g_strdup_printf ("ghelp:%s", file_name);
+	if (link_id)
+		uri = g_strdup_printf ("ghelp:%s?%s", "baobab", link_id);
+	else
+		uri = g_strdup_printf ("ghelp:%s", "baobab");
 
 	ret = gtk_show_uri (gtk_window_get_screen (parent),
 			    uri, gtk_get_current_event_time (), &error);
diff --git a/src/baobab-utils.h b/src/baobab-utils.h
index 737b0b6..a01b255 100644
--- a/src/baobab-utils.h
+++ b/src/baobab-utils.h
@@ -41,7 +41,7 @@ gboolean can_trash_file (GFile *file);
 gboolean trash_file (GFile *file);
 void set_ui_action_sens (const gchar *name, gboolean sens);
 void set_ui_widget_sens (const gchar *name, gboolean sens);
-gboolean baobab_help_display (GtkWindow *parent, const gchar *file_name, const gchar *link_id);
+gboolean baobab_help_display (GtkWindow *parent, const gchar *link_id);
 gboolean is_virtual_filesystem (GFile *file);
 
 #endif /* __BAOBAB_UTILS_H__ */
diff --git a/src/callbacks.c b/src/callbacks.c
index 4d6e32d..948d023 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -271,7 +271,7 @@ on_ck_allocated_activate (GtkToggleAction *action,
 void
 on_helpcontents_activate (GtkAction *a, gpointer user_data)
 {
-	baobab_help_display (GTK_WINDOW (baobab.window), "baobab", NULL);
+	baobab_help_display (GTK_WINDOW (baobab.window), NULL);
 }
 
 void