applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use gtk_show_uri() instead of gnome_help_display_desktop()

Browse source 
Fri Oct 24 15:42:11 2008  Søren Sandmann  <sandmann@redhat.com>

	* Use gtk_show_uri() instead of gnome_help_display_desktop()


svn path=/trunk/; revision=9094
This commit is contained in:
Søren Sandmann 2008-10-24 19:42:26 +00:00 • committed by Søren Sandmann Pedersen
parent bba36b9e37
commit 1616422ded
14 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Oct 24 15:42:11 2008 Søren Sandmann <sandmann@redhat.com>
* Use gtk_show_uri() instead of gnome_help_display_desktop()
Fri Oct 24 14:44:16 2008 Søren Sandmann <sandmann@redhat.com> Fri Oct 24 14:44:16 2008 Søren Sandmann <sandmann@redhat.com>
* Use GnomeDesktopThumbnailFactory instead of * Use GnomeDesktopThumbnailFactory instead of

1
capplets/accessibility/at-properties/main.c
View file

@ -84,7 +84,6 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
GnomeClient *client; GnomeClient *client;
if (response_id == GTK_RESPONSE_HELP) if (response_id == GTK_RESPONSE_HELP)
capplet_help (GTK_WINDOW (dialog), capplet_help (GTK_WINDOW (dialog),
"user-guide.xml",
"goscustaccess-11"); "goscustaccess-11");
else if (response_id == GTK_RESPONSE_CLOSE || response_id == GTK_RESPONSE_DELETE_EVENT) else if (response_id == GTK_RESPONSE_CLOSE || response_id == GTK_RESPONSE_DELETE_EVENT)
gtk_main_quit (); gtk_main_quit ();

1
capplets/appearance/appearance-font.c
View file

