From 81948fae67837b06e7fc6512f980e63a0e378240 Mon Sep 17 00:00:00 2001
From: Monsta <monsta@inbox.ru>
Date: Mon, 12 Jan 2015 14:45:12 +0300
Subject: use mate_gdk_spawn_command_line_on_screen always

Closes https://github.com/mate-desktop/mate-panel/pull/273
---
 mate-panel/panel-action-button.c | 9 +--------
 mate-panel/panel-util.c          | 6 ------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c
index c8c81e75..30e03541 100644
--- a/mate-panel/panel-action-button.c
+++ b/mate-panel/panel-action-button.c
@@ -33,10 +33,8 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 #define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-utils.h>
-#endif
 #include <libmate-desktop/mate-gsettings.h>
 
 #include <libpanel-util/panel-error.h>
@@ -306,12 +304,7 @@ panel_action_connect_server (GtkWidget *widget)
 	else
 		command = g_strdup ("nemo-connect-server");
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-	mate_gdk_spawn_command_line_on_screen (screen, command,
-#else
-	gdk_spawn_command_line_on_screen (screen, command,
-#endif
-					  &error);
+	mate_gdk_spawn_command_line_on_screen (screen, command, &error);
 	g_free (command);
 
 	if (error) {
diff --git a/mate-panel/panel-util.c b/mate-panel/panel-util.c
index b9af4675..6bd78c34 100644
--- a/mate-panel/panel-util.c
+++ b/mate-panel/panel-util.c
@@ -29,10 +29,8 @@
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 #define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-utils.h>
-#endif
 #include <libmate-desktop/mate-gsettings.h>
 
 #include <libpanel-util/panel-error.h>
@@ -465,11 +463,7 @@ void panel_lock_screen_action(GdkScreen* screen, const char* action)
 		return;
 	}
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	if (!mate_gdk_spawn_command_line_on_screen(screen, command, &error))
-#else
-	if (!gdk_spawn_command_line_on_screen(screen, command, &error))
-#endif
 	{
 		char* primary = g_strdup_printf(_("Could not execute '%s'"), command);
 		panel_error_dialog (NULL, screen, "cannot_exec_screensaver", TRUE, primary, error->message);
-- 
cgit v1.2.1