[vino/gnome-3-2] Update smclient to latest libegg version

[David King <davidk src gnome org>]

commit cdd30276d2112aa6776bb4373bfc16ce4fe2a7d1
Author: David King <amigadave amigadave com>
Date:   Wed Sep 28 16:19:39 2011 +0200

    Update smclient to latest libegg version

 server/smclient/eggdesktopfile.c   |    7 +++++--
 server/smclient/eggsmclient-xsmp.c |    7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/server/smclient/eggdesktopfile.c b/server/smclient/eggdesktopfile.c
index d5cc302..443d5ec 100644
--- a/server/smclient/eggdesktopfile.c
+++ b/server/smclient/eggdesktopfile.c
@@ -204,8 +204,11 @@ egg_desktop_file_new_from_key_file (GKeyFile    *key_file,
   else
     desktop_file->source = g_strdup (source);
 
-  desktop_file->name = g_key_file_get_string (key_file, EGG_DESKTOP_FILE_GROUP,
-					      EGG_DESKTOP_FILE_KEY_NAME, error);
+  desktop_file->name = g_key_file_get_locale_string (key_file,
+						     EGG_DESKTOP_FILE_GROUP,
+						     EGG_DESKTOP_FILE_KEY_NAME,
+						     NULL,
+						     error);
   if (!desktop_file->name)
     {
       egg_desktop_file_free (desktop_file);
diff --git a/server/smclient/eggsmclient-xsmp.c b/server/smclient/eggsmclient-xsmp.c
index ec1b594..d5cf3b5 100644
--- a/server/smclient/eggsmclient-xsmp.c
+++ b/server/smclient/eggsmclient-xsmp.c
@@ -193,6 +193,11 @@ egg_sm_client_xsmp_class_init (EggSMClientXSMPClass *klass)
 EggSMClient *
 egg_sm_client_xsmp_new (void)
 {
+#if GTK_CHECK_VERSION(3,0,0)
+  if (!GDK_IS_X11_DISPLAY_MANAGER (gdk_display_manager_get ()))
+    return NULL;
+#endif
+
   if (!g_getenv ("SESSION_MANAGER"))
     return NULL;
 
@@ -368,7 +373,7 @@ 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)
+#if !GTK_CHECK_VERSION(2,23,3) && !GTK_CHECK_VERSION(3,0,0)
       gdk_set_sm_client_id (xsmp->client_id);
 #else
       gdk_x11_set_sm_client_id (xsmp->client_id);