summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2015-11-21 17:54:45 +0100
committerWolfgang Ulbrich <[email protected]>2015-12-02 00:14:33 +0100
commite14591b88509be82cc3de018d846ea215c973569 (patch)
treedf462fa404851b30b14bf6ac091e0d79e0969e3c
parentc3dadac7bb9b732fa2e174bf6470614888021b6b (diff)
downloadmate-session-manager-e14591b88509be82cc3de018d846ea215c973569.tar.bz2
mate-session-manager-e14591b88509be82cc3de018d846ea215c973569.tar.xz
GTK3: don't use deprecated gdk_threads_enter/leave
-rw-r--r--egg/eggsmclient-xsmp.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/egg/eggsmclient-xsmp.c b/egg/eggsmclient-xsmp.c
index 79edd82..ae6629b 100644
--- a/egg/eggsmclient-xsmp.c
+++ b/egg/eggsmclient-xsmp.c
@@ -366,9 +366,13 @@ sm_client_xsmp_startup (EggSMClient *client,
xsmp->client_id = g_strdup (ret_client_id);
free (ret_client_id);
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_enter ();
+#endif
gdk_x11_set_sm_client_id (xsmp->client_id);
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_leave ();
+#endif
g_debug ("Got client ID \"%s\"", xsmp->client_id);
}
@@ -536,7 +540,9 @@ idle_do_pending_events (gpointer data)
EggSMClientXSMP *xsmp = data;
EggSMClient *client = data;
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_enter ();
+#endif
xsmp->idle = 0;
@@ -561,7 +567,9 @@ idle_do_pending_events (gpointer data)
}
out:
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_leave ();
+#endif
return FALSE;
}
@@ -1283,9 +1291,13 @@ process_ice_messages (IceConn ice_conn)
{
IceProcessMessagesStatus status;
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_enter ();
+#endif
status = IceProcessMessages (ice_conn, NULL, NULL);
+#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_leave ();
+#endif
switch (status)
{