help: Avoid file collision with gnome-panel

Also correct help uri for applets.

9 files changed, 14 insertions, 14 deletions

diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c
index 16dbcb9a..d0dfe2de 100644
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -67,7 +67,7 @@ clock_utils_display_help (GtkWidget  *widget,
 	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/clock/clock.c b/applets/clock/clock.c
index 0722e4ad..347dfefc 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -2767,7 +2767,7 @@ static void
 prefs_help (GtkWidget *widget, ClockData *cd)
 {
 	clock_utils_display_help (cd->prefs_window,
-				  "clock", "clock-settings");
+				  "mate-clock", "clock-settings");
 }
 
 static void
@@ -3214,7 +3214,7 @@ static void
 display_help_dialog (GtkAction *action,
                      ClockData *cd)
 {
-	clock_utils_display_help (cd->applet, "clock", NULL);
+	clock_utils_display_help (cd->applet, "mate-clock", NULL);
 }
 
 static void display_about_dialog(GtkAction* action, ClockData* cd)
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index ac3c196d..114aaa4f 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -152,10 +152,10 @@ static void show_help(FishApplet* fish, const char* link_id)
 {
 	GError *error = NULL;
 	char   *uri;
-#define FISH_HELP_DOC "fish"
+#define FISH_HELP_DOC "mate-fish"
 
 	if (link_id)
-		uri = g_strdup_printf ("help:%s?%s", FISH_HELP_DOC, link_id);
+		uri = g_strdup_printf ("help:%s/%s", FISH_HELP_DOC, link_id);
 	else
 		uri = g_strdup_printf ("help:%s", FISH_HELP_DOC);
 
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 0b63bf65..81203bac 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -64,9 +64,9 @@ static void help_cb(GtkAction* action, AppletData* data)
 {
 	GError* error = NULL;
 	char* uri;
-	#define NA_HELP_DOC "user-guide"
+	#define NA_HELP_DOC "mate-user-guide"
 
-	uri = g_strdup_printf("help:%s?%s", NA_HELP_DOC, "panels-notification-area");
+	uri = g_strdup_printf("help:%s/%s", NA_HELP_DOC, "panels-notification-area");
 
 	gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(data->applet)), uri, gtk_get_current_event_time(), &error);
 
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);
 }