summaryrefslogtreecommitdiff
path: root/copy-n-paste/eggsmclient-xsmp.c
diff options
context:
space:
mode:
authorSteve Zesch <[email protected]>2012-11-22 19:35:12 -0800
committerSteve Zesch <[email protected]>2012-11-22 19:35:12 -0800
commit13ed1839179d6ee4cd01e3959f29437d549571b6 (patch)
treede0b4c14457c00003ca8c09a3dc781b423524c34 /copy-n-paste/eggsmclient-xsmp.c
parentcee6f9ff77c3c54f5524a7e725183e93e32a8ada (diff)
parent6cab8b63ebbf27525b53cf75ff18d5811fa2d39a (diff)
downloadengrampa-13ed1839179d6ee4cd01e3959f29437d549571b6.tar.bz2
engrampa-13ed1839179d6ee4cd01e3959f29437d549571b6.tar.xz
Merge pull request #10 from sbalneav/master
Deprecations and warnings
Diffstat (limited to 'copy-n-paste/eggsmclient-xsmp.c')
-rw-r--r--copy-n-paste/eggsmclient-xsmp.c7
1 files changed, 7 insertions, 0 deletions
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);