diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog index a8e77b0fa..3660b5a22 100644 --- a/capplets/font/ChangeLog +++ b/capplets/font/ChangeLog @@ -1,3 +1,7 @@ +2002-05-26 Jody Goldberg + + * main.c (cb_dialog_response) : improve handling of help failures. + Sun May 26 11:38:48 2002 Jonathan Blandford * main.c (main): use APPID instead of argv[0] diff --git a/capplets/font/main.c b/capplets/font/main.c index a7b3b8fc0..8c7645633 100644 --- a/capplets/font/main.c +++ b/capplets/font/main.c @@ -30,19 +30,11 @@ create_dialog (void) static void cb_dialog_response (GtkDialog *dialog, gint response_id) { - if (response_id == GTK_RESPONSE_HELP) { - GError *error = NULL; - - /* TODO : get this written */ - gnome_help_display_desktop (NULL, - "control-center-manual", + if (response_id == GTK_RESPONSE_HELP) + capplet_help (GTK_WINDOW (dialog), "config-font.xml", - "CONFIGURATION", &error); - if (error) { - g_warning ("help error: %s\n", error->message); - g_error_free (error); - } - } else + "CONFIGURATION"); + else gtk_main_quit (); } diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index 06802e563..a6e73271a 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,8 @@ +2002-05-26 Jody Goldberg + + * gnome-mouse-properties.c (dialog_response_cb) : Improve handling of + help failures. + Sun May 26 11:31:34 2002 Jonathan Blandford * gnome-mouse-properties.c (main): use APPID instead of argv[0] diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index adb9db587..3ad10b327 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -705,19 +705,11 @@ create_dialog (void) static void dialog_response_cb (GtkDialog *dialog, 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", + if (response_id == GTK_RESPONSE_HELP) + capplet_help (GTK_WINDOW (dialog), "config-mouse.xml", - "CONFIGURATION", &error); - if (error) { - g_warning ("help error: %s\n", error->message); - g_error_free (error); - } - } else + "CONFIGURATION"); + else gtk_main_quit (); } diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog index 4fcc5d54c..5538d7124 100644 --- a/capplets/network/ChangeLog +++ b/capplets/network/ChangeLog @@ -1,3 +1,8 @@ +2002-05-26 Jody Goldberg + + * gnome-network-preferences.c (cb_dialog_response) : Improve handling + of help failures. + Sun May 26 11:45:26 2002 Jonathan Blandford * gnome-network-preferences.c (main): use APPID instead of argv[0] diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-preferences.c index bed3b5848..a859e7ae9 100644 --- a/capplets/network/gnome-network-preferences.c +++ b/capplets/network/gnome-network-preferences.c @@ -42,19 +42,11 @@ static void cb_dialog_response (GtkDialog *dialog, gint response_id) { - if (response_id == GTK_RESPONSE_HELP) { - GError *error = NULL; - - /* TODO : get this written */ - gnome_help_display_desktop (NULL, - "control-center-manual", + if (response_id == GTK_RESPONSE_HELP) + capplet_help (GTK_WINDOW (dialog), "config-network.xml", - "CONFIGURATION", &error); - if (error) { - g_warning ("help error: %s\n", error->message); - g_error_free (error); - } - } else + "CONFIGURATION"); + else gtk_main_quit (); } diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index 413290080..42e614ca0 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,8 @@ +2002-05-26 Jody Goldberg + + * sound-properties-capplet.c (dialog_button_clicked_cb) : Improve + handling of help failures. + Sun May 26 11:32:09 2002 Jonathan Blandford * sound-properties-capplet.c (main): use APPID instead of argv[0] diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c index c31547a91..b08ce2f1e 100644 --- a/capplets/sound/sound-properties-capplet.c +++ b/capplets/sound/sound-properties-capplet.c @@ -122,18 +122,11 @@ get_legacy_settings (void) static void dialog_button_clicked_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changeset) { - if (response_id == GTK_RESPONSE_HELP) { - GError *error = NULL; - - gnome_help_display_desktop (NULL, - "control-center-manual", + if (response_id == GTK_RESPONSE_HELP) + capplet_help (GTK_WINDOW (dialog), "config-sound.xml", - "CONFIGURATION", &error); - if (error) { - g_warning ("help error: %s\n", error->message); - g_error_free (error); - } - } else + "CONFIGURATION"); + else gtk_main_quit (); } diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 3f4dd9ce6..f8468487a 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,9 @@ +2002-05-26 Jody Goldberg + + * theme-switcher.c (install_dialog_response) : improve handling of + help failures. + (cb_dialog_response) : ditto. + Sun May 26 11:34:31 2002 Jonathan Blandford * theme-switcher.c (main): use APPID instead of argv[0] diff --git a/capplets/theme-switcher/theme-switcher.c b/capplets/theme-switcher/theme-switcher.c index 6b24ad43d..9a1d90d58 100644 --- a/capplets/theme-switcher/theme-switcher.c +++ b/capplets/theme-switcher/theme-switcher.c @@ -361,17 +361,9 @@ install_dialog_response (GtkWidget *widget, int response_id, gpointer data) const gchar *raw; if (response_id == GTK_RESPONSE_HELP) { - GError *error = NULL; - - /* TODO : get this written */ - gnome_help_display_desktop (NULL, - "control-center-manual", + capplet_help (GTK_WINDOW (widget), "config-themes.xml", - "config-theme-add", &error); - if (error) { - g_warning ("help error: %s\n", error->message); - g_error_free (error); - } + "config-theme-add"); return; } @@ -419,19 +411,11 @@ install_dialog_response (GtkWidget *widget, int response_id, gpointer data) static void cb_dialog_response (GtkDialog *dialog, gint response_id) { - if (response_id == GTK_RESPONSE_HELP) { - GError *error = NULL; - - /* TODO : get this written */ - gnome_help_display_desktop (NULL, - "control-center-manual", + if (response_id == GTK_RESPONSE_HELP) + capplet_help (GTK_WINDOW (dialog), "config-themes.xml", - "CONFIGURATION", &error); - if (error) { - g_warning ("help error: %s\n", error->message); - g_error_free (error); - } - } else + "CONFIGURATION"); + else gtk_main_quit (); } diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog index 38efd364f..01fef5f4e 100644 --- a/capplets/ui-properties/ChangeLog +++ b/capplets/ui-properties/ChangeLog @@ -1,3 +1,8 @@ +2002-05-26 Jody Goldberg + + * gnome-ui-properties.c (dialog_button_clicked_cb) : Improve handling + of help failures. + Sun May 26 11:37:08 2002 Jonathan Blandford * gnome-ui-properties.c (main): use APPID instead of argv[0] diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c index 0e02aedb5..6b7099b76 100644 --- a/capplets/ui-properties/gnome-ui-properties.c +++ b/capplets/ui-properties/gnome-ui-properties.c @@ -76,19 +76,11 @@ toolbar_to_widget (GConfPropertyEditor *peditor, GConfValue *value) static void dialog_button_clicked_cb (GtkDialog *dialog, 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", + if (response_id == GTK_RESPONSE_HELP) + capplet_help (GTK_WINDOW (dialog), "config-ui-properties.xml", - "CONFIGURATION", &error); - if (error) { - g_warning ("help error: %s\n", error->message); - g_error_free (error); - } - } else + "CONFIGURATION"); + else gtk_main_quit (); }