[Xfce4-commits] [apps/xfce4-screensaver] 232/425: mate_gdk_spawn_command_line_on_screen can be used with any GTK+

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 5c32ef035d8a18d865e8419d0cf2b8d932039b52
Author: monsta <monsta at inbox.ru>
Date:   Tue Dec 22 12:18:22 2015 +0300

    mate_gdk_spawn_command_line_on_screen can be used with any GTK+
---
 src/gs-lock-plug.c                 | 10 +++++-----
 src/mate-screensaver-preferences.c |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index af3326b..0660882 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -38,11 +38,11 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gtk/gtkx.h>
 #define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-utils.h>
-#define gdk_spawn_command_line_on_screen mate_gdk_spawn_command_line_on_screen
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+#include <gtk/gtkx.h>
 #endif
 
 #ifdef WITH_KBD_LAYOUT_INDICATOR
@@ -220,7 +220,7 @@ do_user_switch (GSLockPlug *plug)
 								   MDM_FLEXISERVER_ARGS);
 
 		error = NULL;
-		res = gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
+		res = mate_gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
 												command,
 												&error);
 
@@ -240,7 +240,7 @@ do_user_switch (GSLockPlug *plug)
 								   GDM_FLEXISERVER_ARGS);
 
 		error = NULL;
-		res = gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
+		res = mate_gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
 												command,
 												&error);
 
diff --git a/src/mate-screensaver-preferences.c b/src/mate-screensaver-preferences.c
index 62e9eaf..fb0d311 100644
--- a/src/mate-screensaver-preferences.c
+++ b/src/mate-screensaver-preferences.c
@@ -36,10 +36,10 @@
 
 #include <gio/gio.h>
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 #define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-utils.h>
-#define gdk_spawn_command_line_on_screen mate_gdk_spawn_command_line_on_screen
+
+#if GTK_CHECK_VERSION (3, 0, 0)
 #include "gs-debug.h"
 #endif
 
@@ -420,7 +420,7 @@ response_cb (GtkWidget *widget,
 
 		error = NULL;
 
-		res = gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
+		res = mate_gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
 		                                        GPM_COMMAND,
 		                                        &error);
 		if (! res)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.