3 files changed, 15 insertions, 2 deletions
diff --git a/cut-n-paste-code/libegg/Makefile.am b/cut-n-paste-code/libegg/Makefile.am
index 1ee4585d..3d6e3977 100644
--- a/cut-n-paste-code/libegg/Makefile.am
+++ b/cut-n-paste-code/libegg/Makefile.am
@@ -2,7 +2,7 @@ NULL=
 
 noinst_LTLIBRARIES = libegg.la
 
-INCLUDES = $(LIBEGG_CFLAGS)
+AM_CPPFLAGS = $(LIBEGG_CFLAGS)
 
 EGG_TREE_DND_FILES = 		\
 	eggtreemultidnd.c	\
diff --git a/cut-n-paste-code/libegg/eggsmclient-private.h b/cut-n-paste-code/libegg/eggsmclient-private.h
index a8da9c7a..e187285b 100644
--- a/cut-n-paste-code/libegg/eggsmclient-private.h
+++ b/cut-n-paste-code/libegg/eggsmclient-private.h
@@ -20,7 +20,12 @@
 #ifndef __EGG_SM_CLIENT_PRIVATE_H__
 #define __EGG_SM_CLIENT_PRIVATE_H__
 
-#include <gdkconfig.h>
+#include <gtk/gtk.h>
+
+#if !GTK_CHECK_VERSION(3, 0, 0)
+    #include <gdkconfig.h>
+#endif
+
 #include "eggsmclient.h"
 
 #ifdef __cplusplus
diff --git a/cut-n-paste-code/libegg/eggsmclient-xsmp.c b/cut-n-paste-code/libegg/eggsmclient-xsmp.c
index f6aae232..454ccaf1 100644
--- a/cut-n-paste-code/libegg/eggsmclient-xsmp.c
+++ b/cut-n-paste-code/libegg/eggsmclient-xsmp.c
@@ -35,7 +35,11 @@
 #include <unistd.h>
 #include <X11/SM/SMlib.h>
 
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#if GTK_CHECK_VERSION (3, 0, 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))
@@ -368,7 +372,11 @@ sm_client_xsmp_startup (EggSMClient *client,
         free (ret_client_id);
 
         gdk_threads_enter ();
+#if GTK_CHECK_VERSION (3, 0, 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);