From 6cab8b63ebbf27525b53cf75ff18d5811fa2d39a Mon Sep 17 00:00:00 2001
From: Scott Balneaves <sbalneav@alburg.net>
Date: Thu, 22 Nov 2012 21:30:10 -0600
Subject: Fix deprecations and warnings

---
 copy-n-paste/eggsmclient-xsmp.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'copy-n-paste')

diff --git a/copy-n-paste/eggsmclient-xsmp.c b/copy-n-paste/eggsmclient-xsmp.c
index c72839c..8c6ba4d 100644
--- a/copy-n-paste/eggsmclient-xsmp.c
+++ b/copy-n-paste/eggsmclient-xsmp.c
@@ -36,6 +36,9 @@
 #include <X11/SM/SMlib.h>
 
 #include <gdk/gdk.h>
+#if GLIB_CHECK_VERSION (2, 24, 0)
+#include <gdk/gdkx.h>
+#endif
 
 #define EGG_TYPE_SM_CLIENT_XSMP            (egg_sm_client_xsmp_get_type ())
 #define EGG_SM_CLIENT_XSMP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP))
@@ -367,7 +370,11 @@ sm_client_xsmp_startup (EggSMClient *client,
       free (ret_client_id);
 
       gdk_threads_enter ();
+#if GLIB_CHECK_VERSION (2, 24, 0)
+      gdk_x11_set_sm_client_id (xsmp->client_id);
+#else
       gdk_set_sm_client_id (xsmp->client_id);
+#endif
       gdk_threads_leave ();
 
       g_debug ("Got client ID \"%s\"", xsmp->client_id);
-- 
cgit v1.2.1