summaryrefslogtreecommitdiff
path: root/src/caja-window-menus.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/caja-window-menus.c')
-rw-r--r--src/caja-window-menus.c45
1 files changed, 10 insertions, 35 deletions
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index 2fc0d640..4a0d721d 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -43,7 +43,6 @@
#include <gio/gio.h>
#include <glib/gi18n.h>
#include <eel/eel-gtk-extensions.h>
-#include <libmate-desktop/mate-aboutdialog.h>
#include <libcaja-extension/caja-menu-provider.h>
#include <libcaja-private/caja-extensions.h>
#include <libcaja-private/caja-file-utilities.h>
@@ -55,6 +54,11 @@
#include <libcaja-private/caja-search-engine.h>
#include <libcaja-private/caja-signaller.h>
#include <libcaja-private/caja-trash-monitor.h>
+
+#define MATE_DESKTOP_USE_UNSTABLE_API
+#include <libmate-desktop/mate-aboutdialog.h>
+#include <libmate-desktop/mate-desktop-utils.h>
+
#include <string.h>
#define MENU_PATH_EXTENSION_ACTIONS "/MenuBar/File/Extension Actions"
@@ -574,40 +578,11 @@ action_caja_manual_callback (GtkAction *action,
error = NULL;
window = CAJA_WINDOW (user_data);
- if (CAJA_IS_DESKTOP_WINDOW (window))
- {
-#if GTK_CHECK_VERSION (3, 0, 0)
- GdkScreen *screen;
- GdkAppLaunchContext *launch_context;
- GAppInfo *app_info = NULL;
- app_info = g_app_info_create_from_commandline ("mate-help",
- NULL,
- G_APP_INFO_CREATE_NONE,
- &error);
- if (error == NULL)
- {
- screen = gtk_window_get_screen(GTK_WINDOW(window));
- launch_context = gdk_app_launch_context_new ();
- gdk_app_launch_context_set_screen (launch_context, screen);
- g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (launch_context), &error);
- g_object_unref (launch_context);
- }
- if (app_info != NULL)
- g_object_unref (app_info);
-#else
-#if GTK_CHECK_VERSION (2, 24, 0)
- gdk_spawn_command_line_on_screen(gtk_window_get_screen(GTK_WINDOW(window)), "mate-help", &error);
-#else
- g_spawn_command_line_async("mate-help", &error);
-#endif
-#endif
- }
- else
- {
- gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)),
- "help:mate-user-guide/goscaja-1",
- gtk_get_current_event_time (), &error);
- }
+ gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)),
+ CAJA_IS_DESKTOP_WINDOW (window)
+ ? "help:mate-user-guide"
+ : "help:mate-user-guide/goscaja-1",
+ gtk_get_current_event_time (), &error);
if (error)
{