diff --git a/ChangeLog b/ChangeLog index 8828051a7..ecc0c4500 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 24 15:42:11 2008 Søren Sandmann + + * Use gtk_show_uri() instead of gnome_help_display_desktop() + Fri Oct 24 14:44:16 2008 Søren Sandmann * Use GnomeDesktopThumbnailFactory instead of diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c index 46620aabf..67d3f6d7e 100644 --- a/capplets/accessibility/at-properties/main.c +++ b/capplets/accessibility/at-properties/main.c @@ -84,7 +84,6 @@ cb_dialog_response (GtkDialog *dialog, gint response_id) GnomeClient *client; if (response_id == GTK_RESPONSE_HELP) capplet_help (GTK_WINDOW (dialog), - "user-guide.xml", "goscustaccess-11"); else if (response_id == GTK_RESPONSE_CLOSE || response_id == GTK_RESPONSE_DELETE_EVENT) gtk_main_quit (); diff --git a/capplets/appearance/appearance-font.c b/capplets/appearance/appearance-font.c index b04b79c6e..60e3062a5 100644 --- a/capplets/appearance/appearance-font.c +++ b/capplets/appearance/appearance-font.c @@ -804,7 +804,6 @@ cb_details_response (GtkDialog *dialog, gint response_id) { if (response_id == GTK_RESPONSE_HELP) { capplet_help (GTK_WINDOW (dialog), - "user-guide.xml", "goscustdesk-38"); } else gtk_widget_hide (GTK_WIDGET (dialog)); diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index 09cedc9c9..b81d4a89e 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -96,24 +96,19 @@ main_window_response (GtkWidget *widget, switch (pindex) { case 0: /* theme */ - capplet_help (GTK_WINDOW (widget), "user-guide.xml", - "goscustdesk-12"); + capplet_help (GTK_WINDOW (widget), "goscustdesk-12"); break; case 1: /* background */ - capplet_help (GTK_WINDOW (widget), "user-guide.xml", - "goscustdesk-7"); + capplet_help (GTK_WINDOW (widget), "goscustdesk-7"); break; case 2: /* fonts */ - capplet_help (GTK_WINDOW (widget), "user-guide.xml", - "goscustdesk-38"); + capplet_help (GTK_WINDOW (widget), "goscustdesk-38"); break; case 3: /* interface */ - capplet_help (GTK_WINDOW (widget), "user-guide.xml", - "goscustuserinter-2"); + capplet_help (GTK_WINDOW (widget), "goscustuserinter-2"); break; default: - capplet_help (GTK_WINDOW (widget), "user-guide.xml", - "prefs-look-and-feel"); + capplet_help (GTK_WINDOW (widget), "prefs-look-and-feel"); break; } } diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index 8cf5c07bd..b9c08a15d 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -393,7 +393,7 @@ static void style_response_cb (GtkDialog *dialog, gint response_id) { if (response_id == GTK_RESPONSE_HELP) { - capplet_help (GTK_WINDOW (dialog), "user-guide.xml", "goscustdesk-61"); + capplet_help (GTK_WINDOW (dialog), "goscustdesk-61"); } else { gtk_widget_hide (GTK_WIDGET (dialog)); } diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c index a1d87d803..f7a03191d 100644 --- a/capplets/common/capplet-util.c +++ b/capplets/common/capplet-util.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "capplet-util.h" @@ -65,20 +66,32 @@ capplet_error_dialog (GtkWindow *parent, char const *msg, GError *err) * Havoc happy way. **/ void -capplet_help (GtkWindow *parent, char const *helpfile, char const *section) +capplet_help (GtkWindow *parent, char const *section) { GError *error = NULL; + char *uri; + GError *err = NULL; + GdkScreen *screen; - g_return_if_fail (helpfile != NULL); g_return_if_fail (section != NULL); - gnome_help_display_desktop (NULL, - "user-guide", - helpfile, section, &error); - if (error != NULL) - capplet_error_dialog (parent, + if (!parent) + screen = gdk_screen_get_default(); + else + screen = gtk_widget_get_screen (GTK_WIDGET (parent)); + + uri = g_strdup_printf ("ghelp:user-guide#%s", section); + + if (!gtk_show_uri (screen, uri, gtk_get_current_event_time(), &err)) { + capplet_error_dialog ( + parent, _("There was an error displaying help: %s"), error); + + g_error_free (err); + } + + g_free (uri); } /** diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h index b94042fd3..714028cb4 100644 --- a/capplets/common/capplet-util.h +++ b/capplets/common/capplet-util.h @@ -45,7 +45,7 @@ /* Some miscellaneous functions useful to all capplets */ -void capplet_help (GtkWindow *parent, char const *helpfile, char const *section); +void capplet_help (GtkWindow *parent, char const *section); void capplet_set_icon (GtkWidget *window, char const *icon_file_name); gboolean capplet_file_delete_recursive (GFile *directory, GError **error); diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c index 2bfd31d6c..674f6a7f8 100644 --- a/capplets/default-applications/gnome-da-capplet.c +++ b/capplets/default-applications/gnome-da-capplet.c @@ -44,7 +44,7 @@ static void close_cb (GtkWidget *window, gint response, gpointer user_data) { if (response == GTK_RESPONSE_HELP) { - capplet_help (GTK_WINDOW (window), "user-guide.xml", "prefs-preferredapps"); + capplet_help (GTK_WINDOW (window), "prefs-preferredapps"); } else { gtk_widget_destroy (window); diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 808e64337..b78731977 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -1377,7 +1377,6 @@ cb_dialog_response (GtkWidget *widget, gint response_id, gpointer data) if (response_id == GTK_RESPONSE_HELP) { capplet_help (GTK_WINDOW (widget), - "user-guide.xml", "goscustdesk-39"); } else diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c index c12734fbb..9e54094ad 100644 --- a/capplets/keyboard/gnome-keyboard-properties.c +++ b/capplets/keyboard/gnome-keyboard-properties.c @@ -118,8 +118,7 @@ dialog_response (GtkWidget * widget, gint response_id, GConfChangeSet * changeset) { if (response_id == GTK_RESPONSE_HELP) - capplet_help (GTK_WINDOW (widget), - "user-guide.xml", "goscustperiph-2"); + capplet_help (GTK_WINDOW (widget), "goscustperiph-2"); else gtk_main_quit (); } diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index e867e9b7d..fa3c5f78b 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -419,7 +419,6 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changes { if (response_id == GTK_RESPONSE_HELP) capplet_help (GTK_WINDOW (dialog), - "user-guide.xml", "goscustperiph-5"); else gtk_main_quit (); diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-preferences.c index 56e49e1c5..04fbc59cc 100644 --- a/capplets/network/gnome-network-preferences.c +++ b/capplets/network/gnome-network-preferences.c @@ -178,7 +178,6 @@ cb_dialog_response (GtkDialog *dialog, gint response_id) { if (response_id == GTK_RESPONSE_HELP) capplet_help (GTK_WINDOW (dialog), - "user-guide.xml", "goscustdesk-50"); else { @@ -196,7 +195,6 @@ cb_details_dialog_response (GtkDialog *dialog, gint response_id) { if (response_id == GTK_RESPONSE_HELP) capplet_help (GTK_WINDOW (dialog), - "user-guide.xml", "goscustdesk-50"); else { gtk_widget_destroy (GTK_WIDGET (dialog)); diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c index c2fa8e9ae..62cee797b 100644 --- a/capplets/sound/sound-properties-capplet.c +++ b/capplets/sound/sound-properties-capplet.c @@ -1163,7 +1163,6 @@ dialog_response_cb (GtkWidget *dialog, gint response_id, GConfChangeSet *changes { if (response_id == GTK_RESPONSE_HELP) { capplet_help (GTK_WINDOW (dialog), - "user-guide.xml", "goscustmulti-2"); return; } diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c index ffa60f58f..59379a934 100644 --- a/capplets/windows/gnome-window-properties.c +++ b/capplets/windows/gnome-window-properties.c @@ -318,7 +318,6 @@ response_cb (GtkWidget *dialog_win, if (response_id == GTK_RESPONSE_HELP) { capplet_help (GTK_WINDOW (dialog_win), - "user-guide.xml", "goscustdesk-58"); } else { gtk_widget_destroy (dialog_win);