capplet_help () The Help directory is changed to user-guide.

2002-05-28 Satyajit Kanungo <satyajit.kanungo@wipro.com>

	* capplet-util.c : capplet_help () The Help directory is changed to
	  user-guide.

25 files changed, 118 insertions, 35 deletions

diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 570667b17..e22e0cc18 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * background-properties-capplet.c : Changed the help file link
+          to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* background-properties-capplet.c (cb_dialog_response) : improve
diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c
index dc1cca924..61e33eb97 100644
--- a/capplets/background/background-properties-capplet.c
+++ b/capplets/background/background-properties-capplet.c
@@ -453,8 +453,8 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-background.xml",
-			"CONFIGURATION");
+			"wgoscustdesk.xml",
+			"goscustdesk-7");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 376d1d4ad..9ed1f9230 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28 Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+	* capplet-util.c : capplet_help () The Help directory is changed to 
+	  user-guide. 		
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* capplet-util.c (capplet_help) : new utility.
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index a979c2671..84e392c44 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -303,7 +303,7 @@ capplet_help (GtkWindow *parent, char const *helpfile, char const *section)
 	g_return_if_fail (section != NULL);
 
 	gnome_help_display_desktop (NULL,
-		"control-center-manual",
+		"user-guide",
 		helpfile, section, &error);
 	if (error) {
 		GtkWidget *dialog;
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 741a4341e..47949af60 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-24  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * gnome-default-applications-properties.c : Changed the help file
+          link to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* file-types-capplet.c (cb_file_type_dialog_response) : Improve
diff --git a/capplets/default-applications/gnome-default-applications-properties.c b/capplets/default-applications/gnome-default-applications-properties.c
index 3204c90fb..414d136df 100644
--- a/capplets/default-applications/gnome-default-applications-properties.c
+++ b/capplets/default-applications/gnome-default-applications-properties.c
@@ -542,8 +542,8 @@ dialog_response (GtkDialog *widget,
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (widget),
-			"config-default-apps.xml",
-			"CONFIGURATION");
+			"wgoscustlookandfeel.xml",
+			"goscustdoc-2");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index e499b5ad9..a9c640a04 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-24  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+	* file-types-capplet.c : Changed the help file link
+	  to get the help document from user-guide.
+
 2002-05-24  Jody Goldberg <jody@gnome.org>
 
 	* mime-type-info.c (mime_category_info_load_all) : make this more paranoid.
diff --git a/capplets/file-types/file-types-capplet.c b/capplets/file-types/file-types-capplet.c
index d2e6465fd..11a418550 100644
--- a/capplets/file-types/file-types-capplet.c
+++ b/capplets/file-types/file-types-capplet.c
@@ -180,8 +180,8 @@ cb_file_type_dialog_response (GtkDialog *dialog, gint response_id)
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-file-type.xml",
-			"CONFIGURATION");
+			"wgoscustlookandfeel.xml",
+			"goscustdoc-7");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index 3660b5a22..e0d6002a2 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * main.c : Changed the help file link
+          to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* main.c (cb_dialog_response) : improve handling of help failures.
diff --git a/capplets/font/main.c b/capplets/font/main.c
index 8c7645633..5583bc32d 100644
--- a/capplets/font/main.c
+++ b/capplets/font/main.c
@@ -32,8 +32,8 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-font.xml",
-			"CONFIGURATION");
+			"wgoscustdesk.xml",
+			"goscustdesk-38");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index 65d746744..ef7aa56f5 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,15 @@
+2002-05-29  Jody Goldberg <jody@gnome.org>
+
+	* gnome-keybinding-properties.c (cb_dialog_response) : fix return type.
+
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+	* gnome-keybinding-properties.glade : Added a help button
+
+	* gnome-keybinding-properties.c : Put the help callback to get
+ 	  the help document from user-guide.
+
+
 Sun May 26 11:01:28 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gnome-keybinding-properties.c (main): use APPID instead of
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index 63d4cba8f..01ebebddd 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -807,6 +807,17 @@ start_editing_cb (GtkTreeView    *tree_view,
 }
 
 static void
+cb_dialog_response (GtkWidget *widget, gint response_id, gpointer data)
+{
+	if (response_id == GTK_RESPONSE_HELP)
+		capplet_help (GTK_WINDOW (widget),
+			      "wgoscustdesk.xml",
+			      "goscustdesk-39");
+	else
+		gtk_main_quit ();
+}
+
+static void
 setup_dialog (GladeXML *dialog)
 {
   GConfClient *client;
@@ -896,7 +907,7 @@ setup_dialog (GladeXML *dialog)
   g_object_unref (icon_pixbuf);
   gtk_widget_show (widget);
 
-  g_signal_connect (G_OBJECT (widget), "response", gtk_main_quit, NULL);
+  g_signal_connect (G_OBJECT (widget), "response", G_CALLBACK(cb_dialog_response), NULL);
   g_signal_connect (G_OBJECT (widget), "close", gtk_main_quit, NULL);
 }
 
diff --git a/capplets/keybindings/gnome-keybinding-properties.glade b/capplets/keybindings/gnome-keybinding-properties.glade
index 9956bbb8e..befd62c95 100644
--- a/capplets/keybindings/gnome-keybinding-properties.glade
+++ b/capplets/keybindings/gnome-keybinding-properties.glade
@@ -26,6 +26,19 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 	  <property name="spacing">10</property>
 
