diff options
| author | infirit <[email protected]> | 2014-02-09 15:07:26 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-02-09 16:19:03 +0100 |
| commit | 83a76222ea1e8af8d928b9ad41d7349256d0e7c3 (patch) | |
| tree | 3ddb81ac9627ec1fa7f479ef7b400a8a982124d2 /applets/wncklet | |
| parent | 6b509a04f52aa4a70cd4a7a6a51295bccbf161b3 (diff) | |
| download | mate-panel-83a76222ea1e8af8d928b9ad41d7349256d0e7c3.tar.bz2 mate-panel-83a76222ea1e8af8d928b9ad41d7349256d0e7c3.tar.xz | |
help: Avoid file collision with gnome-panel
Also correct help uri for applets.
Diffstat (limited to 'applets/wncklet')
| -rw-r--r-- | applets/wncklet/showdesktop.c | 2 | ||||
| -rw-r--r-- | applets/wncklet/window-list.c | 4 | ||||
| -rw-r--r-- | applets/wncklet/window-menu.c | 2 | ||||
| -rw-r--r-- | applets/wncklet/wncklet.c | 2 | ||||
| -rw-r--r-- | applets/wncklet/workspace-switcher.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c index bdf4d568..abee22bc 100644 --- a/applets/wncklet/showdesktop.c +++ b/applets/wncklet/showdesktop.c @@ -456,7 +456,7 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) static void display_help_dialog(GtkAction* action, ShowDesktopData* sdd) { - wncklet_display_help(sdd->applet, "user-guide", "gospanel-564", SHOW_DESKTOP_ICON); + wncklet_display_help(sdd->applet, "mate-user-guide", "gospanel-564", SHOW_DESKTOP_ICON); } static void display_about_dialog(GtkAction* action, ShowDesktopData* sdd) diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index dfa571fb..721aef22 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -86,7 +86,7 @@ static void response_cb(GtkWidget* widget, int id, TasklistData* tasklist) { if (id == GTK_RESPONSE_HELP) { - wncklet_display_help(widget, "user-guide", "windowlist-prefs", WINDOW_LIST_ICON); + wncklet_display_help(widget, "mate-user-guide", "windowlist-prefs", WINDOW_LIST_ICON); } else { @@ -557,7 +557,7 @@ static void call_system_monitor(GtkAction* action, TasklistData* tasklist) static void display_help_dialog(GtkAction* action, TasklistData* tasklist) { - wncklet_display_help(tasklist->applet, "user-guide", "windowlist", WINDOW_LIST_ICON); + wncklet_display_help(tasklist->applet, "mate-user-guide", "windowlist", WINDOW_LIST_ICON); } static void display_about_dialog(GtkAction* action, TasklistData* tasklist) diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c index cef49657..86701b96 100644 --- a/applets/wncklet/window-menu.c +++ b/applets/wncklet/window-menu.c @@ -55,7 +55,7 @@ typedef struct { static void window_menu_help(GtkAction* action, WindowMenu* window_menu) { - wncklet_display_help(window_menu->applet, "user-guide", "panel-windowselector", WINDOW_MENU_ICON); + wncklet_display_help(window_menu->applet, "mate-user-guide", "panel-windowselector", WINDOW_MENU_ICON); } static void window_menu_about(GtkAction* action, WindowMenu* window_menu) diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c index d17c2ee0..d9b9fd47 100644 --- a/applets/wncklet/wncklet.c +++ b/applets/wncklet/wncklet.c @@ -45,7 +45,7 @@ void wncklet_display_help(GtkWidget* widget, const char* doc_id, const char* lin char* uri; if (link_id) - uri = g_strdup_printf("help:%s?%s", doc_id, link_id); + uri = g_strdup_printf("help:%s/%s", doc_id, link_id); else uri = g_strdup_printf("help:%s", doc_id); diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c index e4202076..d35155a2 100644 --- a/applets/wncklet/workspace-switcher.c +++ b/applets/wncklet/workspace-switcher.c @@ -580,7 +580,7 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet) static void display_help_dialog(GtkAction* action, PagerData* pager) { - wncklet_display_help(pager->applet, "user-guide", "overview-workspaces", WORKSPACE_SWITCHER_ICON); + wncklet_display_help(pager->applet, "mate-user-guide", "overview-workspaces", WORKSPACE_SWITCHER_ICON); } static void display_about_dialog(GtkAction* action, PagerData* pager) @@ -760,7 +760,7 @@ static gboolean delete_event(GtkWidget* widget, gpointer data) static void response_cb(GtkWidget* widget, int id, PagerData* pager) { if (id == GTK_RESPONSE_HELP) - wncklet_display_help(widget, "user-guide", "overview-workspaces", WORKSPACE_SWITCHER_ICON); + wncklet_display_help(widget, "mate-user-guide", "overview-workspaces", WORKSPACE_SWITCHER_ICON); else gtk_widget_destroy(widget); } |