[nautilus-actions] Obsoletes GDK threads starting with 3.6

[Pierre Wieser <pwieser src gnome org>]

commit a0e8f67104e51d7f33095c81024ae797375ff87e
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Sep 9 22:51:46 2013 +0200

    Obsoletes GDK threads starting with 3.6

 ChangeLog                     |    3 +++
 src/nact/egg-sm-client-xsmp.c |   12 ++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 30ac2f1..1e04cc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-09-07 Pierre Wieser <pwieser trychlos org>
 
+       * src/nact/egg-sm-client-xsmp.c: Obsoletes gdk_threads_enter(), 
+       gdk_threads_leave() starting with gdk 3.6.
+
        * src/nact/base-gtk-utils.c: Remove useless blank lines.
 
        * src/nact/base-application.c (g_type_init):
diff --git a/src/nact/egg-sm-client-xsmp.c b/src/nact/egg-sm-client-xsmp.c
index 516baf0..0de5a6a 100644
--- a/src/nact/egg-sm-client-xsmp.c
+++ b/src/nact/egg-sm-client-xsmp.c
@@ -379,13 +379,17 @@ sm_client_xsmp_startup (EggSMClient *client,
       xsmp->client_id = g_strdup (ret_client_id);
       free (ret_client_id);
 
+#if !GTK_CHECK_VERSION( 3,6,0 )
       gdk_threads_enter ();
+#endif
 #if GTK_CHECK_VERSION( 2, 91, 7 )
       gdk_x11_set_sm_client_id (xsmp->client_id);
 #else
       gdk_set_sm_client_id (xsmp->client_id);
 #endif
+#if !GTK_CHECK_VERSION( 3,6,0 )
       gdk_threads_leave ();
+#endif
 
       g_debug ("Got client ID \"%s\"", xsmp->client_id);
     }
@@ -557,7 +561,9 @@ idle_do_pending_events (gpointer data)
   EggSMClientXSMP *xsmp = data;
   EggSMClient *client = data;
 
+#if !GTK_CHECK_VERSION( 3,6,0 )
   gdk_threads_enter ();
+#endif
 
   xsmp->idle = 0;
 
@@ -582,7 +588,9 @@ idle_do_pending_events (gpointer data)
     }
 
  out:
+#if !GTK_CHECK_VERSION( 3,6,0 )
   gdk_threads_leave ();
+#endif
   return FALSE;
 }
 
@@ -1305,9 +1313,13 @@ process_ice_messages (IceConn ice_conn)
 {
   IceProcessMessagesStatus status;
 
+#if !GTK_CHECK_VERSION( 3,6,0 )
   gdk_threads_enter ();
+#endif
   status = IceProcessMessages (ice_conn, NULL, NULL);
+#if !GTK_CHECK_VERSION( 3,6,0 )
   gdk_threads_leave ();
+#endif
 
   switch (status)
     {