diff options
author | Stefano Karapetsas <[email protected]> | 2013-07-26 15:35:47 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2013-07-26 15:35:47 +0200 |
commit | 88fbc42c5872c4bca0c3cb71133cda1e66584cee (patch) | |
tree | 37cb3248337a60f19cfb44e927a53e71f11accb8 /mate-panel | |
parent | 95cd1b57f9cd1e84bca22a0d9ff6046e11344b71 (diff) | |
parent | 2ced54ba17c63fda9f5da417f4dd0d5380db8b59 (diff) | |
download | mate-panel-88fbc42c5872c4bca0c3cb71133cda1e66584cee.tar.bz2 mate-panel-88fbc42c5872c4bca0c3cb71133cda1e66584cee.tar.xz |
Merge branch 'dev-yelp-tools'
Diffstat (limited to 'mate-panel')
-rw-r--r-- | mate-panel/libpanel-util/panel-show.c | 4 | ||||
-rw-r--r-- | mate-panel/panel.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mate-panel/libpanel-util/panel-show.c b/mate-panel/libpanel-util/panel-show.c index 0795b837..51167874 100644 --- a/mate-panel/libpanel-util/panel-show.c +++ b/mate-panel/libpanel-util/panel-show.c @@ -271,9 +271,9 @@ panel_show_help (GdkScreen *screen, g_return_val_if_fail (error == NULL || *error == NULL, FALSE); if (link) - uri = g_strdup_printf ("ghelp:%s?%s", doc, link); + uri = g_strdup_printf ("help:%s?%s", doc, link); else - uri = g_strdup_printf ("ghelp:%s", doc); + uri = g_strdup_printf ("help:%s", doc); gtk_show_uri (screen, uri, gtk_get_current_event_time (), &local_error); diff --git a/mate-panel/panel.c b/mate-panel/panel.c index c3a5a8ab..2b9929d3 100644 --- a/mate-panel/panel.c +++ b/mate-panel/panel.c @@ -608,6 +608,7 @@ drop_urilist (PanelWidget *panel, g_ascii_strncasecmp (uri, "ftp:", strlen ("ftp:")) == 0 || g_ascii_strncasecmp (uri, "gopher:", strlen ("gopher:")) == 0 || g_ascii_strncasecmp (uri, "ghelp:", strlen ("ghelp:")) == 0 || + g_ascii_strncasecmp (uri, "help:", strlen ("ghelp:")) == 0 || g_ascii_strncasecmp (uri, "man:", strlen ("man:")) == 0 || g_ascii_strncasecmp (uri, "info:", strlen ("info:")) == 0) { /* FIXME: probably do this only on link, |