@ -804,7 +804,6 @@ cb_details_response (GtkDialog *dialog, gint response_id)
{ {
if (response_id == GTK_RESPONSE_HELP) { if (response_id == GTK_RESPONSE_HELP) {
capplet_help (GTK_WINDOW (dialog), capplet_help (GTK_WINDOW (dialog),
"user-guide.xml",
"goscustdesk-38"); "goscustdesk-38");
} else } else
gtk_widget_hide (GTK_WIDGET (dialog)); gtk_widget_hide (GTK_WIDGET (dialog));

15
capplets/appearance/appearance-main.c
View file

@ -96,24 +96,19 @@ main_window_response (GtkWidget *widget,
switch (pindex) switch (pindex)
{ {
case 0: /* theme */ case 0: /* theme */
capplet_help (GTK_WINDOW (widget), "user-guide.xml", capplet_help (GTK_WINDOW (widget), "goscustdesk-12");
"goscustdesk-12");
break; break;
case 1: /* background */ case 1: /* background */
capplet_help (GTK_WINDOW (widget), "user-guide.xml", capplet_help (GTK_WINDOW (widget), "goscustdesk-7");
"goscustdesk-7");
break; break;
case 2: /* fonts */ case 2: /* fonts */
capplet_help (GTK_WINDOW (widget), "user-guide.xml", capplet_help (GTK_WINDOW (widget), "goscustdesk-38");
"goscustdesk-38");
break; break;
case 3: /* interface */ case 3: /* interface */
capplet_help (GTK_WINDOW (widget), "user-guide.xml", capplet_help (GTK_WINDOW (widget), "goscustuserinter-2");
"goscustuserinter-2");
break; break;
default: default:
capplet_help (GTK_WINDOW (widget), "user-guide.xml", capplet_help (GTK_WINDOW (widget), "prefs-look-and-feel");
"prefs-look-and-feel");
break; break;
} }
} }

2
capplets/appearance/appearance-style.c
View file

@ -393,7 +393,7 @@ static void
style_response_cb (GtkDialog *dialog, gint response_id) style_response_cb (GtkDialog *dialog, gint response_id)
{ {
if (response_id == GTK_RESPONSE_HELP) { if (response_id == GTK_RESPONSE_HELP) {
capplet_help (GTK_WINDOW (dialog), "user-guide.xml", "goscustdesk-61"); capplet_help (GTK_WINDOW (dialog), "goscustdesk-61");
} else { } else {
gtk_widget_hide (GTK_WIDGET (dialog)); gtk_widget_hide (GTK_WIDGET (dialog));
} }

27
capplets/common/capplet-util.c
View file

@ -31,6 +31,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <glib/gi18n.h>
#include "capplet-util.h" #include "capplet-util.h"
@ -65,20 +66,32 @@ capplet_error_dialog (GtkWindow *parent, char const *msg, GError *err)
* Havoc happy way. * Havoc happy way.
**/ **/
void void
capplet_help (GtkWindow *parent, char const *helpfile, char const *section) capplet_help (GtkWindow *parent, char const *section)
{ {
GError *error = NULL; GError *error = NULL;
char *uri;
GError *err = NULL;
GdkScreen *screen;
g_return_if_fail (helpfile != NULL);
g_return_if_fail (section != NULL); g_return_if_fail (section != NULL);
gnome_help_display_desktop (NULL, if (!parent)
"user-guide", screen = gdk_screen_get_default();
helpfile, section, &error); else
if (error != NULL) screen = gtk_widget_get_screen (GTK_WIDGET (parent));
capplet_error_dialog (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"), _("There was an error displaying help: %s"),
error); error);
g_error_free (err);
}
g_free (uri);
} }
/** /**

2
capplets/common/capplet-util.h
View file

@ -45,7 +45,7 @@
/* Some miscellaneous functions useful to all capplets */ /* 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); void capplet_set_icon (GtkWidget *window, char const *icon_file_name);
gboolean capplet_file_delete_recursive (GFile *directory, GError **error); gboolean capplet_file_delete_recursive (GFile *directory, GError **error);

2
capplets/default-applications/gnome-da-capplet.c
View file

@ -44,7 +44,7 @@ static void
close_cb (GtkWidget *window, gint response, gpointer user_data) close_cb (GtkWidget *window, gint response, gpointer user_data)
{ {
if (response == GTK_RESPONSE_HELP) { if (response == GTK_RESPONSE_HELP) {
capplet_help (GTK_WINDOW (window), "user-guide.xml", "prefs-preferredapps"); capplet_help (GTK_WINDOW (window), "prefs-preferredapps");
} }
else { else {
gtk_widget_destroy (window); gtk_widget_destroy (window);

1
capplets/keybindings/gnome-keybinding-properties.c
View file

@ -1377,7 +1377,6 @@ cb_dialog_response (GtkWidget *widget, gint response_id, gpointer data)
if (response_id == GTK_RESPONSE_HELP) if (response_id == GTK_RESPONSE_HELP)
{ {
capplet_help (GTK_WINDOW (widget), capplet_help (GTK_WINDOW (widget),
"user-guide.xml",
"goscustdesk-39"); "goscustdesk-39");
} }
else else

3
capplets/keyboard/gnome-keyboard-properties.c
View file

@ -118,8 +118,7 @@ dialog_response (GtkWidget * widget,
gint response_id, GConfChangeSet * changeset) gint response_id, GConfChangeSet * changeset)
{ {
if (response_id == GTK_RESPONSE_HELP) if (response_id == GTK_RESPONSE_HELP)
capplet_help (GTK_WINDOW (widget), capplet_help (GTK_WINDOW (widget), "goscustperiph-2");
"user-guide.xml", "goscustperiph-2");
else else
gtk_main_quit (); gtk_main_quit ();
} }

1
capplets/mouse/gnome-mouse-properties.c
View file

@ -419,7 +419,6 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, GConfChangeSet *changes
{ {
if (response_id == GTK_RESPONSE_HELP) if (response_id == GTK_RESPONSE_HELP)
capplet_help (GTK_WINDOW (dialog), capplet_help (GTK_WINDOW (dialog),
"user-guide.xml",
"goscustperiph-5"); "goscustperiph-5");
else else
gtk_main_quit (); gtk_main_quit ();

2
capplets/network/gnome-network-preferences.c
View file

@ -178,7 +178,6 @@ cb_dialog_response (GtkDialog *dialog, gint response_id)
{ {
if (response_id == GTK_RESPONSE_HELP) if (response_id == GTK_RESPONSE_HELP)
capplet_help (GTK_WINDOW (dialog), capplet_help (GTK_WINDOW (dialog),
"user-guide.xml",
"goscustdesk-50"); "goscustdesk-50");
else else
{ {
@ -196,7 +195,6 @@ cb_details_dialog_response (GtkDialog *dialog, gint response_id)
{ {
if (response_id == GTK_RESPONSE_HELP) if (response_id == GTK_RESPONSE_HELP)
capplet_help (GTK_WINDOW (dialog), capplet_help (GTK_WINDOW (dialog),
"user-guide.xml",
"goscustdesk-50"); "goscustdesk-50");
else { else {
gtk_widget_destroy (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog));

1
capplets/sound/sound-properties-capplet.c
View file

@ -1163,7 +1163,6 @@ dialog_response_cb (GtkWidget *dialog, gint response_id, GConfChangeSet *changes
{ {
if (response_id == GTK_RESPONSE_HELP) { if (response_id == GTK_RESPONSE_HELP) {
capplet_help (GTK_WINDOW (dialog), capplet_help (GTK_WINDOW (dialog),
"user-guide.xml",
"goscustmulti-2"); "goscustmulti-2");
return; return;
} }

1
capplets/windows/gnome-window-properties.c
View file

@ -318,7 +318,6 @@ response_cb (GtkWidget *dialog_win,
if (response_id == GTK_RESPONSE_HELP) { if (response_id == GTK_RESPONSE_HELP) {
capplet_help (GTK_WINDOW (dialog_win), capplet_help (GTK_WINDOW (dialog_win),
"user-guide.xml",
"goscustdesk-58"); "goscustdesk-58");
} else { } else {
gtk_widget_destroy (dialog_win); gtk_widget_destroy (dialog_win);