[gedit] Update from libegg

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 43a67b730b2a717e2d6dabfcbce5ff0298e089cc
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Dec 22 20:30:47 2010 +0100

    Update from libegg

 gedit/smclient/eggsmclient-private.h |    7 ++++++-
 gedit/smclient/eggsmclient-xsmp.c    |    6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/gedit/smclient/eggsmclient-private.h b/gedit/smclient/eggsmclient-private.h
index 9057918..0c98eee 100644
--- a/gedit/smclient/eggsmclient-private.h
+++ b/gedit/smclient/eggsmclient-private.h
@@ -20,7 +20,13 @@
 #ifndef __EGG_SM_CLIENT_PRIVATE_H__
 #define __EGG_SM_CLIENT_PRIVATE_H__
 
+#include <gtk/gtk.h>
+
+#if !GTK_CHECK_VERSION(2,91,7) && !GTK_CHECK_VERSION(3,0,0)
+/* GTK+ 3 includes this automatically */
 #include <gdkconfig.h>
+#endif
+
 #include "eggsmclient.h"
 
 G_BEGIN_DECLS
@@ -51,4 +57,3 @@ G_END_DECLS
 
 
 #endif /* __EGG_SM_CLIENT_PRIVATE_H__ */
-/* ex:set ts=8 noet: */
diff --git a/gedit/smclient/eggsmclient-xsmp.c b/gedit/smclient/eggsmclient-xsmp.c
index b5a037c..ec1b594 100644
--- a/gedit/smclient/eggsmclient-xsmp.c
+++ b/gedit/smclient/eggsmclient-xsmp.c
@@ -36,6 +36,7 @@
 #include <X11/SM/SMlib.h>
 
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 
 #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 +368,11 @@ sm_client_xsmp_startup (EggSMClient *client,
       free (ret_client_id);
 
       gdk_threads_enter ();
+#if !GTK_CHECK_VERSION(2,91,7) && !GTK_CHECK_VERSION(3,0,0)
       gdk_set_sm_client_id (xsmp->client_id);
+#else
+      gdk_x11_set_sm_client_id (xsmp->client_id);
+#endif
       gdk_threads_leave ();
 
       g_debug ("Got client ID \"%s\"", xsmp->client_id);
@@ -1368,4 +1373,3 @@ smc_error_handler (SmcConn       smc_conn,
 {
   /* Do nothing */
 }
-/* ex:set ts=8 noet: */