+
+          <child>
+            <widget class="GtkButton" id="helpbutton1">
+              <property name="visible">True</property>
+              <property name="can_default">True</property>
+              <property name="can_focus">True</property>
+              <property name="label">gtk-help</property>
+              <property name="use_stock">True</property>
+              <property name="relief">GTK_RELIEF_NORMAL</property>
+              <property name="response_id">-11</property>
+            </widget>
+          </child>
+
 	  <child>
 	    <widget class="GtkButton" id="closebutton1">
 	      <property name="visible">True</property>
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index c6fee4b83..dd0bd413f 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * gnome-keyboard-properties.c : Changed the help file link
+          to get the help document from user-guide.
+
+
 Sun May 26 11:30:25 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* gnome-keyboard-properties.c (main): use APPID instead of argv[0]
diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 9f3283fc7..08acff41a 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -223,19 +223,11 @@ dialog_response (GtkWidget *widget,
 		 gint       response_id,
 		 GConfChangeSet *changeset)
 {
-	if (response_id == GTK_RESPONSE_HELP) {
-		GError *error = NULL;
-
-		/* TODO : get this written */
-		gnome_help_display_desktop (NULL,
-			"control-center-manual",
-			"config-keyboard.xml",
-			"CONFIGURATION", &error);
-		if (error) {
-			g_warning ("help error: %s\n", error->message);
-			g_error_free (error);
-		}
-	} else
+	if (response_id == GTK_RESPONSE_HELP)
+		capplet_help (GTK_WINDOW (widget),
+			"wgoscustdesk.xml",
+			"goscustperiph-2");
+	else
 		gtk_main_quit ();
 }
 
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index a6e73271a..e141ae710 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * gnome-mouse-properties.c : Changed the help file link
+          to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* gnome-mouse-properties.c (dialog_response_cb) : Improve handling of
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 3ad10b327..d0540ace8 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -707,8 +707,8 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changes
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-mouse.xml",
-			"CONFIGURATION");
+			"wgoscustdesk.xml",
+			"goscustperiph-5");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog
index 5538d7124..5350896ff 100644
--- a/capplets/network/ChangeLog
+++ b/capplets/network/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * gnome-network-preferences.c : Changed the help file link
+          to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* gnome-network-preferences.c (cb_dialog_response) : Improve handling
diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-preferences.c
index a859e7ae9..2697d5866 100644
--- a/capplets/network/gnome-network-preferences.c
+++ b/capplets/network/gnome-network-preferences.c
@@ -44,8 +44,8 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-network.xml",
-			"CONFIGURATION");
+			"wgoscustdesk.xml",
+			"goscustdesk-50");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 42e614ca0..e264d3c05 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * sound-properties-capplet.c : Changed the help file link
+          to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* sound-properties-capplet.c (dialog_button_clicked_cb) : Improve
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index b08ce2f1e..8f7cbeab4 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -124,8 +124,8 @@ dialog_button_clicked_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *c
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-sound.xml",
-			"CONFIGURATION");
+			"wgoscustdesk.xml",
+			"goscustmulti-2");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index f8468487a..4da38fe1e 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+        * theme-switcher.c : Changed the help file link
+          to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* theme-switcher.c (install_dialog_response) : improve handling of
diff --git a/capplets/theme-switcher/theme-switcher.c b/capplets/theme-switcher/theme-switcher.c
index 9a1d90d58..2ee8ae322 100644
--- a/capplets/theme-switcher/theme-switcher.c
+++ b/capplets/theme-switcher/theme-switcher.c
@@ -362,8 +362,8 @@ install_dialog_response (GtkWidget *widget, int response_id, gpointer data)
 	
 	if (response_id == GTK_RESPONSE_HELP) {
 		capplet_help (GTK_WINDOW (widget),
-			"config-themes.xml",
-			"config-theme-add");
+			"wgoscustdesk.xml",
+			"goscustdesk-12");
 		return;
 	}
 
@@ -413,8 +413,8 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-themes.xml",
-			"CONFIGURATION");
+			"wgoscustdesk.xml",
+			"goscustdesk-12");
 	else
 		gtk_main_quit ();
 }
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index 01fef5f4e..b8f3e924c 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Satyajit Kanungo <satyajit.kanungo@wipro.com>
+
+        * gnome-ui-properties.c : Changed the help file link
+          to get the help document from user-guide.
+
 2002-05-26  Jody Goldberg <jody@gnome.org>
 
 	* gnome-ui-properties.c (dialog_button_clicked_cb) : Improve handling
diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c
index 6b7099b76..25e12aa4e 100644
--- a/capplets/ui-properties/gnome-ui-properties.c
+++ b/capplets/ui-properties/gnome-ui-properties.c
@@ -78,8 +78,8 @@ dialog_button_clicked_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *c
 {
 	if (response_id == GTK_RESPONSE_HELP)
 		capplet_help (GTK_WINDOW (dialog),
-			"config-ui-properties.xml",
-			"CONFIGURATION");
+			"wgoscustdesk.xml",
+			"goscustuserinter-2");
 	else
 		gtk_main_quit ();
 }