diff options
| author | Monsta <[email protected]> | 2015-07-07 11:09:42 +0300 |
|---|---|---|
| committer | Monsta <[email protected]> | 2015-07-07 11:09:42 +0300 |
| commit | 236551366f45361cfa4bea60d1360b086ac36366 (patch) | |
| tree | f284672a384f73898cee043d305b399d9d2fd68e | |
| parent | e704022661db84095633b71b4ccc712186e5999a (diff) | |
| download | caja-236551366f45361cfa4bea60d1360b086ac36366.tar.bz2 caja-236551366f45361cfa4bea60d1360b086ac36366.tar.xz | |
Revert "show main caja help page from m-u-g in all dialogs"
This reverts commit b4e25754bf17ef54569367718eda57ea759108c5.
| -rw-r--r-- | src/caja-bookmarks-window.c | 3 | ||||
| -rw-r--r-- | src/caja-connect-server-dialog.c | 3 | ||||
| -rw-r--r-- | src/caja-file-management-properties.c | 5 | ||||
| -rw-r--r-- | src/caja-location-dialog.c | 3 | ||||
| -rw-r--r-- | src/caja-property-browser.c | 3 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 3 | ||||
| -rw-r--r-- | src/file-manager/fm-properties-window.c | 3 |
7 files changed, 7 insertions, 16 deletions
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index aa8b8358..572f6275 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -145,8 +145,7 @@ caja_bookmarks_window_response_callback (GtkDialog *dialog, GError *error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - /* FIXME: show proper page instead of main when m-u-g is complete */ - "help:mate-user-guide/files", + "help:mate-user-guide/goscaja-36", gtk_get_current_event_time (), &error); if (error) diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c index f1ee942a..921b2597 100644 --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -707,8 +707,7 @@ connect_dialog_response_cb (CajaConnectServerDialog *dialog, case GTK_RESPONSE_HELP : error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - /* FIXME: show proper page instead of main when m-u-g is complete */ - "help:mate-user-guide/files", + "help:mate-user-guide/caja-server-connect", gtk_get_current_event_time (), &error); if (error) { diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 8111d285..24283611 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -256,8 +256,6 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent, if (response_id == GTK_RESPONSE_HELP) { - /* FIXME: show proper page instead of main when m-u-g is complete */ -#if 0 switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (gtk_builder_get_object (builder, "notebook1")))) { default: @@ -280,8 +278,7 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent, section = "goscaja-61"; break; } -#endif - preferences_show_help (GTK_WINDOW (parent), "mate-user-guide", "files"); + preferences_show_help (GTK_WINDOW (parent), "mate-user-guide", section); } else if (response_id == GTK_RESPONSE_CLOSE) { diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c index 0fc2ef00..b534f210 100644 --- a/src/caja-location-dialog.c +++ b/src/caja-location-dialog.c @@ -95,8 +95,7 @@ response_callback (CajaLocationDialog *dialog, case GTK_RESPONSE_HELP : error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - /* FIXME: show proper page instead of main when m-u-g is complete */ - "help:mate-user-guide/files", + "help:mate-user-guide/caja-open-location", gtk_get_current_event_time (), &error); if (error) { diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c index 6a522af0..d1d75f8d 100644 --- a/src/caja-property-browser.c +++ b/src/caja-property-browser.c @@ -1640,8 +1640,7 @@ help_button_callback (GtkWidget *widget, GtkWidget *property_browser) GtkWidget *dialog; gtk_show_uri (gtk_widget_get_screen (property_browser), - /* FIXME: show proper page instead of main when m-u-g is complete */ - "help:mate-user-guide/files", + "help:mate-user-guide/goscaja-50", gtk_get_current_event_time (), &error); if (error) diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 394a2ac2..ebf80eb3 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1170,8 +1170,7 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data) case GTK_RESPONSE_HELP : error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - /* FIXME: show proper page instead of main when m-u-g is complete */ - "help:mate-user-guide/files", + "help:mate-user-guide/caja-select-pattern", gtk_get_current_event_time (), &error); if (error) { eel_show_error_dialog (_("There was an error displaying help."), error->message, diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 2de1bec1..ba305015 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -5521,8 +5521,7 @@ real_response (GtkDialog *dialog, switch (response) { case GTK_RESPONSE_HELP: gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - /* FIXME: show proper page instead of main when m-u-g is complete */ - "help:mate-user-guide/files", + "help:mate-user-guide/goscaja-51", gtk_get_current_event_time (), &error); if (error != NULL) { |